diff --git a/hosts/nixos-laptop/home-manager/default.nix b/hosts/nixos-laptop/home-manager/default.nix
index 10c506ba..12caf269 100644
--- a/hosts/nixos-laptop/home-manager/default.nix
+++ b/hosts/nixos-laptop/home-manager/default.nix
@@ -1,13 +1,9 @@
 { config, pkgs, hostname, ... }: {
   imports = [ 
     # Hyprland
-    # ./hyprland-conf.nix
-    # ./waybar-conf.nix
-    # ./rofi-conf.nix
-    # ./mako-conf.nix
-    # ./swaylock-conf.nix
+    # ./hyprland
 
     # Gnome
-    ./gnome-conf.nix
+    ./gnome
   ];
 }
\ No newline at end of file
diff --git a/hosts/nixos-laptop/home-manager/gnome/defualt.nix b/hosts/nixos-laptop/home-manager/gnome/defualt.nix
new file mode 100644
index 00000000..462b8ad7
--- /dev/null
+++ b/hosts/nixos-laptop/home-manager/gnome/defualt.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  import = [
+    ./.
+  ];
+}
\ No newline at end of file
diff --git a/hosts/nixos-laptop/home-manager/gnome-conf.nix b/hosts/nixos-laptop/home-manager/gnome/gnome-conf.nix
similarity index 86%
rename from hosts/nixos-laptop/home-manager/gnome-conf.nix
rename to hosts/nixos-laptop/home-manager/gnome/gnome-conf.nix
index 40caf940..80626e7a 100644
--- a/hosts/nixos-laptop/home-manager/gnome-conf.nix
+++ b/hosts/nixos-laptop/home-manager/gnome/gnome-conf.nix
@@ -16,44 +16,6 @@ let
 in {
     # Gnome GTK Settings
     gtk.theme = "${night-gtk-theme}";
-    
-    programs.gnome-terminal = {
-      enable = true;
-      themeVariant = "system";
-      profile."Default" = {
-        boldIsBright = true;
-        cursorShape = "block";
-        font = "Jetbrains Regular Mono";
-        colors = {
-          # https://github.com/Gogh-Co/Gogh/blob/master/themes/Gruvbox%20Dark.yml
-          # highlight = [ ];
-          palette = [ 
-            "#282828" # Black (Host)
-            "#CC241D" # Red (Syntax string)
-            "#98971A" # Green (Command)
-            "#D79921" # Yellow (Command second)
-            "#458588" # Blue (Path)
-            "#B16286" # Magenta (Syntax var)
-            "#689D6A" # Cyan (Prompt)
-            "#A89984" # White
-
-            "#928374" # Bright Black
-            "#FB4934" # Bright Red (Command error)
-            "#B8BB26" # Bright Green (Exec)
-            "#FABD2F" # Bright Yellow
-            "#83A598" # Bright Blue (Folder)
-            "#D3869B" # Bright Magenta
-            "#8EC07C" # Bright Cyan
-            "#EBDBB2" # Bright White
-
-            "#282828" # Background
-            "#EBDBB2" # Foreground (Text)
-
-            "#EBDBB2" # Cursor
-          ];
-        };
-      };
-    };
 
     # Gnome DCONF Settings
     dconf.settings = with lib.hm.gvariant; {
diff --git a/hosts/nixos-laptop/home-manager/gnome/gnome-terminal-conf.nix b/hosts/nixos-laptop/home-manager/gnome/gnome-terminal-conf.nix
new file mode 100644
index 00000000..386ab6dd
--- /dev/null
+++ b/hosts/nixos-laptop/home-manager/gnome/gnome-terminal-conf.nix
@@ -0,0 +1,39 @@
+{ ... }: {
+  programs.gnome-terminal = {
+  enable = true;
+  themeVariant = "system";
+  profile."Default" = {
+    boldIsBright = true;
+    cursorShape = "block";
+    font = "Jetbrains Regular Mono";
+    colors = {
+      # https://github.com/Gogh-Co/Gogh/blob/master/themes/Gruvbox%20Dark.yml
+      # highlight = [ ];
+      palette = [ 
+        "#282828" # Black (Host)
+        "#CC241D" # Red (Syntax string)
+        "#98971A" # Green (Command)
+        "#D79921" # Yellow (Command second)
+        "#458588" # Blue (Path)
+        "#B16286" # Magenta (Syntax var)
+        "#689D6A" # Cyan (Prompt)
+        "#A89984" # White
+
+        "#928374" # Bright Black
+        "#FB4934" # Bright Red (Command error)
+        "#B8BB26" # Bright Green (Exec)
+        "#FABD2F" # Bright Yellow
+        "#83A598" # Bright Blue (Folder)
+        "#D3869B" # Bright Magenta
+        "#8EC07C" # Bright Cyan
+        "#EBDBB2" # Bright White
+
+        "#282828" # Background
+        "#EBDBB2" # Foreground (Text)
+
+        "#EBDBB2" # Cursor
+      ];
+    };
+  };
+};
+}
\ No newline at end of file
diff --git a/hosts/nixos-laptop/home-manager/hyprland/defualt.nix b/hosts/nixos-laptop/home-manager/hyprland/defualt.nix
new file mode 100644
index 00000000..462b8ad7
--- /dev/null
+++ b/hosts/nixos-laptop/home-manager/hyprland/defualt.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  import = [
+    ./.
+  ];
+}
\ No newline at end of file
diff --git a/hosts/nixos-laptop/home-manager/hyprland-conf.nix b/hosts/nixos-laptop/home-manager/hyprland/hyprland-conf.nix
similarity index 100%
rename from hosts/nixos-laptop/home-manager/hyprland-conf.nix
rename to hosts/nixos-laptop/home-manager/hyprland/hyprland-conf.nix
diff --git a/hosts/nixos-laptop/home-manager/mako-conf.nix b/hosts/nixos-laptop/home-manager/hyprland/mako-conf.nix
similarity index 100%
rename from hosts/nixos-laptop/home-manager/mako-conf.nix
rename to hosts/nixos-laptop/home-manager/hyprland/mako-conf.nix
diff --git a/hosts/nixos-laptop/home-manager/rofi-conf.nix b/hosts/nixos-laptop/home-manager/hyprland/rofi-conf.nix
similarity index 100%
rename from hosts/nixos-laptop/home-manager/rofi-conf.nix
rename to hosts/nixos-laptop/home-manager/hyprland/rofi-conf.nix
diff --git a/hosts/nixos-laptop/home-manager/swaylock-conf.nix b/hosts/nixos-laptop/home-manager/hyprland/swaylock-conf.nix
similarity index 100%
rename from hosts/nixos-laptop/home-manager/swaylock-conf.nix
rename to hosts/nixos-laptop/home-manager/hyprland/swaylock-conf.nix
diff --git a/hosts/nixos-laptop/home-manager/waybar-conf.nix b/hosts/nixos-laptop/home-manager/hyprland/waybar-conf.nix
similarity index 100%
rename from hosts/nixos-laptop/home-manager/waybar-conf.nix
rename to hosts/nixos-laptop/home-manager/hyprland/waybar-conf.nix