ThemeManager fix:

- Extended types (with 'Ex' in name) should use the short name in themes...