Fix color theme
Rename some keychords