Fixed Theming mechanism.