GPII-150 - Theming of discovery tool