diff --git a/flake.lock b/flake.lock
index cfadb71..2f0508e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -180,11 +180,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708806879,
-        "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
+        "lastModified": 1708031129,
+        "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
+        "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8",
         "type": "github"
       },
       "original": {
@@ -202,24 +202,24 @@
       "locked": {
         "lastModified": 1706522977,
         "narHash": "sha256-Tq69CQ+uutfY477w8uCRyF/2V0Wh/+zHzM3qwcVmqsk=",
-        "owner": "rouven0",
+        "owner": "therealr5",
         "repo": "TruckSimulatorBot-images",
         "rev": "d54a772d48a329a402433cc90502700a6699008e",
         "type": "github"
       },
       "original": {
-        "owner": "rouven0",
+        "owner": "therealr5",
         "repo": "TruckSimulatorBot-images",
         "type": "github"
       }
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1708968331,
-        "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
+        "lastModified": 1706639736,
+        "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
+        "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
         "type": "github"
       },
       "original": {
@@ -281,11 +281,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708830466,
-        "narHash": "sha256-nGKe3Y1/jkLR2eh1aRSVBtKadMBNv8kOnB52UXqRy6A=",
+        "lastModified": 1708225687,
+        "narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "f070c7eeec3bde8c8c8baa9c02b6d3d5e114d73b",
+        "rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
         "type": "github"
       },
       "original": {
@@ -296,11 +296,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708807242,
-        "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
+        "lastModified": 1708118438,
+        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
+        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
         "type": "github"
       },
       "original": {
@@ -349,13 +349,13 @@
       "locked": {
         "lastModified": 1698315015,
         "narHash": "sha256-RWYymaHHx6pi4HRLfJJTF3u4Im22uUtVZDUvTbP0Qrc=",
-        "owner": "rouven0",
+        "owner": "therealr5",
         "repo": "pfersel",
         "rev": "40292aa59ed9f6630dc39405f318842a9c8e7cb3",
         "type": "github"
       },
       "original": {
-        "owner": "rouven0",
+        "owner": "therealr5",
         "repo": "pfersel",
         "type": "github"
       }
@@ -400,13 +400,13 @@
       "locked": {
         "lastModified": 1706780558,
         "narHash": "sha256-tZRNaZKENRzd83oLgqgG/G2A+7FgsISFhgblGjFM244=",
-        "owner": "rouven0",
+        "owner": "therealr5",
         "repo": "purge",
         "rev": "3875053bd588aeee14849c50c60f6a33ac784da3",
         "type": "github"
       },
       "original": {
-        "owner": "rouven0",
+        "owner": "therealr5",
         "repo": "purge",
         "type": "github"
       }
@@ -488,15 +488,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1708375524,
-        "narHash": "sha256-6XxKJhGupxakfrz8GBJJ/l9RvLs3tt9wuj3c8MZoSuo=",
-        "owner": "rouven0",
+        "lastModified": 1706780552,
+        "narHash": "sha256-qXEAZNReY2jeoxLO/uZmZMOEOQq6BRq/Mh20BQGF2Bs=",
+        "owner": "therealr5",
         "repo": "TruckSimulatorBot",
-        "rev": "6b33532486100f83fc9c7f2da3d1b54ea4fe5986",
+        "rev": "88194a54c984fb91090c00d116c821627af9ed2f",
         "type": "github"
       },
       "original": {
-        "owner": "rouven0",
+        "owner": "therealr5",
         "repo": "TruckSimulatorBot",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index f2b7da7..54e1d98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,15 +26,15 @@
     nix-colors.url = "github:Misterio77/nix-colors";
 
     purge = {
-      url = "github:rouven0/purge";
+      url = "github:therealr5/purge";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     trucksimulatorbot = {
-      url = "github:rouven0/TruckSimulatorBot";
+      url = "github:therealr5/TruckSimulatorBot";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     pfersel = {
-      url = "github:rouven0/pfersel";
+      url = "github:therealr5/pfersel";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/hosts/falkenstein/modules/mail/default.nix b/hosts/falkenstein/modules/mail/default.nix
index 256d899..c19faa5 100644
--- a/hosts/falkenstein/modules/mail/default.nix
+++ b/hosts/falkenstein/modules/mail/default.nix
@@ -122,10 +122,6 @@ in
           auto = "create";
           specialUse = "Trash";
         };
-        Archive = {
-          auto = "no";
-          specialUse = "Archive";
-        };
       };
       modules = [
         pkgs.dovecot_pigeonhole
diff --git a/overlays/default.nix b/overlays/default.nix
index b03b091..8cda764 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -8,14 +8,17 @@ let
   inherit (prev) python3Packages;
 in
 rec {
+  pcmanfm = prev.pcmanfm.overrideAttrs (_: {
+    # remove deskop preferences shortcut
+    postInstall = ''
+      rm $out/share/applications/pcmanfm-desktop-pref.desktop
+    '';
+  });
+
   pww = callPackage ../pkgs/pww { };
   ianny = callPackage ../pkgs/ianny { };
 
   tpm2-pkcs11 = prev.tpm2-pkcs11.override { fapiSupport = false; };
-  imv = prev.imv.override {
-    # freeimage is broken
-    withBackends = [ "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ];
-  };
 
   gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
   jmri = callPackage ../pkgs/jmri { };
diff --git a/shared/nix.nix b/shared/nix.nix
index ba3d866..f428010 100644
--- a/shared/nix.nix
+++ b/shared/nix.nix
@@ -6,16 +6,15 @@
       nixpkgs.flake = nixpkgs;
     };
     nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+    # keep build-time deps around for offline-rebuilding
     settings = {
       auto-optimise-store = true;
       experimental-features = [ "nix-command" "flakes" "repl-flake" ];
       substituters = [
         "https://cache.rfive.de"
-        "https://cache.ifsr.de"
       ];
       trusted-public-keys = [
         "cache.rfive.de:of5d+o6mfGXQSR3lk6ApfDBr4ampAUaNHux1O/XY3Tw="
-        "cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
       ];
     };
   };
diff --git a/users/rouven/modules/aerc/default.nix b/users/rouven/modules/aerc/default.nix
deleted file mode 100644
index 1eb42a4..0000000
--- a/users/rouven/modules/aerc/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ ... }:
-{
-  programs = {
-    aerc = {
-      enable = true;
-      extraConfig = {
-        # general = {
-        #   unsafe-accounts-conf = true;
-        # };
-        ui = {
-          sort = "date";
-          dirlist-tree = true;
-          fuzzy-complete = true;
-          styleset-name = "dracula";
-          threading-enabled = true;
-          icon-encrypted = "󰯄";
-          icon-signed = "";
-          icon-unknown = "";
-          icon-attachment = "";
-          icon-new = "";
-          icon-old = "";
-          icon-replied = "";
-          icon-marked = "󰄳";
-          icon-flagged = "";
-          icon-deleted = "";
-        };
-        filters = {
-          "text/plain" = "colorize";
-          "text/html" = "html | colorize";
-          "message/delivery-status" = "colorize";
-          "message/rfc822" = "colorize";
-          "text/calendar" = "calendar";
-        };
-      };
-
-    };
-  };
-}
diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix
index 83d4337..9ea32e1 100644
--- a/users/rouven/modules/default.nix
+++ b/users/rouven/modules/default.nix
@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./aerc
     ./foot
     ./git
     ./gpg
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index eb3fbba..39a482e 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -8,7 +8,7 @@
     zip
     unzip
     man-pages
-    cinnamon.nemo
+    pcmanfm
     xdg-utils # used for xdg-open
     appimage-run
     seafile-client
@@ -42,7 +42,6 @@
     bitwarden-cli
 
     # misc
-    hugo
     neofetch # obligatory
     jetbrains.idea-ultimate #😎
     croc # send files anywhere
diff --git a/users/rouven/modules/wayland/waybar.nix b/users/rouven/modules/wayland/waybar.nix
index cc4fe9a..7220107 100644
--- a/users/rouven/modules/wayland/waybar.nix
+++ b/users/rouven/modules/wayland/waybar.nix
@@ -4,12 +4,13 @@
   programs.waybar = {
     enable = true;
     systemd.enable = true;
+    # package = hyprland.packages.x86_64-linux.waybar-hyprland;
     settings = {
       mainBar = {
         layer = "top";
         position = "top";
         height = 26;
-        modules-left = [ "sway/workspaces" "river/tags" "river/window" ];
+        modules-left = [ "sway/workspaces" "river/tags" "custom/spotifytitle" "river/window" ];
         modules-right = [ "network" "cpu" "pulseaudio" "battery" "tray" "custom/notification" "clock" ];
         network = {
           format-wifi = "  {essid} ({signalStrength}%)";
@@ -53,6 +54,12 @@
           escape = true;
         };
 
+        "custom/spotifytitle" = {
+          format = "  {}";
+          max-length = 80;
+          return-type = "json";
+          exec = "${lib.getExe pkgs.pww} -w spotifyd:title -p None 2> /dev/null";
+        };
         cpu = {
           format = "{usage}% ";
         };
@@ -131,6 +138,7 @@
         background-color: #eb4d4b;
     }
     
+    #custom-spotifytitle,
     #custom-notification,
     #clock,
     #battery,
@@ -160,6 +168,19 @@
         background-color: #${config.colorScheme.palette.base00};
     }
     
+    #custom-spotifytitle {
+        background: #1db954;
+        color: #191414;
+        opacity: 1;
+        transition-property: opacity;
+        transition-duration: 0.25s;
+    }
+    
+    #custom-spotifytitle.Paused,
+    #custom-spotifytitle.Inactive {
+        opacity: 0.5;
+    }
+
     #battery {
         background-color: #${config.colorScheme.palette.base02};
         color: #${config.colorScheme.palette.base05};
@@ -209,5 +230,6 @@
         background-color: #${config.colorScheme.palette.base01};
         color: #${config.colorScheme.palette.base05};
     }
+
   '';
 }