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