UI theme refinements 1/n