diff --git a/home/modules/stylix/default.nix b/home/modules/stylix/default.nix
index b069f1e..c02c3fd 100644
--- a/home/modules/stylix/default.nix
+++ b/home/modules/stylix/default.nix
@@ -20,13 +20,8 @@ in
         base16Scheme
         override
         image
+        fonts
         ;
-      fonts = {
-        monospace = theme.monospaceFont;
-        serif = config.stylix.fonts.monospace;
-        sansSerif = config.stylix.fonts.monospace;
-        emoji = config.stylix.fonts.monospace;
-      };
       targets = import ../../../modules/stylix/targets.nix;
     };
   };
diff --git a/modules/stylix/default.nix b/modules/stylix/default.nix
index 244dcd4..2da68d2 100644
--- a/modules/stylix/default.nix
+++ b/modules/stylix/default.nix
@@ -23,14 +23,8 @@ in
         base16Scheme
         override
         image
+        fonts
         ;
-      fonts = {
-        monospace = theme.monospaceFont;
-        serif = config.stylix.fonts.monospace;
-        sansSerif = config.stylix.fonts.monospace;
-        emoji = config.stylix.fonts.monospace;
-      };
-      autoEnable = true;
       targets.regreet.enable = false;
     };
 
diff --git a/modules/stylix/theme.nix b/modules/stylix/theme.nix
index 41f51f8..6e22669 100644
--- a/modules/stylix/theme.nix
+++ b/modules/stylix/theme.nix
@@ -1,5 +1,11 @@
 { pkgs }:
 
+let
+  monospaceFont = {
+    package = pkgs.iosevka-bin.override { variant = "SS08"; };
+    name = "Iosevka Term SS08";
+  };
+in
 {
   polarity = "dark";
   base16Scheme = ./zenwritten-dark.yaml;
@@ -9,8 +15,11 @@
   image = pkgs.runCommand "solid-bg.png" { nativeBuildInputs = [ pkgs.imagemagick ]; } ''
     magick -size 1x1 xc:#191919 $out
   '';
-  monospaceFont = {
-    package = pkgs.iosevka-bin.override { variant = "SS08"; };
-    name = "Iosevka Term SS08";
+  inherit monospaceFont;
+  fonts = {
+    monospace = monospaceFont;
+    serif = monospaceFont;
+    sansSerif = monospaceFont;
+    emoji = monospaceFont;
   };
 }