diff --git a/common/dotfiles/neovim.nix b/common/dotfiles/neovim.nix
index 795f14b1..332ae31b 100644
--- a/common/dotfiles/neovim.nix
+++ b/common/dotfiles/neovim.nix
@@ -17,6 +17,7 @@
       vim-airline-themes
       nord-vim
       gruvbox
+      tokyo-night-theme
     ];
     extraConfig = ''
       set mouse=a
diff --git a/desktops/gnome.nix b/desktops/gnome.nix
index e1de05a4..e433cec2 100644
--- a/desktops/gnome.nix
+++ b/desktops/gnome.nix
@@ -40,12 +40,15 @@
     gnomeExtensions.user-themes
     gnomeExtensions.caffeine
     gnomeExtensions.hibernate-status-button
+    gnomeExtensions.night-theme-switcher
     gnome3.gnome-tweaks
+    papirus-icon-theme
   ];
 
   imports = [ 
-    ./gnome/gruvbox-theme.nix
-    # ./gnome/nordic-theme.nix
+    ./gnome/themes/gruvbox.nix
+    ./gnome/themes/tokyo-night.nix
+    # ./gnome/themes/nordic.nix
    ];
   # Idea... Move these to a separate file and tie it into dconf sections that load the theme automatically when I want it.
 }
\ No newline at end of file
diff --git a/desktops/gnome/gruvbox-theme.nix b/desktops/gnome/themes/gruvbox.nix
similarity index 100%
rename from desktops/gnome/gruvbox-theme.nix
rename to desktops/gnome/themes/gruvbox.nix
diff --git a/desktops/gnome/nordic-theme.nix b/desktops/gnome/themes/nordic.nix
similarity index 100%
rename from desktops/gnome/nordic-theme.nix
rename to desktops/gnome/themes/nordic.nix
diff --git a/desktops/gnome/themes/tokyo-night.nix b/desktops/gnome/themes/tokyo-night.nix
new file mode 100644
index 00000000..18bf31a5
--- /dev/null
+++ b/desktops/gnome/themes/tokyo-night.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }: {
+  environment.systemPackages = with pkgs; [
+    tokyo-night-gtk
+  ]; 
+}
\ No newline at end of file