diff --git a/mutt/macros.rc b/mutt/macros.rc
index e8de563..a8ca547 100644
--- a/mutt/macros.rc
+++ b/mutt/macros.rc
@@ -16,3 +16,6 @@ macro index I "<modify-labels>-inbox -unread\\n"                 # removed from
 macro index S "<modify-labels-then-hide>-inbox -unread +junk\\n" # tag as Junk mail
 macro index + "<modify-labels>+*\\n<sync-mailbox>"               # tag as starred
 macro index - "<modify-labels>-*\\n<sync-mailbox>"               # tag as unstarred
+bind index <left> sidebar-prev          # got to previous folder in sidebar
+bind index <right> sidebar-next         # got to next folder in sidebar
+bind index <space> sidebar-open         # open selected folder from sidebar
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 694275d..1dc21b2 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -64,3 +64,5 @@ bind -r L resize-pane -R 5
 #set border colors
 #set -g pane-active-border-fg blue
 set-option -g pane-active-border-style fg=blue
+set -g default-terminal "screen-256color"
+set-option -sa terminal-overrides ',XXX:RGB'                                                                                                                                                                                         
diff --git a/vim/vimrc b/vim/vimrc
index d641149..138fcc1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -28,32 +28,42 @@ call vundle#begin()
 
 " let Vundle manage Vundle, required
 Plugin 'gmarik/Vundle.vim'
+"
+" Python Plugins
 Plugin 'Valloric/YouCompleteMe'
 Plugin 'vim-syntastic/syntastic'
 Plugin 'nvie/vim-flake8'
 Plugin 'python-mode/python-mode'
 Plugin 'airblade/vim-gitgutter'
+"
+"general development plugins
 Plugin 'scrooloose/nerdtree'
 Plugin 'powerline/powerline', {'rtp': 'powerline/bindings/vim'}
 Plugin 'flazz/vim-colorschemes'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'ervandew/supertab'
+Plugin 'ryanoasis/vim-webdevicons'
+Plugin 'direnv/direnv.vim'
+Plugin 'ActivityWatch/aw-watcher-vim'
+"
 " Bind zonefile stuff
 Plugin 'seveas/bind.vim'
+"
 " extline extends rst stuff
 Plugin 'drmikehenry/vim-extline'
 Plugin 'tpope/vim-surround.git'
-Plugin 'ryanoasis/vim-webdevicons'
 Plugin 'brookhong/DBGPavim'
 Plugin 'dhruvasagar/vim-table-mode'
-Plugin 'nathanielc/vim-tickscript'
 Plugin 'godlygeek/tabular'
 Plugin 'plasticboy/vim-markdown'
+" Additional languages
+Plugin 'nathanielc/vim-tickscript'
 Plugin 'fatih/vim-go'
 Plugin 'dbeniamine/cheat.sh-vim'
 Plugin 'jacqueswww/vim-vyper'
-Plugin 'direnv/direnv.vim'
 Plugin 'tomlion/vim-solidity'
+Plugin 'kien/ctrlp.vim'
+
 
 "let g:deoplete#enable_at_startup = 1
 "Plugin 'Shougo/deoplete.nvim'
@@ -163,3 +173,5 @@ let g:table_mode_corner_corner='+'
 let g:table_mode_header_fillchar='='
 let g:webdevicons_enable = 1
 let g:webdevicons_enable_nerdtree = 1
+set relativenumber
+set number
diff --git a/zsh/zshrc b/zsh/zshrc
index abe4f32..e10261b 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -47,10 +47,10 @@ HIST_STAMPS="yyyy-mm-dd"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 # plugins=(git)
-plugins=(sudo taskwarrior common-aliases git-flow github keybase vi-mode battery web-search)
+plugins=(sudo taskwarrior common-aliases git-flow github keybase vi-mode battery python)
 
 # User configuration
-export PATH="/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/home/kellya/bin:/home/kellya/incoming/git-annex.linux:/home/kellya/bin/keybase/bin"
+export PATH="/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:/home/kellya/bin:/home/kellya/incoming/git-annex.linux:/home/kellya/bin/keybase/bin:/home/kellya/.local/bin"
 # export MANPATH="/usr/local/man:$MANPATH"
 
 
@@ -119,4 +119,23 @@ prompt_git () {
 
 
 # hyperdrive autocomplete setup
-HYPERDRIVE_AC_ZSH_SETUP_PATH=/home/kellya/.cache/hyperdrive-daemon/autocomplete/zsh_setup && test -f $HYPERDRIVE_AC_ZSH_SETUP_PATH && source $HYPERDRIVE_AC_ZSH_SETUP_PATH;
\ No newline at end of file
+HYPERDRIVE_AC_ZSH_SETUP_PATH=/home/kellya/.cache/hyperdrive-daemon/autocomplete/zsh_setup && test -f $HYPERDRIVE_AC_ZSH_SETUP_PATH && source $HYPERDRIVE_AC_ZSH_SETUP_PATH;
+alias vi=nvim
+alias ashow="litecli --auto-vertical-output /home/kellya/snap/accountable2you/common/storage.db -e \"select * from log;\""
+alias akill="litecli --auto-vertical-output /home/kellya/snap/accountable2you/common/storage.db -e \"delete from log;\""
+fpath+=~/.zfunc
+compinit
+kitty + complete setup zsh | source /dev/stdin
+#
+# Enable 'z' tracking for directory speediness
+source /usr/libexec/z.sh
+
+export PATH="$HOME/.poetry/bin:$PATH"
+
+#function chpwd() {
+#  if [ -r $PWD/.zsh_config ]; then
+#    source $PWD/.zsh_config
+#  else
+#    source $HOME/.zshrc
+#  fi
+#}