diff --git a/firefox/vimperatorrc b/firefox/vimperatorrc
new file mode 100644
index 0000000..3f09d82
--- /dev/null
+++ b/firefox/vimperatorrc
@@ -0,0 +1,4 @@
+" vim: set ft=vim :
+
+
+
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 14560fc..93f05db 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -4,8 +4,12 @@
 ###
 ############
 
-#tmux display things in 256 colors
+# Remap the prefix, but not to C-A incase we need to screen
+set-option -g prefix C-q
+
+# Set default terminal, colors, and encoding
 set -g default-terminal "screen-256color"
+setw -g utf8 on
 
 #start window numbers at 1
 set -g base-index 1
@@ -77,48 +81,45 @@ set -g window-status-current-format '#[fg=black,bg=cyan]#[fg=bright] #I '
 # Keybinds
 ###
 
-#act like vim
+# Act like vim
 setw -g mode-keys vi
 
-#pane movement
+# Pane movement
 bind h select-pane -L
 bind j select-pane -D
 bind k select-pane -U
 bind l select-pane -R
 
-#window movement
+# Window movement
 bind-key -r C-h select-window -t :-
 bind-key -r C-l select-window -t :+
 
-#pane resizing
+# Pane resizing
 bind -r H resize-pane -L 5
 bind -r J resize-pane -D 5
 bind -r K resize-pane -U 5
 bind -r L resize-pane -R 5
 
-#split window and fix path for tmux 1.9
+# Split window and fix path for tmux 1.9
 bind | split-window -h #-c "#{pane_current_path}"
 bind - split-window -v #-c "#{pane_current_path}"
 
-# reload config file
+# Reload config file
 bind r source-file ~/.tmux.conf \; display "Config Reloaded!"
 
-# copy/paste improvements :: NOT WORKING PROPERLY NOW
-#bind C-c run "tmux save-buffer - | xclip -i -sel clipboard"
-
 # Capture a pane into file for uploading to Gist
 # bind-key u capture-pane \; save-buffer /tmp/tmux-buffer
 
 # Captur selection, create a gist from it
 #bind-key -tvi-copy u copy-pipe "~/Workbench/dotfiles/tmux/copy_selected.sh"
-bind-key -tvi-copy u copy-pipe "ruby ~/gist_gem.rb -" 
+bind-key -tvi-copy u copy-pipe "ruby ~/gist_gem.rb -"
 
 ######
 # Plugins
 ###
 
 # TPM - Tmux Plugin Manager
-# Install Plugins: <C-b> + I 
+# Install Plugins: <C-b> + I
 # Uninstall Plugins: <C-b> + <Alt-u>
 # Update Plugins: <C-b> + U
 set -g @plugin 'tmux-plugins/tpm'
diff --git a/vim/vimrc b/vim/vimrc
index f37c431..1237366 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,6 +14,7 @@ set nocompatible
 " Necessary for Syntax hilighting and cool stuff
 syntax on
 filetype plugin indent on
+set encoding=utf-8
 
 " Auto-reload files changed outside Vim
 set autoread
@@ -29,8 +30,10 @@ set number
 set autoindent
 set expandtab
 set smarttab
+set tabstop=4
 set shiftwidth=4
 set softtabstop=4
+
 " File-Type Specifics
 augroup customfiletypes
      " Clear old autocmds in group
@@ -43,7 +46,7 @@ augroup END
 " Set width; word wrap; scroll mods
 set scrolloff=5
 set textwidth=80
-" set colorcolumn=80
+set winwidth=80
 set wrap
 
 " Enable auto-completion for vim commands
@@ -53,6 +56,7 @@ set wildmode:longest:full,full
 
 " Search modifications
 " Incremental search; search hilighting
+set ignorecase smartcase
 set incsearch
 set hlsearch
 
@@ -85,23 +89,21 @@ nnoremap <silent> <C-h> <C-w>h
 " Allow saving of files as sudo when I forgot to start vim using sudo.
 cmap w!! w !sudo tee > /dev/null %
 
-" Edit dotfiles with <leader>d
-"  v is for vim
-     nnoremap <silent> <leader>dv :tabnew ~/.dotfiles/vim/vimrc<CR>
-     nnoremap <silent> <leader>dp :tabnew ~/.dotfiles/vim/vimrc-plugins<CR>
-"  b is for bash
-"    nnoremap <silent> <leader>db :tabnew ~/.dotfiles/bash/bashrc<CR>
-"  t is for tmux
-     nnoremap <silent> <leader>dt :tabnew ~/.dotfiles/tmux/tmux.conf<CR>
-"  m is for makefile
-     nnoremap <silent> <leader>dm :tabnew ~/.dotfiles/makefile<CR>
-
 " Remap ESC in insert mode
 inoremap jk <esc>
 
 " Remove Trailing Whitespaace
 nnoremap <silent> <leader>rtw :%s/\s\+$//e<CR>
 
+" Easy mapping for Startify
+nnoremap <silent> <leader>s :Startify<CR>
+
+" Open help topics in a full new tab
+command! -nargs=1 -complete=help H :enew | :set buftype=help | :h <args>
+
+" Show buffer list and prompt to choose one
+nnoremap <leader>b :ls<CR>:b<space>
+
 "######
 "# Plugins
 "###
diff --git a/vim/vimrc-plugins b/vim/vimrc-plugins
index 648539b..afb33a4 100644
--- a/vim/vimrc-plugins
+++ b/vim/vimrc-plugins
@@ -25,6 +25,7 @@ endif
 " # Fetch & Install Plugins
 " ###
 
+
 call plug#begin('~/.vim/bundle')
 
 " Current list of plugins
@@ -61,8 +62,14 @@ set laststatus=2
 let g:airline_powerline_fonts = 1
 
 " Startify configs
-let g:startify_files_number = 5
+let g:startify_files_number = 6
 let g:startify_change_to_dir = 1
+let g:startify_bookmarks = [
+          \ '~/.dotfiles/vim/vimrc',
+          \ '~/.dotfiles/vim/vimrc-plugins',
+          \ '~/.dotfiles/tmux/tmux.conf',
+          \ '~/.dotfiles/makefile',
+          \ ]
 
 " Syntastic configs
 let g:syntastic_always_populate_loc_list = 1