Improvements to scala color theme