diff --git a/home/programs/qutebrowser/default.nix b/home/programs/qutebrowser/default.nix
index 33cd02c..f1dca95 100644
--- a/home/programs/qutebrowser/default.nix
+++ b/home/programs/qutebrowser/default.nix
@@ -73,7 +73,7 @@ let
 
 in {
 
-  # imports = [ ./duckduckgo-colorscheme.nix ];
+  imports = [ ./duckduckgo-colorscheme.nix ];
 
   programs.qutebrowser = {
     enable = true;
diff --git a/home/programs/qutebrowser/duckduckgo-colorscheme.nix b/home/programs/qutebrowser/duckduckgo-colorscheme.nix
index eace3f7..f51d8a9 100644
--- a/home/programs/qutebrowser/duckduckgo-colorscheme.nix
+++ b/home/programs/qutebrowser/duckduckgo-colorscheme.nix
@@ -1,36 +1,38 @@
 { config, ... }: {
-  home.file.".duckduckgo-colorscheme.js".text = ''
-    // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
-    // based on https://ddg.codingcodax.dev/
-    // Cookies string for your theme
-    const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};';
+  home.file.".duckduckgo-colorscheme.js".text =
+    # js
+    ''
+      // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
+      // based on https://ddg.codingcodax.dev/
+      // Cookies string for your theme
+      const cookie = '7=${config.lib.stylix.colors.base00}; j=${config.lib.stylix.colors.base00}; 9=${config.lib.stylix.colors.base05}; aa=${config.lib.stylix.colors.base06}; 8=${config.lib.stylix.colors.base05}; x=${config.lib.stylix.colors.base0D}; 21=${config.lib.stylix.colors.base01};';
 
-    // Converts cookie string into formatted JSON
-    const cookieToJSON = (cookieRaw) => {
-      const cookieJson = {};
-      const items = cookieRaw.split(/[ ,]+/);
+      // Converts cookie string into formatted JSON
+      const cookieToJSON = (cookieRaw) => {
+        const cookieJson = {};
+        const items = cookieRaw.split(/[ ,]+/);
 
-      items.forEach((item) => {
-        const parts = item.split('=');
-        cookieJson[parts[0]] = parts[1];
-      });
+        items.forEach((item) => {
+          const parts = item.split('=');
+          cookieJson[parts[0]] = parts[1];
+        });
 
-      return cookieJson;
-    };
+        return cookieJson;
+      };
 
-    // Iterates over JSON, and adds to browser cookie store
-    const setCookies = (cookieJson) => {
-      Object.keys(cookieJson).forEach((key) => {
-        document.cookie = `''${key}=''${cookieJson [ key ]}`;
-      });
-    };
+      // Iterates over JSON, and adds to browser cookie store
+      const setCookies = (cookieJson) => {
+        Object.keys(cookieJson).forEach((key) => {
+          document.cookie = `''${key}=''${cookieJson [ key ]}`;
+        });
+      };
 
-    alert('The Nixy theme will be applied.');
+      alert('The Nixy theme will be applied.');
 
-    // Call set cookies, passing in formated cookie data
-    setCookies(cookieToJSON(cookie));
+      // Call set cookies, passing in formated cookie data
+      setCookies(cookieToJSON(cookie));
 
-    // All done, reload page for changes to take effect :)
-    location.reload();
-  '';
+      // All done, reload page for changes to take effect :)
+      location.reload();
+    '';
 }
diff --git a/home/scripts/nerdfont_fzf/default.nix b/home/scripts/nerdfont_fzf/default.nix
index 84455ba..0439d05 100644
--- a/home/scripts/nerdfont_fzf/default.nix
+++ b/home/scripts/nerdfont_fzf/default.nix
@@ -5,11 +5,9 @@
 #- - `nerdfont-fzf` - Search for Nerd Fonts icons using fzf.
 { pkgs, config, ... }:
 let
-  homedir = config.home.homeDirectory;
-
   nerdfont-fzf = pkgs.writeShellScriptBin "nerdfont-fzf" ''
     # Dependencies: jq, fzf, wl-copy, wget
-    icons=$(jq -r 'to_entries[] | "\(.key):\(.value.char)"' "${homedir}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
+    icons=$(jq -r 'to_entries[] | "\(.key):\(.value.char)"' "/home/${config.var.username}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
     fzf_result=$(echo "$icons" | fzf --ansi --border none | awk '{print $1}')
     if [ -z "$fzf_result" ]; then
       echo "No icon selected"
diff --git a/home/system/clipman/default.nix b/home/system/clipman/default.nix
index 1a524dc..eca248e 100644
--- a/home/system/clipman/default.nix
+++ b/home/system/clipman/default.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }:
 let
-
   clipboard-clear = pkgs.writeShellScriptBin "clipboard-clear" ''
     clipman clear --all
   '';
@@ -14,5 +13,4 @@ in {
     [ "${clipboard-clear}" "wl-paste -t text --watch clipman store" ];
   home.packages = with pkgs; [ clipman clipboard clipboard-clear ];
   services.clipman.enable = true;
-
 }
diff --git a/home/system/gtk/default.nix b/home/system/gtk/default.nix
index f0bef3a..8c44441 100644
--- a/home/system/gtk/default.nix
+++ b/home/system/gtk/default.nix
@@ -6,130 +6,11 @@
     style.name = "gtk2";
   };
 
-  gtk = { enable = true; };
-  #
-  #   theme = { name = "FlatColor"; };
-  #
-  #   iconTheme = {
-  #     package = pkgs.kora-icon-theme;
-  #     name = "Kora";
-  #   };
-  #
-  #   font = {
-  #     name = config.var.theme.font;
-  #     size = config.var.theme.font-size;
-  #   };
-  #
-  #   gtk3.extraConfig = {
-  #     Settings = ''
-  #       gtk-application-prefer-dark-theme=1
-  #     '';
-  #   };
-  #
-  #   gtk4.extraConfig = {
-  #     Settings = ''
-  #       gtk-application-prefer-dark-theme=1
-  #     '';
-  #   };
-  # };
-  #
-  # home.pointerCursor = {
-  #   gtk.enable = true;
-  #   package = pkgs.bibata-cursors;
-  #   name = "Bibata-Modern-Classic";
-  #   size = 14;
-  # };
-  #
-  # home.file = {
-  #   ".local/share/themes/FlatColor" = {
-  #     recursive = true;
-  #     source = pkgs.stdenv.mkDerivation {
-  #       name = "FlatColor";
-  #
-  #       src = pkgs.fetchFromGitHub {
-  #         owner = "jasperro";
-  #         repo = "FlatColor";
-  #         rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
-  #         hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
-  #       };
-  #
-  #       buildPhase = ''
-  #         mkdir -p $out
-  #         # delete the default gtk-color-scheme:
-  #         file="./gtk-2.0/gtkrc"
-  #         sed -i '3,29d' $file
-  #         sed -i '3i include "../colors2"' $file
-  #
-  #         file="./gtk-3.0/gtk.css"
-  #         sed -i '2,10d' $file
-  #         sed -i '2i @import url("../colors3");' $file
-  #
-  #         file="./gtk-3.20/gtk.css"
-  #         sed -i '2,26d' $file
-  #         sed -i '2i @import url("../colors3");' $file
-  #
-  #         cp -r . $out 
-  #       '';
-  #     };
-  #   };
-  #
-  #   ".local/share/themes/FlatColor/colors2".text = ''
-  #     bg_color:#${config.var.theme.colors.bg}
-  #     color0:#${config.var.theme.colors.c0}
-  #     color1:#${config.var.theme.colors.c1}
-  #     color2:#${config.var.theme.colors.c2}
-  #     color3:#${config.var.theme.colors.c3}
-  #     color4:#${config.var.theme.colors.c4}
-  #     color5:#${config.var.theme.colors.c5}
-  #     color6:#${config.var.theme.colors.c6}
-  #     color7:#${config.var.theme.colors.c7}
-  #     color8:#${config.var.theme.colors.c8}
-  #     color9:#${config.var.theme.colors.c9}
-  #     color10:#${config.var.theme.colors.c10}
-  #     color11:#${config.var.theme.colors.c11}
-  #     color12:#${config.var.theme.colors.c12}
-  #     color13:#${config.var.theme.colors.c13}
-  #     color14:#${config.var.theme.colors.c14}
-  #     color15:#${config.var.theme.colors.c15}
-  #     text_color:#${config.var.theme.colors.fg}
-  #     selected_bg_color:#${config.var.theme.colors.accent}
-  #     selected_fg_color:#${config.var.theme.colors.accentFg}
-  #     tooltip_bg_color:#${config.var.theme.colors.bgalt}
-  #     tooltip_fg_color:#${config.var.theme.colors.fgalt}
-  #     titlebar_bg_color:#${config.var.theme.colors.bgalt}
-  #     titlebar_fg_color:#${config.var.theme.colors.fgalt}
-  #     menu_bg_color:#${config.var.theme.colors.bgalt}
-  #     menu_fg_color:#${config.var.theme.colors.fgalt}
-  #     link_color:#${config.var.theme.colors.accent}
-  #   '';
-  #
-  #   ".local/share/themes/FlatColor/colors3".text = ''
-  #     @define-color color0 #${config.var.theme.colors.c0};
-  #     @define-color color1 #${config.var.theme.colors.c1};
-  #     @define-color color2 #${config.var.theme.colors.c2};
-  #     @define-color color3 #${config.var.theme.colors.c3};
-  #     @define-color color4 #${config.var.theme.colors.c4};
-  #     @define-color color5 #${config.var.theme.colors.c5};
-  #     @define-color color6 #${config.var.theme.colors.c6};
-  #     @define-color color7 #${config.var.theme.colors.c7};
-  #     @define-color color8 #${config.var.theme.colors.c8};
-  #     @define-color color9 #${config.var.theme.colors.c9};
-  #     @define-color color10 #${config.var.theme.colors.c10};
-  #     @define-color color11 #${config.var.theme.colors.c11};
-  #     @define-color color12 #${config.var.theme.colors.c12};
-  #     @define-color color13 #${config.var.theme.colors.c13};
-  #     @define-color color14 #${config.var.theme.colors.c14};
-  #     @define-color color15 #${config.var.theme.colors.c15};
-  #     @define-color selected_bg_color #${config.var.theme.colors.accent};
-  #     @define-color selected_fg_color #${config.var.theme.colors.accentFg};
-  #
-  #     @define-color bg_color #${config.var.theme.colors.bg};
-  #     @define-color fg_color #${config.var.theme.colors.fg};
-  #     @define-color base_color @bg_color;
-  #     @define-color text_color @fg_color;
-  #     @define-color text_color_disabled mix(@text_color, @base_color, 0.4);
-  #     @define-color tooltip_bg_color #${config.var.theme.colors.bgalt};
-  #     @define-color tooltip_fg_color #${config.var.theme.colors.fgalt};
-  #   '';
-  # };
+  gtk = {
+    enable = true;
+    iconTheme = {
+      package = pkgs.kora-icon-theme;
+      name = "Kora";
+    };
+  };
 }
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/X_cursor.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/X_cursor.hlc
deleted file mode 100644
index 4fa2af1..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/X_cursor.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/all-scroll.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/all-scroll.hlc
deleted file mode 100644
index 7d9afd6..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/all-scroll.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/bottom_left_corner.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/bottom_left_corner.hlc
deleted file mode 100644
index 350a56f..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/bottom_left_corner.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/bottom_right_corner.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/bottom_right_corner.hlc
deleted file mode 100644
index 24dd10d..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/bottom_right_corner.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/bottom_tee.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/bottom_tee.hlc
deleted file mode 100644
index a0d0509..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/bottom_tee.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/center_ptr.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/center_ptr.hlc
deleted file mode 100644
index fb9a7f5..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/center_ptr.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/context-menu.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/context-menu.hlc
deleted file mode 100644
index e7d7112..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/context-menu.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/copy.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/copy.hlc
deleted file mode 100644
index 9329ace..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/copy.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/cross.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/cross.hlc
deleted file mode 100644
index 3203396..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/cross.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/crossed_circle.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/crossed_circle.hlc
deleted file mode 100644
index 1459dce..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/crossed_circle.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/crosshair.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/crosshair.hlc
deleted file mode 100644
index c41078b..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/crosshair.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/dnd_no_drop.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/dnd_no_drop.hlc
deleted file mode 100644
index da718a1..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/dnd_no_drop.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/dotbox.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/dotbox.hlc
deleted file mode 100644
index d495e9a..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/dotbox.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/hand1.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/hand1.hlc
deleted file mode 100644
index 4387b72..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/hand1.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/hand2.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/hand2.hlc
deleted file mode 100644
index 598cba9..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/hand2.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/left_ptr.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/left_ptr.hlc
deleted file mode 100644
index ebc0945..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/left_ptr.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/left_ptr_watch.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/left_ptr_watch.hlc
deleted file mode 100644
index 8bd0a6c..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/left_ptr_watch.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/left_side.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/left_side.hlc
deleted file mode 100644
index 99c277a..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/left_side.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/left_tee.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/left_tee.hlc
deleted file mode 100644
index 15fb62c..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/left_tee.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/link.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/link.hlc
deleted file mode 100644
index 70d6bf9..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/link.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/ll_angle.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/ll_angle.hlc
deleted file mode 100644
index 966de15..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/ll_angle.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/lr_angle.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/lr_angle.hlc
deleted file mode 100644
index e14a23d..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/lr_angle.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/move.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/move.hlc
deleted file mode 100644
index 60d0a20..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/move.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/pencil.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/pencil.hlc
deleted file mode 100644
index 87a665a..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/pencil.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/plus.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/plus.hlc
deleted file mode 100644
index 5f782c6..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/plus.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/question_arrow.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/question_arrow.hlc
deleted file mode 100644
index 5f92d7a..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/question_arrow.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/right_ptr.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/right_ptr.hlc
deleted file mode 100644
index 266dc0a..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/right_ptr.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/right_tee.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/right_tee.hlc
deleted file mode 100644
index de4a9c0..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/right_tee.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/sb_down_arrow.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/sb_down_arrow.hlc
deleted file mode 100644
index b4b43df..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/sb_down_arrow.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/sb_h_double_arrow.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/sb_h_double_arrow.hlc
deleted file mode 100644
index 78f720e..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/sb_h_double_arrow.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/sb_left_arrow.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/sb_left_arrow.hlc
deleted file mode 100644
index 0b3292c..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/sb_left_arrow.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/sb_right_arrow.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/sb_right_arrow.hlc
deleted file mode 100644
index c976d17..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/sb_right_arrow.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/sb_up_arrow.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/sb_up_arrow.hlc
deleted file mode 100644
index 2b30934..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/sb_up_arrow.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/sb_v_double_arrow.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/sb_v_double_arrow.hlc
deleted file mode 100644
index a09d48a..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/sb_v_double_arrow.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/top_side.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/top_side.hlc
deleted file mode 100644
index b1b6c94..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/top_side.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/top_tee.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/top_tee.hlc
deleted file mode 100644
index 1c44d1e..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/top_tee.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/ul_angle.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/ul_angle.hlc
deleted file mode 100644
index 126ceb1..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/ul_angle.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/ur_angle.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/ur_angle.hlc
deleted file mode 100644
index cdd8126..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/ur_angle.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/vertical-text.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/vertical-text.hlc
deleted file mode 100644
index b297848..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/vertical-text.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/wait.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/wait.hlc
deleted file mode 100644
index a13d93b..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/wait.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/wayland-cursor.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/wayland-cursor.hlc
deleted file mode 100644
index 8d3d6f5..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/wayland-cursor.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/xterm.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/xterm.hlc
deleted file mode 100644
index 144f322..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/xterm.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/zoom-in.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/zoom-in.hlc
deleted file mode 100644
index 0f31814..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/zoom-in.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/hyprcursors/zoom-out.hlc b/home/system/hyprland/cursor/macOS/hyprcursors/zoom-out.hlc
deleted file mode 100644
index b12fb2e..0000000
Binary files a/home/system/hyprland/cursor/macOS/hyprcursors/zoom-out.hlc and /dev/null differ
diff --git a/home/system/hyprland/cursor/macOS/manifest.hl b/home/system/hyprland/cursor/macOS/manifest.hl
deleted file mode 100644
index da013a0..0000000
--- a/home/system/hyprland/cursor/macOS/manifest.hl
+++ /dev/null
@@ -1,4 +0,0 @@
-name = macOS (SVG)
-description = macOS cursors because they are a beaut!
-version = 1
-cursors_directory = hyprcursors
diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index fd08b70..86f5f2f 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -1,12 +1,6 @@
 { pkgs, config, inputs, ... }: {
 
-  imports = [
-    ./hyprlock.nix
-    ./hypridle.nix
-    ./hyprpaper.nix
-    # ./hyprcursor.nix
-    ./hyprpanel.nix
-  ];
+  imports = [ ./hyprlock.nix ./hypridle.nix ./hyprpaper.nix ./hyprpanel.nix ];
 
   home.packages = with pkgs; [
     qt5.qtwayland
diff --git a/home/system/hyprland/hyprcursor.nix b/home/system/hyprland/hyprcursor.nix
deleted file mode 100644
index 916ad79..0000000
--- a/home/system/hyprland/hyprcursor.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  home.file.".local/share/icons/macOS" = {
-    recursive = true;
-    source = ./cursor/macOS;
-  };
-}
diff --git a/home/system/hyprland/hyprpanel.nix b/home/system/hyprland/hyprpanel.nix
index 89e885c..682ed75 100644
--- a/home/system/hyprland/hyprpanel.nix
+++ b/home/system/hyprland/hyprpanel.nix
@@ -131,7 +131,7 @@
           "menus.clock.weather.location": "${config.var.location}",
           "menus.clock.weather.key": "myapikey",
           "menus.clock.weather.unit": "metric",
-          "menus.dashboard.powermenu.avatar.image": "${config.var.homeDirectory}/.profile_picture.png",
+          "menus.dashboard.powermenu.avatar.image": "/home/${config.var.username}/.profile_picture.png",
           "menus.dashboard.powermenu.confirmation": false,
 
           "menus.dashboard.shortcuts.left.shortcut1.icon": "",
diff --git a/home/system/mime/default.nix b/home/system/mime/default.nix
index 280bdc4..9da8e97 100644
--- a/home/system/mime/default.nix
+++ b/home/system/mime/default.nix
@@ -1,7 +1,6 @@
 {
   xdg.mimeApps = {
     enable = true;
-
     defaultApplications = {
       "text/markdown" = "nvim.desktop";
       "text/plain" = "nvim.desktop";
diff --git a/home/system/wofi/default.nix b/home/system/wofi/default.nix
index 38b2c31..0a027ea 100644
--- a/home/system/wofi/default.nix
+++ b/home/system/wofi/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
 
   home.packages = with pkgs; [ wofi-emoji ];
 
@@ -33,66 +33,66 @@
       key_exit = "Escape";
     };
 
-    # style = ''
-    #   /** ********** Fonts ********** **/
-    #
-    #   * {
-    #     font-family: "${config.var.theme.font}";
-    #     font-weight: 500;
-    #     font-size: ${toString config.var.theme.font-size}px;
-    #   }
-    #
-    #   #window {
-    #     background-color: #${config.var.theme.colors.bgalt};
-    #     color: #${config.var.theme.colors.fgalt};
-    #     border-radius: ${toString config.var.theme.rounding}px;
-    #   }
-    #
-    #   #outer-box {
-    #     padding: 20px;
-    #   }
-    #
-    #   #input {
-    #     background-color: #${config.var.theme.colors.bg};
-    #     border: 0px solid #${config.var.theme.colors.accent};
-    #     padding: 8px 12px;
-    #   }
-    #
-    #   #scroll {
-    #     margin-top: 20px;
-    #   }
-    #
-    #   #inner-box {}
-    #
-    #   #img {
-    #     padding-right: 8px;
-    #   }
-    #
-    #   #text {
-    #     color: #${config.var.theme.colors.c7};
-    #   }
-    #
-    #   #text:selected {
-    #     color: #${config.var.theme.colors.fg};
-    #   }
-    #
-    #   #entry {
-    #     padding: 6px;
-    #   }
-    #
-    #   #entry:selected {
-    #     background-color: #${config.var.theme.colors.accent};
-    #     color: #${config.var.theme.colors.accentFg};
-    #   }
-    #
-    #   #unselected {}
-    #
-    #   #selected {}
-    #
-    #   #input,
-    #   #entry:selected {
-    #     border-radius: ${toString config.var.theme.rounding}px;
-    #   }
-    # '';
+    style = lib.mkForce
+      # css
+      ''
+        * {
+          font-family: "${config.stylix.fonts.serif.name}";
+          font-weight: 500;
+          font-size: 13px;
+        }
+
+        #window {
+          background-color: #${config.lib.stylix.colors.base01};
+          color: #${config.lib.stylix.colors.base06};
+          border-radius: ${toString config.var.theme.rounding}px;
+        }
+
+        #outer-box {
+          padding: 20px;
+        }
+
+        #input {
+          background-color: #${config.lib.stylix.colors.base00};
+          border: 0px solid #${config.lib.stylix.colors.base0D};
+          padding: 8px 12px;
+        }
+
+        #scroll {
+          margin-top: 20px;
+        }
+
+        #inner-box {}
+
+        #img {
+          padding-right: 8px;
+        }
+
+        #text {
+          color: #${config.lib.stylix.colors.base05};
+        }
+
+        #text:selected {
+          color: #${config.lib.stylix.colors.base05};
+        }
+
+        #entry {
+          padding: 6px;
+        }
+
+        #entry:selected {
+          background-color: #${config.lib.stylix.colors.base0D};
+          color: #${config.lib.stylix.colors.base05};
+        }
+
+        #unselected {}
+
+        #selected {}
+
+        #input,
+        #entry:selected {
+          border-radius: ${toString config.var.theme.rounding}px;
+        }
+      '';
   };
 }
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 3902e70..acdb136 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -12,6 +12,7 @@
     ../../home/programs/git
     ../../home/programs/spicetify
     ../../home/programs/nextcloud
