Merge "Embedding themeId in the themeController" into main