diff --git a/desktop-sway.nix b/desktop-wayland.nix
similarity index 98%
rename from desktop-sway.nix
rename to desktop-wayland.nix
index 33587b2..7677def 100644
--- a/desktop-sway.nix
+++ b/desktop-wayland.nix
@@ -36,6 +36,7 @@
   ];
 
   services = {
+    gnome.gnome-keyring.enable = true;
     greetd = {
       enable = true;
       settings = {
diff --git a/hardware-specific/intel-laptop.nix b/hardware-specific/intel-laptop.nix
index 4e0fa9d..0ff24fc 100644
--- a/hardware-specific/intel-laptop.nix
+++ b/hardware-specific/intel-laptop.nix
@@ -7,28 +7,5 @@
     ];
   };
 
-  services = {
-    tlp = {
-      enable = true;
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-
-        CPU_MIN_PERF_ON_AC = 0;
-        CPU_MAX_PERF_ON_AC = 100;
-        CPU_MIN_PERF_ON_BAT = 0;
-        CPU_MAX_PERF_ON_BAT = 40;
-
-        #Optional helps save long term battery health
-        START_CHARGE_THRESH_BAT0 = 60; # 60 and bellow it starts to charge
-        STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
-
-      };
-    };
-
-    logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
-  };
+  services.logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
 }
diff --git a/machine-confs/lithium.nix b/machine-confs/lithium.nix
index 2f5161a..9494a93 100644
--- a/machine-confs/lithium.nix
+++ b/machine-confs/lithium.nix
@@ -49,7 +49,7 @@
   imports = [
     ../base.nix
     ../users/vili.nix
-    ../desktop-sway.nix
+    ../desktop-wayland.nix
     ../development.nix
     ../onlykey.nix
     ../services/syncthing.nix
diff --git a/program-config-files/sway.nix b/program-config-files/sway.nix
index 82ed68e..ab75e13 100644
--- a/program-config-files/sway.nix
+++ b/program-config-files/sway.nix
@@ -114,13 +114,14 @@ let
     bindsym $mod+Return exec "alacritty --config-file ${alacritty-conf}"
     bindsym $mod+d exec --no-startup-id "rofi -theme 'Arc-Dark' -show combi -combi-modes 'run' -modes combi"
 
-    set $mode_system "(l)ock, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown"
+    set $mode_system "(l)ock, (e)xit, (s)uspend, (h)ibernate, (r)eboot, (S)hutdown"
     bindsym $mod+Shift+p mode $mode_system
     mode $mode_system {
             bindsym l exec --no-startup-id swaylock, mode "default"
             bindsym s exec --no-startup-id "swaylock; systemctl suspend", mode "default"
             bindsym h exec --no-startup-id systemctl hibernate, mode "default"
             bindsym r exec --no-startup-id systemctl reboot, mode "default"
+            bindsym e exec --no-startup-id loginctl terminate-session self, mode "default"
             bindsym Shift+s exec --no-startup-id systemctl poweroff, mode "default"
             bindsym Return mode "default"
             bindsym Escape mode "default"