diff --git a/users/jordan/common/optional/graphical/hyprland/default.nix b/users/jordan/common/optional/graphical/hyprland/default.nix
index 4c2342f..f3fa7f8 100644
--- a/users/jordan/common/optional/graphical/hyprland/default.nix
+++ b/users/jordan/common/optional/graphical/hyprland/default.nix
@@ -226,10 +226,6 @@ in
     };
   };
 
-  fonts.fontconfig.defaultFonts.sansSerif = [
-    "Adwaita Sans"
-  ];
-
   xdg.configFile = mkIf osConfig.programs.hyprland.withUWSM {
     "Kvantum/kvantum.kvconfig".text = toINI { } {
       General.theme = "KvLibadwaitaDark";
@@ -243,41 +239,33 @@ in
     ) hyprVariables;
   };
 
-  stylix = {
+  home.pointerCursor = {
     enable = true;
-    autoEnable = false;
-    image = osConfig.lib.stylix.pixel "base00";
-    polarity = "dark";
+    gtk.enable = true;
+    name = "macOS";
+    package = pkgs.apple-cursor;
+    size = 28;
+  };
 
-    # colors, dracula, eris, google-dark, framer, horizon-terminal-dark, humanoid-dark, isotope, onedark-dark, spacemacs, windows-nt
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-dark.yaml";
-
-    cursor = {
-      name = "macOS";
-      package = pkgs.apple-cursor;
-      size = 28;
-    };
-
-    fonts = {
-      sansSerif = {
-        name = "Adwaita Sans";
-        package = pkgs.adwaita-fonts;
-      };
-      emoji = {
-        name = "Apple Color Emoji";
-        package = pkgs.apple-color-emoji;
-      };
-    };
+  gtk = {
+    enable = true;
 
     iconTheme = {
-      enable = true;
+      name = "MoreWaita";
       package = pkgs.unstable.morewaita-icon-theme;
-      dark = "MoreWaita";
-      light = "MoreWaita";
     };
+  };
 
-    targets.font-packages.enable = true;
-    targets.fontconfig.enable = true;
+  fonts.fontconfig = {
+    enable = true;
+    defaultFonts = {
+      sansSerif = [
+        "Adwaita Sans"
+      ];
+      emoji = [
+        "Apple Color Emoji"
+      ];
+    };
   };
 
   programs.kitty = {
@@ -288,7 +276,10 @@ in
     };
   };
 
-  home.packages = with pkgs.unstable; [
+  home.packages = (with pkgs; [
+    adwaita-fonts
+    apple-color-emoji
+  ]) ++ (with pkgs.unstable; [
     anyrun
     clipse
     dunst
@@ -298,7 +289,7 @@ in
     qadwaitadecorations
     qadwaitadecorations-qt6
     wl-clipboard
-  ];
+  ]);
 
   services = {
     flameshot.enable = true;