-improvements on color themes