diff --git a/.config/sway/config b/.config/sway/config
index 1c06a7a..85d5527 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -9,7 +9,6 @@ client.unfocused        #88c0d0 #2e3440 #d8dee9 #4c566a   #4c566a
 client.urgent           #ebcb8b #ebcb8b #2e3440 #8fbcbb   #ebcb8b
 
 workspace_layout default
-focus_wrapping workspace
 default_border normal
 default_floating_border none
 font pango:monospace 0.001
@@ -17,7 +16,8 @@ titlebar_padding 1
 titlebar_border_thickness 1
 smart_borders off
 gaps inner 10
-for_window [app_id="kitty_shell"] floating enable, resize set 700 700, move center
+
+for_window [app_id="kitty_shell"] floating enable, move center
 
 ### Variables
 #
@@ -30,7 +30,6 @@ set $right l
 set $term kitty
 set $browser firefox
 set $menu fish -c 'rofi -show run -terminal $term'
-set $switcher ~/.scripts/kitty_shell.fish ~/.scripts/switcher.fish
 set $laptop eDP-1
 set $external DP-1
 
@@ -105,10 +104,10 @@ input "type:keyboard" {
     bindsym $mod+Return exec $term
     bindsym $mod+Shift+q kill
     bindsym $mod+Space exec $menu
-    bindsym $mod+Tab exec $switcher 
-    bindsym $mod+Backspace exec ~/.config/sway/power.fish
-    bindsym $mod+grave exec ~/.config/sway/shot.fish
-    bindsym $mod+backslash exec ~/.config/sway/search.fish
+    bindsym $mod+Tab workspace next
+    bindsym $mod+Backspace exec ~/.scripts/kitty_shell.fish ~/.scripts/power.fish
+    bindsym $mod+grave exec ~/.scripts/shot.fish
+    bindsym $mod+backslash exec KS_WIDTH=30c KS_HEIGHT=1c ~/.scripts/kitty_shell.fish ~/.scripts/search.fish
     
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
@@ -126,7 +125,6 @@ input "type:keyboard" {
 # Moving around:
 #
     # Move your focus around
-    #bindsym $mod+Tab focus next
     bindsym $mod+$left focus left
     bindsym $mod+$down focus down
     bindsym $mod+$up focus up
@@ -241,7 +239,7 @@ exec $term
 ### Idle configuration
 #
 
-exec ~/.config/sway/idle.fish
+exec ~/.scripts/idle.fish
 
 
 
diff --git a/.config/sway/idle.fish b/.scripts/idle.fish
similarity index 100%
rename from .config/sway/idle.fish
rename to .scripts/idle.fish
diff --git a/.scripts/kitty_shell.fish b/.scripts/kitty_shell.fish
index c22f9dd..bfdd7d1 100755
--- a/.scripts/kitty_shell.fish
+++ b/.scripts/kitty_shell.fish
@@ -1,3 +1,6 @@
 #!/usr/bin/fish
 
-kitty --class "kitty_shell" $argv
+set -q KS_WIDTH || set KS_WIDTH "50c"
+set -q KS_HEIGHT || set KS_HEIGHT "7c"
+
+kitty --class "kitty_shell" -o remember_window_size=no -o initial_window_height=$KS_HEIGHT -o initial_window_width=$KS_WIDTH $argv
diff --git a/.config/sway/power.fish b/.scripts/power.fish
similarity index 54%
rename from .config/sway/power.fish
rename to .scripts/power.fish
index 9e1a247..5ca003b 100755
--- a/.config/sway/power.fish
+++ b/.scripts/power.fish
@@ -1,6 +1,8 @@
 #!/usr/bin/fish
 
-set action (echo -e "hibernate\nreboot\npoweroff\nsuspend\nlock" | rofi -dmenu -p "to:")  
+set options "hibernate\nreboot\npoweroff\nsuspend\nlock"
+
+set action (echo -e $options | fzf)  
 
 if test "$action" = "lock"
 	swaylock
diff --git a/.config/sway/search.fish b/.scripts/search.fish
similarity index 67%
rename from .config/sway/search.fish
rename to .scripts/search.fish
index e0025e7..3d0d539 100755
--- a/.config/sway/search.fish
+++ b/.scripts/search.fish
@@ -1,6 +1,7 @@
 #!/bin/env fish
 
-set search (echo "" | rofi -dmenu -p "" -theme-str 'listview {lines: 0;}') 
+
+set search (read -P ">")
 
 if test "$search" != "" 
 	firefox --new-tab "https://www.google.de/search?q=$search" && swaymsg [app_id="org.mozilla.firefox"] focus
diff --git a/.config/sway/shot.fish b/.scripts/shot.fish
similarity index 100%
rename from .config/sway/shot.fish
rename to .scripts/shot.fish