TRDSEnabler to ThemeEnabler