diff --git a/configs/.tmux.conf b/configs/.tmux.conf
index 4e4099fef..00e9b750b 100644
--- a/configs/.tmux.conf
+++ b/configs/.tmux.conf
@@ -17,3 +17,5 @@ bind % split-window -c "#{pane_current_path}"
 bind '"' split-window -h -c "#{pane_current_path}"
 bind c new-window -c "#{pane_current_path}"
 
+set -g default-terminal "screen-256color-italic"
+
diff --git a/usbify/vim/.vimrc b/usbify/vim/.vimrc
index 7c2442c14..c4ebeb098 100644
--- a/usbify/vim/.vimrc
+++ b/usbify/vim/.vimrc
@@ -25,7 +25,10 @@ Plugin 'mileszs/ack.vim'
 Plugin 'pangloss/vim-javascript'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
+
 Plugin 'sickill/vim-monokai'
+Plugin 'altercation/vim-colors-solarized'
+
 Plugin 'sjl/clam.vim'
 " NOTE: use <C-n> to run miltiple cursors not <C-d>
 Plugin 'terryma/vim-multiple-cursors'
@@ -108,12 +111,6 @@ inoremap <C-a> <Esc>I
 inoremap <C-e> <Esc>A
 
 
-" keybinds to close a buffer
-inoremap <C-q> <Esc>:q<CR>
-nnoremap <C-q> :q<CR>
-nnoremap <C-q> :q<CR>
-
-
 " vs and sp keybinding
 nnoremap vs <Esc>:vs<CR>
 nnoremap vv <Esc>:vs<CR>
@@ -233,15 +230,28 @@ let g:syntastic_javascript_checkers = ['gjslint']
 
 
 " Basic settings
-syntax on
 set number
 set tabstop=2
 set expandtab
 set shiftwidth=2
-colorscheme monokai
+
+syntax enable
+
+if has('gui_running')
+  set background=light
+else
+  set background=dark
+endif
+
+colorscheme solarized
+
 set t_Co=255
 
 
+" Support italics
+highlight Comment cterm=italic
+
+
 " Remove all characters until the end of the line
 inoremap <C-c> <Esc>lC