[TASK] Additional theming