New color themes and language modes
Merge conflict