diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 9b3df97..43e0215 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -19,7 +19,6 @@ set -x ZPOOL_VDEV_NAME_PATH 1
 # Aliases
 alias f "fff"
 alias peerflix "peerflix -d"
-alias xclip "xclip -selection clipboard"
 alias xi "xbps-install -S"
 alias xu "xbps-install -Su"
 alias xc "xbps-remove -o"
diff --git a/kanshi/.config/kanshi/config b/kanshi/.config/kanshi/config
new file mode 100644
index 0000000..573112d
--- /dev/null
+++ b/kanshi/.config/kanshi/config
@@ -0,0 +1,8 @@
+{
+	output eDP-1 disable
+	output HDMI-A-2 enable
+}
+
+{
+	output eDP-1 enable mode 1366x768
+}
diff --git a/neomutt/.config/neomutt/etc/aliases b/neomutt/.config/neomutt/etc/aliases
index 7b14622..e4561c3 100644
--- a/neomutt/.config/neomutt/etc/aliases
+++ b/neomutt/.config/neomutt/etc/aliases
@@ -10,6 +10,7 @@ alias carlos carlosrodriguez@ugr.es
 alias mari mjesusrodriguez@ugr.es
 alias bea beap@ugr.es
 alias jorge jsguerrero@ugr.es
+alias boras rafagrosso@ugr.es
 
 # Uni students
 alias elenche elenche@correo.ugr.es
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 75ae724..2675218 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -1,5 +1,5 @@
 host zion
     user coolneng
-    hostname 192.168.1.2
+    hostname 10.8.0.1
     port 22
     identityfile ~/.ssh/zion
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 4f36fc2..d46c6ee 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -23,7 +23,7 @@ set $menu /bin/rofi -show drun | xargs swaymsg exec --
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /home/coolneng/Photos/Wallpapers/d2a0wsarpmx21.jpg fill
+output * bg ~/Photos/Wallpapers/d2a0wsarpmx21.jpg fill
 #
 # Example configuration:
 #
@@ -58,8 +58,10 @@ output * bg /home/coolneng/Photos/Wallpapers/d2a0wsarpmx21.jpg fill
 #
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
+    # Keyboard layout
     input * xkb_layout "es"
 
+    # Touchpad settings
     input "1739:29859:Synaptics_TM2985-009" {
        dwt enabled
        tap enabled
@@ -237,6 +239,9 @@ exec_always {
     gsettings set $gnome-schema cursor-theme 'Paper'
     gsettings set $gnome-schema gtk-font 'Roboto 10'
 }
+# Enable floating windows
+for_window [app_id="mpv"] floating enable
+for_window [app_id="imv"] floating enable
 
 #
 # Special keys
@@ -261,19 +266,30 @@ exec_always {
     bindsym $mod+c exec clipman pick -t rofi
     # grim
     bindsym Print exec grim
-    # power management
-    bindsym $mod+Pause mode "$Pause-break"
+# power menu
+bindsym $mod+Pause mode "$Pause-break"
 
 set $Pause-break (p) poweroff, (r) reboot
 
 mode "$Pause-break" {
-    bindsym s exec --no-startup-id  sudo shutdown -h now, mode "default"
-    bindsym r exec --no-startup-id  sudo shutdown -r now, mode "default"
+bindsym s exec --no-startup-id  sudo shutdown -h now, mode "default"
+bindsym r exec --no-startup-id  sudo shutdown -r now, mode "default"
 
-    bindsym Return  mode "default"
-    bindsym Escape  mode "default"
+bindsym Return  mode "default"
+bindsym Escape  mode "default"
 }
 
+# lock screen on suspend
+set $lock_bg ~/Photos/Wallpapers/wallhaven-638719.png
+
+bindsym $mod+End exec swaylock -i $lock_bg
+
+exec swayidle -w \
+         timeout 300 'swaylock -f -c 000000 -i $lock_bg' \
+         timeout 600 'swaymsg "output * dpms off"' \
+              resume 'swaymsg "output * dpms on"' \
+         before-sleep 'swaylock -f -c 000000 -i $lock_bg'
+
 #
 # Autostart programs
 #
@@ -281,20 +297,22 @@ mode "$Pause-break" {
     exec wl-paste -t text --watch clipman store
     # syncthing
     exec syncthing -no-browser -home="$HOME/.config/syncthing"
-    # emacs
-    assign [class="Emacs"] $workspace3
-    exec emacs    
+    # wireguard
+    exec doas wg-quick up /etc/wireguard/wg0.conf
+    # kanshi
+    exec kanshi
+    # tmux
+    assign [app_id="tmux"] $workspace1
+    exec kitty --class tmux -- tmuxp load ~/.tmuxp/local.yaml
     # firefox
     assign [app_id="firefox"] $workspace2
     exec firefox
-    # tmuxp
-    assign [app_id="kitty"] $workspace1
-    exec kitty -- tmuxp load ~/.tmuxp/local.yaml
+    # emacs
+    assign [class="Emacs"] $workspace3
+    exec emacs
 
 #
 # Program behaviour
 #
-    # Enable floating windows
-    for_window [app_id="mpv"] floating enable
 
-    include /etc/sway/config.d/*
+include /etc/sway/config.d/*