diff --git a/.gitignore b/.gitignore
index b10c8b4..bebaa8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.swp
 config/neomutt/accounts
 config/neomutt/signature
 Bin/calameco.sh
diff --git a/bin/autoFocus.sh b/bin/autoFocus.sh
new file mode 100755
index 0000000..35fc844
--- /dev/null
+++ b/bin/autoFocus.sh
@@ -0,0 +1,9 @@
+#! /bin/bash
+
+swaymsg -t get_outputs|grep 'eDP-1' > /dev/null
+
+if [ $? == 0 ]; then
+  swaymsg focus output eDP-1
+else
+  swaymsg focus output HDMI-A-3
+fi
diff --git a/config/sway/config b/config/sway/config
index d2c913a..8d46767 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -5,13 +5,9 @@ input "type:keyboard" {
   xkb_options "compose:rwin"
 }
 input "19266:13912:You_kbd6x" {
-  xkb_layout us
-  xkb_variant intl
   xkb_options "compose:rctrl"
 }
 input "1:1:AT_Translated_Set_2_keyboard" {
-  xkb_layout us
-  xkb_variant intl
   xkb_options "compose:rctrl"
 }
 
@@ -29,8 +25,10 @@ set $mod Mod4
 
 # Displays
 set $thinkstation HDMI-A-3
-set $thinkstation-work DP-1
+set $thinkstation-work "DP-1 'llyma'"
 set $thinkpad eDP-1
+set $thinkpad-work "DP-1 'Samsung Electric Company SMS24A450/460 HTMC807749'"
+set $work DP-1
 
 # Workspaces
 set $wksp1 "1: Main"
@@ -76,10 +74,17 @@ set $ps2 Control+Print
 set $modalWidth 1280
 set $modalHeight 800
 
-# Screens definitions
-output $thinkstation resolution 3440x1440@100Hz position 0,0 adaptive_sync on
-output $thinkstation-work resolution 1920x1080@60Hz position 3440,0 transform 270 adaptive_sync on
-output $thinkpad resolution 1920x1080 position 0,0
+
+### Screens definitions
+#
+
+# Thinkstation
+output $thinkstation resolution 3440x1440@100Hz position 0 0 adaptive_sync on
+output $thinkstation-work resolution 1920x1080@60Hz position 3440 0 transform 270 adaptive_sync on
+
+# Thinkpad
+output $thinkpad-work resolution 1920x1080 position 0 0
+output $thinkpad resolution 1920x1080 position 1920 785
 
 
 ### Gnome settings
@@ -126,6 +131,9 @@ exec spotify
 exec signal-desktop --use-tray-icon
 exec teams
 exec mpd
+exec libinput-gestures-setup start
+# Set focus on main screen
+exec ~/bin/autoFocus.sh
 
 
 ### Window config
@@ -184,8 +192,11 @@ bindsym $mod+t exec "$term -t 'Top' -e bpytop"
 # Calendar
 bindsym $mod+c exec "$term -t 'Calendar' -e khal interactive"
 
-# Note
-bindsym $mod+n exec "/home/dbroqua/Softwares/Zettlr"
+# Dismiss last notification
+bindsym $mod+n exec makoctl dismiss
+# Do not disturb
+bindsym $mod+d exec makoctl set-mode do-not-disturb
+bindsym $mod+Shift+d exec "makoctl set-mode default && makoctl restore"
 
 # Multimedia keys
 bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
@@ -199,12 +210,12 @@ bindsym $mod+shift+m exec "$term -t 'Music Player Client' -e ncmpcpp"
 bindsym $mod+shift+v exec "$term -t 'Audio Visualizer' -e cava"
 
 # Screen
-bindsym $mod+p exec swaymsg output $thinkstation-work toggle
+bindsym $mod+p exec "swaymsg output $work toggle"
 
 #
 # Brightness
-bindsym XF86MonBrightnessDown exec light -U 10
-bindsym XF86MonBrightnessUp exec light -A 10
+bindsym XF86MonBrightnessDown exec brightnessctl s 64-
+bindsym XF86MonBrightnessUp exec brightnessctl s 64+
 
 # Screenshots
 bindsym $ps1 exec grim ~/Pictures/Screenshots/ps_$(date +"%Y%m%d%H%M%S").png
@@ -304,8 +315,8 @@ workspace $wksp5 output $thinkstation
 workspace $wksp6 output $thinkstation
 workspace $wksp7 output $thinkstation
 workspace $wksp8 output $thinkstation
-workspace $wksp9 output $thinkstation-work
-workspace $wksp10 output $thinkstation-work
+workspace $wksp9 output $work
+workspace $wksp10 output $work