diff --git a/flake.nix b/flake.nix
index f4072b3..0f53742 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,7 @@
   };
 
   outputs = { self, nixpkgs, home-manager, disko, ... }@inputs: 
-  let 
+  let
     inherit (self) outputs;
     forAllSystems = nixpkgs.lib.genAttrs [
       "x86_64-linux"
diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix
index b36ef90..f0965c0 100644
--- a/users/willifan/applications.nix
+++ b/users/willifan/applications.nix
@@ -15,7 +15,6 @@
 
     feh
 
-    hyfetch
     enpass
     webcord
     obsidian
diff --git a/users/willifan/default.nix b/users/willifan/default.nix
index 65b3a03..d99b5b5 100644
--- a/users/willifan/default.nix
+++ b/users/willifan/default.nix
@@ -7,6 +7,7 @@
     ./auto-cpufreq.nix
     ./envvar.nix
     ./git.nix
+    ./hyfetch.nix
     ./locales.nix
     #./ssh.nix
     ./syncthing.nix
diff --git a/users/willifan/graphical/dev/default.nix b/users/willifan/graphical/dev/default.nix
index abfa574..f4e2e6c 100644
--- a/users/willifan/graphical/dev/default.nix
+++ b/users/willifan/graphical/dev/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
+    ./rust.nix
     ./vscodium.nix
   ];
 }
-
diff --git a/users/willifan/graphical/dev/rust.nix b/users/willifan/graphical/dev/rust.nix
new file mode 100644
index 0000000..53031b9
--- /dev/null
+++ b/users/willifan/graphical/dev/rust.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+
+    rustup
+    probe-rs
+    cargo-binutils
+    
+  ];
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/dev/vscodium.nix b/users/willifan/graphical/dev/vscodium.nix
index 53b6d62..c2496dd 100644
--- a/users/willifan/graphical/dev/vscodium.nix
+++ b/users/willifan/graphical/dev/vscodium.nix
@@ -8,6 +8,7 @@
 
       userSettings = {
         "[nix]"."editor.tabSize" = 2;
+        "explorer.confirmDragAndDrop" = false;
       };
       extensions = with pkgs.vscode-extensions; [
         # System
diff --git a/users/willifan/graphical/hyprland/Lenni/default.nix b/users/willifan/graphical/hyprland/Lenni/default.nix
new file mode 100644
index 0000000..274fc73
--- /dev/null
+++ b/users/willifan/graphical/hyprland/Lenni/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./hypridle.nix
+    ./hyprlock.nix
+    ./kanshi.nix
+  ];
+}
diff --git a/users/willifan/graphical/hyprland/hypridle.nix b/users/willifan/graphical/hyprland/Lenni/hypridle.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/hypridle.nix
rename to users/willifan/graphical/hyprland/Lenni/hypridle.nix
diff --git a/users/willifan/graphical/hyprland/hyprlock.nix b/users/willifan/graphical/hyprland/Lenni/hyprlock.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/hyprlock.nix
rename to users/willifan/graphical/hyprland/Lenni/hyprlock.nix
diff --git a/users/willifan/graphical/hyprland/kanshi.nix b/users/willifan/graphical/hyprland/Lenni/kanshi.nix
similarity index 99%
rename from users/willifan/graphical/hyprland/kanshi.nix
rename to users/willifan/graphical/hyprland/Lenni/kanshi.nix
index 4b0baca..1df997b 100644
--- a/users/willifan/graphical/hyprland/kanshi.nix
+++ b/users/willifan/graphical/hyprland/Lenni/kanshi.nix
@@ -70,7 +70,7 @@
               criteria = "eDP-1";
               mode = "2256x1504";
               position = "3840,0";
-              scale = 1.6;
+              scale = 1.0;
               transform = "normal";
             }
           ];
