diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index a33bdc4..ef3a6a6 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -69,6 +69,7 @@
       ssh.enable = true;
       btop.enable = true;
       nh.enable = true;
+      thunar.enable = true;
     };
   };
   system.stateVersion = "23.11";
diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix
index cfc2982..a3a09dc 100644
--- a/hosts/temperance/configuration.nix
+++ b/hosts/temperance/configuration.nix
@@ -91,6 +91,7 @@ in {
       ssh.enable = true;
       btop.enable = true;
       nh.enable = true;
+      thunar.enable = true;
     };
   };
 }
diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix
index 8677994..8aed3ea 100644
--- a/modules/programs/gui/foot.nix
+++ b/modules/programs/gui/foot.nix
@@ -17,10 +17,8 @@
       title = "foot";
       locked-title = "no";
 
-      font = "valiosevka:size=14";
-      font-bold = "valiosevka:size=14";
-      # font = "Iosevka Nerd Font:size=14";
-      # font-bold = "Iosevka Nerd Font:size=14";
+      font = "Iosevka Nerd Font:size=14";
+      font-bold = "Iosevka Nerd Font:size=14";
 
       line-height = 20;
       letter-spacing = 0;
diff --git a/modules/programs/gui/thunar/module.nix b/modules/programs/gui/thunar/module.nix
index 7a829d0..0937764 100644
--- a/modules/programs/gui/thunar/module.nix
+++ b/modules/programs/gui/thunar/module.nix
@@ -3,21 +3,37 @@
   lib,
   pkgs,
   ...
-}: {
-  programs.thunar = {
-    enable = true;
-    plugins = builtins.attrValues {
-      inherit
-        (pkgs.xfce)
-        thunar-volman
-        thunar-vcs-plugin
-        thunar-archive-plugin
-        thunar-media-tags-plugin
-        ;
+}: let
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
+  cfg = config.modules.programs.thunar;
+in {
+  options.modules.programs.thunar.enable = mkEnableOption "Thunar file manager";
+  config = mkIf cfg.enable {
+    programs.thunar = {
+      enable = true;
+      plugins = builtins.attrValues {
+        inherit
+          (pkgs.xfce)
+          thunar-volman
+          thunar-vcs-plugin
+          thunar-archive-plugin
+          thunar-media-tags-plugin
+          ;
+      };
     };
-  };
-  services.gvfs = {
-    enable = true;
-    package = pkgs.gvfs;
+    services.gvfs = {
+      enable = true;
+      package = pkgs.gvfs;
+    };
+
+    # Archive management
+    programs.file-roller = {
+      enable = true;
+      package = pkgs.file-roller;
+    };
+
+    # image thumbnails
+    services.tumbler.enable = true;
   };
 }
diff --git a/modules/services/firewall.nix b/modules/services/firewall/module.nix
similarity index 100%
rename from modules/services/firewall.nix
rename to modules/services/firewall/module.nix
diff --git a/modules/services/greetd.nix b/modules/services/greetd/module.nix
similarity index 100%
rename from modules/services/greetd.nix
rename to modules/services/greetd/module.nix
diff --git a/modules/services/locate.nix b/modules/services/locate/module.nix
similarity index 100%
rename from modules/services/locate.nix
rename to modules/services/locate/module.nix
diff --git a/modules/services/mako.nix b/modules/services/mako/module.nix
similarity index 100%
rename from modules/services/mako.nix
rename to modules/services/mako/module.nix
diff --git a/modules/services/module.nix b/modules/services/module.nix
deleted file mode 100644
index b874528..0000000
--- a/modules/services/module.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-_: {
-  imports = [
-    ./pipewire.nix
-    ./locate.nix
-    ./ssh.nix
-    ./greetd.nix
-    ./mako.nix
-    ./mpd.nix
-    ./firewall.nix
-  ];
-}
diff --git a/modules/services/mpd.nix b/modules/services/mpd/module.nix
similarity index 100%
rename from modules/services/mpd.nix
rename to modules/services/mpd/module.nix
diff --git a/modules/services/pipewire.nix b/modules/services/pipewire/module.nix
similarity index 100%
rename from modules/services/pipewire.nix
rename to modules/services/pipewire/module.nix
diff --git a/modules/services/ssh.nix b/modules/services/ssh/module.nix
similarity index 100%
rename from modules/services/ssh.nix
rename to modules/services/ssh/module.nix
diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix
index 18727cb..46bad17 100644
--- a/modules/style/fonts.nix
+++ b/modules/style/fonts.nix
@@ -1,24 +1,5 @@
 {pkgs, ...}: let
   inherit (builtins) mapAttrs;
-  valiosevka = pkgs.iosevka.override {
-    privateBuildPlan = {
-      family = "valiosevka";
-      spacing = "normal";
-      serifs = "sans";
-      noCvSs = true;
-      exportGlyphNames = false;
-
-      ligations.inherits = "dlig";
-      variants = {
-        inherits = "ss15";
-        design = {
-          e = "flat-crossbar";
-          f = "diagonal-tailed-crossbar-at-x-height";
-        };
-      };
-    };
-    set = "Fancy";
-  };
 in {
   # A (somewhat) sane list of fonts to be installed.
   fonts = {
@@ -73,7 +54,6 @@ in {
         comic-shanns-mono
         symbols-only
         ;
-      inherit valiosevka;
     };
     fontDir = {
       # Whether to create a directory with links to all fonts in