theme: update to new style - minimal mistakes