diff --git a/gui/sway/base b/gui/sway/base
index ed1da48..fcf928e 100644
--- a/gui/sway/base
+++ b/gui/sway/base
@@ -15,16 +15,12 @@ bar {
     swaybar_command waybar;
 }
 # setup screens
-exec_always killall kanshi; kanshi
+exec_always "killall kanshi; kanshi"
 # background
 exec_always wallpaper.sh
 # waybar
-# exec_always killall -SIGUSR2 waybar; waybar
 # Restarts waybar if running, starts otherwise
 exec_always pgrep waybar && (killall -SIGUSR2 waybar) || (waybar)
-# bar {
-#     swaybar_command waybar;
-# }
 
 # loading layout
 assign [class="st-256color"] 1
@@ -47,8 +43,8 @@ exec swayidle -w \
          lock 'swaylock-blur'
 
 # lock the screen
-# bindsym $mod+q exec swaylock-blur
-bindsym $mod+q exec sleep 1 && killall -SIGUSR1 swayidle
+bindsym $mod+q exec swaylock-blur
+# bindsym $mod+q exec sleep 1 && killall -SIGUSR1 swayidle
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -74,10 +70,10 @@ bindsym $mod+k focus up
 bindsym $mod+l focus right
 
 # move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
 
 # split in horizontal orientation
 #bindsym $mod+h split h
diff --git a/passwords/gnupg/pubring.kbx b/passwords/gnupg/pubring.kbx
index 2bc9a49..03f9565 100644
Binary files a/passwords/gnupg/pubring.kbx and b/passwords/gnupg/pubring.kbx differ
diff --git a/passwords/gnupg/pubring.kbx~ b/passwords/gnupg/pubring.kbx~
index 0e1a1c4..446167c 100644
Binary files a/passwords/gnupg/pubring.kbx~ and b/passwords/gnupg/pubring.kbx~ differ
diff --git a/terminals/tmux/tmux.full.conf b/terminals/tmux/tmux.full.conf
index a9be240..657f3c4 100644
--- a/terminals/tmux/tmux.full.conf
+++ b/terminals/tmux/tmux.full.conf
@@ -9,6 +9,8 @@ set -g display-panes-time 5000
 # setup automatic renaming
 set -g automatic-rename on
 
+# count from 1 for easier pane switching
+setw -g pane-base-index 1
 #set -g default-shell $SHELL
 
 # keybinds
diff --git a/terminals/tmux/tmux.sparse.conf b/terminals/tmux/tmux.sparse.conf
index 390926a..11bdf86 100644
--- a/terminals/tmux/tmux.sparse.conf
+++ b/terminals/tmux/tmux.sparse.conf
@@ -14,6 +14,9 @@ set -g automatic-rename on
 # escape sequence delay
 set -g escape-time 10
 
+# start from 1 for pane numbering
+setw -g pane-base-index 1
+
 #set -g default-shell $SHELL
 
 # keybinds