diff --git a/dist-font/cm-data/99-font.sh.addon b/dist-font/cm-data/99-font.sh.addon
index 53fb86a..486e9c3 100755
--- a/dist-font/cm-data/99-font.sh.addon
+++ b/dist-font/cm-data/99-font.sh.addon
@@ -24,24 +24,18 @@ export PATH="${PATH}:$S/bin:$S/xbin"
 
 list_files() {
 cat <<EOF
-fonts/IBMPlexSans-Black.ttf
-fonts/IBMPlexSans-BlackItalic.ttf
-fonts/IBMPlexSans-Bold.ttf
-fonts/IBMPlexSans-BoldItalic.ttf
-fonts/IBMPlexSans-Hairline.ttf
-fonts/IBMPlexSans-HairlineItalic.ttf
-fonts/IBMPlexSans-Heavy.ttf
-fonts/IBMPlexSans-HeavyItalic.ttf
-fonts/IBMPlexSans-Italic.ttf
-fonts/IBMPlexSans-Light.ttf
-fonts/IBMPlexSans-LightItalic.ttf
-fonts/IBMPlexSans-Medium.ttf
-fonts/IBMPlexSans-MediumItalic.ttf
-fonts/IBMPlexSans-Regular.ttf
-fonts/IBMPlexSans-Semibold.ttf
-fonts/IBMPlexSans-SemiboldItalic.ttf
-fonts/IBMPlexSans-Thin.ttf
-fonts/IBMPlexSans-ThinItalic.ttf
+fonts/NotoSans-BlackItalic.ttf
+fonts/NotoSans-Black.ttf
+fonts/NotoSans-BoldItalic.ttf
+fonts/NotoSans-Bold.ttf
+fonts/NotoSans-Italic.ttf
+fonts/NotoSans-LightItalic.ttf
+fonts/NotoSans-Light.ttf
+fonts/NotoSans-MediumItalic.ttf
+fonts/NotoSans-Medium.ttf
+fonts/NotoSans-Regular.ttf
+fonts/NotoSans-ThinItalic.ttf
+fonts/NotoSans-Thin.ttf
 EOF
 }
 
@@ -71,7 +65,7 @@ case "$1" in
     # update fonts.xml
     cp -p "$SYS/etc/fonts.xml" "$SYS/etc/fonts.xml.bak"
     sed -i \
