diff --git a/data/fonts/LICENSE-noto-fonts-2014-11-17 b/data/fonts/LICENSE-noto-2015-06-05
similarity index 100%
rename from data/fonts/LICENSE-noto-fonts-2014-11-17
rename to data/fonts/LICENSE-noto-2015-06-05
diff --git a/data/fonts/mplus1mn-bolditalic-ascii.ttf b/data/fonts/mplus1mn-bold_italic-ascii.ttf
similarity index 100%
rename from data/fonts/mplus1mn-bolditalic-ascii.ttf
rename to data/fonts/mplus1mn-bold_italic-ascii.ttf
diff --git a/data/fonts/mplus1p-regular-multilingual.ttf b/data/fonts/mplus1p-regular-fallback.ttf
similarity index 75%
rename from data/fonts/mplus1p-regular-multilingual.ttf
rename to data/fonts/mplus1p-regular-fallback.ttf
index 46f474182..5251e5c4b 100644
Binary files a/data/fonts/mplus1p-regular-multilingual.ttf and b/data/fonts/mplus1p-regular-fallback.ttf differ
diff --git a/data/fonts/notoserif-bold-latin.ttf b/data/fonts/notoserif-bold-latin.ttf
deleted file mode 100644
index 87c1edb28..000000000
Binary files a/data/fonts/notoserif-bold-latin.ttf and /dev/null differ
diff --git a/data/fonts/notoserif-bold-subset.ttf b/data/fonts/notoserif-bold-subset.ttf
new file mode 100644
index 000000000..aecf9d074
Binary files /dev/null and b/data/fonts/notoserif-bold-subset.ttf differ
diff --git a/data/fonts/notoserif-bold_italic-subset.ttf b/data/fonts/notoserif-bold_italic-subset.ttf
new file mode 100644
index 000000000..c39cd6c35
Binary files /dev/null and b/data/fonts/notoserif-bold_italic-subset.ttf differ
diff --git a/data/fonts/notoserif-bolditalic-latin.ttf b/data/fonts/notoserif-bolditalic-latin.ttf
deleted file mode 100644
index 2bb260f70..000000000
Binary files a/data/fonts/notoserif-bolditalic-latin.ttf and /dev/null differ
diff --git a/data/fonts/notoserif-italic-latin.ttf b/data/fonts/notoserif-italic-latin.ttf
deleted file mode 100644
index 8dff8b68b..000000000
Binary files a/data/fonts/notoserif-italic-latin.ttf and /dev/null differ
diff --git a/data/fonts/notoserif-italic-subset.ttf b/data/fonts/notoserif-italic-subset.ttf
new file mode 100644
index 000000000..db6991da5
Binary files /dev/null and b/data/fonts/notoserif-italic-subset.ttf differ
diff --git a/data/fonts/notoserif-regular-latin.ttf b/data/fonts/notoserif-regular-latin.ttf
deleted file mode 100644
index b38a0227e..000000000
Binary files a/data/fonts/notoserif-regular-latin.ttf and /dev/null differ
diff --git a/data/fonts/notoserif-regular-subset.ttf b/data/fonts/notoserif-regular-subset.ttf
new file mode 100644
index 000000000..ef6f925c7
Binary files /dev/null and b/data/fonts/notoserif-regular-subset.ttf differ
diff --git a/data/themes/default-theme.yml b/data/themes/default-theme.yml
index bd4ba74e8..2d3c16e48 100644
--- a/data/themes/default-theme.yml
+++ b/data/themes/default-theme.yml
@@ -1,23 +1,25 @@
 font:
   catalog:
+    # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols
     Noto Serif:
-      normal: notoserif-regular-latin.ttf
-      bold: notoserif-bold-latin.ttf
-      italic: notoserif-italic-latin.ttf
-      bold_italic: notoserif-bolditalic-latin.ttf
+      normal: notoserif-regular-subset.ttf
+      bold: notoserif-bold-subset.ttf
+      italic: notoserif-italic-subset.ttf
+      bold_italic: notoserif-bold_italic-subset.ttf
+    # M+ 1mn supports ASCII and the circled numbers used for conums
     M+ 1mn:
       normal: mplus1mn-regular-ascii-conums.ttf
       bold: mplus1mn-bold-ascii.ttf
       italic: mplus1mn-italic-ascii.ttf
-      bold_italic: mplus1mn-bolditalic-ascii.ttf
+      bold_italic: mplus1mn-bold_italic-ascii.ttf
+    # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
+    # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
     M+ 1p Fallback:
-      normal: mplus1p-regular-multilingual.ttf
-      bold: mplus1p-regular-multilingual.ttf
-      italic: mplus1p-regular-multilingual.ttf
-      bold_italic: mplus1p-regular-multilingual.ttf
+      normal: mplus1p-regular-fallback.ttf
+      bold: mplus1p-regular-fallback.ttf
+      italic: mplus1p-regular-fallback.ttf
+      bold_italic: mplus1p-regular-fallback.ttf
   fallbacks:
-    # NOTE M+ 1p doesn't support all CJK characters, but it at least has some coverage
-    # NOTE M+ 1p provides the arrows for ->, <-, => and <=
     - M+ 1p Fallback
 page:
   background_color: ffffff