change colorscheme

Conflicts:
	.vim/vimrc
remove margin colors