diff --git a/.config/i3/config b/.config/i3/config
index 2518098..04e7f71 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -63,16 +63,16 @@ bindsym $mod+space focus mode_toggle
 bindsym $mod+Shift+q focus parent
 
 # switch to workspace
-bindsym $mod+ampersand workspace 1
-bindsym $mod+eacute workspace 2
-bindsym $mod+quotedbl workspace 3
-bindsym $mod+apostrophe workspace 4
-bindsym $mod+parenleft workspace 5
-bindsym $mod+minus workspace 6
-bindsym $mod+egrave workspace 7
-bindsym $mod+underscore workspace 8
-bindsym $mod+ccedilla workspace 9
-bindsym $mod+agrave workspace 10
+bindsym $mod+ampersand workspace number 1
+bindsym $mod+eacute workspace number 2
+bindsym $mod+quotedbl workspace number 3
+bindsym $mod+apostrophe workspace number 4
+bindsym $mod+parenleft workspace number 5
+bindsym $mod+minus workspace number 6
+bindsym $mod+egrave workspace number 7
+bindsym $mod+underscore workspace number 8
+bindsym $mod+ccedilla workspace number 9
+bindsym $mod+agrave workspace number 10
 
 # move focused container to workspace
 bindsym $mod+Shift+ampersand move container to workspace 1
@@ -124,18 +124,9 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-#bar {
-        #status_command i3status
-#}
-
 #put workspace 1 on main screen
 workspace 1 output DVI-D-0
 
-#press the same combinaison for changing workspace to get back to old workspace (like cd -)
-workspace_auto_back_and_forth yes
-
 #start compositor
 exec --no-startup-id compton
 
@@ -148,6 +139,30 @@ exec setxkbmap fr
 #numlock
 exec numlockx on
 
-#popup config Firefox
+#popup config Firefox / Terminator / General Purpose
 for_window [window_role="About"] floating enable
 for_window [window_role="Organizer"] floating enable
+for_window [title="^Terminator *"] floating enable
+for_window [window_role="pop-up"] floating enable
+for_window [window_role="task_dialog"] floating enable
+for_window [title="Preferences$"] floating enable
+
+set $Locker ~/.config/i3/lock/lock.sh
+#Just lock the screen
+bindsym $mod+l exec --no-startup-id $Locker && sleep 1
+
+#Lock and suspend to RAM
+bindsym $mod+Shift+l exec --no-startup-id $Locker && echo mem > /sys/power/state
+exec_always --no-startup-id xset dpms 600
+exec_always --no-startup-id xautolock -time 9 -locker $Locker
+
+#i3 gaps
+gaps inner 10
+gaps outer 0
+smart_gaps on
+
+#Volume keys
+bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set 'Master' 5%+
+bindsym XF86AudioLowerVolume exec --no-startup-id amixer set 'Master' 5%-
+bindsym XF86AudioMute exec --no-startup-id amixer set 'Master' toggle
+bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
\ No newline at end of file
diff --git a/.config/polybar/config b/.config/polybar/config
index c18ea7c..3d471d4 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -113,8 +113,8 @@ format = <label-state> <label-mode>
 
 index-sort = true
 
-ws-icon-0 = term;
-ws-icon-1 = web;
+ws-icon-0 = 2;
+ws-icon-1 = 1;
 ws-icon-2 = code;
 ws-icon-3 = music;
 ws-icon-4 = irssi;
diff --git a/.config/polybar/scripts/launch_polybar.sh b/.config/polybar/scripts/launch_polybar.sh
index 0d1edde..b50e2c8 100755
--- a/.config/polybar/scripts/launch_polybar.sh
+++ b/.config/polybar/scripts/launch_polybar.sh
@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
 names=("chostybottombar" "chostytopbar")
-pkill polybar
+killall -q polybar
+while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 if type "xrandr"; then
   for monitor in $(xrandr --query | grep " connected" | cut -d" " -f1); do
     for name in ${names[@]}; do
-      MONITOR=${monitor} polybar -q --reload ${name}&
+      MONITOR=${monitor} polybar -q --reload ${name} &
     done
   done
 else
   polybar --reload ${name} &
-fi
+fi
\ No newline at end of file
diff --git a/.config/terminator/config b/.config/terminator/config
index a0762aa..7fb9ae1 100644
--- a/.config/terminator/config
+++ b/.config/terminator/config
@@ -1,6 +1,9 @@
 [global_config]
   enabled_plugins = TerminalShot, LaunchpadCodeURLHandler, APTURLHandler, LaunchpadBugURLHandler
+  title_font = DejaVu Sans Mono 11
+  title_use_system_font = False
 [keybindings]
+  layout_launcher = <Shift><Alt>l
   switch_to_tab_1 = None
   switch_to_tab_2 = None
 [layouts]
@@ -17,5 +20,8 @@
     background_darkness = 0.85
     background_type = transparent
     cursor_color = "#aaaaaa"
+    font = DejaVu Sans Mono 11
     scrollback_infinite = True
+    scrollbar_position = hidden
     show_titlebar = False
+    use_system_font = False