[development] Theming system, round 2