Use more generic colour use cases, remove excess body padding