diff --git a/home-manager/common/desktops/gnome/themes/default/default.nix b/home-manager/common/desktops/gnome/themes/default/default.nix
index 9a4461a2..82a9b9b4 100644
--- a/home-manager/common/desktops/gnome/themes/default/default.nix
+++ b/home-manager/common/desktops/gnome/themes/default/default.nix
@@ -3,14 +3,57 @@
 let
   # Day Variant
   day-wallpaper = "file:///etc/nixos/git/wallpapers/default/wallpaper1.png";
+  day-gtk-theme = "Fluent-Light-compact";
+  day-shell-theme = "Fluent-compact";
+  day-icon-theme = "Papirus";
+
   # Night Variant
   night-wallpaper = "file:///etc/nixos/git/wallpapers/default/wallpaper1.png";
+  night-gtk-theme = "Fluent-Dark-compact";
+  night-shell-theme = "Fluent-Dark-compact";
+  night-icon-theme = "Papirus-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;
+    };
+
   };
 }