diff --git a/config/i3/config b/config/i3/config
index 096889a..82e49dd 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -7,21 +7,31 @@ set $mod Mod4
 # is used in the bar {} block below.
 # Also changes titlebar height accordingly
 #font pango: tewi 9
-#font pango: terminus 16
+#font pango: terminus 9
+#font pango: terminus 11
 #font pango: mononoki Nerd Font 16
-font pango: FuraCode Nerd Font Bold 9
-#font pango:terminus 9
+#font pango: Iosevka Nerd Font Bold 9
+font pango: ProfontIIx Nerd Font 9
+#font pango: FuraCode Nerd Font Bold 9
 #font pango: pxplus ibm vga8 8
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec $term
-bindsym $mod+t exec $term
+bindsym $mod+Return exec --no-startup-id $term
+bindsym $mod+t exec --no-startup-id $term
 
 # start a floating terminal
-bindsym $mod+Shift+Return exec $term --title floatingterm --geometry 80x20
+
+# urxvt
+#bindsym $mod+Shift+Return exec $term --title floatingterm --geometry 80x20
+#bindsym $mod+Shift+t exec $term --title floatingterm --geometry 80x20
+
+# st
+bindsym $mod+Shift+Return exec --no-startup-id $term -t floatingterm -g 80x20
+bindsym $mod+Shift+t exec --no-startup-id $term -t floatingterm -g 80x20
+
 for_window [title="floatingterm"] floating enable
 
 # kill focused window
@@ -29,6 +39,9 @@ bindsym $mod+Shift+q kill
 # Doesnt work
 #bindsym $mod+q exec xkill
 
+# open ghost window
+bindsym $mod+g exec --no-startup-id i3 open
+
 # The middle button over a titlebar kills the window
 bindsym --release button2 kill
 
@@ -37,7 +50,7 @@ bindsym button3 floating toggle
 
 # The middle button and a modifer over any part of the window kills the window
 # Works but the middle click also goes through the window "under"
-# bindsym --whole-window $mod+button2 kill
+ bindsym --whole-window $mod+shift+button2 kill
 
 # start dmenu (a program launcher)
 #bindsym $mod+d exec dmenu_run SOS LOOK FOR "rofi" down down down
@@ -97,7 +110,8 @@ bindsym $mod+a focus parent
 #bindsym $mod+d focus child
 
 # Terminal
-set $term urxvtc
+set $term st
+#set $term urxvtc
 #set $term urxvt
 
 # Workspace variables
@@ -137,19 +151,35 @@ bindsym $mod+Shift+9 move container to workspace $ws9
 bindsym $mod+Shift+0 move container to workspace $ws0
 
 # Specific Workspace options
-assign [class="Firefox"] $ws1
-#assign [class="wow_434.exe"] $ws2
+#assign [class="Firefox"] $ws1
+#assign [class="Chromium-browser"] $ws1
 assign [class="discord"] $ws3
-#assign [class="skypeforlinux"] $ws3
-#assign [class="TeamSpeak 3"] $ws3
+assign [class="TelegramDesktop"] $ws3
+assign [class="TeamSpeak 3"] $ws3
 #assign [class="Sublime_text"] $ws4
 #assign [class="Thunar"] $ws5
 #assign [class="Evince"] $ws5
 assign [class="Gimp"] $ws6
 #assign [class="VirtualBox"] $ws7
 #assign [class="vlc"] $ws8
+
+# Games
+assign [class="Steam"] $ws8
+for_window [class="Steam" title=".*Chat.*"] move to workspace $ws3
+for_window [class="Steam" title=".*Friends.*"] move to workspace $ws3
+for_window [class="Steam" title=".*Chat.*"] floating enable
+for_window [class="Steam" title=".*Friends.*"] floating enable
+
+assign [class="battle.net.exe"] $ws8
 assign [class="Lutris"] $ws9
-assign [class="Steam"] $ws9
+
+# tubify
+assign [title="tubify"] $ws0
+for_window [title="tubify"] floating enable
+
+# calculator
+for_window [class="Galculator"] floating enable
+
 
 # For gimp (not needed anymore since im using single window mode)
 #for_window [window_role="gimp-dock"] floating disable; move left; resize shrink width 50 px or 50ppt
@@ -158,11 +188,11 @@ assign [class="Steam"] $ws9
 
 
 # reload the configuration file
-bindsym $mod+Shift+c reload
+#bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # restart Xresources
-bindsym $mod+Shift+w exec xrdb ~/.Xresources
+bindsym $mod+Shift+w exec --no-startup-id xrdb ~/.Xresources
 
 # exit i3 (logs you out of your X session)
 #bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
@@ -235,6 +265,8 @@ for_window [class="^.*"] border pixel $border_width
 
 # Borders only on terminal
 #for_window [class="URxvt"] border pixel $border_width
+#for_window [class="st-256color"] border pixel $border_width
+#for_window [class="st"] border pixel $border_width
 
 set $wave .:*~*:._.:*~*:.
 set $decor X
