fixed some keymaps and color-theme