diff --git a/nixos/flake.nix b/nixos/flake.nix
index fa8b125..60e1025 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -46,7 +46,6 @@
         "steam" "steam-unwrapped" "steam-run"
         "vista-fonts"
         "intel-ocl"
-        "libfprint-2-tod1-broadcom"
       ];
     in
     utils.lib.mkFlake {
diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix
index 7431ae5..5de8df4 100644
--- a/nixos/hosts/Tibo-NixTop/default.nix
+++ b/nixos/hosts/Tibo-NixTop/default.nix
@@ -15,7 +15,6 @@
 
     hardware = {
       eid.enable = true;
-      fingerprint-scanner.enable = true;
       nvidia = {
         enable = true;
         model = "Quadro T2000";
@@ -74,19 +73,12 @@
 
     loader = {
       # Use the systemd-boot EFI boot loader.
-      systemd-boot = {
-        enable = true;
-
-        editor = false;
-        memtest86.enable = true;
-      };
+      systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
 
     # Use latest kernel.
     kernelPackages = pkgs.linuxPackages_latest;
-
-    plymouth.enable = true;
   };
 
   hardware.bluetooth = {
@@ -124,8 +116,6 @@
 
     power-profiles-daemon.enable = false;
 
-    smartd.enable = true;
-
     thermald.enable = true;
 
     xserver = {
diff --git a/nixos/modules/hardware/default.nix b/nixos/modules/hardware/default.nix
index 238bcea..2d38b1e 100644
--- a/nixos/modules/hardware/default.nix
+++ b/nixos/modules/hardware/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./eid
-    ./fingerprint-scanner
     ./nvidia
     ./yubikey
   ];
diff --git a/nixos/modules/hardware/fingerprint-scanner/default.nix b/nixos/modules/hardware/fingerprint-scanner/default.nix
deleted file mode 100644
index b7580c6..0000000
--- a/nixos/modules/hardware/fingerprint-scanner/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.sisyphus.hardware.fingerprint-scanner;
-in {
-  options.sisyphus.hardware.fingerprint-scanner.enable = lib.mkEnableOption "Fingerprint scanner support";
-
-  config = lib.mkIf cfg.enable {
-    # Enable driver
-    services.fprintd = {
-      enable = true;
-
-      # Enable Touch OEM Drivers library support
-      tod = {
-        enable = true;
-        # Dell drivers
-        driver = pkgs.libfprint-2-tod1-broadcom;
-      };
-    };
-
-    # Start driver at boot
-    systemd.services.fprintd = {
-      wantedBy = [
-        "multi-user.target"
-      ];
-      serviceConfig.Type = "simple";
-    };
-  };
-}
-
diff --git a/nixos/users/tdpeuter/firefox.nix b/nixos/users/tdpeuter/firefox.nix
index 626eecc..09cd1d6 100644
--- a/nixos/users/tdpeuter/firefox.nix
+++ b/nixos/users/tdpeuter/firefox.nix
@@ -32,19 +32,15 @@ in {
           };
 
           # Anything in about:config
-          Preferences = let
-            falseLocked = {
+          Preferences = {
+            "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = {
               Value = false;
-              Status = "falseLocked";
+              Status = "locked";
             };
-          in {
-            "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = falseLocked;
-            "browser.newtabpage.activity-stream.showSponsoredTopSites" = falseLocked;
             "browser.newtabpage.pinned" = {
               Value = "[]";
               Status = "default";
             };
-            "services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.showSponsoredTopSites" = falseLocked;
           };
         };
 
diff --git a/stow/hyprland/.config/hypr/hyprland.conf b/stow/hyprland/.config/hypr/hyprland.conf
index b9629db..73bfa92 100644
--- a/stow/hyprland/.config/hypr/hyprland.conf
+++ b/stow/hyprland/.config/hypr/hyprland.conf
@@ -270,7 +270,23 @@ $lock = swaylock
 
 source = /home/tdpeuter/.config/hypr/input-output.conf
 source = /home/tdpeuter/.config/hypr/keybinds.conf
-source = /home/tdpeuter/.config/hypr/modes.conf
+
+$mode_launcher = Launch (f)irefox, (t)hunderbird.
+bind = $flag, O, submap, $mode_launcher
+submap = $mode_launcher
+
+bind = , F, exec,   firefox
+bind = , F, submap, reset
+bind = , T, exec,   thunderbird
+bind = , T, submap, reset
+bind = , Z, exec,   zen
+bind = , Z, submap, reset
+
+bind = $flag, O, submap, reset
+bind = , Escape, submap, reset
+bind = , Return, submap, reset
+
+submap = reset
 
 # https://wiki.hyprland.org/Nvidia/#environment-variables
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
diff --git a/stow/hyprland/.config/hypr/keybinds.conf b/stow/hyprland/.config/hypr/keybinds.conf
index 26385f3..880a1f8 100644
--- a/stow/hyprland/.config/hypr/keybinds.conf
+++ b/stow/hyprland/.config/hypr/keybinds.conf
@@ -58,8 +58,9 @@ bind = $flag,       s, setfloating
 bind = $flag+Shift, s, pin
 bind = $flag+Shift, s, settiled
 
-bind = $flag,       F11,      fullscreen, 1
-bind = $flag+Shift, F11,      fullscreen, 0
+bind = $flag, F11, fullscreen, 1
+# bind = $flag, Prior, fullscreen, 1
+# bind = $flag, KP_Prior, fullscreen, 1
 
 # Workspaces
 
@@ -157,9 +158,9 @@ bind = , XF86Calculator,            exec, qalculate-gtk
 # Shortcuts
 
 # Reload
-bind = Alt+Shift,      r, exec, "hyperctl reload"
+bind = Alt+Shift, r, exec, "hyperctl reload"
 bind = Ctrl+Alt+Shift, r, forcerendererreload
-bind = Alt+Shift,      e, exit
+bind = Alt+Shift, e, exit
 
 # Kill a window
 bind = $flag,    q,      closewindow, activewindow
diff --git a/stow/hyprland/.config/hypr/modes.conf b/stow/hyprland/.config/hypr/modes.conf
deleted file mode 100644
index 72e9a3d..0000000
--- a/stow/hyprland/.config/hypr/modes.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# System actions
-$mode_system = System (l)ock, (s)leep, (h)ibernate, (r)eboot, (Shift+s)hutdown
-bind = Ctrl+Alt, Delete, submap, $mode_system
-submap = $mode_system
-
-bind =      , l, exec, $lock
-bind =      , l, submap, reset
-bind =      , s, exec, $lock, exec, systemctl suspend
-bind =      , s, submap, reset
-bind =      , h, exec, $lock, exec, systemctl hibernate
-bind =      , h, submap, reset
-bind =      , r, exec, systemctl reboot
-bind = Shift, s, exec, systemctl poweroff -i
-
-bind = Ctrl+Alt, Delete, submap, reset
-bind =         , Escape, submap, reset
-bind =         , Return, submap, reset
-
-submap = reset
-
-# Launcher
-$mode_launcher = Launch (f)irefox, (t)hunderbird.
-bind = $flag, O, submap, $mode_launcher
-submap = $mode_launcher
-
-bind = , F, exec,   firefox
-bind = , F, submap, reset
-bind = , T, exec,   thunderbird
-bind = , T, submap, reset
-bind = , Z, exec,   zen
-bind = , Z, submap, reset
-
-bind = $flag, O, submap, reset
-bind = , Escape, submap, reset
-bind = , Return, submap, reset
-
-submap = reset
-
diff --git a/stow/waybar/.config/waybar/config.jsonc b/stow/waybar/.config/waybar/config.jsonc
index ff861e3..2a4f8a4 100644
--- a/stow/waybar/.config/waybar/config.jsonc
+++ b/stow/waybar/.config/waybar/config.jsonc
@@ -40,14 +40,11 @@
             "sway/window",
             "group/workspaces",
             "custom/scratchpad-indicator",
-            "group/mode"
         ],
         "modules-center": [
             "mpris"
         ],
         "modules-right": [
-            "keyboard-state#numlock",
-            "keyboard-state#capslock",
             "privacy",
             "tray",
             "group/control-center",