Changed vim colorscheme and rearranged statements