diff --git a/.config/environment.d/30-envvars.conf b/.config/environment.d/30-envvars.conf
deleted file mode 100644
index de07a33..0000000
--- a/.config/environment.d/30-envvars.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default env vars.
-#XDG_CURRENT_DESKTOP=sway 
-#XDG_SESSION_TYPE,wayland 
-#XDG_SESSION_DESKTOP=sway 
-MOZ_ENABLE_WAYLAND=1
-GDK_BACKEND=wayland
-WLR_NO_HARDWARE_CURSORS=1
-GDK_BACKEND=wayland
-WLR_RENDERER_ALLOW_SOFTWARE=1
-OZONE_PLATFORM=wayland
diff --git a/.config/sway/config.d/autostart_applications b/.config/sway/config.d/autostart_applications
index 6de6fda..787fd25 100644
--- a/.config/sway/config.d/autostart_applications
+++ b/.config/sway/config.d/autostart_applications
@@ -22,6 +22,10 @@ exec_always --no-startup-id foot --server
 
 # Autotiling
 exec_always ~/.config/sway/scripts/autotiling
+
+# cliphist
+exec wl-paste --type text --watch cliphist store
+exec wl-paste --type image --watch cliphist store
      
 # Welcome App
 exec dex -a -s /etc/xdg/autostart/:~/.config/autostart/  
diff --git a/.config/sway/config.d/default b/.config/sway/config.d/default
index f87c19e..48ab4b8 100644
--- a/.config/sway/config.d/default
+++ b/.config/sway/config.d/default
@@ -17,17 +17,9 @@ set $launcher fuzzel
 set $powermenu ~/.config/sway/scripts/power_menu.sh
 
 ### Idle configuration
-exec swayidle -w\
-    timeout 1070 'swaylock -f -C ~/.config/swaylock/config'\
-    timeout 770 'swaymsg "output * power off"' \
-    resume 'swaymsg "output * power on"' \
-    before-sleep 'swaylock -C ~/.config/swaylock/config'
-# This will lock your screen after 300 seconds of inactivity, then turn off
-# your displays after another 300 seconds, and turn your screens back on when
-# resumed. It will also lock your screen before your computer goes to sleep.
-
-## Lock Screen
-    bindsym $mod+f1 exec ~/.config/sway/scripts/lockman.sh
+exec swayidle idlehint 1
+exec_always swayidle -w before-sleep "$lock"
+set $lock swaylock -C ~/.config/swaylock/config
 
 ### Key bindings
 #
@@ -45,6 +37,9 @@ exec swayidle -w\
     # Start your launcher
     bindsym $mod+d exec $launcher
 
+    # Lock screen
+    bindsym $mod+f1 exec $lock
+
     # Activities
     bindsym $mod+p exec ~/.config/sway/scripts/window_switcher.sh
 
@@ -193,8 +188,17 @@ exec swayidle -w\
 #
 # App shortcuts
 #
+    # Launch the file explorer
     bindsym $mod+n exec thunar
+
+    # Launch the browser
     bindsym $mod+o exec firefox
+
+    # Launch the clipboard manager
+    bindsym $mod+Ctrl+v exec cliphist list | fuzzel -d -w 90 -l 30 -p "Select an entry to copy it to your clipboard buffer:"| cliphist decode | wl-copy
+    # Delete an entry from the clipboard manager
+    bindsym $mod+Ctrl+x exec cliphist list | fuzzel -d -w 90 -l 30 -t cc9393ff -S cc9393ff -p "Select an entry to delete it from cliphist:"| cliphist delete
+    # Note: you can clear all cliphist entries by running `cliphist wipe`
 #
 # Screenshots
 #
diff --git a/.config/sway/config.d/input b/.config/sway/config.d/input
index 43f258a..a97703a 100644
--- a/.config/sway/config.d/input
+++ b/.config/sway/config.d/input
@@ -6,7 +6,6 @@
 input type:touchpad {
     dwt enabled
     tap enabled
-    tap_button_map lrm # Fixed autoscroll without having to scroll on browser (this thing is tested) , right click menu was not showing up idk how this works but it supresses the autoscroll
     natural_scroll enabled
 }
 
