corrected theming and functionality