diff --git a/vimrc b/vimrc
index 45befa3..b233f68 100644
--- a/vimrc
+++ b/vimrc
@@ -2,5 +2,55 @@ execute pathogen#infect()
 syntax on
 filetype plugin indent on
 
+
 " NERDTree Hotkey
 map <C-n> :NERDTreeToggle<CR>
+
+
+" Indent
+set tabstop=4           " number of visual spaces per TAB
+set noexpandtab         " tabs are tabs
+set shiftwidth=4        " number of spaces to use for autoindenting
+set autoindent          " always set autoindenting on
+set copyindent          " copy the previous indentation on autoindenting
+set shiftround          " use multiple of shiftwidth when indenting with '<' and '>'
+set smarttab            " insert tabs on the start of a line according to shiftwidth, not tabstop
+" FileType dependent indent setup
+autocmd FileType javascript setlocal shiftwidth=2 tabstop=2 expandtab
+autocmd FileType html setlocal shiftwidth=2 tabstop=2 expandtab
+
+
+" Search
+set incsearch           " search as characters are entered
+set hlsearch            " highlight matches
+set ignorecase          " ignore case when searching
+set smartcase           " ignore case if search pattern is all lowercase, case-sensitive otherwise
+
+
+" UI tweek
+set number                      " always show line numbers
+set ruler
+set showcmd                     " show command in bottom bar
+set showmode            " show current mode in bottom bar
+"set cursorline         " highlight current line
+set wildmenu            " visual autocomplete for command menu
+set showmatch           " highlight matching [{()}]
+set backspace=indent,eol,start " allow backspacing over everything in insert mode
+set title                " change the terminal's title
+set visualbell           " don't beep
+set noerrorbells         " don't beep
+
+
+" Easy window navigation
+map <C-h> <C-w>h
+map <C-j> <C-w>j
+map <C-k> <C-w>k
+map <C-l> <C-w>l
+
+" Misc
+set wrap
+set history=1000         " remember more commands and search history
+set undolevels=1000      " use many muchos levels of undo
+set wildignore=*.swp,*.bak,*.pyc,*.class
+set pastetoggle=<F2>
+nnoremap ; :