diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 8923ac6..518f8cf 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -40,10 +40,6 @@ bind = select-layout tiled
 # unbind o # this is the default key for cycling panes
 # bind ^A select-pane -t:.+
 
-# make window/pane index start with 1
-set -g base-index 1
-setw -g pane-base-index 1
-
 set-option -g set-titles on
 set-option -g set-titles-string "#T - #W"
 # set-window-option -g automatic-rename on
@@ -118,3 +114,4 @@ bind -t vi-copy 'y' copy-selection
 ##############################
 
 source ~/.dotfiles/tmux/theme.sh
+
diff --git a/vimrc b/vimrc
index 369e6d6..b7c50be 100644
--- a/vimrc
+++ b/vimrc
@@ -28,10 +28,12 @@ Plug 'scrooloose/nerdcommenter'
 "Plug 'myusuf3/numbers.vim'
 Plug 'Shougo/neocomplete.vim'
 Plug 'Shougo/neosnippet.vim'
+Plug 'Shougo/neosnippet-snippets'
 Plug 'easymotion/vim-easymotion'
 Plug 'bling/vim-airline'
 Plug 'tpope/vim-ragtag'
 Plug 'surround.vim'
+Plug 'tpope/vim-repeat'
 
 " html / templates
 Plug 'mattn/emmet-vim', { 'for': 'html' } " emmet support for vim - easily create markdup wth CSS-like syntax
@@ -47,13 +49,16 @@ Plug 'othree/es.next.syntax.vim', { 'for': 'javascript' } " ES6 and beyond synta
 " Go
 Plug 'fatih/vim-go', { 'for': 'go' } " go support
 
+" Colorschemes
+Plug 'altercation/vim-colors-solarized'
+
 " All of your Plugins must be added before the following line
 call plug#end()            " required
 filetype plugin indent on    " required
 " To ignore plugin indent changes, instead use:
 "filetype plugin on
 
-" S E T T I N G S 
+" S E T T I N G S
 set number
 set autoread
 
@@ -103,6 +108,8 @@ let g:airline_powerline_fonts = 1
 
 " M A P P I N G S
 let mapleader = ","
+" CtrlP for Tags
+nnoremap <leader><C-p> :CtrlPTag<cr>
 
 " Toggle NERDTree
 nmap <silent> <leader>k :NERDTreeToggle<cr>