@@ -252,6 +284,9 @@ set $decor X
 #for_window [class=".*"] title_format <span font_desc='terminus 12'> » %title</span>
 #for_window [class=".*"] title_format <span font_desc='pxplus ibm vga8 11'> » %title</span>
 #for_window [class=".*"] title_format " » %title"
+#for_window [class=".*"] title_format "  %title"
+for_window [class=".*"] title_format "  %title"
+#for_window [class=".*"] title_format <span> </span><span font_desc='Siji 7'></span> %title
 
 # title box
 #for_window [class=".*"] title_format <span background='$color8' foreground='$color0' font_desc='mononoki Nerd Font 11'> </span><span background='$color8' font_desc='Siji 7'></span><span background='$color8' foreground='$color7' font_desc='Terminus 7' > %title </span><span foreground='$color8' font_desc='mononoki Nerd Font 11'></span> 
@@ -267,8 +302,8 @@ set $decor X
 #for_window [class="Firefox"] border none
 
 # Global gaps
-set $inner_default 10
-set $outer_default 25
+set $inner_default 5
+set $outer_default 0
 
 gaps inner $inner_default
 gaps outer $outer_default
@@ -304,31 +339,32 @@ set_from_resource $color14 i3wm.color14 #00AAAA
 set_from_resource $color15 i3wm.color15 #AAAAAA
 
 # Urgent color
-set_from_resource $colorU i3wm.color1 #AAAAAA
+set_from_resource $colorU i3wm.color9 #AAAAAA
 # Focused color
-set_from_resource $colorF i3wm.color6 #AAAAAA
+set_from_resource $colorF i3wm.color12 #AAAAAA
 # Inactive color
-set_from_resource $colorI i3wm.color8 #AAAAAA
+set_from_resource $colorI i3wm.color11 #AAAAAA
 # uNfocused color
 set_from_resource $colorN i3wm.color8 #666666
 # Background color
-set_from_resource $colorB i3wm.color2 #666666
+set_from_resource $colorB i3wm.color0 #666666
+#set $colorB #000000
 
 # Example
 #set $color7 #AAAAAA
 
 ####### NORMAL #######
 # class                 border	background	text	indicator	child_border
-client.focused		$colorF	$colorF		$color0	$colorF		$colorF
-client.focused_inactive	$colorI	$colorI		$color0	$colorI		$colorI
-client.unfocused	$colorN	$colorN		$color0	$colorN		$colorN		
-client.urgent		$colorU	$colorU		$color0	$colorU		$colorU		
+client.focused		$colorB	$colorB		$colorF	$colorF		$colorF
+client.focused_inactive	$colorB	$colorB		$colorI	$colorI		$colorI
+client.unfocused	$colorB	$colorB		$colorN	$colorN		$colorN		
+client.urgent		$colorB	$colorB		$colorU	$colorU		$colorU		
 client.placeholder	$color7	$color0		$color7	$color7		$color7		
 
 
 ####### DARK #######
 # class                 border	background	text	indicator	child_border
-#client.focused		$colorB	$colorB		$colorF	$colorB		$colorB
+#client.focused		$colorB	$colorB		$colorF	$colorB		$colorF
 #client.focused_inactive	$colorB	$colorB		$colorI	$colorB		$colorB
 #client.unfocused	$colorB	$colorB		$colorN	$colorB		$colorB		
 #client.urgent		$colorB	$colorB		$colorU	$colorB		$colorB		
