updated mappings and colorscheme