ThemeSet small progress