Slight restructuring, made second color scheme