diff --git a/.config/sway/scripts/clamshell.sh b/.config/sway/scripts/clamshell.sh
deleted file mode 100755
index e25072a..0000000
--- a/.config/sway/scripts/clamshell.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/bash
-if [-d "/proc/acpi" ]; then
-  if cat /proc/acpi/button/lid/*/state | grep -q open; then
-     swaymsg output eDP-1 enable
-  else
-     swaymsg output eDP-1 disable
-  fi
-fi
diff --git a/.config/sway/scripts/lockman.sh b/.config/sway/scripts/lockman.sh
deleted file mode 100755
index 69edccf..0000000
--- a/.config/sway/scripts/lockman.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# Times the screen off and puts it to background
-swayidle \
-    timeout  300 'swaymsg "output * power off"' \
-    resume 'swaymsg "output * power on"' &
-# Locks the screen immediately
-swaylock
-# Kills last background task so idle timer doesn't keep running
-kill %%
diff --git a/.config/sway/scripts/power_menu.sh b/.config/sway/scripts/power_menu.sh
index cad2e76..e790426 100755
--- a/.config/sway/scripts/power_menu.sh
+++ b/.config/sway/scripts/power_menu.sh
@@ -4,8 +4,8 @@ SELECTION="$(printf "1 - Lock\n2 - Suspend\n3 - Log out\n4 - Reboot\n5 - Reboot
 
 confirm_action() {
     local action="$1"
-    CONFIRMATION="$(printf "No\nYes" | fuzzel --dmenu -a top-right -l 2 -w 20 -p "$action?")"
-    [ "$CONFIRMATION" = "Yes" ]
+    CONFIRMATION="$(printf "1 - No\n2 - Yes" | fuzzel --dmenu -a top-right -l 2 -w 20 -p "$action?")"
+    [ "$CONFIRMATION" = "2 - Yes" ]
 }
 
 case $SELECTION in
diff --git a/README.md b/README.md
index 4093d87..7afc8d9 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ You can examine the contents of the script here: https://github.com/EndeavourOS-
 - Screen settings in: `~/.config/sway/config.d/output`
 - Keybindings Cheatsheet: press keyboard icon in waybar
 
-- If your experiencing issues with your cursor - edit file `~/.profile` and comment out `export WLR_NO_HARDWARE_CURSORS=1`     
+- If your experiencing issues with your cursor - edit file `/etc/greetd/regreet.toml` and uncomment `export WLR_NO_HARDWARE_CURSORS = "1"`     
  
 ## Get involved at our forum:
 https://forum.endeavouros.com/t/sway-edition-general-conversation
@@ -49,7 +49,6 @@ https://forum.endeavouros.com/t/sway-edition-general-conversation
 ## Tutorial for sway-wm settings:
 
  - Background handled by swaybg
- - Gtk3 theme handled by lxappearance
  - Filebrowser = Thunar
  - Default Terminal-Emulator = Foot
  - Text-Editor = xed/nano
@@ -91,7 +90,8 @@ Is set to default for swaywm and can be changed to:
 
 
 ![sway](https://forum.endeavouros.com/uploads/default/original/3X/b/c/bc09b71d718cb09a8efd4545cc65366c5f855441.png)
-![wofi](https://forum.endeavouros.com/uploads/default/original/3X/9/d/9daff7f842bd9db097e0bb9d6be5cf5b65e6baa0.jpeg)
+
+![fuzzel](https://github.com/user-attachments/assets/88fdbf21-83b6-44b3-a2c4-c84cbfcac585)
 
 Waybar :
 ![waybar](https://forum.endeavouros.com/uploads/default/original/3X/7/3/73b22b2a678c6836c3b2d15747b0ef28e064fbc2.png)
diff --git a/etc/greetd/regreet.toml b/etc/greetd/regreet.toml
index f172f22..d8908f7 100644
--- a/etc/greetd/regreet.toml
+++ b/etc/greetd/regreet.toml
@@ -13,13 +13,22 @@ fit = "Cover"
 
 # The entries defined in this section will be passed to the session as environment variables when it is started
 [env]
+# Set desktop and session type
 XDG_SESSION_TYPE = "wayland"
 XDG_CURRENT_DESKTOP = "sway"
 XDG_SESSION_DESKTOP = "sway"
 
+# Specify Wayland backends for various applications
+MOZ_ENABLE_WAYLAND = "1"
+OZONE_PLATFORM = "wayland"
+GDK_BACKEND = "wayland"
+QT_QPA_PLATFORM = "wayland"
+
+# Prevent using hardware cursors in Wayland, forcing software-rendered cursors.
 # Uncomment if you experience issues with your cursor
 #export WLR_NO_HARDWARE_CURSORS = "1"
 
+# Allow the Wayland renderer to fall back to software rendering if necessary.
 # Uncomment if you are running in a virtual machine or have an underpowered GPU
 #export WLR_RENDERER_ALLOW_SOFTWARE = "1"
 
diff --git a/etc/sudoers.d/custom b/etc/sudoers.d/custom
new file mode 100644
index 0000000..46168bf
--- /dev/null
+++ b/etc/sudoers.d/custom
@@ -0,0 +1 @@
+Defaults env_keep += "QT_QPA_PLATFORM WAYLAND_DISPLAY XDG_RUNTIME_DIR"
diff --git a/etc/systemd/logind.conf.d/suspend.conf b/etc/systemd/logind.conf.d/suspend.conf
new file mode 100644
index 0000000..ea8f892
--- /dev/null
+++ b/etc/systemd/logind.conf.d/suspend.conf
@@ -0,0 +1,3 @@
+[Login]
+IdleAction=suspend
+IdleActionSec=10min
diff --git a/packages-repository.txt b/packages-repository.txt
index d417145..579d98b 100644
--- a/packages-repository.txt
+++ b/packages-repository.txt
@@ -2,6 +2,7 @@ acpi
 arc-gtk-theme-eos
 awesome-terminal-fonts
 brightnessctl
+cliphist
 dex
 egl-wayland
 file-roller