-        -e "s/Roboto-/IBMPlexSans-/g" \
+        -e "s/Roboto-/NotoSans-/g" \
         "$SYS/etc/fonts.xml"
     # Fix ownership/permissions
     for i in $(list_files); do
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Bold.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Bold.ttf
deleted file mode 100644
index e324b09..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Bold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-BoldItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-BoldItalic.ttf
deleted file mode 100644
index 3dac75f..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-BoldItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLight.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLight.ttf
deleted file mode 100644
index 44880d0..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLight.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLightItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLightItalic.ttf
deleted file mode 100644
index 2f7b249..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ExtraLightItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Italic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Italic.ttf
deleted file mode 100644
index 2fa3e21..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Italic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Light.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Light.ttf
deleted file mode 100644
index 1ba6c20..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Light.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-LightItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-LightItalic.ttf
deleted file mode 100644
index c9d12a1..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-LightItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Medium.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Medium.ttf
deleted file mode 100644
index a965e3a..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Medium.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-MediumItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-MediumItalic.ttf
deleted file mode 100644
index e3257f5..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-MediumItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Regular.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Regular.ttf
deleted file mode 100644
index 7253123..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Regular.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBold.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBold.ttf
deleted file mode 100644
index cfcf46d..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBold.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBoldItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBoldItalic.ttf
deleted file mode 100644
index 5442441..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-SemiBoldItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Text.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Text.ttf
deleted file mode 100644
index e53b7b0..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Text.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-TextItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-TextItalic.ttf
deleted file mode 100644
index d38880d..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-TextItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Thin.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Thin.ttf
deleted file mode 100644
index 4290a8e..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-Thin.ttf and /dev/null differ
diff --git a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ThinItalic.ttf b/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ThinItalic.ttf
deleted file mode 100644
index 656c76d..0000000
Binary files a/dist-font/cm-data/IBMPlexSans/IBMPlexSans-ThinItalic.ttf and /dev/null differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-Black.ttf b/dist-font/cm-data/NotoSans/NotoSans-Black.ttf
new file mode 100644
index 0000000..c33dc09
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-Black.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-BlackItalic.ttf b/dist-font/cm-data/NotoSans/NotoSans-BlackItalic.ttf
new file mode 100644
index 0000000..91defc2
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-BlackItalic.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-Bold.ttf b/dist-font/cm-data/NotoSans/NotoSans-Bold.ttf
new file mode 100644
index 0000000..1baeffd
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-Bold.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-BoldItalic.ttf b/dist-font/cm-data/NotoSans/NotoSans-BoldItalic.ttf
new file mode 100644
index 0000000..c08cc8e
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-BoldItalic.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-Italic.ttf b/dist-font/cm-data/NotoSans/NotoSans-Italic.ttf
new file mode 100644
index 0000000..944862d
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-Italic.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-Light.ttf b/dist-font/cm-data/NotoSans/NotoSans-Light.ttf
new file mode 100644
index 0000000..381908a
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-Light.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-LightItalic.ttf b/dist-font/cm-data/NotoSans/NotoSans-LightItalic.ttf
new file mode 100644
index 0000000..470d320
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-LightItalic.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-Medium.ttf b/dist-font/cm-data/NotoSans/NotoSans-Medium.ttf
new file mode 100644
index 0000000..cce761e
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-Medium.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-MediumItalic.ttf b/dist-font/cm-data/NotoSans/NotoSans-MediumItalic.ttf
new file mode 100644
index 0000000..999d063
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-MediumItalic.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-Regular.ttf b/dist-font/cm-data/NotoSans/NotoSans-Regular.ttf
new file mode 100644
index 0000000..df8e728
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-Regular.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-Thin.ttf b/dist-font/cm-data/NotoSans/NotoSans-Thin.ttf
new file mode 100644
index 0000000..d078618
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-Thin.ttf differ
diff --git a/dist-font/cm-data/NotoSans/NotoSans-ThinItalic.ttf b/dist-font/cm-data/NotoSans/NotoSans-ThinItalic.ttf
new file mode 100644
index 0000000..ee9429b
Binary files /dev/null and b/dist-font/cm-data/NotoSans/NotoSans-ThinItalic.ttf differ
diff --git a/dist-font/cm.sh b/dist-font/cm.sh
index 35cafbc..66d26fe 100755
--- a/dist-font/cm.sh
+++ b/dist-font/cm.sh
@@ -10,9 +10,9 @@ export PATH="${PATH}:${SYSTEM}/bin:${SYSTEM}/xbin"
 
 # install iptables script
 echo "Installing font"
-cp cm-data/IBMPlexSans/IBMPlexSans*.ttf ${SYSTEM}/fonts/
-chown root:root ${SYSTEM}/fonts/IBMPlexSans*.ttf
-chmod 750 ${SYSTEM}/fonts/IBMPlexSans*.ttf
+cp cm-data/NotoSans/NotoSans*.ttf ${SYSTEM}/fonts/
+chown root:root ${SYSTEM}/fonts/NotoSans*.ttf
+chmod 750 ${SYSTEM}/fonts/NotoSans*.ttf
 
 # install restore script
 echo "Installing restore script"
diff --git a/fontpatcher.pe b/fontpatcher.pe
new file mode 100644
index 0000000..1cfc209
--- /dev/null
+++ b/fontpatcher.pe
@@ -0,0 +1,8 @@
+#!/usr/bin/env fontforge
+
+Open($1)
+Select(0u003A);
+Copy();
+Select(0uEE01);
+Paste();
+Generate($1)
diff --git a/fontpatcher.sh b/fontpatcher.sh
new file mode 100755
index 0000000..ec0e691
--- /dev/null
+++ b/fontpatcher.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for font in dist-font/cm-data/NotoSans/*
+do
+    echo "Patching $font"
+    fontforge -script fontpatcher.pe $font
+done