corrected theming bugs