diff --git a/home/calypso.nix b/home/calypso.nix
index 5921247..74bd972 100644
--- a/home/calypso.nix
+++ b/home/calypso.nix
@@ -3,17 +3,17 @@
   imports = [
     ./global.nix
 
-    ./features/desktop/zathura.nix
-    ./features/desktop/spotify.nix
-    ./features/desktop/obsidian.nix
+    # ./features/desktop/zathura.nix
+    # ./features/desktop/spotify.nix
+    # ./features/desktop/obsidian.nix
     ./features/desktop/foot.nix
     ./features/desktop/firefox
     ./features/desktop/discord
-    ./features/cli/productivity
-    ./features/cli/pass.nix
-    ./features/cli/zellij.nix
+    # ./features/cli/productivity
+    # ./features/cli/pass.nix
+    # ./features/cli/zellij.nix
     ./features/cli/nix-index.nix
-    ./features/cli/catgirl.nix
+    # ./features/cli/catgirl.nix
     ./features/cli/lazygit.nix
     ./features/wayland/hyprland
     ./features/neovim
@@ -23,11 +23,11 @@
   home.packages = with pkgs; [
     # {{{ Communication
     # signal-desktop # Signal client
-    element-desktop # Matrix client
+    # element-desktop # Matrix client
     # zoom-us # Zoom client 🤮
     # }}}
     # {{{ Editors for different formats
-    gimp # Image editing
+    # gimp # Image editing
     # lmms # Music software
     # kicad # PCB editing
     # libreoffice # Free office suite
@@ -41,16 +41,16 @@
     # sherlock # Search for usernames across different websites
     # }}}
     # {{{ Misc
-    bitwarden # Password-manager
-    qbittorrent # Torrent client
+    # bitwarden # Password-manager
+    # qbittorrent # Torrent client
     # google-chrome # Not my primary browser, but sometimes needed in webdev
     # plover.dev # steno engine
 
     overskride # Bluetooth client
     # }}}
     # {{{ Media playing/recording
-    mpv # Video player
-    imv # Image viewer
+    # mpv # Video player
+    # imv # Image viewer
     # peek # GIF recorder
     # obs-studio # video recorder
     # }}}
diff --git a/home/features/wayland/hyprland/hyprland.conf b/home/features/wayland/hyprland/hyprland.conf
index 6d0cd1f..e82cbb0 100644
--- a/home/features/wayland/hyprland/hyprland.conf
+++ b/home/features/wayland/hyprland/hyprland.conf
@@ -54,7 +54,7 @@ animations {
 }
 
 # Execute apps at launch
-exec-once = foot & firefox & discocss & gtk-launch obsidiantui & gtk-launch smostui
+exec-once = foot & firefox & discocss & gtk-launch obsidiantui & gtk-launch smostui & Spotify
 
 # Without this, xdg-open doesn't work
 exec = systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service
diff --git a/hosts/nixos/calypso/default.nix b/hosts/nixos/calypso/default.nix
index 5963a72..247ec6d 100644
--- a/hosts/nixos/calypso/default.nix
+++ b/hosts/nixos/calypso/default.nix
@@ -8,16 +8,17 @@
     ../common/global
     ../common/users/pilot.nix
 
-    ../common/optional/bluetooth.nix
+    # ../common/optional/bluetooth.nix
     ../common/optional/greetd.nix
     ../common/optional/oci.nix
     ../common/optional/quietboot.nix
 
     ../common/optional/desktop
-    ../common/optional/desktop/steam.nix
+    # ../common/optional/desktop/steam.nix
     ../common/optional/wayland/hyprland.nix
 
     ../common/optional/services/kanata.nix
+    ../common/optional/services/nginx.nix
     ../common/optional/services/syncthing.nix
     ../common/optional/services/restic
 
diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix
index 236c6d4..b8b2466 100644
--- a/hosts/nixos/tethys/default.nix
+++ b/hosts/nixos/tethys/default.nix
@@ -19,6 +19,7 @@
 
     ../common/optional/services/kanata.nix
     ../common/optional/services/restic
+    ../common/optional/services/nginx.nix
     ./services/syncthing.nix
 
     ./hardware