diff --git a/dot_config/sway/config b/dot_config/sway/config
index b58c62a..5e73840 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -1,83 +1,16 @@
 # Read `man 5 sway` for a complete reference.
 
-### Variables
-# Logo key. Use Mod1 for Alt.
-set $mod Mod4
-# Home row direction keys, like vim
-set $left h
-set $down j
-set $up k
-set $right l
+# where the sway config lives
+set $swaydir $HOME/.config/sway
 
-# Your preferred terminal emulator
-set $term $HOME/.config/sway/scripts/foot.sh
-set $term_cwd $term -D "$(swaycwd 2>/dev/null || echo $HOME)"
-set $term_float footclient -a floating_shell
+# load all variables ... 'set x'
+include $swaydir/variables.conf
 
-# Your preferred application launcher
-# Note: pass the final command to swaymsg so that the resulting window can be opened
-# on the original workspace that the command was run on.
-#
-# this is the default search menu
-# set $menu dmenu_path | dmenu | xargs swaymsg exec --
-# Gruvbox Colors
-set $dark0_hard         #1d2021
-set $dark0_hard_t       #1d2021e6
-set $dark0              #282828
-set $dark0_t            #282828e6
-set $dark0_soft         #32302f
-set $dark1              #3c3836
-set $dark2              #504945
-set $dark3              #665c54
-set $dark4              #7c6f64
-set $gray_245           #928374
-set $gray_244           #928374
-set $light0_hard        #f9f5d7
-set $light0             #fbf1c7
-set $light0_soft        #f2e5bc
-set $light1             #ebdbb2
-set $light2             #d5c4a1
-set $light3             #bdae93
-set $light4             #a89984
-set $bright_red         #fb4934
-set $bright_green       #b8bb26
-set $bright_yellow      #fabd2f
-set $bright_blue        #83a598
-set $bright_purple      #d3869b
-set $bright_aqua        #8ec07c
-set $bright_orange      #fe8019
-set $neutral_red        #cc241d
-set $neutral_green      #98971a
-set $neutral_yellow     #d79921
-set $neutral_blue       #458588
-set $neutral_purple     #b16286
-set $neutral_aqua       #689d6a
-set $neutral_orange     #d65d0e
-set $faded_red          #9d0006
-set $faded_green        #79740e
-set $faded_yellow       #b57614
-set $faded_blue         #076678
-set $faded_purple       #8f3f71
-set $faded_aqua         #427b58
-set $faded_orange       #af3a03
-set $transparent        #ffffff00
-
-# Layout
-# window color class    border          backgr.         text         indicator      child_border
-client.focused          $bright_green   $dark0_t        $light0_hard $bright_orange $bright_green
-client.focused_inactive $faded_green    $dark0_t        $light0_hard $dark0_hard    $dark0_hard
-client.unfocused        $dark0_hard_t   $dark0_t        $light0_hard $dark0_hard    $dark0_hard_t
-client.urgent           $bright_green   $bright_orange  $light0_hard $dark0_hard    $bright_orange
-client.placeholder      $bright_green   $dark0_t        $light0_hard $dark0_hard    $dark0_hard
-client.background       $dark0_hard
-
-### Output configuration
-# Wallpaper
-output * bg ~/pictures/wallpapers/iceland.jpg fill
-# You can get the names of your outputs by running: swaymsg -t get_outputs
+# load sway settings, depends on variables
+include $swaydir/settings.conf
 
 # Hide borders for single window
-hide_edge_borders --i3 smart
+hide_edge_borders smart
 default_border normal
 
 # Font
@@ -115,7 +48,6 @@ focus_wrapping no
 # include all the keybindings
 include $HOME/.config/sway/keybinding.conf
 
-
 ##########
 # PROGRAMS
 ##########
diff --git a/dot_config/sway/keybinding.conf b/dot_config/sway/keybinding.conf
index 908dfbf..1e1c284 100644
--- a/dot_config/sway/keybinding.conf
+++ b/dot_config/sway/keybinding.conf
@@ -1,6 +1,7 @@
 ### Key bindings
