diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix
index 77ef58b..a1e5263 100644
--- a/users/willifan/applications.nix
+++ b/users/willifan/applications.nix
@@ -2,11 +2,15 @@
 {
   environment.systemPackages = with pkgs; [
 
+    #rustup
+    #probe-rs
+    #cargo-binutils
+
+    hyprpicker
     hyprcursor
     grim
     slurp
     wl-clipboard
-
     playerctl
 
     jq
@@ -16,32 +20,28 @@
     inotify-tools
     papirus-icon-theme
     eww
-
-    mako
+    dconf
 
     polkit_gnome
 
-    dconf
 
     usbutils
     unzip
-
     btop
 
     feh
 
-    kitty
     dolphin
     hyfetch
     enpass
-    firefox
-    thunderbird
     webcord
     obsidian
     kicad
     gnome.nautilus
     cinnamon.nemo-with-extensions
-
+    
+    thunderbird
+    firefox
 
   ];
 }
diff --git a/users/willifan/graphical/default.nix b/users/willifan/graphical/default.nix
index 07140bd..1d122ce 100644
--- a/users/willifan/graphical/default.nix
+++ b/users/willifan/graphical/default.nix
@@ -8,7 +8,7 @@
     ./theme
 
     #./firefox.nix
-    #./kitty.nix
+    ./kitty.nix
     #./thunderbird.nix
   ];
 
diff --git a/users/willifan/graphical/firefox.nix b/users/willifan/graphical/firefox.nix
index e69de29..77b5b56 100644
--- a/users/willifan/graphical/firefox.nix
+++ b/users/willifan/graphical/firefox.nix
@@ -0,0 +1,17 @@
+{ pkgs, home-manager, ... }:
+{
+  home-manager.users.willifan = {
+    programs.firefox = {
+      enable = true;
+      profiles = {
+        willifan = {
+          name = "";
+          id = 42069;
+          isDefault = true;
+          search.default = "DuckDuckGo";
+
+        };
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/hyprland/default.nix b/users/willifan/graphical/hyprland/default.nix
index 28404e9..b5723c5 100644
--- a/users/willifan/graphical/hyprland/default.nix
+++ b/users/willifan/graphical/hyprland/default.nix
@@ -8,6 +8,7 @@
     ./hyprlock.nix
     ./hyprpaper.nix
     #./kanshi.nix
+    ./mako.nix
     ./pipewire.nix
     ./polkit.nix
     ./wofi.nix
diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/hyprland.nix
index 451f89c..ea5526f 100644
--- a/users/willifan/graphical/hyprland/hyprland.nix
+++ b/users/willifan/graphical/hyprland/hyprland.nix
@@ -127,6 +127,8 @@
 
         windowrule = [
           "idleinhibit fullscreen, ^(firefox)$"
+          "float, ^(org.gnome.Nautilus)$"
+          "float, ^(nemo)$"
           "float, ^(org.kde.dolphin)$"
           "float, ^(org.gnome.FileRoller)$"
           "stayfocused, title:^(Enpass Assistant)$"
diff --git a/users/willifan/graphical/hyprland/mako.nix b/users/willifan/graphical/hyprland/mako.nix
new file mode 100644
index 0000000..9544fb1
--- /dev/null
+++ b/users/willifan/graphical/hyprland/mako.nix
@@ -0,0 +1,13 @@
+{ pkgs, home-manager, ... }:
+{
+  home-manager.users.willifan = {
+    services.mako = {
+      enable = true;
+      backgroundColor = "#191724bb";
+      borderColor = "#ffa44bee";
+      borderRadius = 10;
+      borderSize = 2;
+
+    };
+  };
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/kitty.nix b/users/willifan/graphical/kitty.nix
index e69de29..53c62c2 100644
--- a/users/willifan/graphical/kitty.nix
+++ b/users/willifan/graphical/kitty.nix
@@ -0,0 +1,11 @@
+{ pkgs, home-manager, ... }:
+{
+  home-manager.users.willifan = {
+    programs.kitty = {
+      enable = true;
+      settings = {
+        enable_audio_bell = false;
+      };
+    };
+  };
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/theme/gtk.nix b/users/willifan/graphical/theme/gtk.nix
index a3354ec..057bd4d 100644
--- a/users/willifan/graphical/theme/gtk.nix
+++ b/users/willifan/graphical/theme/gtk.nix
@@ -36,7 +36,7 @@
         };
         extraCss = ''
           .sidebar-pane {
-            background-color: rgb(42, 42, 42);
+            background-color: rgb(25, 23, 36);
           }
         '';
 
diff --git a/users/willifan/graphical/thunderbird.nix b/users/willifan/graphical/thunderbird.nix
index e69de29..40e09c3 100644
--- a/users/willifan/graphical/thunderbird.nix
+++ b/users/willifan/graphical/thunderbird.nix
@@ -0,0 +1,16 @@
+{ pkgs, home-manager, ... }:
+{
+  home-manager.users.willifan = {
+    programs.thunderbird = {
+      enable = true;
+      profiles = {
+        willifan = {
+          isDefault = true;
+          settings = {
+            browser.search.defaultenginename = "DuckDuckGo";
+          };
+        };
+      };
+    };
+  };
+}
\ No newline at end of file