diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 28b4dce..13c041d 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -170,4 +170,5 @@ configuration {
       sorting-method:    "name";
   }
 }
-@theme "theme" // read theme in ./theme.rasi
+//@theme "theme" // read theme in ./theme.rasi
+@theme "/usr/share/rofi/themes/Monokai.rasi"
diff --git a/.config/sway/config.d/default b/.config/sway/config.d/default
index 9e9445b..510a720 100644
--- a/.config/sway/config.d/default
+++ b/.config/sway/config.d/default
@@ -2,6 +2,7 @@
 # Logo key. Use Mod1 for Alt.
 set $mod Mod4
 bindsym $mod+F12 reload
+bindsym $mod+Shift+Escape exec systemctl poweroff
 focus_follows_mouse no
 
 # Variables to set
@@ -46,10 +47,7 @@ bindsym $mod+F9 exec lollypop
 bindsym $mod+F10 exec spotify
 bindsym $mod+F11 exec rofi -show drun
 
-## xfce4-terminal
-bindsym f12 exec xfce4-terminal --drop-down
 
-# Start a terminal
 bindsym $mod+Return exec "rofi -show"
 bindsym $mod+Shift+Space exec $terminal
 
@@ -97,10 +95,8 @@ bindsym Alt+Up exec variety --pause
 bindsym Alt+Down exec variety --resume
 
 # task manager
-bindsym Ctrl+Shift+Escape exec kitty -e btop
-bindsym Ctrl+Alt+End exec kitty -e btop
 
-bindsym $mod+Escape exec ~/.config/sway/scripts/wkill.sh
+#bindsym $mod+Escape exec ~/.config/sway/scripts/wkill.sh
 
 # CONTROL + ALT
 bindsym Ctrl+Alt+b exec thunar
@@ -176,9 +172,7 @@ bindsym Ctrl+Alt+s exec spotify
     bindsym $mod+v splitv
 
     # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+t layout toggle split
+    bindsym $mod+t layout toggle tabbed splith
 
     # Make the current focus fullscreen
     bindsym $mod+f fullscreen
@@ -187,7 +181,7 @@ bindsym Ctrl+Alt+s exec spotify
     bindsym $mod+d floating toggle
 
     # Swap focus between the tiling area and the floating area
-    bindsym $mod+space focus mode_toggle
+    #bindsym $mod+space focus mode_toggle
 
     # Move focus to the parent container
     bindsym $mod+a focus parent
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index 7399a96..9d11384 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -3,9 +3,6 @@
 # exec_always ~/.config/sway/scripts/ricing
 exec_always ~/.config/sway/scripts/gtkthemes
 
-# Set inner/outer gaps
-gaps inner 5
-gaps outer 5
 
 # Hide titlebar on windows: 
 default_border pixel 2
diff --git a/.config/sway/waybar/config.ini b/.config/sway/waybar/config.ini
index a3c41c1..a92c4bf 100755
--- a/.config/sway/waybar/config.ini
+++ b/.config/sway/waybar/config.ini
@@ -136,11 +136,6 @@
       	"signal": 1, // SIGHUP
       	"tooltip": false,
         "on-click": "~/.config/waybar/scripts/keyhint",
-},
-   "custom/keybindings": {
-        "format":"  ",
-        "tooltip": false,
-        "on-click": "~/.config/sway/waybar/scripts/keyhint",
 },
      "custom/launcher": {
     	"format":" ",