diff --git a/home/common/optional/desktop/common/themes/standard-dark.nix b/home/common/optional/desktop/common/themes/standard-dark.nix
new file mode 100644
index 0000000..836493f
--- /dev/null
+++ b/home/common/optional/desktop/common/themes/standard-dark.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+{
+  # Prevent error when enabling gtk https://github.com/nix-community/home-manager/issues/3113
+  #  error: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name ca.desrt.dconf was not provided by any .service files
+  home.packages = [ pkgs.dconf ];
+  gtk.enable = true;
+
+  home.file = {
+    ".icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
+  };
+
+  # Get details about theme package 
+  #cd $(nix build nixpkgs#kanagawa-gtk-theme --print-out-paths --no-link) && nix run nixpkgs#eza -- --tree --level 4
+  gtk.theme.package = pkgs.kanagawa-gtk-theme;
+  gtk.theme.name = "Kanagawa-B";
+
+  gtk.iconTheme.package = pkgs.kanagawa-icon-theme;
+  gtk.iconTheme.name = "Kanagawa";
+
+  qt.enable = true;
+  qt.platformTheme.name = "gtk";
+  qt.style.name = "adwaita-dark";
+  qt.style.package = pkgs.adwaita-qt;
+}
diff --git a/home/semita.nix b/home/semita.nix
index f03d213..30def67 100644
--- a/home/semita.nix
+++ b/home/semita.nix
@@ -11,6 +11,7 @@
     ./common/optional/sops.nix
     ./common/optional/syncthing.nix
     ./common/optional/desktop/dwm
+    ./common/optional/desktop/common/themes/standard-dark.nix
 
   ];
   #  ------  
diff --git a/home/users/sam/default.nix b/home/users/sam/default.nix
index 802dc2c..3561ac8 100644
--- a/home/users/sam/default.nix
+++ b/home/users/sam/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, outputs, config, ... }:
+{ outputs, ... }:
 
 {
   home.username = "sam";
@@ -8,10 +8,6 @@
   imports = [
   ] ++ (builtins.attrValues outputs.homeManagerModules); # import all homeManagerModules?
 
-  home.file = {
-    ".icons/bibata".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
-  };
-
   programs.ssh = {
     enable = true;
     matchBlocks = {
@@ -38,24 +34,6 @@
     videos = "/home/sam/vids";
   };
 
-  # Prevent error when enabling gtk https://github.com/nix-community/home-manager/issues/3113
-  #  error: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name ca.desrt.dconf was not provided by any .service files
-  home.packages = [ pkgs.dconf ];
-  gtk.enable = true;
-
-  # Get details about theme package 
-  #cd $(nix build nixpkgs#kanagawa-gtk-theme --print-out-paths --no-link) && nix run nixpkgs#eza -- --tree --level 4
-  gtk.theme.package = pkgs.kanagawa-gtk-theme;
-  gtk.theme.name = "Kanagawa-B";
-
-  gtk.iconTheme.package = pkgs.kanagawa-icon-theme;
-  gtk.iconTheme.name = "Kanagawa";
-
-  qt.enable = true;
-  qt.platformTheme.name = "gtk";
-  qt.style.name = "adwaita-dark";
-  qt.style.package = pkgs.adwaita-qt;
-
   home.sessionVariables = {
     EDITOR = "nvim";
     TERMINAL = "alacritty";