diff --git a/.bashrc b/.bashrc
index 5b2456e..d1de51e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -98,6 +98,8 @@ export NVM_DIR="$HOME/.nvm"
 alias yavide="gvim --servername yavide -f -N -u /opt/yavide/.vimrc"
 
 alias t="clear; python ~/t/t.py --task-dir ~/Dropbox --list tasks"
+alias tw="t | grep 'verify'"
+
 function ta() {
     t "$1"
     t
@@ -106,6 +108,8 @@ function tf() {
     t -f "$1"
     t
 }
+
+
 # include .bashrc helpers if they exist (Non-Open Source helpers)
 if [ -f $HOME/.bash_helpers ]; then
     . $HOME/.bash_helpers
diff --git a/desktop/i3/config b/desktop/i3/config
index 021cf02..7a4db98 100644
--- a/desktop/i3/config
+++ b/desktop/i3/config
@@ -51,29 +51,33 @@ bindsym $mod+Return exec i3-sensible-terminal
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run
+#bindsym $mod+d exec dmenu_run
+bindsym $mod+d exec rofi -show run -modi run -theme Arc-Dark
+bindsym F3 exec rofi -modi ssh -show ssh -theme Arc-Dark
+bindsym F2 exec rofi -modi window -show window -theme Arc-Dark
+
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
 # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
 
 # change focus
-bindsym $mod+Shif+j focus left
-bindsym $mod+Shift+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
+bindsym $mod+h focus left
+bindsym $mod+k focus down
+bindsym $mod+j focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
-#bindsym $mod+Left focus left
-#bindsym $mod+Down focus down
-#bindsym $mod+Up focus up
-#bindsym $mod+Right focus right
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right 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+k move down
+bindsym $mod+Shift+j move up
+bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
@@ -82,14 +86,18 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+h split h
+bindsym F8 split h
 
 # split in vertical orientation
-bindsym $mod+v split v
+bindsym F9 split v
 
 # enter fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
 
+for_window [title="^scratchpad$"] border 1pixel, floating enable, move scratchpad
+bindsym F1 [instance="scratchpad"] scratchpad show; sticky enable
+exec urxvt -name scratchpad -geometry 186x48
+
 # change container layout (stacked, tabbed, toggle split)
 bindsym $mod+s layout stacking
 bindsym $mod+w layout tabbed
@@ -140,8 +148,8 @@ bindsym --release Print exec scrot -s '/tmp/%F_%T_$wx$h.png' -e 'xclip -selectio
 # mocp
 #bindsym $mod+Shift+j exec "/usr/bin/mocp -G"
 bindsym $mod+p exec "/usr/bin/mocp -G"
-bindsym $mod+k exec "/usr/bin/mocp -f"
-bindsym $mod+j exec "/usr/bin/mocp -r"
+bindsym $mod+o exec "/usr/bin/mocp -f"
+bindsym $mod+i exec "/usr/bin/mocp -r"
 
 # Force mpv to left-most screen
 for_window [class="mpv"] move to workspace media
diff --git a/i3blocks.conf b/i3blocks.conf
index 8671f63..9771d7c 100644
--- a/i3blocks.conf
+++ b/i3blocks.conf
@@ -4,11 +4,6 @@ command= sh ~/Scripts/docker.sh
 color=#0db7ed
 interval=10
 
-[balance]
-command= sh ~/Scripts/getTransferBal.sh
-interval=120
-color=#00ff00
-
 [memory]
 command= sh ~/Scripts/memory.sh
 label=MEM
@@ -19,23 +14,12 @@ command= sh ~/Scripts/disk.sh
 label=HOME:
 interval=30
 
-[clicker]
-command= sh ~/Scripts/getTimeWorked.sh
-interval=480
-color=#00f404
-
 # Guess the weather hourly
 [weather]
 command=curl -Ss 'https://wttr.in?0&T&Q' | cut -c 16- | head -2 | xargs echo
 interval=3600
 color=#A4C2F4
 
-# Query my default IP address only on startup
-[ip]
-command=curl -s ip.me | awk '{ print "IP:" $1 }'
-interval=once
-color=#91E78B
-
 [covid]
 command= sh ~/Scripts/corona.sh
 color=#ffffff
@@ -43,6 +27,6 @@ interval=240
 
 # Update time every 5 seconds
 [time]
-command=echo "Local: $(date +%H:%M) | LA: $(TZ="America/Los_Angeles" date +%H:%M)"
+command=echo "🇱🇹 $(date +%H:%M) 🇺🇸 $(TZ="America/Los_Angeles" date +%H:%M) "
 color=#ffffff
 interval=5
diff --git a/setup.sh b/setup.sh
index 487aa4c..2aaffe5 100755
--- a/setup.sh
+++ b/setup.sh
@@ -95,6 +95,7 @@ echo -e "vim-airline"
 echo -e "${GREEN} Please run :helptags on first run ${RESET}"
 
 git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline &> /dev/null
+git clone git://github.com/digitaltoad/vim-pug.git &> /dev/null
 
 echo -e "${GREEN} nerdtree ${RESET}"