changes in the ResolvedThemeEvent
updated tests