diff --git a/home/dotfiles/neomutt/colors.neomuttrc b/home/dotfiles/neomutt/colors.neomuttrc
index 363f28f..afb98b1 100644
--- a/home/dotfiles/neomutt/colors.neomuttrc
+++ b/home/dotfiles/neomutt/colors.neomuttrc
@@ -1,9 +1,11 @@
 # Colors
 
-color indicator default brightblack
+color status $my_primary_color default
+color index  $my_primary_color default '~N'
+
+# color indicator default foreground
 color index_flags brightmagenta default '.*'
 color index_date cyan default
-color index  brightgreen default '~N'
 color header brightblack default ".*"
 color header brightgreen default "^(Subject)"
 color header yellow default "^(From|To|CC|BCC)"
diff --git a/home/modules/mail.nix b/home/modules/mail.nix
index 6a5d423..ae349b3 100644
--- a/home/modules/mail.nix
+++ b/home/modules/mail.nix
@@ -12,6 +12,7 @@ let
       set nm_record_tags = "+sent -inbox -unread +${ accountName }";
       set my_signature = ${ pkgs.writeText "signature.txt" config.accounts.email.accounts.${accountName}.signature.text }
       set status_format = "— [ %r ] $my_account %f (%lB) %>— %m messages%?n? [ %n new ]?%?d?  [ %d to delete ]?%?t?  [ %t tagged ]? —"
+      source colors.neomuttrc
     '';
 
   makeAccount = accountName: {
@@ -84,11 +85,11 @@ in
           '';
         };
         neomutt = {
-          extraConfig = makeConfig name + ''
-            color status blue default
+          extraConfig = ''
+            set my_primary_color=blue
             alternates ^tstraube@(em|rz)?.uni-frankfurt.de$
             set smime_is_default
-          '';
+          '' + makeConfig name;
         };
       };
 
@@ -105,6 +106,7 @@ in
         neomutt = {
           extraConfig = makeConfig name + ''
             color status green default
+            set my_primary_color=green
             alternates @t9e.me$ @ktiu.net$ ^(tillkowski|till.straube)@gmail.com$
             set reverse_name
           '';
@@ -126,6 +128,7 @@ in
         neomutt = {
           extraConfig = makeConfig name + ''
             color status red default
+            set my_primary_color=red
           '';
         };
         passwordCommand = "pass ksh/systemli";
diff --git a/system/desktop/niri.nix b/system/desktop/niri.nix
index 025a474..f2e6623 100644
--- a/system/desktop/niri.nix
+++ b/system/desktop/niri.nix
@@ -2,12 +2,11 @@
 
 {
   programs.niri.enable = true;
-
   programs.dms-shell.enable = true;
-
   services.gnome.gnome-keyring.enable = lib.mkForce false;
+  programs.nm-applet.enable = false;
 
-  programs.firefox.preferences = {
-    "widget.gtk.libadwaita-colors.enabled" = false;
-  };
+  # programs.firefox.preferences = {
+  #   "widget.gtk.libadwaita-colors.enabled" = false;
+  # };
 }