diff --git a/flake.lock b/flake.lock
index 67c86a9..01655ba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678006026,
-        "narHash": "sha256-cGOfrU7JsKHAWXbPVDTOu2yyMb7GeWdUtJQNQSqht+w=",
+        "lastModified": 1678019241,
+        "narHash": "sha256-ntj0u3guaIu9dT8aZ3HtnEVhIsibtM7EaG/2VteKaTw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "68ba59578352815ac372b17fb3df9db39afb1407",
+        "rev": "e314f6cf211e480ab8fa101a017e593a9bb9f21b",
         "type": "github"
       },
       "original": {
@@ -91,11 +91,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677946956,
-        "narHash": "sha256-5kzTfzNVzN/VOssGfNko5O2BTYciWSKlqb+q7oX1lh4=",
+        "lastModified": 1678093429,
+        "narHash": "sha256-TDegkSVDSTwOi9j1tc84xiIctxYwgt4kBLfKu88cjlQ=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "5184b542b1f505c90f9ef4715ae949ac45b2b7ef",
+        "rev": "4f647a8e8be78d3817f126e41940bef49e81232e",
         "type": "github"
       },
       "original": {
@@ -165,11 +165,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1677949148,
-        "narHash": "sha256-dEdcn+UYs8TUK3VTNCQk9TsJapJLEq50A4q7eC3/PTU=",
+        "lastModified": 1678095239,
+        "narHash": "sha256-4F6jovFJcwh6OkMsY94ZrHdrvVqZi1FX5pYv6V9LIQw=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "d63e86cbed3d399c4162594943bd8c1d8392e550",
+        "rev": "f6610997b0fc5ea5f9e142c348fca27497efe1c7",
         "type": "github"
       },
       "original": {
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 6e3f395..09317f6 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -113,14 +113,21 @@
       user = "libvirtd";
     };
   };
-	
+
   services.logind = {
-	lidSwitch = "suspend-then-hibernate";
-	lidSwitchDocked = "suspend-then-hibernate";
-	lidSwitchExternalPower = "suspend";
-	extraConfig = ''
-	  HandlePowerKey = ignore
-	'';
+    lidSwitch = "suspend-then-hibernate";
+    lidSwitchDocked = "suspend-then-hibernate";
+    lidSwitchExternalPower = "suspend";
+    extraConfig = ''
+      HandlePowerKey = ignore
+    '';
+  };
+  services.tlp = {
+    enable = true;
+    settings = {
+      START_CHARGE_THRESH_BAT0 = 70;
+      STOP_CHARGE_THRESH_BAT0 = 85;
+    };
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/users/rouven/modules/accounts/default.nix b/users/rouven/modules/accounts/default.nix
index 6962adc..88ae728 100644
--- a/users/rouven/modules/accounts/default.nix
+++ b/users/rouven/modules/accounts/default.nix
@@ -1,13 +1,13 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
   gpg-default-key = "116987A8DD3F78FF8601BF4DB95E8FE6B11C4D09";
 in
 {
   sops.secrets = {
-    "email/rfive" = {};
-    "email/tu-dresden" = {};
-    "email/ifsr" = {};
-    "email/google" = {};
+    "email/rfive" = { };
+    "email/tu-dresden" = { };
+    "email/ifsr" = { };
+    "email/google" = { };
   };
   home.packages = with pkgs; [
     imv
@@ -91,13 +91,14 @@ in
           };
         };
       };
-      neomutt = {
-        enable = true;
-        mailboxName = " 󰒋 rfive.de";
-        extraMailboxes = [ "Sent" "Trash" "Junk" "Drafts" ];
-      };
+      neomutt = let c = mbsync.groups.rfive.channels; in
+        {
+          enable = true;
+          mailboxName = " 󰒋 rfive.de";
+          extraMailboxes = lib.lists.forEach [ c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
+        };
     };
-    "TU-Dresden" = {
+    "TU-Dresden" = rec {
       address = "rouven.seifert@mailbox.tu-dresden.de";
       gpg.key = gpg-default-key;
       realName = "Rouven Seifert";
@@ -155,13 +156,14 @@ in
         };
       };
       msmtp.enable = true;
-      neomutt = {
-        enable = true;
-        mailboxName = "  TU Dresden";
-        extraMailboxes = [ "Opal" "Sent" "Trash" "Junk" "Drafts" ];
-      };
+      neomutt = let c = mbsync.groups.tud.channels; in
+        {
+          enable = true;
+          mailboxName = "  TU Dresden";
+          extraMailboxes = lib.lists.forEach [ c.opal c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
+        };
     };
-    "iFSR" = {
+    "iFSR" = rec {
       address = "rouven.seifert@ifsr.de";
       primary = true;
       gpg.key = gpg-default-key;
@@ -188,6 +190,11 @@ in
             farPattern = "INBOX";
             extraConfig.Create = "near";
           };
+          channels.admin = {
+            nearPattern = "Admin spam";
+            farPattern = "Admin spam";
+            extraConfig.Create = "near";
+          };
           channels.trash = {
             nearPattern = "Trash";
             farPattern = "Trash";
@@ -198,7 +205,6 @@ in
             farPattern = "Sent";
             extraConfig.Create = "near";
           };
-          # There is a lot of spam around, maybe we should not include that folder
           channels.junk = {
             nearPattern = "Junk";
             farPattern = "Public/Spam";
@@ -217,10 +223,11 @@ in
         };
       };
       msmtp.enable = true;
-      neomutt = {
+      neomutt = let c = mbsync.groups.ifsr.channels; in
+        {
         enable = true;
         mailboxName = "  iFSR";
-        extraMailboxes = [ "Sent" "Trash" "Drafts" ];
+        extraMailboxes = lib.lists.forEach [ c.admin c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
       };
     };
     "gmail" = rec {
@@ -240,7 +247,7 @@ in
         enable = true;
         create = "maildir";
         expunge = "both";
-        groups.googlemail = {
+        groups.gmail = {
           channels.inbox = {
             nearPattern = "INBOX";
             farPattern = "INBOX";
@@ -274,10 +281,11 @@ in
         };
       };
       msmtp.enable = true;
-      neomutt = {
+      neomutt = let c = mbsync.groups.gmail.channels; in
+        {
         enable = true;
         mailboxName = " 󰊫 gmail";
-        extraMailboxes = [ "Sent" "Trash" "Junk" "Drafts" ];
+        extraMailboxes = lib.lists.forEach [ c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
       };
     };
   };
diff --git a/users/rouven/modules/spotify/default.nix b/users/rouven/modules/spotify/default.nix
index fe3aa89..c065d2d 100644
--- a/users/rouven/modules/spotify/default.nix
+++ b/users/rouven/modules/spotify/default.nix
@@ -11,4 +11,5 @@
       };
     };
   };
+  systemd.user.services.spotifyd.Unit.After = [ "sops-nix.service" ];
 }