diff --git a/home/TODOS.md b/home/TODOS.md
index 98673f7..370c880 100644
--- a/home/TODOS.md
+++ b/home/TODOS.md
@@ -75,36 +75,6 @@
 ## Firefox
 
 - Addons strukturieren
-- Lesezeichen strukturieren
-  - Studium
-  - Linux
-    - Arch Linux
-    - NixOS
-    - Allgemein
-  - Nützlich?
-  - Online Tools?
-    - Spiele ?
-  - Musik? => Downloaden?
-  - Hobbies
-    - 3D
-    - Bienen
-    - Gärtnern
-    - Handarbeit
-    - Instrumente
-    - Kohen
-    - Programieren
-    - Sport
-    - Yu-Gi-Oh!
-    - Zauberwürfel
-    - Zocken
-    - Raspberry Pi
-    - Training
-    - Slackline
-    - Radeln
-  - Studium
-    - Info
-    - Mathe
-    - Allgemein
 
 ## XMonad
 
@@ -144,6 +114,5 @@
 
 ## xmobar
 
-- XMonadLog change colors
 - pulseaudioctl only gives correct answer after one change
 - change bash scripts to Haskell Functions
diff --git a/home/programs/alacritty/default.nix b/home/programs/alacritty/default.nix
index 95ea6c5..4153b3f 100644
--- a/home/programs/alacritty/default.nix
+++ b/home/programs/alacritty/default.nix
@@ -1,12 +1,21 @@
 { pkgs, ... }:
 
-{
+let
+  theme = builtins.fetchurl {
+    url =
+      "https://github.com/catppuccin/alacritty/ raw/main/catppuccin-mocha.toml";
+    sha256 = "061yalrzpqivr67k2f8hsqixr77srgd8y47xvhp5vg0sjmh5lrcy";
+  };
+in {
   home.packages = with pkgs; [ fira-code alacritty-theme ];
 
   programs.alacritty = {
     enable = true;
     settings = {
-      env = { "TERM" = "xterm-256color"; };
+      env = {
+        "TERM" = "xterm-256color";
+        import = "${theme}";
+      };
       font = {
         size = 9;
         normal.family = "Fira Code";
diff --git a/home/programs/default.nix b/home/programs/default.nix
index 45e7351..7732ac1 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -10,6 +10,7 @@
     ./rofi
     ./signal.nix
     ./telegram.nix
+    ./thunderbird
     ./wallpaper.nix
     ./xmonad
     ./zathura.nix
diff --git a/home/programs/thunderbird/default.nix b/home/programs/thunderbird/default.nix
new file mode 100644
index 0000000..da7f815
--- /dev/null
+++ b/home/programs/thunderbird/default.nix
@@ -0,0 +1,56 @@
+{ pkgs, ... }:
+
+{
+  #programs.thunderbird = true;
+  accounts.email = {
+    accounts = {
+      kjr = {
+        address = "elias.schroeter@kjr-ebe.de";
+        realName = "Elias Schröter";
+        signature = {
+          text = ''
+            Mit freundlichen Grüßen,
+            Elias Schröter.
+          '';
+          showSignature = "append";
+        };
+        passwordCommand = "mail-password";
+        userName = "elias.schroeter@kjr-ebe.de";
+        thunderbird = { enable = true; };
+      };
+      privat = {
+        address = "elias.schroeter@e.email";
+        gpg = {
+          key = "0x99D2EF975FE523CC";
+          signByDefault = true;
+        };
+        aliases = [ "eliasschrei@gmail.com" "elias.schroeter1601@gmail.com" ];
+        imap = {
+          host = "mail.ecloud.global";
+          port = 993;
+          tls.enable = true;
+        };
+        realName = "Elias Schröter";
+        signature = {
+          text = ''
+            Mit freundlichen Grüßen,
+            Elias Schröter.
+          '';
+          showSignature = "append";
+        };
+        passwordCommand = "mail-password";
+        smtp = {
+          host = "mail.ecloud.global";
+          port = 587;
+        };
+        userName = "elias.schroeter@e.email";
+        primary = true;
+        tls = {
+          enable = true;
+          useStartTls = true;
+        };
+        thunderbird = { enable = true; };
+      };
+    };
+  };
+}
diff --git a/home/programs/xmonad/src/xmonad.hs b/home/programs/xmonad/src/xmonad.hs
index 155058e..0763fc5 100644
--- a/home/programs/xmonad/src/xmonad.hs
+++ b/home/programs/xmonad/src/xmonad.hs
@@ -48,6 +48,7 @@ myXmobarPP = def
       ppSep               = pink " • "
       , ppWsSep           = ""
       , ppCurrent         = wrap " " "" . xmobarBorder "Top" "#f38ba8" 2
+      , ppVisible         = wrap " " "" . xmobarBorder "Top" "#a6e3a1" 2
       , ppHidden          = green . wrap " " ""
       , ppHiddenNoWindows = gray . wrap " " ""
       , ppUrgent          = red . wrap (yellow "!") (yellow "!")
diff --git a/home/services/default.nix b/home/services/default.nix
index 4493c83..e929b23 100644
--- a/home/services/default.nix
+++ b/home/services/default.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }:
 
 {
-  imports = [ ./ssh-agent.nix ./gpg-agent.nix ];
+  imports = [ ./ssh-agent.nix ./gpg-agent.nix ./xscreenlocker.nix ];
 }