diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index ef3a6a6..a33bdc4 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -69,7 +69,6 @@
       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 a3a09dc..cfc2982 100644
--- a/hosts/temperance/configuration.nix
+++ b/hosts/temperance/configuration.nix
@@ -91,7 +91,6 @@ 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 8aed3ea..8677994 100644
--- a/modules/programs/gui/foot.nix
+++ b/modules/programs/gui/foot.nix
@@ -17,8 +17,10 @@
       title = "foot";
       locked-title = "no";
 
-      font = "Iosevka Nerd Font:size=14";
-      font-bold = "Iosevka Nerd Font:size=14";
+      font = "valiosevka:size=14";
+      font-bold = "valiosevka: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 0937764..7a829d0 100644
--- a/modules/programs/gui/thunar/module.nix
+++ b/modules/programs/gui/thunar/module.nix
@@ -3,37 +3,21 @@
   lib,
   pkgs,
   ...
-}: 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
-          ;
-      };
+}: {
+  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;
-    };
-
-    # Archive management
-    programs.file-roller = {
-      enable = true;
-      package = pkgs.file-roller;
-    };
-
-    # image thumbnails
-    services.tumbler.enable = true;
+  };
+  services.gvfs = {
+    enable = true;
+    package = pkgs.gvfs;
   };
 }
diff --git a/modules/services/firewall/module.nix b/modules/services/firewall.nix
similarity index 100%
rename from modules/services/firewall/module.nix
rename to modules/services/firewall.nix
diff --git a/modules/services/greetd/module.nix b/modules/services/greetd.nix
similarity index 100%
rename from modules/services/greetd/module.nix
rename to modules/services/greetd.nix
diff --git a/modules/services/locate/module.nix b/modules/services/locate.nix
similarity index 100%
rename from modules/services/locate/module.nix
rename to modules/services/locate.nix
diff --git a/modules/services/mako/module.nix b/modules/services/mako.nix
similarity index 100%
rename from modules/services/mako/module.nix
rename to modules/services/mako.nix
diff --git a/modules/services/module.nix b/modules/services/module.nix
new file mode 100644
index 0000000..b874528
--- /dev/null
+++ b/modules/services/module.nix
@@ -0,0 +1,11 @@
+_: {
+  imports = [
+    ./pipewire.nix
+    ./locate.nix
+    ./ssh.nix
+    ./greetd.nix
+    ./mako.nix
+    ./mpd.nix
+    ./firewall.nix
+  ];
+}
diff --git a/modules/services/mpd/module.nix b/modules/services/mpd.nix
similarity index 100%
rename from modules/services/mpd/module.nix
rename to modules/services/mpd.nix
diff --git a/modules/services/pipewire/module.nix b/modules/services/pipewire.nix
similarity index 100%
rename from modules/services/pipewire/module.nix
rename to modules/services/pipewire.nix
diff --git a/modules/services/ssh/module.nix b/modules/services/ssh.nix
similarity index 100%
rename from modules/services/ssh/module.nix
rename to modules/services/ssh.nix
diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix
index 46bad17..18727cb 100644
--- a/modules/style/fonts.nix
+++ b/modules/style/fonts.nix
@@ -1,5 +1,24 @@
 {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 = {
@@ -54,6 +73,7 @@ in {
         comic-shanns-mono
         symbols-only
         ;
+      inherit valiosevka;
     };
     fontDir = {
       # Whether to create a directory with links to all fonts in