diff --git a/home/config/gtk.nix b/home/config/gtk.nix
new file mode 100644
index 0000000..ee425fe
--- /dev/null
+++ b/home/config/gtk.nix
@@ -0,0 +1,18 @@
+{ pkgs, config, ... }:
+{
+  gtk = pkgs.lib.mkIf (!config.machineVars.headless) {
+    enable = true;
+    font = {
+      name = "Droid Sans";
+    };
+    iconTheme = {
+      package = pkgs.papirus-icon-theme;
+      name = "Papirus";
+    };
+    theme = {
+      package = pkgs.vimix-gtk-themes;
+      name = "VimixDark";
+    };
+    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+  };
+}
\ No newline at end of file
diff --git a/home/misc/ssh/hosts/pvv.nix b/home/config/ssh/hosts/pvv.nix
similarity index 100%
rename from home/misc/ssh/hosts/pvv.nix
rename to home/config/ssh/hosts/pvv.nix
diff --git a/home/config/xdg/default.nix b/home/config/xdg/default.nix
new file mode 100644
index 0000000..8610aa6
--- /dev/null
+++ b/home/config/xdg/default.nix
@@ -0,0 +1,18 @@
+{ config, ... }:
+{
+  imports = [ ./mimetypes.nix ];
+  xdg = {
+    enable = true;
+    userDirs = {
+      enable = true;
+      desktop = "${config.home.homeDirectory}/Desktop";
+      documents = "${config.home.homeDirectory}/Documents";
+      download = "${config.home.homeDirectory}/Downloads";
+      music = "${config.home.homeDirectory}/music";
+      pictures = "${config.home.homeDirectory}/Pictures";
+      publicShare = "${config.home.homeDirectory}/public";
+      templates = "${config.home.homeDirectory}/templates";
+      videos = "${config.home.homeDirectory}/Videos";
+    };
+  };
+}
\ No newline at end of file
diff --git a/home/misc/mimetypes.nix b/home/config/xdg/mimetypes.nix
similarity index 100%
rename from home/misc/mimetypes.nix
rename to home/config/xdg/mimetypes.nix
diff --git a/home/home.nix b/home/home.nix
index 20618f9..26c2d1f 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -7,7 +7,8 @@ in {
     ./shellOptions.nix
     ./packages.nix
 
-    ./misc/ssh/hosts/pvv.nix
+    ./config/ssh/hosts/pvv.nix
+    ./config/xdg
 
     ./programs/comma.nix
     ./programs/firefox.nix
@@ -23,7 +24,7 @@ in {
 
     inputs.secrets.outputs.nixosModule
   ] ++ optionals graphics [
-    ./misc/mimetypes.nix
+    ./config/gtk.nix
 
     ./programs/alacritty.nix
     ./programs/emacs
@@ -121,23 +122,6 @@ in {
     json.enable = true;
   };
 
-  xdg.enable = true;
-
-  gtk = mkIf graphics {
-    enable = true;
-    font = {
-      name = "Droid Sans";
-    };
-    iconTheme = {
-      package = pkgs.papirus-icon-theme;
-      name = "Papirus";
-    };
-    theme = {
-      package = pkgs.vimix-gtk-themes;
-      name = "VimixDark";
-    };
-  };
-
   qt = mkIf graphics {
     enable = true;
     platformTheme = "gtk";