corrected functionality and theming