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/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 100%
rename from users/willifan/graphical/hyprland/kanshi.nix
rename to users/willifan/graphical/hyprland/Lenni/kanshi.nix
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