clean code and theming