new color theme and some changes