Add ThemeSelector block to handle themeName request parameter + add navigationContext in __change in page templates.