diff --git a/git/gitconfig b/git/gitconfig
index 1dd8254..33ec9c5 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -28,6 +28,7 @@
   up = pull --rebase --autostash
   ignore = update-index --assume-unchanged
   noignore = update-index --no-assume-unchanged
+  rename-branch = branch -m
 [push]
   default = matching
 [core]
diff --git a/i3/config b/i3/config
index e133a54..6e0b393 100644
--- a/i3/config
+++ b/i3/config
@@ -18,7 +18,7 @@ bindsym $mod+shift+apostrophe bar mode dock
 # Rename a workspace
 bindsym $mod+shift+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' 
 # Rofi shortcuts
-bindsym $mod+p exec rofi -font "Terminus 14" -show run
+bindsym $mod+p exec "~/.i3/run.sh run"
 bindsym $mod+shift+p exec "rofi-pass --last-used"
 # Misc shortcuts
 bindsym --release Num_Lock exec "xdotool key --clearmodifiers Shift+Insert;numlockx on"
@@ -107,7 +107,8 @@ bindsym $mod+shift+u focus child
 bindsym --release $mod+n exec "~/.i3/run.sh paste"
 # Exit/restart i3
 bindsym $mod+q restart
-bindsym $mod+shift+q exec "i3-nagbar -m 'Shutdown/Restart/Logout' -t warning -b Shutdown 'sudo /sbin/poweroff' -b Restart 'sudo /sbin/shutdown -r now' -b Logout 'i3-msg exit' -b Sleep 'amixer set Master 0% mute;slock&until echo mem|sudo tee /sys/power/state>/dev/null;do sleep 1;done;sleep 4;nmcli radio wifi off;sleep 3;nmcli radio wifi on'"
+#bindsym $mod+shift+q exec "i3-nagbar -m 'NMRestart/Shutdown/Restart/Logout' -t warning -b NMRestart 'nmcli radio wifi off;sleep 1;nmcli radio wifi on' -b Shutdown 'sudo /sbin/poweroff' -b Restart 'sudo /sbin/shutdown -r now' -b Logout 'i3-msg exit' -b Sleep 'amixer set Master 0% mute;slock&until echo mem|sudo tee /sys/power/state>/dev/null;do sleep 1;done;sleep 4;nmcli radio wifi off;sleep 3;nmcli radio wifi on'"
+bindsym $mod+shift+q exec "~/.i3/run.sh shutdownprompt"
 # Wallpaper
 bindsym $mod+shift+w exec "~/.i3/run.sh wall"
 
diff --git a/i3/run.sh b/i3/run.sh
index e5d2f51..58beccd 100755
--- a/i3/run.sh
+++ b/i3/run.sh
@@ -68,6 +68,7 @@ if [ "$1" = "screen-lock" ];then
   revert
 fi
 if [ "$1" = "paste" ]; then
+  sleep 2
   DISPLAY=:0.0 xdotool type --clearmodifiers --file <(xsel)
 fi
 if [ "$1" = "ping" ]; then
@@ -112,3 +113,31 @@ if [ "$1" = "screenshot" ]; then
   DISPLAY=:0.0 xfce4-screenshooter -r -s ~/last-photo
   cp ~/last-photo/* ~/Pictures
 fi
+if [ "$1" = "shutdownprompt" ]; then
+  RESP=$(printf 'Sleep\nNMRestart\nShutdown\nRestart\nLogout\n' | rofi -i -dmenu 2>/dev/null)
+  if [[ ! -z "$RESP" ]]; then
+    case "$RESP" in
+      NMRestart) nmcli radio wifi off;sleep 1;nmcli radio wifi on;;
+      Restart)
+        sudo /sbin/shutdown -r now
+        ;;
+      Shutdown)
+        sudo /sbin/poweroff
+        ;;
+      Logout)
+        i3-msg exit
+        ;;
+      Sleep)
+        amixer set Master 0% mute
+        slock&until echo mem|sudo tee /sys/power/state>/dev/null;do sleep 1;done
+        sleep 4
+        nmcli radio wifi off
+        sleep 3
+        nmcli radio wifi on
+        ;;
+    esac
+  fi
+fi
+if [ "$1" = "run" ]; then
+  PATH="$HOME/bin:$PATH" rofi -show run
+fi
diff --git a/shells/Xresources b/shells/Xresources
index 0cde3cb..46c5141 100644
--- a/shells/Xresources
+++ b/shells/Xresources
@@ -6,11 +6,15 @@
 !URxvt.font: xft:Terminus:size=12
 !URxvt.font: xft:Neep:size=13
 !URxvt.font: xft:Courier New:size=12
+URxvt.font: xft:Gohu GohuFont:size=12
 !URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-*
 !URxvt.font: xft:Fixed:style=SemiCondensed:size=16
 
 URxvt.urgentOnBell: true
 
+URxvt.cursorBlink: 0
+URxvt.cursorUnderline: 0
+
 URxvt.keysym.Control-Up:   \033[1;5A
 URxvt.keysym.Control-Down:    \033[1;5B
 URxvt.keysym.Control-Left:    \033[1;5D
diff --git a/shells/zshrc b/shells/zshrc
index 75aacee..83d8654 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -1,5 +1,5 @@
 # Borg backup repository
-export BORG_REPO="kserver:borg"
+export BORG_REPO="aw:borg"
 #zmodload zsh/zprof
 echo -ne '[  ]\r'
 for config (~/.zsh/*.zsh) source $config
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index f1d2af3..6475e8d 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -43,8 +43,8 @@ bind-key J resize-pane -D 5
 bind-key K resize-pane -U 5
 bind-key L resize-pane -R 5
 setw -g mode-keys vi
-bind-key -t vi-copy v begin-selection
-bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace"
+#bind-key -t vi-copy v begin-selection
+#bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace"
 set-option -g pane-border-fg colour235
 set-option -g pane-active-border-fg colour240
 set-option -g status on
diff --git a/vim/vimrc b/vim/vimrc
index 446a3e9..4050644 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -129,7 +129,8 @@ let g:tex_flavor='latex'
 " Gui options {
   set gfn=Monospace\ 8
   set guioptions=
-  set guicursor+=n-v-c:blinkon0
+  "set guicursor+=n-v-c:blinkon0
+  set guicursor+=a:blinkon0
   set mouse-=a
 " }
 " Annoyance fixes {
@@ -408,7 +409,7 @@ endfunction
   let g:ycm_semantic_triggers.tex = [
         \ 're!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*'
         \ ]
-set guifont=Fixed\ Medium\ Semi-Condensed\ 10
+set guifont=Gohu\ GohuFont
 inoremap <Tab> <C-R>=g:UltiSnips_Complete()<cr>
 map <unique> <buffer> <LocalLeader>b <Plug>JavagetsetInsertBothGetterSetter
 map <Leader>a O<Esc>:Autoformat<CR>:v/\S/d<CR>:nohlsearch<CR>