Fixes to topbar color-kit

Fixes some issues with the topbars color-kit.