diff --git a/home/environments/kde/konawall.nix b/home/environments/kde/konawall.nix
index 93d3e9cb..2ef15020 100644
--- a/home/environments/kde/konawall.nix
+++ b/home/environments/kde/konawall.nix
@@ -12,6 +12,24 @@
     Terminal=False
     Type=Application
   '';
+  konawallConfig = {
+    interval = 300;
+    rotate = true;
+    source = "konachan";
+    tags = [
+      "rating:s"
+      "touhou"
+      "score:>=50"
+      "width:>=1500"
+    ];
+    logging = {
+      file = "INFO";
+      console = "DEBUG";
+    };
+  };
 in {
-  xdg.configFile."autostart/konawall.desktop".text = desktop_entry;
+  xdg.configFile = {
+    "konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig;
+    "autostart/konawall.desktop".text = desktop_entry;
+  };
 }
diff --git a/modules/nixos/machine.nix b/modules/nixos/machine.nix
index a26f1430..644e758b 100644
--- a/modules/nixos/machine.nix
+++ b/modules/nixos/machine.nix
@@ -1,5 +1,5 @@
 {lib, ...}: let
-  inherit (lib.modules) mkOption;
+  inherit (lib.options) mkOption;
   inherit (lib.types) enum;
 in {
   options.machine = {
diff --git a/nixos/profiles/graphical/fonts.nix b/nixos/profiles/graphical/fonts.nix
index d4be138c..de807289 100644
--- a/nixos/profiles/graphical/fonts.nix
+++ b/nixos/profiles/graphical/fonts.nix
@@ -4,6 +4,7 @@
       font-awesome
       twitter-color-emoji
       iosevka-bin
+      monaspace
     ];
     enableDefaultPackages = true;
     fontDir.enable = true;
diff --git a/nixos/profiles/wireless/firewall.nix b/nixos/profiles/wireless/firewall.nix
index e2f70be3..f5600e8d 100644
--- a/nixos/profiles/wireless/firewall.nix
+++ b/nixos/profiles/wireless/firewall.nix
@@ -1,5 +1,5 @@
 _: {
-  firewall = {
+  networking.firewall = {
     allowedUDPPorts = [5353]; # MDNS
     allowedUDPPortRanges = [
       {
diff --git a/nixos/servers/monitoring-server/grafana.nix b/nixos/servers/grafana-stack/grafana.nix
similarity index 100%
rename from nixos/servers/monitoring-server/grafana.nix
rename to nixos/servers/grafana-stack/grafana.nix
diff --git a/nixos/servers/monitoring-server/nginx.nix b/nixos/servers/grafana-stack/nginx.nix
similarity index 100%
rename from nixos/servers/monitoring-server/nginx.nix
rename to nixos/servers/grafana-stack/nginx.nix
diff --git a/nixos/servers/monitoring-server/prometheus.nix b/nixos/servers/grafana-stack/prometheus.nix
similarity index 100%
rename from nixos/servers/monitoring-server/prometheus.nix
rename to nixos/servers/grafana-stack/prometheus.nix
diff --git a/nixos/servers/monitoring-server/scalpel.nix b/nixos/servers/grafana-stack/scalpel.nix
similarity index 100%
rename from nixos/servers/monitoring-server/scalpel.nix
rename to nixos/servers/grafana-stack/scalpel.nix
diff --git a/nixos/servers/monitoring-server/secrets.nix b/nixos/servers/grafana-stack/secrets.nix
similarity index 100%
rename from nixos/servers/monitoring-server/secrets.nix
rename to nixos/servers/grafana-stack/secrets.nix
diff --git a/nixos/servers/monitoring-server/secrets.yaml b/nixos/servers/grafana-stack/secrets.yaml
similarity index 100%
rename from nixos/servers/monitoring-server/secrets.yaml
rename to nixos/servers/grafana-stack/secrets.yaml
diff --git a/nixos/servers/monitoring-server/synapse-v2.rules b/nixos/servers/grafana-stack/synapse-v2.rules
similarity index 100%
rename from nixos/servers/monitoring-server/synapse-v2.rules
rename to nixos/servers/grafana-stack/synapse-v2.rules
diff --git a/nixos/servers/monitoring-server/telegraf.nix b/nixos/servers/grafana-stack/telegraf.nix
similarity index 100%
rename from nixos/servers/monitoring-server/telegraf.nix
rename to nixos/servers/grafana-stack/telegraf.nix
diff --git a/nixos/servers/matrix-homeserver/nginx.nix b/nixos/servers/matrix/nginx.nix
similarity index 100%
rename from nixos/servers/matrix-homeserver/nginx.nix
rename to nixos/servers/matrix/nginx.nix
diff --git a/nixos/servers/matrix-homeserver/scalpel.nix b/nixos/servers/matrix/scalpel.nix
similarity index 100%
rename from nixos/servers/matrix-homeserver/scalpel.nix
rename to nixos/servers/matrix/scalpel.nix
diff --git a/nixos/servers/matrix-homeserver/secrets.nix b/nixos/servers/matrix/secrets.nix
similarity index 100%
rename from nixos/servers/matrix-homeserver/secrets.nix
rename to nixos/servers/matrix/secrets.nix
diff --git a/nixos/servers/matrix-homeserver/secrets.yaml b/nixos/servers/matrix/secrets.yaml
similarity index 100%
rename from nixos/servers/matrix-homeserver/secrets.yaml
rename to nixos/servers/matrix/secrets.yaml
diff --git a/nixos/servers/matrix-homeserver/synapse.nix b/nixos/servers/matrix/synapse.nix
similarity index 100%
rename from nixos/servers/matrix-homeserver/synapse.nix
rename to nixos/servers/matrix/synapse.nix
diff --git a/nixos/servers/monica-server.nix b/nixos/servers/monica.nix
similarity index 100%
rename from nixos/servers/monica-server.nix
rename to nixos/servers/monica.nix
diff --git a/nixos/servers/postgres-server.nix b/nixos/servers/postgres.nix
similarity index 100%
rename from nixos/servers/postgres-server.nix
rename to nixos/servers/postgres.nix
diff --git a/nixos/servers/vaultwarden-server/nginx.nix b/nixos/servers/vaultwarden/nginx.nix
similarity index 100%
rename from nixos/servers/vaultwarden-server/nginx.nix
rename to nixos/servers/vaultwarden/nginx.nix
diff --git a/nixos/servers/vaultwarden-server/postgres.nix b/nixos/servers/vaultwarden/postgres.nix
similarity index 100%
rename from nixos/servers/vaultwarden-server/postgres.nix
rename to nixos/servers/vaultwarden/postgres.nix
diff --git a/nixos/servers/vaultwarden-server/scalpel.nix b/nixos/servers/vaultwarden/scalpel.nix
similarity index 100%
rename from nixos/servers/vaultwarden-server/scalpel.nix
rename to nixos/servers/vaultwarden/scalpel.nix
diff --git a/nixos/servers/vaultwarden-server/secrets.yaml b/nixos/servers/vaultwarden/secrets.yaml
similarity index 100%
rename from nixos/servers/vaultwarden-server/secrets.yaml
rename to nixos/servers/vaultwarden/secrets.yaml
diff --git a/nixos/servers/vaultwarden-server/vaultwarden.nix b/nixos/servers/vaultwarden/vaultwarden.nix
similarity index 100%
rename from nixos/servers/vaultwarden-server/vaultwarden.nix
rename to nixos/servers/vaultwarden/vaultwarden.nix
diff --git a/nixos/servers/web-server/acme.nix b/nixos/servers/web/acme.nix
similarity index 100%
rename from nixos/servers/web-server/acme.nix
rename to nixos/servers/web/acme.nix
diff --git a/nixos/servers/web-server/firewall.nix b/nixos/servers/web/firewall.nix
similarity index 100%
rename from nixos/servers/web-server/firewall.nix
rename to nixos/servers/web/firewall.nix
diff --git a/nixos/servers/web-server/nginx.nix b/nixos/servers/web/nginx.nix
similarity index 100%
rename from nixos/servers/web-server/nginx.nix
rename to nixos/servers/web/nginx.nix
diff --git a/nixos/servers/web-server/scalpel.nix b/nixos/servers/web/scalpel.nix
similarity index 100%
rename from nixos/servers/web-server/scalpel.nix
rename to nixos/servers/web/scalpel.nix
diff --git a/nixos/servers/web-server/secrets.nix b/nixos/servers/web/secrets.nix
similarity index 100%
rename from nixos/servers/web-server/secrets.nix
rename to nixos/servers/web/secrets.nix
diff --git a/nixos/servers/web-server/secrets.yaml b/nixos/servers/web/secrets.yaml
similarity index 100%
rename from nixos/servers/web-server/secrets.yaml
rename to nixos/servers/web/secrets.yaml
diff --git a/systems/koishi.nix b/systems/koishi.nix
index 87c5892e..a30af9df 100644
--- a/systems/koishi.nix
+++ b/systems/koishi.nix
@@ -10,10 +10,14 @@ _: let
         kde
       ]);
 
-    home-manager.users.kat.imports = with tree.home.profiles; [
-      graphical
-      devops
-    ];
+    home-manager.users.kat.imports =
+      (with tree.home.profiles; [
+        graphical
+        devops
+      ])
+      ++ (with tree.home.environments; [
+        kde
+      ]);
 
     fileSystems = {
       "/" = {
diff --git a/systems/yukari.nix b/systems/yukari.nix
index 340dc619..3c933d5e 100644
--- a/systems/yukari.nix
+++ b/systems/yukari.nix
@@ -13,14 +13,16 @@ _: let
       ]
       ++ (with tree.nixos.roles; [
         server
-        web-server
-        postgres-server
-        matrix-homeserver
-        vaultwarden-server
-        minecraft-server
-        monitoring-server
+      ])
+      ++ (with tree.nixos.servers; [
+        web
+        postgres
+        matrix
+        vaultwarden
+        minecraft
+        grafana-stack
         public-directory
-        irc-client
+        web-irc-client
       ]);
 
     boot = {