ThemeEngine: Merge Fix