diff --git a/packages/components/src/utils/prop.validators.ts b/packages/components/src/utils/prop.validators.ts
index 1f2c17196b..d29580b513 100644
--- a/packages/components/src/utils/prop.validators.ts
+++ b/packages/components/src/utils/prop.validators.ts
@@ -4,7 +4,7 @@ import rgba from 'rgba-convert';
 import { Subject } from 'rxjs';
 import { hex, score } from 'wcag-contrast';
 
-import { Generic, patchTheme } from '@a11y-ui/core';
+import { Generic, patchTheme, patchThemeTag } from '@a11y-ui/core';
 
 import { Stringified } from '../types/common';
 import { AriaCurrentPropType } from '../types/props/aria-current';
@@ -486,6 +486,7 @@ export const ariaCurrentSubject = new Subject<AriaCurrentEventType>();
 
 export class KoliBriDevHelper {
 	public static readonly patchTheme = patchTheme;
+	public static readonly patchThemeTag = patchThemeTag;
 	public static readonly querySelector = koliBriQuerySelector;
 	public static readonly querySelectorAll = koliBriQuerySelectorAll;
 	public static readonly stringifyJson = stringifyJson;
diff --git a/packages/designer/src/components/editor/css-style.editor.ts b/packages/designer/src/components/editor/css-style.editor.ts
index 256c232316..220d8cff2e 100644
--- a/packages/designer/src/components/editor/css-style.editor.ts
+++ b/packages/designer/src/components/editor/css-style.editor.ts
@@ -1,7 +1,8 @@
 import { editor, KeyCode } from 'monaco-editor';
 import { format } from 'prettier';
 import parserCss from 'prettier/esm/parser-postcss.mjs';
-import { KoliBriDevHelper } from '@public-ui/components';
+// import { KoliBriDevHelper } from '@public-ui/components';
+import { Generic, patchThemeTag } from '@a11y-ui/core';
 import { storeThemes } from '../../shares/theme';
 
 /**
@@ -39,7 +40,8 @@ export const createCssEditor = (model: editor.ITextModel, ref: HTMLElement, tagN
 				model.updateOptions({
 					tabSize: 2,
 				});
-				KoliBriDevHelper.patchThemeTag(theme, tagName, css);
+				// KoliBriDevHelper.patchThemeTag(theme, tagName, css);
+				patchThemeTag(theme, tagName as Generic.Theming.Props<string, string>, css);
 				storeThemes();
 				setSignal(() => false);
 				const timeout = setTimeout(() => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 06fc33993b..b12b843f39 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -72,7 +72,7 @@ importers:
         specifier: 11.2.14
         version: 11.2.14(rxjs@6.5.5)(zone.js@0.11.8)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -117,7 +117,7 @@ importers:
         specifier: 12.2.17
         version: 12.2.17(rxjs@7.6.0)(zone.js@0.11.8)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -162,7 +162,7 @@ importers:
         specifier: 13.4.0
         version: 13.4.0(rxjs@7.6.0)(zone.js@0.11.8)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -207,7 +207,7 @@ importers:
         specifier: 14.3.0
         version: 14.3.0(rxjs@7.6.0)(zone.js@0.12.0)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -252,7 +252,7 @@ importers:
         specifier: 15.2.10
         version: 15.2.10(rxjs@7.8.1)(zone.js@0.12.0)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -297,7 +297,7 @@ importers:
         specifier: 16.2.10
         version: 16.2.10(rxjs@7.8.1)(zone.js@0.13.3)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -333,7 +333,7 @@ importers:
   packages/adapters/hydrate:
     devDependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       rimraf:
         specifier: 3.0.2
@@ -342,14 +342,14 @@ importers:
   packages/adapters/preact:
     dependencies:
       '@public-ui/react':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../react
       preact:
         specifier: '>=10.11.3'
         version: 10.11.3
     devDependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       react:
         specifier: 18.2.0
@@ -367,7 +367,7 @@ importers:
   packages/adapters/react:
     devDependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -403,7 +403,7 @@ importers:
   packages/adapters/react-standalone:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       react:
         specifier: '>=16.14.0'
@@ -413,7 +413,7 @@ importers:
         version: 18.2.0(react@18.2.0)
     devDependencies:
       '@public-ui/react':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../react
       cpy-cli:
         specifier: 5.0.0
@@ -425,7 +425,7 @@ importers:
   packages/adapters/solid:
     devDependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -455,7 +455,7 @@ importers:
         specifier: 7.23.0
         version: 7.23.0
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       '@types/minimatch':
         specifier: 5.1.2
@@ -488,7 +488,7 @@ importers:
         specifier: 1.5.3
         version: 1.5.3
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../schema
       i18next:
         specifier: 23.6.0
@@ -700,13 +700,13 @@ importers:
         specifier: 0.0.3
         version: 0.0.3(@public-ui/components@packages+components)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../components
       '@public-ui/solid':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../adapters/solid
       '@public-ui/themes':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../themes
       monaco-editor:
         specifier: 0.44.0
@@ -800,13 +800,13 @@ importers:
         specifier: 0.0.3
         version: 0.0.3(@public-ui/components@packages+components)
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       '@public-ui/react':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../adapters/react
       '@public-ui/themes':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../themes
       '@types/node':
         specifier: 20.8.7
@@ -906,11 +906,11 @@ importers:
   packages/themes:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../schema
       '@types/node':
         specifier: ts5.1
@@ -940,14 +940,14 @@ importers:
   packages/themes/bmf:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../schema
       '@public-ui/visual-tests':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../tools/visual-tests
       '@types/node':
         specifier: ts5.2
@@ -959,14 +959,14 @@ importers:
   packages/themes/bzst:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../schema
       '@public-ui/visual-tests':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../tools/visual-tests
       '@types/node':
         specifier: ts5.2
@@ -978,14 +978,14 @@ importers:
   packages/themes/default:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../schema
       '@public-ui/visual-tests':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../tools/visual-tests
       '@types/node':
         specifier: ts5.2
@@ -1012,14 +1012,14 @@ importers:
   packages/themes/ecl:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../schema
       '@public-ui/visual-tests':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../tools/visual-tests
       '@types/node':
         specifier: ts5.2
@@ -1034,14 +1034,14 @@ importers:
   packages/themes/itzbund:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../schema
       '@public-ui/visual-tests':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../tools/visual-tests
       '@types/node':
         specifier: ts5.2
@@ -1053,14 +1053,14 @@ importers:
   packages/themes/mfm:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../schema
       '@public-ui/visual-tests':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../tools/visual-tests
       '@types/node':
         specifier: ts5.2
@@ -1072,14 +1072,14 @@ importers:
   packages/themes/zoll:
     dependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
     devDependencies:
       '@public-ui/schema':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../schema
       '@public-ui/visual-tests':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../tools/visual-tests
       '@types/node':
         specifier: ts5.2
@@ -1116,7 +1116,7 @@ importers:
         version: 7.5.4
     devDependencies:
       '@public-ui/components':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../components
       '@types/gradient-string':
         specifier: 1.1.4
@@ -1185,7 +1185,7 @@ importers:
         specifier: 1.39.0
         version: 1.39.0
       '@public-ui/sample-react':
-        specifier: 2.0.0-rc.1
+        specifier: 2.0.0-rc.2
         version: link:../../samples/react
       axe-playwright:
         specifier: 1.2.3