Refactor colorscheme fix and some mapping