diff --git a/i3/.config/dunstrc b/i3/.config/dunstrc
index c0e3d45..f521dc8 100644
--- a/i3/.config/dunstrc
+++ b/i3/.config/dunstrc
@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "300x5-30+20"
+    geometry = "300x5-30+40"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -135,7 +135,7 @@
     max_icon_size = 32
 
     # Paths to default icons.
-    icon_folders = /usr/share/icons/Numix/16/status/:/usr/share/icons/Numix/16/devices/
+    icon_folders = /usr/share/icons/Faenza/status/16:/usr/share/icons/Faenza/devices/16
 
     ### History ###
 
@@ -222,7 +222,7 @@
     frame_color = "#dca3a3"
     timeout = 0
     # Icon for notifications with critical urgency, uncomment to enable
-    icon = /usr/share/icons/Numix/16/status/error.svg
+    icon = /usr/share/icons/Faenza/status/16/error.png
 
 # Every section that isn't one of the above is interpreted as a rules to
 # override settings for certain messages.
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 14ccb06..a4a39c3 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -12,7 +12,7 @@
 ##
 exec --no-startup-id bash ~/script/autoxrandr &
 set $mod Mod4
-
+set $defaultTerm termite
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 #font pango:monospace 8
@@ -32,10 +32,10 @@ font xft:Droid Sans Mono 10
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec termite
+bindsym $mod+Return exec $defaultTerm
 
 # kill focused window
-bindsym $mod+Shift+A kill
+bindsym $mod+Shift+Q kill
 
 # start dmenu (a program launcher)
 bindsym $mod+d exec --no-startup-id i3-dmenu-desktop --dmenu='rofi -theme ~/.config/i3/rofi.theme -show drun'
@@ -89,38 +89,50 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 
 # focus the parent container
-bindsym $mod+q focus parent
+bindsym $mod+a focus parent
 
 # focus the child container
-bindsym $mod+Shift+q focus child
+bindsym $mod+Shift+a focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
 
 # 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+Tab workspace back_and_forth
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
 
 # move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+eacute move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-bindsym $mod+Shift+egrave move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8
-bindsym $mod+Shift+ccedilla move container to workspace 9
-bindsym $mod+Shift+agrave move container to workspace 10
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10
 
+# use workspaces on different monitors
+ workspace $ws1 output primary
 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
@@ -190,8 +202,8 @@ hide_edge_borders both
 new_window pixel 1 
 new_float normal 1
 ## Gaps
-gaps inner 20
-gaps outer 10 
+gaps inner 10
+gaps outer 0 
 smart_gaps on
 smart_borders on
 
@@ -208,6 +220,16 @@ bindsym XF86AudioStop exec "mpc stop"
 bindsym XF86AudioNext exec "mpc next"
 bindsym XF86AudioPrev exec "mpc prev"
 
+bindsym XF86LaunchA exec "$defaultTerm"
+bindsym XF86Launch9 exec "keepassxc"
+bindsym XF86Launch8 exec "firefox"
+bindsym XF86Launch7 exec "code"
+bindsym XF86Launch6 exec "pavucontrol"
+bindsym Print exec "gnome-screenshot -a"
+bindsym mod1 + Print exec "gnome-screenshot -i"
+
+
+
 bindsym $mod+b exec --no-startup-id "firefox"
 
 
@@ -229,6 +251,7 @@ for_window [class="(?i)pavucontrol"] floating enable, move position mouse
 for_window [window_type="dialog"] floating enable
 for_window [window_type="menu"] floating enable
 for_window [class="Gnome-calculator" instance="gnome-calculator" title="Calculatrice" window_role="gnome-calculator"] floating enable
+for_window [class="Gnome-screenshot"] floating enable
 for_window [class="KeePass"] floating enable
 for_window [class="Docky"] floating enable
 for_window [title="cave a vin"] floating enable
@@ -239,6 +262,13 @@ exec --no-startup-id dunst -config ~/.config/dunstrc
 #       Update notifier Archlinux
 exec --no-startup-id aarchup            # exec octopi-notifier
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
-
+exec --no-startup-id xinput set-prop 13 325 1
+exec --no-startup-id xinput set-prop 13 309 1 
+exec --no-startup-id keepassxc
+exec --no-startup-id redshift-gtk
+exec --no-startup-id start-pulseaudio-x11
+exec_always --no-startup-id picom -b
+exec --no-startup-id numlockx
 exec_always --no-startup-id feh --bg-scale ~/.config/i3/wallpaper.jpg
 exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+exec start-pulseaudio-x11
diff --git a/i3/.config/polybar/config b/i3/.config/polybar/config
index 39d77a7..2781a36 100644
--- a/i3/.config/polybar/config
+++ b/i3/.config/polybar/config
@@ -33,7 +33,7 @@ width = 100%
 height = 29
 ;offset-x = 1%
 ;offset-y = 1%
-radius = 6.0
+radius = 0.0
 fixed-center = false
 
 background = ${colors.background}
@@ -42,7 +42,7 @@ foreground = ${colors.foreground}
 line-size = 3
 line-color = #f00
 spacing=1
-border-size = 4
+border-size = 0
 border-color = #00000000
 
 padding-left = 0
@@ -80,8 +80,8 @@ cursor-scroll = ns-resize
 
 [module/xwindow]
 type = internal/xwindow
-label =   %title:0:30:...%
-
+label =   %title:0:50%
+label-maxlen = 50
 [module/xkeyboard]
 type = internal/xkeyboard
 blacklist-0 = num lock
@@ -189,7 +189,7 @@ icon-repeat = 
 toggle-on-foreground =
 toggle-off-foreground = #55
 
-label-song-maxlen = 25
+label-song-maxlen = 35
 label-song-ellipsis = true
 
 ; bar-progress-width = 15
diff --git a/i3/.config/polybar/updates-arch-combined.sh b/i3/.config/polybar/updates-arch-combined.sh
index ff6e701..4bb419f 100755
--- a/i3/.config/polybar/updates-arch-combined.sh
+++ b/i3/.config/polybar/updates-arch-combined.sh
@@ -3,7 +3,7 @@
 updates=$(checkupdates 2>/dev/null | wc -l)
 
 if [ "$updates" -gt 0 ]; then
-    echo "# $updates"
+    echo "$updates"
 else
     echo ""
 fi