DAR-2107 | Prepare for ThemeDesigner changes (temporary)