diff --git a/.vimrc b/.vimrc
index cb828d4..6c81c5c 100755
--- a/.vimrc
+++ b/.vimrc
@@ -62,6 +62,7 @@ Plugin 'VundleVim/Vundle.vim'
 " All of your Plugins must be added before the following line
 " 
 
+Plugin 'jasonccox/vim-wayland-clipboard'
 Plugin 'gabrielelana/vim-markdown'
 Plugin 'itchyny/vim-cursorword'
 Plugin 'preservim/nerdtree'
@@ -378,3 +379,5 @@ let g:lightline = {
             \ }
 
 " }}}
+"
+
diff --git a/ranger/rc.conf b/ranger/rc.conf
index b7e2aca..210c680 100644
--- a/ranger/rc.conf
+++ b/ranger/rc.conf
@@ -20,7 +20,7 @@
 # == Options
 # ===================================================================
 
-set preview_images true
+#set preview_images true
 
 # Which viewmode should be used?  Possible values are:
 #     miller: Use miller columns which show multiple levels of the hierarchy
@@ -41,7 +41,7 @@ set show_hidden false
 # Ask for a confirmation when running the "delete" command?
 # Valid values are "always", "never", "multiple" (default)
 # With "multiple", ranger will ask only if you delete multiple files at once.
-set confirm_on_delete multiple
+set confirm_on_delete never
 
 # Use non-default path for file preview script?
 # ranger ships with scope.sh, a script that calls external programs (see
@@ -70,7 +70,7 @@ set vcs_backend_bzr disabled
 set vcs_backend_svn disabled
 
 # Truncate the long commit messages to this length when shown in the statusbar.
-set vcs_msg_length 50
+set vcs_msg_length 40
 
 # Use one of the supported image preview protocols
 set preview_images true
diff --git a/ranger/rifle.conf b/ranger/rifle.conf
index 42fd056..1fcf9db 100644
--- a/ranger/rifle.conf
+++ b/ranger/rifle.conf
@@ -2,6 +2,7 @@ ext css|md|conf|txt|sh = vim "$@"
 ext ogv|mp3|mp4|avi|mkv|ogg|mov = mpv "$@"
 ext pdf= firefox-esr "$@"
 ext epub = foliate "$@"
-ext png|jpg = feh "$@"
+#ext png|jpg = feh "$@"
+ext png|jpg = ristretto "$@"
 ext cb[zr] = zathura "$@"
 ext html = firefox-esr "$@"
diff --git a/sway/config.d/autostart_applications b/sway/config.d/autostart_applications
index 288b1b0..a1c8628 100644
--- a/sway/config.d/autostart_applications
+++ b/sway/config.d/autostart_applications
@@ -21,4 +21,5 @@ exec hash dbus-update-activation-environment 2>/dev/null && \
 # Autostart
 exec 'syncthing &'
 exec 'gammastep -l 0:0 -o -b 0.9:0.9 &'
+exec_always 'autotiling -w 1 3 5 7 9'
 # https://man.archlinux.org/man/extra/gammastep/gammastep.1.en 
\ No newline at end of file
diff --git a/sway/config.d/default b/sway/config.d/default
index 0253c77..48cc4f3 100644
--- a/sway/config.d/default
+++ b/sway/config.d/default
@@ -16,7 +16,7 @@ set $volume_mute $(pactl set-sink-mute @DEFAULT_SINK@ toggle && pactl get-sink-m
 set $mic_mute $(pactl set-source-mute @DEFAULT_SOURCE@ toggle && pactl get-source-mute @DEFAULT_SOURCE@ | sed -En "/no/ s/.*/$($source_volume)/p; /yes/ s/.*/0/p")
 
 # Your preferred terminal emulators
-set $term-float kitty
+set $term-float alacritty
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
diff --git a/waybar/config b/waybar/config
index 2a30200..db2ef90 100644
--- a/waybar/config
+++ b/waybar/config
@@ -19,6 +19,7 @@
     ],
 
     "modules-right": [
+        "disk",
         "network",
         "idle_inhibitor",
         "memory",
@@ -37,6 +38,11 @@
 
     // Modules
 
+    "disk": {
+	      "interval": 30,
+	      "format": "{used} used on {path} ({percentage_used}%)",
+    },
+
     "idle_inhibitor": {
         "format": "{icon} ",
         "format-icons":{
@@ -92,6 +98,16 @@
         "on-click": "~/.config/waybar/scripts/keyhint.sh",
     },
 
+    "custom/keyboard-state": {
+       	"numlock": true,
+       	"capslock": true,
+       	"format": "{name} {icon}",
+       	"format-icons": {
+       		"locked": "",
+       		"unlocked": ""
+       	}
+    }, 
+
     "memory": {
         "interval": 5,
         "format": " {}%", // Icon: memory