@@ -382,7 +418,7 @@ mode $gaps_mode {
 
 
 # System monitor
-bindsym $mod+Shift+h exec $term -e htop
+bindsym $mod+Shift+h exec --no-startup-id $term -e htop
 
 
 # Quick Launcher
@@ -390,6 +426,7 @@ set $launcher_mode "» launcher"
 bindsym $mod+z mode $launcher_mode
 mode $launcher_mode {
 	
+	bindsym q exec "notify-send 'Launching qutebrowser' --urgency low; qutebrowser"
 	bindsym w exec "notify-send 'Launching Firefox' --urgency low; firefox"
 	bindsym e exec "notify-send 'Launching Sublime Text' --urgency low; subl"
 	bindsym f exec "notify-send 'Launching Thunar' --urgency low; thunar"
@@ -397,7 +434,8 @@ mode $launcher_mode {
 	bindsym g exec "notify-send 'Launching GIMP' --urgency low; gimp"
 	bindsym s exec "notify-send 'Launching Steam' --urgency low; steam"
 	bindsym d exec "notify-send 'Launching Discord' --urgency low; discord"
-	bindsym c exec --no-startup-id compositor
+	bindsym v exec "notify-send 'Launching VMware' --urgency low; vmware"
+	bindsym c exec --no-startup-id ~/Scripts/compositor
 	bindsym x exec --no-startup-id flux
 	
 	bindsym z mode "default"
@@ -407,7 +445,9 @@ mode $launcher_mode {
 }
 
 # Music
-bindsym $mod+Shift+m exec $term -e ncmpcpp
+bindsym $mod+y exec --no-startup-id ~/Scripts/Rofi/rofi_tubify
+bindsym $mod+shift+y exec --no-startup-id ~/Scripts/mpv-query.sh
+bindsym $mod+Shift+m exec --no-startup-id $term -e ncmpcpp
 
 set $music_mode "» music"
 
@@ -416,12 +456,17 @@ mode $music_mode {
 	bindsym Left exec --no-startup-id mpc prev
 	bindsym Right exec --no-startup-id mpc next
 	
+    # mpc
 	bindsym p exec --no-startup-id mpc toggle
 	bindsym n exec --no-startup-id mpc next
 	bindsym b exec --no-startup-id mpc prev
 
-	bindsym l exec --no-startup-id mpc next
-	bindsym h exec --no-startup-id mpc prev
+    # tubify (mpv)
+	bindsym $mod+p exec --no-startup-id xdotool key --window "$(xdotool search --name tubify)" p
+    bindsym $mod+n exec --no-startup-id xdotool key --window "$(xdotool search --name tubify)" greater
+    bindsym $mod+b exec --no-startup-id xdotool key --window "$(xdotool search --name tubify)" less
+	bindsym $mod+i exec --no-startup-id ~/Scripts/mpv-query.sh
+	bindsym i exec --no-startup-id ~/Scripts/mpv-query.sh
 	
 	bindsym m mode "default"
 	bindsym $mod+m mode "default"
@@ -448,35 +493,51 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
 
 # Rofi (Instead of dmenu) (Edit config for colors etc!)
 #bindsym $mod+d exec rofi -show run
-bindsym $mod+d exec ~/Scripts/fullrofi 
-bindsym $mod+Tab exec ~/Scripts/fullrofi 
+bindsym $mod+d exec ~/Scripts/Rofi/rofi_launch
+bindsym $mod+Tab exec ~/Scripts/Rofi/rofi_combi
 bindsym $mod+Shift+d exec --no-startup-id "rofi -show drun -run-command 'gksudo {cmd}'"
 
-# screenshots
-bindsym $mod+Print exec --no-startup-id thunar ~/Pictures/Screenshots
-bindsym Print exec --no-startup-id ~/Scripts/scrot_plus_notification.sh 
-#bindsym $mod+Print exec scrot -e 'mv $f ~/Pictures/Screenshots'
-bindsym $mod+Shift+Print --release exec --no-startup-id ~/Scripts/scrot_plus_notification.sh -s 
-#bindsym $mod+Shift+Print --release exec scrot -s -e  'mv $f ~/Pictures/Screenshots'
+#  ============= screenshots ============= 
+# take full screenshot
+bindsym Print exec --no-startup-id ~/Scripts/screenshot.sh
+bindsym $mod+c exec --no-startup-id ~/Scripts/screenshot.sh
+
+# select area to capture
+bindsym $mod+Shift+Print --release exec --no-startup-id ~/Scripts/screenshot.sh -s
+bindsym $mod+Shift+c --release exec --no-startup-id ~/Scripts/screenshot.sh -s
+
+# save selection to clipboard
+bindsym $mod+Control+Print exec --no-startup-id ~/Scripts/screenshot.sh -c
+bindsym $mod+Control+c exec --no-startup-id ~/Scripts/screenshot.sh -c
+
+# open most recent screenshot with gimp
+bindsym $mod+Print exec --no-startup-id "cd ~/Pictures/Screenshots ; gimp $(ls -t | head -n1) &"
 
 ##################################### autostart ####################################
+# if the persistent workspaces patch is applied, cycle through all workspaces
+# in order to "create" them once
+exec --no-startup-id ~/Scripts/cycle_workspaces.sh
+
 # urxvt daemon
-exec --no-startup-id urxvtd -q -o -f
+#exec --no-startup-id urxvtd -q -o -f
+
+# For battery notifications
+exec --no-startup-id xfce4-power-manager &
 
 # Compton
-exec --no-startup-id compositor
+exec --no-startup-id ~/Scripts/compositor
 
 # Enable numlock
 exec --no-startup-id numlockx &
 
 # Keyboard lang
-exec --no-startup-id setxkbmap -layout "us,gr,ru" -option "grp:alt_shift_toggle"
+exec --no-startup-id setxkbmap -layout "us,gr,ru" -option "grp:alt_shift_toggle" &
 
 # Mpd
-exec --no-startup-id mpd ~/.config/mpd/mpd.conf
+exec --no-startup-id mpd ~/.config/mpd/mpd.conf &
 
 # Bar
-exec_always --no-startup-id barstart
+exec_always --no-startup-id barstart &
 
 # Run htop on $ws0 on startup
 #exec --no-startup-id i3-msg 'workspace $ws0; exec $term -e htop'