diff --git a/assets/fonts/Comfortaa-Bold.ttf b/assets/fonts/Comfortaa-Bold.ttf
new file mode 100755
index 0000000..e64de93
Binary files /dev/null and b/assets/fonts/Comfortaa-Bold.ttf differ
diff --git a/assets/fonts/Comfortaa-Regular.ttf b/assets/fonts/Comfortaa-Regular.ttf
new file mode 100755
index 0000000..abc4409
Binary files /dev/null and b/assets/fonts/Comfortaa-Regular.ttf differ
diff --git a/assets/fonts/NotoSansSC-VariableFont_wght.ttf b/assets/fonts/NotoColorEmoji-Regular.ttf
similarity index 57%
rename from assets/fonts/NotoSansSC-VariableFont_wght.ttf
rename to assets/fonts/NotoColorEmoji-Regular.ttf
index 4e0c62e..05b42fd 100755
Binary files a/assets/fonts/NotoSansSC-VariableFont_wght.ttf and b/assets/fonts/NotoColorEmoji-Regular.ttf differ
diff --git a/assets/fonts/NotoSansHK-Bold.ttf b/assets/fonts/NotoSansHK-Bold.ttf
new file mode 100755
index 0000000..76812d7
Binary files /dev/null and b/assets/fonts/NotoSansHK-Bold.ttf differ
diff --git a/assets/fonts/NotoSansHK-Regular.ttf b/assets/fonts/NotoSansHK-Regular.ttf
new file mode 100755
index 0000000..2a62b97
Binary files /dev/null and b/assets/fonts/NotoSansHK-Regular.ttf differ
diff --git a/assets/fonts/NotoSansJP-Bold.ttf b/assets/fonts/NotoSansJP-Bold.ttf
new file mode 100755
index 0000000..384f8eb
Binary files /dev/null and b/assets/fonts/NotoSansJP-Bold.ttf differ
diff --git a/assets/fonts/NotoSansJP-Regular.ttf b/assets/fonts/NotoSansJP-Regular.ttf
new file mode 100755
index 0000000..1583096
Binary files /dev/null and b/assets/fonts/NotoSansJP-Regular.ttf differ
diff --git a/assets/fonts/NotoSansSC-Bold.ttf b/assets/fonts/NotoSansSC-Bold.ttf
new file mode 100755
index 0000000..53f4437
Binary files /dev/null and b/assets/fonts/NotoSansSC-Bold.ttf differ
diff --git a/assets/fonts/NotoSansHK-VariableFont_wght.ttf b/assets/fonts/NotoSansSC-Regular.ttf
similarity index 54%
rename from assets/fonts/NotoSansHK-VariableFont_wght.ttf
rename to assets/fonts/NotoSansSC-Regular.ttf
index 47f2c84..7056f5e 100755
Binary files a/assets/fonts/NotoSansHK-VariableFont_wght.ttf and b/assets/fonts/NotoSansSC-Regular.ttf differ
diff --git a/assets/fonts/Quicksand-VariableFont_wght.ttf b/assets/fonts/Quicksand-VariableFont_wght.ttf
deleted file mode 100755
index bd332b6..0000000
Binary files a/assets/fonts/Quicksand-VariableFont_wght.ttf and /dev/null differ
diff --git a/lib/theme.dart b/lib/theme.dart
index b8de593..e7d4f92 100644
--- a/lib/theme.dart
+++ b/lib/theme.dart
@@ -38,9 +38,18 @@ abstract class SolianTheme {
         brightness: brightness,
         seedColor: seedColor ?? const Color.fromRGBO(154, 98, 91, 1),
       ),
-      fontFamily: 'Quicksand',
-      fontFamilyFallback: const ['NotoSansSC', 'NotoSansHK'],
-      typography: Typography.material2021(),
+      fontFamily: 'Comfortaa',
+      fontFamilyFallback: const [
+        'NotoSansSC',
+        'NotoSansHK',
+        'NotoSansJP',
+        'NotoSansEmoji'
+      ],
+      typography: Typography.material2021(
+        colorScheme: brightness == Brightness.light
+            ? const ColorScheme.light()
+            : const ColorScheme.dark(),
+      ),
     );
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index bb31bb2..e55f14e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -81,15 +81,29 @@ flutter:
     - assets/logo.png
 
   fonts:
+    - family: NotoSansEmoji
+      fonts:
+        - asset: assets/fonts/NotoColorEmoji-Regular.ttf
     - family: NotoSansSC
       fonts:
-        - asset: assets/fonts/NotoSansSC-VariableFont_wght.ttf
+        - asset: assets/fonts/NotoSansSC-Regular.ttf
+        - asset: assets/fonts/NotoSansSC-Bold.ttf
+          weight: 700
     - family: NotoSansHK
       fonts:
-        - asset: assets/fonts/NotoSansHK-VariableFont_wght.ttf
-    - family: Quicksand
+        - asset: assets/fonts/NotoSansHK-Regular.ttf
+        - asset: assets/fonts/NotoSansHK-Bold.ttf
+          weight: 700
+    - family: NotoSansJP
       fonts:
-        - asset: assets/fonts/Quicksand-VariableFont_wght.ttf
+        - asset: assets/fonts/NotoSansJP-Regular.ttf
+        - asset: assets/fonts/NotoSansJP-Bold.ttf
+          weight: 700
+    - family: Comfortaa
+      fonts:
+        - asset: assets/fonts/Comfortaa-Regular.ttf
+        - asset: assets/fonts/Comfortaa-Bold.ttf
+          weight: 700
 
 flutter_launcher_icons:
   android: