change theme, color values
merge fixes