Feature/fix theming of events