code cleanup
color theme