diff --git a/bootstrap/packages.txt b/bootstrap/packages.txt
index 674b898..a0f0eb5 100644
--- a/bootstrap/packages.txt
+++ b/bootstrap/packages.txt
@@ -256,7 +256,7 @@ waylock
 wl-clipboard
 clipman
 libqalculate
+ydotool
 brightnessctl
 grim
 slurp
-wtype
diff --git a/pass/.local/bin/pass-pick b/pass/.local/bin/pass-pick
index d494fdf..02ccfe2 100755
--- a/pass/.local/bin/pass-pick
+++ b/pass/.local/bin/pass-pick
@@ -105,7 +105,7 @@ set_defaults() {
     KEY_ENTRYMENU_SHOWFIELD="${KEY_ENTRYMENU_SHOWFIELD:-$(get_config KEY_ENTRYMENU_SHOWFIELD Alt+s)}"
     KEY_ENTRYMENU_QUIT="${PP_KEY_ENTRYMENU_QUIT:-$(get_config KEY_ENTRYMENU_QUIT Alt+BackSpace)}"
 
-    AUTOFILL_BACKEND="${PP_AUTOFILL_BACKEND:-$(get_config AUTOFILL_BACKEND wtype)}"
+    AUTOFILL_BACKEND="${PP_AUTOFILL_BACKEND:-$(get_config AUTOFILL_BACKEND ydotool)}"
     AUTOFILL_CHAIN="${PP_AUTOENTRY_CHAIN:-$(get_config AUTOFILL_CHAIN 'username :tab password')}"
     AUTOFILL_DELAY="${PP_AUTOENTRY_DELAY:-$(get_config AUTOFILL_DELAY 30)}"
     PASS_USERNAME_FIELD="${PP_PASS_USERNAME_FIELD:-$(get_config PASS_USERNAME_FIELD 'username user login')}"
@@ -213,13 +213,7 @@ _type() {
     local toolmode="$1"
     local key="$2"
 
-    if [ "$tool" = "wtype" ]; then
-        if [ "$toolmode" = "type" ]; then
-            "$tool" -s "${AUTOFILL_DELAY}" -- "$key"
-        elif [ "$toolmode" = "key" ]; then
-            "$tool" -s "${AUTOFILL_DELAY}" -k "$key"
-        fi
-    elif [ "$tool" = "xdotool" ]; then
+    if [ "$tool" = "xdotool" ]; then
         "$tool" "$toolmode" --delay "${AUTOFILL_DELAY}" "$key"
     elif [ "$tool" = "ydotool" ]; then
         "$tool" "$toolmode" --key-delay "${AUTOFILL_DELAY}" "$key"
diff --git a/scripts/.local/bin/vidl b/scripts/.local/bin/vidl
index f5b4e36..9d4dab3 100755
--- a/scripts/.local/bin/vidl
+++ b/scripts/.local/bin/vidl
@@ -5,8 +5,6 @@
 DL_FOLDER="${DL_FOLDER:-${XDG_VIDEOS_DIR:-$HOME/videos}}/inbox"
 ARCHIVE_FOLDER="${ARCHIVE_FOLDER:-${XDG_VIDEOS_DIR:-$HOME/videos}}/archive"
 YT_DL_CMD="${YT_DL_CMD:-yt-dlp}"
-yt_default_opts=(-f "best[height\<=1080]" --retries 15 --embed-subs --sub-lang "en,de,es,fr")
-declare -a YT_DL_OPTS=${YT_DL_OPTS:-( "${yt_default_opts[@]}" )}
 YT_DL_TITLE="""${YT_DL_TITLE:-%(channel)s_%(title)s_%(id)s}"""
 
 show_help() {
@@ -73,8 +71,10 @@ _findfile() {
 YT_DL_TITLE="%(channel)s_%(title)s_%(id)s"
 _download() {
     "$YT_DL_CMD" \
+        -f 'best[height<=1080]' \
         -o "$DL_FOLDER/$YT_DL_TITLE.%(ext)s" \
-        "${YT_DL_OPTS[@]}" \
+        --write-sub --write-auto-sub --embed-subs --sub-lang en,de,es,fr \
+        --retries 15 \
         "$url"
 }
 
diff --git a/wayland/.config/river/init b/wayland/.config/river/init
index 2327311..853b532 100755
--- a/wayland/.config/river/init
+++ b/wayland/.config/river/init
@@ -48,20 +48,16 @@ riverctl map normal $mod backspace spawn "powermenu"
 
 # Open Bookmark search
 riverctl map normal None XF86Search spawn "qutedmenu"
-riverctl map normal $mod+Shift O spawn "qutedmenu"
 
 # Open clipboard history
 riverctl map normal $mod+Shift Space spawn "clipman pick --tool=bemenu"
 
-# Open floating calculator
+# Open floting calculator
 riverctl map normal $mod+Shift R spawn "$term --class float -e qalc"
 
-# Open emoji picker
-riverctl map normal $mod+Shift E spawn "bemoji -t"
-
 # Desktop theming
 # shellcheck disable=SC2016
-riverctl map normal $mod+Shift S spawn 'styler set $(styler list themes | bemenu)'
+riverctl map normal $mod F8 spawn 'styler set $(styler list themes | bemenu)'
 
 # Password dropdown frontend
 riverctl map normal $mod+Shift P spawn "pass-pick"
@@ -75,11 +71,6 @@ riverctl map normal Shift Print spawn "screenshot | sharefile -"
 riverctl map normal $mod Print spawn "screenshot region"
 riverctl map normal $mod+Shift Print spawn "screenshot region | sharefile -"
 
-# control dunst notification daemon
-riverctl map normal $mod N spawn "dunstctl close"
-riverctl map normal $mod+Shift N spawn "dunstctl close-all"
-riverctl map normal $mod+Control N spawn "dunstctl history-pop"
-
 # # Clear clipboard
 # riverctl map normal $mod BackSpace spawn 'wl-copy -c && printf ''|xclip -selection c'
 
@@ -98,18 +89,20 @@ riverctl map normal $mod+Shift K swap previous
 # bump the focused view to the top of the layout stack
 riverctl map normal $mod+Shift Return zoom
 
+# decrease/increase the main ratio of layout
+riverctl map normal $mod+Shift H send-layout-cmd rivercarro "main-ratio -0.05"
+riverctl map normal $mod+Shift L send-layout-cmd rivercarro "main-ratio +0.05"
+
+# increment/decrement the main count of layout
+riverctl map normal $mod+Control H send-layout-cmd rivercarro "main-count +1"
+riverctl map normal $mod+Control L send-layout-cmd rivercarro "main-count -1"
+
 # change layout orientation
 riverctl map normal $mod Up send-layout-cmd rivercarro "main-location top"
 riverctl map normal $mod Right send-layout-cmd rivercarro "main-location right"
 riverctl map normal $mod Down send-layout-cmd rivercarro "main-location bottom"
 riverctl map normal $mod Left send-layout-cmd rivercarro "main-location left"
 
-# snap views to screen edges
-riverctl map normal $mod+Control H snap left
-riverctl map normal $mod+Control J snap down
-riverctl map normal $mod+Control K snap up
-riverctl map normal $mod+Control L snap right
-
 # Mod+F to toggle fullscreen
 riverctl map normal $mod F toggle-fullscreen
 
@@ -124,22 +117,24 @@ riverctl map-pointer normal $mod BTN_RIGHT resize-view
 riverctl declare-mode interact_float
 riverctl map normal $modemod R enter-mode interact_float
 riverctl map interact_float $modemod R enter-mode normal
+
 # resize views on screen
 riverctl map interact_float $mod H resize horizontal -100
 riverctl map interact_float $mod J resize vertical 100
 riverctl map interact_float $mod K resize vertical -100
 riverctl map interact_float $mod L resize horizontal 100
+
 # move views around screen
-riverctl map interact_float $mod+Shift H move left 100
-riverctl map interact_float $mod+Shift J move down 100
-riverctl map interact_float $mod+Shift K move up 100
-riverctl map interact_float $mod+Shift L move right 100
-# decrease/increase the main ratio of layout
-riverctl map interact_float None H send-layout-cmd rivercarro "main-ratio -0.05"
-riverctl map interact_float None L send-layout-cmd rivercarro "main-ratio +0.05"
-# increment/decrement the main layout
-riverctl map interact_float None J send-layout-cmd rivercarro "main-count +1"
-riverctl map interact_float None K send-layout-cmd rivercarro "main-count -1"
+riverctl map interact_float None H move left 100
+riverctl map interact_float None J move down 100
+riverctl map interact_float None K move up 100
+riverctl map interact_float None L move right 100
+
+# snap views to screen edges
+riverctl map interact_float $mod+Shift H snap left
+riverctl map interact_float $mod+Shift J snap down
+riverctl map interact_float $mod+Shift K snap up
+riverctl map interact_float $mod+Shift L snap right
 ### End resize and moving mode
 
 # focus the next/previous output