-# Start a terminal
-bindsym $mod+Return exec $term
+## Launch // Terminal ##
+$bindsym $mod+Return exec $term_cwd
+$bindsym $mod+Shift+Return exec $term
 
 # Kill focused window
 bindsym $mod+Shift+q kill
@@ -127,3 +128,9 @@ bindsym $mod+Shift+BackSpace move scratchpad
 # Show the next scratchpad window or hide the focused scratchpad window.
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+BackSpace scratchpad show
+
+## Launch // Toggle Help ##
+$bindsym $mod+question exec $help
+
+# allow to kill focused floating shell windows using Esc (manjaro)
+$bindsym --release Escape [app_id="floating_shell" con_id=__focused__] kill
diff --git a/dot_config/sway/settings.conf b/dot_config/sway/settings.conf
new file mode 100644
index 0000000..d027659
--- /dev/null
+++ b/dot_config/sway/settings.conf
@@ -0,0 +1,4 @@
+### Output configuration
+# Wallpaper
+output * bg  $background fill
+# You can get the names of your outputs by running: swaymsg -t get_outputs
diff --git a/dot_config/sway/variables.conf b/dot_config/sway/variables.conf
new file mode 100644
index 0000000..42545dd
--- /dev/null
+++ b/dot_config/sway/variables.conf
@@ -0,0 +1,78 @@
+# Add --to-code to bindsym, support for non-latin layouts
+set $bindsym bindsym --to-code
+# For user's convenience, the same for unbindsym
+set $unbindsym unbindsym --to-code
+
+# background
+set $background $HOME/pictures/wallpapers/iceland.jpg
+###
+### Variables
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+
+# Your preferred terminal emulator
+set $term $HOME/.config/sway/scripts/foot.sh
+set $term_cwd $term -D "$(swaycwd 2>/dev/null || echo $HOME)"
+set $term_float footclient -a floating_shell
+
+# Your preferred application launcher
+# Note: pass the final command to swaymsg so that the resulting window can be opened
+# on the original workspace that the command was run on.
+#
+# this is the default search menu
+# set $menu dmenu_path | dmenu | xargs swaymsg exec --
+# Gruvbox Colors
+set $dark0_hard         #1d2021
+set $dark0_hard_t       #1d2021e6
+set $dark0              #282828
+set $dark0_t            #282828e6
+set $dark0_soft         #32302f
+set $dark1              #3c3836
+set $dark2              #504945
+set $dark3              #665c54
+set $dark4              #7c6f64
+set $gray_245           #928374
+set $gray_244           #928374
+set $light0_hard        #f9f5d7
+set $light0             #fbf1c7
+set $light0_soft        #f2e5bc
+set $light1             #ebdbb2
+set $light2             #d5c4a1
+set $light3             #bdae93
+set $light4             #a89984
+set $bright_red         #fb4934
+set $bright_green       #b8bb26
+set $bright_yellow      #fabd2f
+set $bright_blue        #83a598
+set $bright_purple      #d3869b
+set $bright_aqua        #8ec07c
+set $bright_orange      #fe8019
+set $neutral_red        #cc241d
+set $neutral_green      #98971a
+set $neutral_yellow     #d79921
+set $neutral_blue       #458588
+set $neutral_purple     #b16286
+set $neutral_aqua       #689d6a
+set $neutral_orange     #d65d0e
+set $faded_red          #9d0006
+set $faded_green        #79740e
+set $faded_yellow       #b57614
+set $faded_blue         #076678
+set $faded_purple       #8f3f71
+set $faded_aqua         #427b58
+set $faded_orange       #af3a03
+set $transparent        #ffffff00
+
+# Layout
+# window color class    border          backgr.         text         indicator      child_border
+client.focused          $bright_green   $dark0_t        $light0_hard $bright_orange $bright_green
+client.focused_inactive $faded_green    $dark0_t        $light0_hard $dark0_hard    $dark0_hard
+client.unfocused        $dark0_hard_t   $dark0_t        $light0_hard $dark0_hard    $dark0_hard_t
+client.urgent           $bright_green   $bright_orange  $light0_hard $dark0_hard    $bright_orange
+client.placeholder      $bright_green   $dark0_t        $light0_hard $dark0_hard    $dark0_hard
+client.background       $dark0_hard