diff --git a/flake.nix b/flake.nix
index fc2e3c77..001a8552 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,7 +50,7 @@
       osaka-linode-01  = libx.mkHost { hostname = "osaka-linode-01"; type = "small"; };
       framework-server = libx.mkHost { hostname = "framework-server"; };
       nuc-server       = libx.mkHost { hostname = "nuc-server"; };
-      nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";  desktop = "plasma6"; gpu = "nvidia"; };
+      nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";  desktop = "gnome"; gpu = "nvidia"; };
       nixos-framework  = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd";  theme = "green"; };
       backups-rpi4     = libx.mkHost { hostname = "backups-rpi4";  platform = "aarch64-linux"; type = "small"; };
       piaware-rpi4     = libx.mkHost { hostname = "piaware-rpi4";  platform = "aarch64-linux"; type = "small"; };
@@ -60,7 +60,7 @@
       "albert@osaka-linode-01"  = libx.mkHome { hostname = "osaka-linode-01"; };
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
       "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server"; };
-      "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop"; desktop = "plasma6"; };
+      "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop"; desktop = "gnome"; };
       "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; };
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4";  platform = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4";  platform = "aarch64-linux"; type = "small"; };
diff --git a/home-manager/common/desktops/gnome/themes/default/default.nix b/home-manager/common/desktops/gnome/themes/default/default.nix
index 81f5df5a..fb66ad7c 100644
--- a/home-manager/common/desktops/gnome/themes/default/default.nix
+++ b/home-manager/common/desktops/gnome/themes/default/default.nix
@@ -1,63 +1,4 @@
 # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
-{ lib, hostname, username, ... }: with lib.hm.gvariant; 
-let
-  # General Theming
-  font = "FontAwesome Bold 11";
-  font-doc = "FontAwesome Regular 11";
-  font-mono = "JetBrainsMono Nerd Font Propo Medium 11";
-
-  # 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-light";
-      font-antialiasing = "rgba";
-      font-hinting = "slight";
-      gtk-theme = "${day-gtk-theme}";
-      icon-theme = "${night-icon-theme}";
-      monospace-font-name = "${font-mono}";
-      font-name = "${font}";
-      document-font-name = "${font-doc}";
-      show-battery-percentage = false;
-    };
-  };
+{ lib, hostname, username, ... }: with lib.hm.gvariant;  {
+  
 }
diff --git a/nixos/common/desktops/gnome/default.nix b/nixos/common/desktops/gnome/default.nix
index 6be2c1c7..ab9b77ad 100644
--- a/nixos/common/desktops/gnome/default.nix
+++ b/nixos/common/desktops/gnome/default.nix
@@ -67,7 +67,7 @@
 
   environment.systemPackages = with pkgs; [
     # Gnome Extensions
-    gnomeExtensions.tiling-assistant
+    gnomeExtensions.forge
     gnomeExtensions.dash-to-dock
     gnomeExtensions.blur-my-shell
     gnomeExtensions.vitals
@@ -82,19 +82,20 @@
     papirus-icon-theme
     dconf2nix # https://github.com/gvolpe/dconf2nix
     # Tweak libadwaita themes
-    # gradience
-    # adw-gtk3
+    gradience
+    adw-gtk3
 
     gnome.gnome-session
   ];
 
   imports = [ 
     # Gnome Themes
-    ./themes/gruvbox.nix
-    ./themes/tokyo-night.nix
-    ./themes/nordic.nix
-    ./themes/vimix.nix
-    ./themes/fluent.nix
+    ./themes/arc.nix
+    # ./themes/gruvbox.nix
+    # ./themes/tokyo-night.nix
+    # ./themes/nordic.nix
+    # ./themes/vimix.nix
+    # ./themes/fluent.nix
     # You may need to edit which theme you're using in dconf.nix if you remove themes
    ];
 }
diff --git a/nixos/common/desktops/gnome/themes/arc.nix b/nixos/common/desktops/gnome/themes/arc.nix
new file mode 100644
index 00000000..140b72e0
--- /dev/null
+++ b/nixos/common/desktops/gnome/themes/arc.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    arc-theme
+  ]; 
+}
\ No newline at end of file