diff --git a/modules/home-manager/programs/aerc.nix b/modules/home-manager/programs/aerc.nix
index ea5af38..2001847 100644
--- a/modules/home-manager/programs/aerc.nix
+++ b/modules/home-manager/programs/aerc.nix
@@ -16,6 +16,20 @@ let
     "mS" = exec "move Junk";
     "mI" = exec "move INBOX";
   };
+
+  aercPackage = pkgs.unstable.aerc.override {
+    # support .filename filter
+    buildGoModule = args: pkgs.unstable.buildGoModule (args // rec {
+      version = "6ffc0ed5991bef69a50cbc22647af0a6a0e0a895";
+      src = pkgs.fetchFromSourcehut {
+        owner = "~rjarry";
+        repo = "aerc";
+        rev = version;
+        hash = "sha256-IyAcTCDSjOmZ6KPr9nYKdxWA0qryeU4jTwxRWzt2NOY=";
+      };
+      vendorHash = "sha256-pir78zXidz7N9Z6uw9YqkkjVRUho0PuKgDTQFli/4fs=";
+    });
+  };
 in
 {
   options.local.programs.aerc.enable = lib.mkEnableOption "aerc";
@@ -26,19 +40,7 @@ in
     # See: https://git.sbruder.de/simon/nixos-config/src/branch/master/users/simon/modules/mail/aerc/default.nix
     programs.aerc = {
       enable = true;
-      package = pkgs.unstable.aerc.override {
-        # support .filename filter
-        buildGoModule = args: pkgs.unstable.buildGoModule (args // rec {
-          version = "6ffc0ed5991bef69a50cbc22647af0a6a0e0a895";
-          src = pkgs.fetchFromSourcehut {
-            owner = "~rjarry";
-            repo = "aerc";
-            rev = version;
-            hash = "sha256-IyAcTCDSjOmZ6KPr9nYKdxWA0qryeU4jTwxRWzt2NOY=";
-          };
-          vendorHash = "sha256-pir78zXidz7N9Z6uw9YqkkjVRUho0PuKgDTQFli/4fs=";
-        });
-      };
+      package = aercPackage;
       # https://git.sr.ht/~rjarry/aerc/tree/master/item/doc/aerc-config.5.scd
       extraConfig = {
         general = {
@@ -169,27 +171,37 @@ in
       };
 
       stylesets.default = {
-        "*.selected.reverse" = true;
-        "title.reverse" = true;
-        "header.bold" = true;
+        "*.selected.bg" = 6;
+        "*.selected.fg" = 18;
+        "*.selected.bold" = true;
+        "statusline_*.dim" = true;
+        "statusline_*.bg" = 0;
+        "statusline_*.fg" = 15;
+        "*warning.fg" = 3;
+        "*success.fg" = 2;
+        "*error.fg" = 1;
         "*error.bold" = true;
-        "error.fg" = 1;
-        "warning.fg" = 3;
-        "success.fg" = 2;
+        "border.fg" = 15;
+        "title.bg" = 12;
+        "title.fg" = 15;
+        "title.bold" = true;
+        "header.fg" = 4;
+        "header.bold" = true;
+        "msglist_read.selected.fg" = 0;
         "msglist_unread.bold" = true;
-        "msglist_deleted.fg" = 10;
-        "tab.fg" = 0;
-        "tab.selected.reverse" = false;
-        "tab.selected.bold" = true;
-        "tab.selected.bg" = 2;
-        "dirlist_default.bg" = 18;
-        "border.fg" = 0;
-        "statusline_default.bg" = 18;
-        "statusline_error.fg" = 1;
-        "statusline_error.reverse" = true;
-        "statusline_success.fg" = 2;
-        "statusline_success.reverse" = true;
-        "completion_default.bg" = 0;
+        "msglist_deleted.dim" = true;
+        "msglist_marked.bg" = 6;
+        "msglist_marked.fg" = 15;
+        "msglist_pill.bg" = 12;
+        "msglist_pill.fg" = 15;
+        "part_mimetype.fg" = 12;
+        "selector_chooser.bold" = true;
+        "selector_focused.bold" = true;
+        "selector_focused.bg" = 12;
+        "selector_focused.fg" = 15;
+        "completion_pill.bg" = 12;
+        "completion_default.bg" = 8;
+        "completion_default.fg" = 15;
       };
     };
   };