Fixed up theming mechanism.