+    ../../home/programs/yazi
 
     # Scripts
     ../../home/scripts # All scripts
@@ -31,7 +32,7 @@
 
   home = {
     inherit (config.var) username;
-    inherit (config.var) homeDirectory;
+    homeDirectory = "/home/" + config.var.username;
 
     packages = with pkgs; [
       # Apps
diff --git a/hosts/laptop/secrets/default.nix b/hosts/laptop/secrets/default.nix
index 33c6246..b5e918e 100644
--- a/hosts/laptop/secrets/default.nix
+++ b/hosts/laptop/secrets/default.nix
@@ -1,8 +1,6 @@
 { pkgs, inputs, ... }: {
   imports = [ inputs.sops-nix.homeManagerModules.sops ];
 
-  home.packages = with pkgs; [ sops age ];
-
   sops = {
     age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
     defaultSopsFile = ./secrets.yaml;
@@ -16,4 +14,5 @@
   };
 
   systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
+  home.packages = with pkgs; [ sops age ];
 }
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index ba4977f..681b536 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -4,8 +4,7 @@
   config.var = {
     hostname = "nixy";
     username = "hadi";
-    homeDirectory = "/home/" + config.var.username;
-    configDirectory = config.var.homeDirectory + "/.config/nixos";
+    configDirectory = "/home/" + config.var.username + "/.config/nixos";
 
     keyboardLayout = "fr";
 
@@ -27,7 +26,6 @@
     # change the sops configuration if you want to enable that:
     sops = true;
 
-    # theme = import ../themes/nixy.nix; # select your theme here
     theme = {
       rounding = 15;
       gaps-in = 10;
@@ -36,13 +34,13 @@
       inactive-opacity = 0.89;
       blur = true;
       border-size = 3;
-      animation-speed = "fast"; # "fast" | "medium" | "slow"
+      animation-speed = "medium"; # "fast" | "medium" | "slow"
       fetch = "nerdfetch"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
 
       bar = {
         transparent = false;
         floating = true;
-        font-size = 16;
+        font-size = 13;
       };
     };
   };
diff --git a/themes/nixy.nix b/themes/nixy.nix
index 3c72e8f..fab70b3 100644
--- a/themes/nixy.nix
+++ b/themes/nixy.nix
@@ -7,7 +7,7 @@
       base00 = "0b0b0b"; # Default Background
       base01 =
         "1b1b1b"; # Lighter Background (Used for status bars, line number and folding marks)
-      base02 = "313244"; # Selection Background
+      base02 = "2b2b2b"; # Selection Background
       base03 = "45475a"; # Comments, Invisibles, Line Highlighting
       base04 = "585b70"; # Dark Foreground (Used for status bars)
       base05 = "fcfcfc"; # Default Foreground, Caret, Delimiters, Operators