Merged two scala color theme files together