Refactor colorscheme and some indentation