RemoveThemeCompatible added