diff --git a/modules/core/default.nix b/modules/core/default.nix
index 849878a..d7aa66f 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -18,6 +18,7 @@
     ++ [(import ./services.nix)]
     ++ [(import ./gaming.nix)]
     ++ [(import ./system.nix)]
+    ++ [(import ./stylix.nix)]
     ++ [(import ./user.nix)]
     ++ [(import ./wayland.nix)]
     ++ [(import ./virtualisation.nix)];
diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix
new file mode 100644
index 0000000..1f55985
--- /dev/null
+++ b/modules/core/stylix.nix
@@ -0,0 +1,11 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [inputs.stylix.nixosModules.stylix];
+  stylix = {
+    enable = true;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+  };
+}
diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix
index 388c757..bcaf145 100644
--- a/modules/home/stylix.nix
+++ b/modules/home/stylix.nix
@@ -1,13 +1,11 @@
 {
-  inputs,
   config,
   pkgs,
   ...
 }: {
-  imports = [inputs.stylix.homeModules.stylix];
-
   stylix = {
     enable = true;
+    autoEnable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
     targets = {
       librewolf.profileNames = ["pedro"];
@@ -22,10 +20,7 @@
         name = "JetBrainsMono Nerd Font";
       };
 
-      emoji = {
-        package = pkgs.noto-fonts-emoji;
-        name = "Noto Color Emoji";
-      };
+      emoji = config.stylix.fonts.monospace;
     };
 
     cursor = {