diff --git a/users/willifan/graphical/hyprland/common/default.nix b/users/willifan/graphical/hyprland/common/default.nix
new file mode 100644
index 0000000..0700cdd
--- /dev/null
+++ b/users/willifan/graphical/hyprland/common/default.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  programs.hyprland.enable = true;
+  imports = [
+    ./hyprland.nix
+    ./hyprpaper.nix
+    ./mako.nix
+    ./pipewire.nix
+    ./polkit.nix
+    ./utils.nix
+    ./wofi.nix
+  ];
+  
+  
+}
diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/common/hyprland.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/hyprland.nix
rename to users/willifan/graphical/hyprland/common/hyprland.nix
diff --git a/users/willifan/graphical/hyprland/hyprpaper.nix b/users/willifan/graphical/hyprland/common/hyprpaper.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/hyprpaper.nix
rename to users/willifan/graphical/hyprland/common/hyprpaper.nix
diff --git a/users/willifan/graphical/hyprland/mako.nix b/users/willifan/graphical/hyprland/common/mako.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/mako.nix
rename to users/willifan/graphical/hyprland/common/mako.nix
diff --git a/users/willifan/graphical/hyprland/pipewire.nix b/users/willifan/graphical/hyprland/common/pipewire.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/pipewire.nix
rename to users/willifan/graphical/hyprland/common/pipewire.nix
diff --git a/users/willifan/graphical/hyprland/polkit.nix b/users/willifan/graphical/hyprland/common/polkit.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/polkit.nix
rename to users/willifan/graphical/hyprland/common/polkit.nix
diff --git a/users/willifan/graphical/hyprland/utils.nix b/users/willifan/graphical/hyprland/common/utils.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/utils.nix
rename to users/willifan/graphical/hyprland/common/utils.nix
diff --git a/users/willifan/graphical/hyprland/wofi.nix b/users/willifan/graphical/hyprland/common/wofi.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/wofi.nix
rename to users/willifan/graphical/hyprland/common/wofi.nix
diff --git a/users/willifan/graphical/hyprland/default.nix b/users/willifan/graphical/hyprland/default.nix
index d7b6dfe..c7f8050 100644
--- a/users/willifan/graphical/hyprland/default.nix
+++ b/users/willifan/graphical/hyprland/default.nix
@@ -1,19 +1,7 @@
-{ pkgs, ... }:
-
+{ pkgs, configVars, ... }:
 {
-  programs.hyprland.enable = true;
   imports = [
-    ./hypridle.nix
-    ./hyprland.nix
-    ./hyprlock.nix
-    ./hyprpaper.nix
-    ./kanshi.nix
-    ./mako.nix
-    ./pipewire.nix
-    ./polkit.nix
-    ./utils.nix
-    ./wofi.nix
+    ./common
+    ./${configVars.hostname}
   ];
-  
-  
-}
+}
\ No newline at end of file
diff --git a/users/willifan/hyfetch.nix b/users/willifan/hyfetch.nix
new file mode 100644
index 0000000..7e463ee
--- /dev/null
+++ b/users/willifan/hyfetch.nix
@@ -0,0 +1,25 @@
+{ pkgs, home-manager, ... }:
+
+{
+  home-manager.users.willifan = {
+    programs.hyfetch = {
+      enable = true;
+      settings = {
+        preset = "transgender";
+        mode = "rgb";
+        light_dark = "dark";
+        lightness = 0.69;
+        color_align = {
+            mode = "horizontal";
+            custom_colors = [];
+            fore_back = null;
+        };
+        backend = "neofetch";
+        args = null;
+        distro = null;
+        pride_month_shown = [];
+        pride_month_disable = false;
+      };
+    };
+  };
+}
diff --git a/users/willifan/syncthing.nix b/users/willifan/syncthing.nix
index 427161a..9e0e9ea 100644
--- a/users/willifan/syncthing.nix
+++ b/users/willifan/syncthing.nix
@@ -3,8 +3,8 @@
   services.syncthing = {
     enable =  true;
     user = "willifan";
-    dataDir = "/home/willifan/temp";
-    configDir = "/home/willifan/temp/.config/syncthing";
+    dataDir = "/mnt/data";
+    configDir = "/mnt/data/.config/syncthing";
     overrideDevices = true;
     overrideFolders = true;
     settings = {