adding colors and stuff
Merge branch 'redesign'

* redesign:
  adding colors and stuff