diff --git a/users/simon/base.nix b/users/simon/base.nix
index ac4f641..f2c1395 100644
--- a/users/simon/base.nix
+++ b/users/simon/base.nix
@@ -32,40 +32,11 @@ in
     imports = [
       ./modules/alacritty.nix
       ./modules/ankisyncd.nix
+      ./modules/gtk.nix
+      ./modules/htop.nix
       ./modules/sway.nix
+      ./modules/xdg.nix
       ./modules/zathura.nix
     ];
-
-    gtk = {
-      enable = true;
-      font.name = "sans-serif 10";
-      theme = {
-        package = pkgs.gnome-themes-extra;
-        name = "Adwaita";
-      };
-      iconTheme = {
-        package = pkgs.gnome3.adwaita-icon-theme;
-        name = "Adwaita";
-      };
-      # Tooltips remain visible when switching to another workspace
-      gtk2.extraConfig = ''
-        gtk-enable-tooltips = 0
-      '';
-    };
-
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = {
-        "application/pdf" = "org.pwmt.zathura.desktop";
-        "image/png" = "mpv.desktop";
-        "image/jpeg" = "mpv.desktop";
-      };
-    };
-
-    home.file = {
-      ".config/htop/htoprc".text = ''
-        color_scheme=6
-      '';
-    };
   };
 }
diff --git a/users/simon/modules/gtk.nix b/users/simon/modules/gtk.nix
new file mode 100644
index 0000000..76a4676
--- /dev/null
+++ b/users/simon/modules/gtk.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+
+{
+  gtk = {
+    enable = true;
+    font.name = "sans-serif 10";
+    theme = {
+      package = pkgs.gnome-themes-extra;
+      name = "Adwaita";
+    };
+    iconTheme = {
+      package = pkgs.gnome3.adwaita-icon-theme;
+      name = "Adwaita";
+    };
+    # Tooltips remain visible when switching to another workspace
+    gtk2.extraConfig = ''
+      gtk-enable-tooltips = 0
+    '';
+  };
+}
diff --git a/users/simon/modules/htop.nix b/users/simon/modules/htop.nix
new file mode 100644
index 0000000..d847bc3
--- /dev/null
+++ b/users/simon/modules/htop.nix
@@ -0,0 +1,7 @@
+{
+  home.file = {
+    ".config/htop/htoprc".text = ''
+      color_scheme=6
+    '';
+  };
+}
diff --git a/users/simon/modules/xdg.nix b/users/simon/modules/xdg.nix
new file mode 100644
index 0000000..3feddf7
--- /dev/null
+++ b/users/simon/modules/xdg.nix
@@ -0,0 +1,10 @@
+{
+  xdg.mimeApps = {
+    enable = true;
+    defaultApplications = {
+      "application/pdf" = "org.pwmt.zathura.desktop";
+      "image/png" = "mpv.desktop";
+      "image/jpeg" = "mpv.desktop";
+    };
+  };
+}