New color themes and misc fixes