Tidy up some colors
Second go at renderes for tabs