diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix
index 49d9642..c5daa53 100644
--- a/flake-modules/rice.nix
+++ b/flake-modules/rice.nix
@@ -41,8 +41,7 @@ pkgs: rec {
   in ccolor // fcolor // xcolor; 
   font = {
     code = {
-      name = "JetBrainsMono-NF";
-      name2 = "JetBrainsMono Nerd Font";
+      name = "JetBrainsMono Nerd Font";
       package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; });
       # name = "CascadiaCove-NF";
       # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix
index 797a03e..b8731de 100644
--- a/home-modules/color-pallete.nix
+++ b/home-modules/color-pallete.nix
@@ -46,7 +46,7 @@
           margin: ${builtins.toString rice.gap-size}px;
         }
         .color-container {
-          font-family: ${rice.font.code.name2};
+          font-family: ${rice.font.code.name};
           display: flex;
           gap: ${builtins.toString rice.gap-size}px;
           margin: ${builtins.toString rice.gap-size}px;
diff --git a/home-modules/kitty.nix b/home-modules/kitty.nix
index 8a99779..710fb1e 100755
--- a/home-modules/kitty.nix
+++ b/home-modules/kitty.nix
@@ -3,7 +3,7 @@
   programs.kitty = {
     enable = true;
     font = {
-      name = rice.font.code.name2;
+      name = rice.font.code.name;
       package = rice.font.code.package;
     };
     settings = with rice.color; {
diff --git a/home-modules/mako.nix b/home-modules/mako.nix
index 0d9e4c2..712943b 100755
--- a/home-modules/mako.nix
+++ b/home-modules/mako.nix
@@ -8,7 +8,7 @@
     textColor = color.foreground;
     borderColor = color.border;
     borderSize = border-width;
-    font = font.code.name2;
+    font = font.code.name;
     borderRadius = rounding;
     anchor = "top-right";
     margin = builtins.toString (gap-size * 2) ;
diff --git a/home-modules/rofi.nix b/home-modules/rofi.nix
index b342b50..880b5e2 100755
--- a/home-modules/rofi.nix
+++ b/home-modules/rofi.nix
@@ -14,7 +14,7 @@
       }
 
       * {
-        font: "${rice.font.code.name2} 12";
+        font: "${rice.font.code.name} 12";
         foreground: ${foreground};
         background-color: ${background}${trdr};
         padding: 0px;
diff --git a/home-modules/vscode.nix b/home-modules/vscode.nix
index b38d123..6ef5d6d 100755
--- a/home-modules/vscode.nix
+++ b/home-modules/vscode.nix
@@ -65,7 +65,7 @@
       ];
       userSettings = {
         workbench.colorTheme = "Just Black";
-        editor.fontFamily = "'${rice.font.code.name2}', 'monospace', monospace";
+        editor.fontFamily = "'${rice.font.code.name}', 'monospace', monospace";
         remote.SSH.useLocalServer = false;
       };
       enableUpdateCheck = false;
diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix
index d7e0bed..6cba5d8 100755
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -163,7 +163,7 @@ in {
     };
     style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in ''
       * {
-        font-family: ${rice.font.code.name2};
+        font-family: ${rice.font.code.name};
         font-size: 1em;
         min-height: 0px;
         margin: 0px;
@@ -223,7 +223,7 @@ in {
       }
 
       #window, #custom-ctimeremaining {
-        font-family: ${rice.font.base.name}, ${rice.font.code.name2};
+        font-family: ${rice.font.base.name}, ${rice.font.code.name};
         color: rgb(${f tertiary.bright});
       }
 
diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix
index 7d32cd4..9c88a2e 100644
--- a/system-modules/fonts.nix
+++ b/system-modules/fonts.nix
@@ -7,7 +7,8 @@
 {
   fonts.packages = with pkgs; [
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
+    noto-fonts-cjk-serif
     noto-fonts-emoji
     newcomputermodern
     atkinson-hyperlegible