diff --git a/features-nixos/global/default.nix b/features-nixos/global/default.nix
index b7fc332..393bf56 100644
--- a/features-nixos/global/default.nix
+++ b/features-nixos/global/default.nix
@@ -13,6 +13,7 @@
       ./nix.nix
       ./sops.nix
       ./root.nix
+      ./stylix.nix
     ]
     ++ [
       inputs.home-manager.nixosModules.home-manager
diff --git a/features-nixos/global/stylix.nix b/features-nixos/global/stylix.nix
new file mode 100644
index 0000000..664a4fe
--- /dev/null
+++ b/features-nixos/global/stylix.nix
@@ -0,0 +1,32 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [inputs.stylix.nixosModules.stylix];
+
+  stylix.enable = true;
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+
+  stylix.fonts = {
+    serif = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Serif";
+    };
+
+    sansSerif = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans";
+    };
+
+    monospace = {
+      package = pkgs.dejavu_fonts;
+      name = "DejaVu Sans Mono";
+    };
+
+    emoji = {
+      package = pkgs.noto-fonts-color-emoji;
+      name = "Noto Color Emoji";
+    };
+  };
+}
diff --git a/homes/julian/features/suites/desktop/default.nix b/homes/julian/features/suites/desktop/default.nix
index 4a68a45..453b8fb 100644
--- a/homes/julian/features/suites/desktop/default.nix
+++ b/homes/julian/features/suites/desktop/default.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  imports = [./stylix.nix];
+  # imports = [./stylix.nix];
 
   services.blueman-applet.enable = true;
   services.nextcloud-client.enable = true;
@@ -9,6 +9,8 @@
   services.syncthing.tray.enable = true;
   services.syncthing.tray.command = "syncthingtray --wait"; # Wait for tray to become available
 
+  gtk.gtk4.theme = null; # Fix evaluation warning since using old home manager version
+
   programs.chromium = {
     enable = true;
     extensions = [
diff --git a/homes/julian/features/suites/desktop/stylix.nix b/homes/julian/features/suites/desktop/stylix.nix
deleted file mode 100644
index e4b2fea..0000000
--- a/homes/julian/features/suites/desktop/stylix.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [inputs.stylix.homeModules.stylix];
-
-  stylix.enable = true;
-  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-}