diff --git a/.Xresources b/.Xresources
index 4f1fc8b..9db39c7 100644
--- a/.Xresources
+++ b/.Xresources
@@ -6,4 +6,10 @@ Xft.autohint: 0
 Xft.hintstyle:  hintfull
 Xft.lcdfilter:  lcddefault
 
+XTerm*metaSendsEscape: true
+XTerm.VT100.translations: #override \
+Meta <Key> minus: smaller-vt-font() \n\
+Meta <Key> plus: larger-vt-font() \n\
+Super <Key> minus: smaller-vt-font() \n\
+Super <Key> plus: larger-vt-font() \n\
 
diff --git a/.bash_aliases b/.bash_aliases
index 98f349d..496bab7 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -10,7 +10,7 @@ alias timestamp='TZ=Z date "+%Y%m%dT%H%M%SZ"'
 alias tree='tree -C'
 alias upper="tr '[:lower:]' '[:upper:]'"
 alias vimdiff='vimdiff -R'
-alias vim='nvim'
+alias vim=nvim
 
 ls --group-directories-first >/dev/null 2>&1
 if [ $? -gt 0 ] ; then
diff --git a/.clusterssh/config b/.clusterssh/config
index 6890ec3..4919b57 100644
--- a/.clusterssh/config
+++ b/.clusterssh/config
@@ -1,5 +1,5 @@
 auto_close=2
 ssh_args=-o StrictHostKeyChecking=no -o ForwardAgent=yes
 terminal=xterm
-terminal_args=-fa "xft:Droid Sans Mono Dotted:size=7:autohint=true:antialias=true"
+terminal_args=-fa "xft:Ubuntu Mono:size=15"
 terminal_bg_style=light
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 425a1d5..d6b571b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -4,10 +4,12 @@ call vundle#begin()
 
 " Plugins
 Plugin 'VundleVim/Vundle.vim'
+Plugin 'b4b4r07/vim-hcl'
 " Plugin 'bling/vim-airline'
 Plugin 'chriskempson/base16-vim'
 Plugin 'ctrlpvim/ctrlp.vim'
 Plugin 'ervandew/supertab'
+Plugin 'hashivim/vim-terraform'
 Plugin 'itchyny/lightline.vim'
 Plugin 'NLKNguyen/papercolor-theme'
 Plugin 'rust-lang/rust.vim'
@@ -322,7 +324,17 @@ let g:PaperColor_Light_Override = { 'Background' : '#fefe00' }
 
 let g:lightline = {
   \ 'colorscheme': 'seoul256',
+  \ 'component': { 'readonly': '%{&readonly?"":""}' },
+  \ 'component_function': {
+  \   'filename': 'LightLineFilename'
   \ }
+  \ }
+  " \ 'separator': { 'left': '', 'right': '' },
+  " \ 'subseparator': { 'left': '', 'right': '' }
+
+function! LightLineFilename()
+  return expand('%:p:~')
+endfunction
 
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
diff --git a/.tmux.conf b/.tmux.conf
index 40070cb..842f915 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -76,7 +76,8 @@ bind K confirm kill-server
 set -g status-fg "#cccccc"
 set -g status-bg "#222222"
 set -g status-left '#[bg="#999999",fg="#ffffff"] #I #[default]'
-set -g status-right '#[bg="#444444",fg="#cccccc"] #T #[bg="#555555"] | #(date +"%R") '
+#set -g status-right '#[bg="#444444",fg="#cccccc"] #T #[bg="#555555"] | #(date +"%R") '
+set -g status-right '#[bg="#444444",fg="#cccccc"] #T #[bg="#555555"] | #{battery_percentage} #{battery_remain} | #(date +"%R") '
 
 # Colors (Light)
 #set -g message-fg colour226
@@ -113,4 +114,6 @@ neww -d 'exec bash'
 neww -d 'exec bash'
 selectw -t 1
 
+run-shell ~/src/github.com/tmux-plugins/tmux-battery/battery.tmux
+
 # vim:set ft=tmux:
diff --git a/.vimrc b/.vimrc
index 9e8a123..28f2e9a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -337,10 +337,6 @@ map ,h :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
 set background=light
 let g:PaperColor_Light_Override = { 'Background' : '#fefe00' }
 
-let g:lightline = {
-  \ 'colorscheme': 'seoul256',
-  \ }
-
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
@@ -350,5 +346,12 @@ let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
 
+set g:lightline = {
+  \ 'colorscheme': 'seoul256',
+  \ 'component': {
+  \   'readonly': '%{&readonly?"":""}',
+  \ }
+  \ }
+
 color dln-light
 
diff --git a/bin/dwm b/bin/dwm
index 4dc78c9..b70545e 100755
Binary files a/bin/dwm and b/bin/dwm differ
diff --git a/bin/st b/bin/st
index e441b7b..5eb1e7b 100755
--- a/bin/st
+++ b/bin/st
@@ -5,7 +5,7 @@ case `hostname` in
     exec st.x86_64 -f "Roboto Mono:pixelsize=14" $@
     ;;
   dredd)
-    exec st.x86_64 -f "Roboto Mono-18" $@
+    exec st.x86_64 -f "Roboto Mono-15" $@
     ;;
 esac
 exec st.x86_64 $@