Added colors to content types and changed expando buttons
Merge branch 'bookish-only' into atc