diff --git a/nixos/modules/hardware/yubikey/default.nix b/nixos/modules/hardware/yubikey/default.nix
index 708b9c1..8deb1ed 100644
--- a/nixos/modules/hardware/yubikey/default.nix
+++ b/nixos/modules/hardware/yubikey/default.nix
@@ -6,31 +6,12 @@ in {
   options.sisyphus.hardware.yubikey.enable = lib.mkEnableOption "YubiKey support";
 
   config = lib.mkIf cfg.enable {
-    programs = {
-      gnupg.agent = {
-        enable = true;
-        # TODO Necessary?
-        # enableSSHSupport = true;
-        # pinentryFlavor = "curses";
-      };
-
-      # yubikey-touch-detector.enable = true;
-    };
-
     # Enable smart card reading
     services.pcscd.enable = true;
 
-    environment.systemPackages = with pkgs; [
-      yubikey-touch-detector
-    ];
-
-    # Send a notification if the YubiKey is waiting for touch.
-    systemd.user.services.yubikey-touch-detector = {
+    programs.gnupg.agent = {
       enable = true;
-      description = "Detects when your YubiKey is waiting for a touch";
-      path = with pkgs; [ yubikey-touch-detector ];
-      script = ''exec yubikey-touch-detector --notify'';
-      environment.YUBIKEY_TOUCH_DETECTOR_LIBNOTIFY = "true";
+      pinentryFlavor = "curses";
     };
   };
 }
diff --git a/nixos/users/tdpeuter/mail.nix b/nixos/users/tdpeuter/mail.nix
index d6b4928..a7335c9 100644
--- a/nixos/users/tdpeuter/mail.nix
+++ b/nixos/users/tdpeuter/mail.nix
@@ -67,13 +67,9 @@ in {
           thunderbird = {
             enable = true;
             settings = id: {
-              "mail.server.server_${id}.authMethod"   = 10;
+              "mail.server.server_${id}.authMethod" = 10;
               "mail.smtpserver.smtp_${id}.authMethod" = 10;
-              "mail.identity.id_${id}.htmlSigText"    = signatures.UGent;
-
-              # Allow PGP
-              "mail.identity.id_${id}.openpgp_key_id" = "9B11F5243089DB5B"; # Your 'master' key
-              "mail.identity.id_${id}.attachPgpKey"   = true;
+              "mail.identity.id_${id}.htmlSigText" = signatures.UGent;
             };
           };
         };
@@ -121,15 +117,10 @@ in {
           profiles.tdpeuter = {
             isDefault = true;
             settings = {
-              # View
-              "mailnews.default_sort_order" = 2;          # Sort descending
+              "mailnews.default_sort_order" = 2; # Sort descending
               "mailnews.mark_message_read.delay" = true;
               "mailnews.start_page.enabled" = false;
-              "mail.pane_config.dynamic" = 2;             # Vertical view
-
-              # Encryption
-              "mail.openpgp.allow_external_gnupg" = true; # Enable YubiKey GPG signing
-              "mail.e2ee.auto_enable" = true;             # Automatically enable encryption when possible.
+              "mail.pane_config.dynamic" = 2; # Vertical view
             };
           };
         };
diff --git a/stow/sway/.config/sway/config b/stow/sway/.config/sway/config
index 922a75b..1b9ee29 100644
--- a/stow/sway/.config/sway/config
+++ b/stow/sway/.config/sway/config
@@ -16,8 +16,8 @@ set {
     $scrollDown button5
 
     # $term            kitty || alacritty || foot
-    $term            foot
-    $menu            j4-dmenu-desktop --dmenu="rofi -dmenu -i" --no-generic --usage-log="/home/tdpeuter/.local/state/dmenu.log" --term=$term
+    $term            kitty
+    $menu            j4-dmenu-desktop --dmenu "rofi -dmenu -i" --usage-log="/home/tdpeuter/.local/state/dmenu.log"
     # TODO Find better location and better way to reference this.
     $window_switcher /home/tdpeuter/projects/fzf-jump/new.sh
     $lock            swaylock -f