simplify and change colors
update theme