Refactor mappings
Refactor colorscheme and some indentation