diff --git a/home/default.nix b/home/default.nix
index f6be9d6..24d4d1d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -80,6 +80,7 @@
   imports = [
     ./R.nix
     ./nvim
+    ./foot.nix
     ./fish.nix
     ./mail
     ./tex.nix
diff --git a/home/foot.nix b/home/foot.nix
new file mode 100644
index 0000000..de879a5
--- /dev/null
+++ b/home/foot.nix
@@ -0,0 +1,46 @@
+{ config, pkgs, ... }:
+
+{
+  programs.foot = {
+    enable = true;
+    settings =  {
+      shell = "/home/till/.nix-profile/bin/fish -c 'tmux attach || tmux'";
+      pad = "20x20";
+      font = "JetBrains Mono:size=9";
+      initial-window-mode = "maximized";
+      line-height = "11.3";
+      dpi-aware = "yes";
+      mouse.hide-when-typing = "yes";
+      cursor = {
+        style = "beam";
+        blink = "yes";
+        color = "eeeeee 1c1c1c";
+      };
+      csd.size = "0";
+      colors = {
+        alpha = "1.0";
+        background = "eeeeee";
+        foreground = "1c1c1c";
+        regular0 = "1c1c1c"; # black
+        bright0 = "585858 "; # bright black
+        regular1 = "af0000"; # red
+        bright1 = "d70000"; # bright red
+        regular2 = "008700"; # green
+        bright2 = "5faf5f"; # bright green
+        regular3 = "d75f00"; # yellow
+        bright3 = "ffaf00 "; # bright yellow
+        regular4 = "005faf "; # blue
+        bright4 = "0087af "; # bright blue
+        regular5 = "d70087 "; # magenta
+        bright5 = "ff5faf  "; # bright magenta
+        regular6 = "005f87 "; # cyan
+        bright6 = "00afaf "; # bright cyan
+        regular7 = "ffffff"; # white
+        bright7 = "bcbcbc "; # bright white
+      };
+      key-bindings = {
+        show-urls-launch = "Control+Shift+g";
+        show-urls-copy = "Control+Shift+y";
+      };
+  };
+}
diff --git a/home/mail/default.nix b/home/mail/default.nix
index e582b28..3553878 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -1,7 +1,14 @@
 { config, pkgs, ... }:
 
 {
-  programs.msmtp.enable = true;
+  programs.msmtp = {
+    enable = true;
+    extraConfig = ''
+      defaults
+      logfile ${config.xdg.stateHome}/msmtp/msmtp.log
+      port 587
+    '';
+  };
   programs.mbsync.enable = true;
   programs.neomutt = {
     enable = true;
@@ -14,6 +21,7 @@
   accounts.email = {
     maildirBasePath = "${config.xdg.dataHome}/mail/imap";
     accounts = {
+
       gu = {
         primary = true;
         address = "straube@geo.uni-frankfurt.de";
@@ -37,12 +45,14 @@
             set my_junk='+Spamverdacht'
             set my_mbsync_acct='gu'
 
-            set crypt_autosign
-            set crypt_replyencrypt
-            set crypt_replysign
-            set crypt_replysignencrypted
+            set crypt_auto_smime
+            unset crypt_auto_pgp
+
+            # set crypt_autosign
+            # set crypt_replyencrypt
+            # set crypt_replysign
+            # set crypt_replysignencrypted
             set crypt_verify_sig
-            set smime_is_default
             set smime_default_key = "f1355556.0"
             set pgp_default_key   = ""
 
@@ -57,13 +67,9 @@
           '';
         };
         mbsync.enable = true;
-        msmtp = {
-          enable = true;
-          # extraConfig = {
-          #   tls_starttls = "on";
-          # };
-        };
+        msmtp.enable = true;
       };
+
       ktiu = {
         address = "till@ktiu.net";
         realName = "Till Straube";
@@ -75,11 +81,19 @@
           Till Straube
         '';
         signature.showSignature = "append";
+        gpg = {
+          key = "5FA6782F543D12ED07110780BA1B73F10BABF8E3";
+          signByDefault = true;
+        };
         neomutt = {
           enable = true;
           sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
           extraConfig = ''
             set my_mbsync_acct='ktiu'
+
+            set crypt_auto_pgp
+            unset crypt_auto_smime
+
             unalternates *
             alternates @ktiu.net$
             set reverse_name
@@ -88,7 +102,10 @@
           '';
         };
         mbsync.enable = true;
-        msmtp.enable = true;
+        msmtp = {
+          enable = true;
+          extraConfig.from = "*@ktiu.net";
+        };
         passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till";
       };
     };
diff --git a/home/mail/smime.neomuttrc b/home/mail/smime.neomuttrc
index 15da302..7426dd3 100644
--- a/home/mail/smime.neomuttrc
+++ b/home/mail/smime.neomuttrc
@@ -1,6 +1,3 @@
-# Use SMIME
-unset crypt_use_gpgme
-
 # Locations
 set smime_ca_location="~/.keys/neomutt/smime/ca"
 set smime_certificates="~/.keys/neomutt/smime/public"