diff --git a/flake.nix b/flake.nix
index 0f53742..f4072b3 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 f0965c0..b36ef90 100644
--- a/users/willifan/applications.nix
+++ b/users/willifan/applications.nix
@@ -15,6 +15,7 @@
 
     feh
 
+    hyfetch
     enpass
     webcord
     obsidian
diff --git a/users/willifan/default.nix b/users/willifan/default.nix
index d99b5b5..65b3a03 100644
--- a/users/willifan/default.nix
+++ b/users/willifan/default.nix
@@ -7,7 +7,6 @@
     ./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 f4e2e6c..abfa574 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
deleted file mode 100644
index 53031b9..0000000
--- a/users/willifan/graphical/dev/rust.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ 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 c2496dd..53b6d62 100644
--- a/users/willifan/graphical/dev/vscodium.nix
+++ b/users/willifan/graphical/dev/vscodium.nix
@@ -8,7 +8,6 @@
 
       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
deleted file mode 100644
index 274fc73..0000000
--- a/users/willifan/graphical/hyprland/Lenni/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./hypridle.nix
-    ./hyprlock.nix
-    ./kanshi.nix
-  ];
-}
diff --git a/users/willifan/graphical/hyprland/common/default.nix b/users/willifan/graphical/hyprland/common/default.nix
deleted file mode 100644
index 0700cdd..0000000
--- a/users/willifan/graphical/hyprland/common/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ 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/default.nix b/users/willifan/graphical/hyprland/default.nix
index c7f8050..d7b6dfe 100644
--- a/users/willifan/graphical/hyprland/default.nix
+++ b/users/willifan/graphical/hyprland/default.nix
@@ -1,7 +1,19 @@
-{ pkgs, configVars, ... }:
+{ pkgs, ... }:
+
 {
+  programs.hyprland.enable = true;
   imports = [
-    ./common
-    ./${configVars.hostname}
+    ./hypridle.nix
+    ./hyprland.nix
+    ./hyprlock.nix
+    ./hyprpaper.nix
+    ./kanshi.nix
+    ./mako.nix
+    ./pipewire.nix
+    ./polkit.nix
+    ./utils.nix
+    ./wofi.nix
   ];
-}
\ No newline at end of file
+  
+  
+}
diff --git a/users/willifan/graphical/hyprland/Lenni/hypridle.nix b/users/willifan/graphical/hyprland/hypridle.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/Lenni/hypridle.nix
rename to users/willifan/graphical/hyprland/hypridle.nix
diff --git a/users/willifan/graphical/hyprland/common/hyprland.nix b/users/willifan/graphical/hyprland/hyprland.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/common/hyprland.nix
rename to users/willifan/graphical/hyprland/hyprland.nix
diff --git a/users/willifan/graphical/hyprland/Lenni/hyprlock.nix b/users/willifan/graphical/hyprland/hyprlock.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/Lenni/hyprlock.nix
rename to users/willifan/graphical/hyprland/hyprlock.nix
diff --git a/users/willifan/graphical/hyprland/common/hyprpaper.nix b/users/willifan/graphical/hyprland/hyprpaper.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/common/hyprpaper.nix
rename to users/willifan/graphical/hyprland/hyprpaper.nix
diff --git a/users/willifan/graphical/hyprland/Lenni/kanshi.nix b/users/willifan/graphical/hyprland/kanshi.nix
similarity index 99%
rename from users/willifan/graphical/hyprland/Lenni/kanshi.nix
rename to users/willifan/graphical/hyprland/kanshi.nix
index 1df997b..4b0baca 100644
--- a/users/willifan/graphical/hyprland/Lenni/kanshi.nix
+++ b/users/willifan/graphical/hyprland/kanshi.nix
@@ -70,7 +70,7 @@
               criteria = "eDP-1";
               mode = "2256x1504";
               position = "3840,0";
-              scale = 1.0;
+              scale = 1.6;
               transform = "normal";
             }
           ];
diff --git a/users/willifan/graphical/hyprland/common/mako.nix b/users/willifan/graphical/hyprland/mako.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/common/mako.nix
rename to users/willifan/graphical/hyprland/mako.nix
diff --git a/users/willifan/graphical/hyprland/common/pipewire.nix b/users/willifan/graphical/hyprland/pipewire.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/common/pipewire.nix
rename to users/willifan/graphical/hyprland/pipewire.nix
diff --git a/users/willifan/graphical/hyprland/common/polkit.nix b/users/willifan/graphical/hyprland/polkit.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/common/polkit.nix
rename to users/willifan/graphical/hyprland/polkit.nix
diff --git a/users/willifan/graphical/hyprland/common/utils.nix b/users/willifan/graphical/hyprland/utils.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/common/utils.nix
rename to users/willifan/graphical/hyprland/utils.nix
diff --git a/users/willifan/graphical/hyprland/common/wofi.nix b/users/willifan/graphical/hyprland/wofi.nix
similarity index 100%
rename from users/willifan/graphical/hyprland/common/wofi.nix
rename to users/willifan/graphical/hyprland/wofi.nix
diff --git a/users/willifan/hyfetch.nix b/users/willifan/hyfetch.nix
deleted file mode 100644
index 7e463ee..0000000
--- a/users/willifan/hyfetch.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ 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 9e0e9ea..427161a 100644
--- a/users/willifan/syncthing.nix
+++ b/users/willifan/syncthing.nix
@@ -3,8 +3,8 @@
   services.syncthing = {
     enable =  true;
     user = "willifan";
-    dataDir = "/mnt/data";
-    configDir = "/mnt/data/.config/syncthing";
+    dataDir = "/home/willifan/temp";
+    configDir = "/home/willifan/temp/.config/syncthing";
     overrideDevices = true;
     overrideFolders = true;
     settings = {