color updates
might as well leave main.css in
Merge branch 'working'