diff --git a/home-manager/common/desktops/gnome/themes/gruvbox/gnome-conf.nix b/home-manager/common/desktops/gnome/common/gnome-dconf.nix
similarity index 76%
rename from home-manager/common/desktops/gnome/themes/gruvbox/gnome-conf.nix
rename to home-manager/common/desktops/gnome/common/gnome-dconf.nix
index 812aa78a..1a082a8c 100644
--- a/home-manager/common/desktops/gnome/themes/gruvbox/gnome-conf.nix
+++ b/home-manager/common/desktops/gnome/common/gnome-dconf.nix
@@ -1,22 +1,4 @@
-# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
-{ lib, hostname, username, ... }: with lib.hm.gvariant; 
-let
-  # Day Variant
-  day-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper10.jpg";
-  day-gtk-theme = "vimix-doder";
-  day-shell-theme = "vimix-doder";
-  day-icon-theme = "Vimix-Doder";
-
-  # Night Variant
-  night-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper11.jpg";
-  night-gtk-theme = "Gruvbox-Dark-BL";
-  night-shell-theme = "Gruvbox-Dark-BL";
-  night-icon-theme = "Nordzy-yellow-dark";
-
-in {
-  # Gnome GTK Settings
-  gtk.theme = "${night-gtk-theme}";
-
+{ lib, hostname, username, ... }: with lib.hm.gvariant; {
   # Gnome DCONF Settings
   dconf.settings = {
     "apps/seahorse/listing" = {
@@ -52,30 +34,10 @@ in {
       translate = true;
     };
 
-    "org/gnome/desktop/background" = {
-      picture-uri = "${day-wallpaper}";
-      picture-uri-dark = "${night-wallpaper}";
-    };
-
     "org/gnome/desktop/calendar" = {
       show-weekdate = false;
     };
 
-    "org/gnome/desktop/interface" = {
-      clock-show-date = true;
-      clock-show-weekday = false;
-      color-scheme = "prefer-dark";
-      document-font-name = "JetBrainsMonoNL Nerd Font 11";
-      font-antialiasing = "rgba";
-      font-hinting = "slight";
-      font-name = "JetBrainsMonoNL Nerd Font Propo Thin 11";
-      gtk-theme = "Gruvbox-Dark-BL";
-      icon-theme = "Nordzy-yellow-dark";
-      monospace-font-name = "JetBrainsMono Nerd Font 10";
-      show-battery-percentage = false;
-    };
-
-
     "org/gnome/desktop/notifications" = {
       show-banners = true;
     };
@@ -129,24 +91,6 @@ in {
       transparency-mode = "FIXED";
     };
 
-    "org/gnome/shell/extensions/nightthemeswitcher/gtk-variants" = {
-      enabled = true;
-      day = "${day-gtk-theme}";
-      night = "${night-gtk-theme}";
-    };
-
-    "org/gnome/shell/extensions/nightthemeswitcher/icon-variants" = {
-      enabled = true;
-      day = "${day-icon-theme}";
-      night = "${night-icon-theme}";
-    };
-
-    "org/gnome/shell/extensions/nightthemeswitcher/shell-variants" = {
-      enabled = true;
-      day = "${day-shell-theme}";
-      night = "${night-shell-theme}";
-    };
-
     "org/gnome/shell/extensions/nightthemeswitcher/time" = {
       manual-schedule = true;
       nightthemeswitcher-ondemand-keybinding = [ "<Shift><Super>t" ];
@@ -176,5 +120,4 @@ in {
       view-type = "list";
       window-size = mkTuple [ 859 453 ];
     };
-  };
-}
+  };
\ No newline at end of file
diff --git a/home-manager/common/desktops/gnome/default.nix b/home-manager/common/desktops/gnome/default.nix
index 70e413e3..ccdacdf6 100644
--- a/home-manager/common/desktops/gnome/default.nix
+++ b/home-manager/common/desktops/gnome/default.nix
@@ -1,5 +1,7 @@
-{ pkgs, theme, ... }: {
+# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
+{ lib, hostname, username, theme, ... }: {
     imports = [
-        ./themes/${theme}/gnome-conf.nix 
+        ./themes/${theme}
+        ./common/gnome-dconf.nix
     ];
 }
\ No newline at end of file
diff --git a/home-manager/common/desktops/gnome/themes/gruvbox/default.nix b/home-manager/common/desktops/gnome/themes/gruvbox/default.nix
new file mode 100644
index 00000000..413bab5e
--- /dev/null
+++ b/home-manager/common/desktops/gnome/themes/gruvbox/default.nix
@@ -0,0 +1,59 @@
+# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
+{ lib, hostname, username, ... }: with lib.hm.gvariant; 
+let
+  # Day Variant
+  day-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper10.jpg";
+  day-gtk-theme = "vimix-doder";
+  day-shell-theme = "vimix-doder";
+  day-icon-theme = "Vimix-Doder";
+
+  # Night Variant
+  night-wallpaper = "file:///etc/nixos/git/wallpapers/gruvbox/wallpaper11.jpg";
+  night-gtk-theme = "Gruvbox-Dark-BL";
+  night-shell-theme = "Gruvbox-Dark-BL";
+  night-icon-theme = "Nordzy-yellow-dark";
+in {
+  # Gnome GTK Settings
+  gtk.theme = "${night-gtk-theme}";
+
+  # Gnome DCONF Settings
+  dconf.settings = {
+    "org/gnome/desktop/background" = {
+      picture-uri = "${day-wallpaper}";
+      picture-uri-dark = "${night-wallpaper}";
+    };
+
+    "org/gnome/shell/extensions/nightthemeswitcher/gtk-variants" = {
+      enabled = true;
+      day = "${day-gtk-theme}";
+      night = "${night-gtk-theme}";
+    };
+
+    "org/gnome/shell/extensions/nightthemeswitcher/icon-variants" = {
+      enabled = true;
+      day = "${day-icon-theme}";
+      night = "${night-icon-theme}";
+    };
+
+    "org/gnome/shell/extensions/nightthemeswitcher/shell-variants" = {
+      enabled = true;
+      day = "${day-shell-theme}";
+      night = "${night-shell-theme}";
+    };
+
+    "org/gnome/desktop/interface" = {
+      clock-show-date = true;
+      clock-show-weekday = false;
+      color-scheme = "prefer-dark";
+      document-font-name = "JetBrainsMonoNL Nerd Font 11";
+      font-antialiasing = "rgba";
+      font-hinting = "slight";
+      font-name = "JetBrainsMonoNL Nerd Font Propo Thin 11";
+      gtk-theme = "Gruvbox-Dark-BL";
+      icon-theme = "${night-icon-theme};
+      monospace-font-name = "JetBrainsMono Nerd Font 10";
+      show-battery-percentage = false;
+    };
+
+  };
+}