From c77485cbc1a0e133b7bf8b0103028163c635ee1b Mon Sep 17 00:00:00 2001
From: joakbjerk <joakbjerk@gmail.com>
Date: Fri, 12 Jun 2026 13:24:29 +0200
Subject: [PATCH 1/5] remove empty theme-extensions and theme-forms files

---
 packages/dnb-eufemia/bundlewatch.config.js    | 32 --------------
 .../scripts/prebuild/tasks/themeFactory.ts    | 42 -------------------
 .../carnegie/carnegie-theme-components.scss   |  2 -
 .../carnegie/carnegie-theme-extensions.scss   | 15 -------
 .../themes/carnegie/carnegie-theme-forms.scss | 15 -------
 .../eiendom/eiendom-theme-components.scss     |  1 -
 .../eiendom/eiendom-theme-extensions.scss     | 15 -------
 .../themes/eiendom/eiendom-theme-forms.scss   | 15 -------
 .../sbanken/sbanken-theme-components.scss     |  2 -
 .../sbanken/sbanken-theme-extensions.scss     | 15 -------
 .../themes/sbanken/sbanken-theme-forms.scss   | 15 -------
 .../src/style/themes/ui/extensions.ts         |  2 -
 .../style/themes/ui/ui-theme-components.scss  |  2 -
 .../style/themes/ui/ui-theme-extensions.scss  | 11 -----
 .../src/style/themes/ui/ui-theme-forms.scss   | 15 -------
 15 files changed, 199 deletions(-)
 delete mode 100644 packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-extensions.scss
 delete mode 100644 packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-forms.scss
 delete mode 100644 packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-extensions.scss
 delete mode 100644 packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-forms.scss
 delete mode 100644 packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-extensions.scss
 delete mode 100644 packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-forms.scss
 delete mode 100644 packages/dnb-eufemia/src/style/themes/ui/ui-theme-extensions.scss
 delete mode 100644 packages/dnb-eufemia/src/style/themes/ui/ui-theme-forms.scss

diff --git a/packages/dnb-eufemia/bundlewatch.config.js b/packages/dnb-eufemia/bundlewatch.config.js
index fcee3ddd9de..837d48fb9d9 100644
--- a/packages/dnb-eufemia/bundlewatch.config.js
+++ b/packages/dnb-eufemia/bundlewatch.config.js
@@ -36,14 +36,6 @@ const cssBundles = [
     path: 'build/style/themes/carnegie/carnegie-theme-elements.min.css',
     maxSize: '10kB',
   },
-  {
-    path: 'build/style/themes/carnegie/carnegie-theme-extensions.min.css',
-    maxSize: '10kB',
-  },
-  {
-    path: 'build/style/themes/carnegie/carnegie-theme-forms.min.css',
-    maxSize: '10kB',
-  },
   {
     path: 'build/style/themes/eiendom/eiendom-theme-basis.min.css',
     maxSize: '10kB',
@@ -56,14 +48,6 @@ const cssBundles = [
     path: 'build/style/themes/eiendom/eiendom-theme-elements.min.css',
     maxSize: '10kB',
   },
-  {
-    path: 'build/style/themes/eiendom/eiendom-theme-extensions.min.css',
-    maxSize: '10kB',
-  },
-  {
-    path: 'build/style/themes/eiendom/eiendom-theme-forms.min.css',
-    maxSize: '10kB',
-  },
   {
     path: 'build/style/themes/sbanken/sbanken-theme-basis.min.css',
     maxSize: '10kB',
@@ -76,14 +60,6 @@ const cssBundles = [
     path: 'build/style/themes/sbanken/sbanken-theme-elements.min.css',
     maxSize: '10kB',
   },
-  {
-    path: 'build/style/themes/sbanken/sbanken-theme-extensions.min.css',
-    maxSize: '10kB',
-  },
-  {
-    path: 'build/style/themes/sbanken/sbanken-theme-forms.min.css',
-    maxSize: '10kB',
-  },
   {
     path: 'build/style/themes/ui/ui-theme-basis.min.css',
     maxSize: '10kB',
@@ -96,14 +72,6 @@ const cssBundles = [
     path: 'build/style/themes/ui/ui-theme-elements.min.css',
     maxSize: '10kB',
   },
-  {
-    path: 'build/style/themes/ui/ui-theme-extensions.min.css',
-    maxSize: '10kB',
-  },
-  {
-    path: 'build/style/themes/ui/ui-theme-forms.min.css',
-    maxSize: '10kB',
-  },
   {
     path: 'build/style/themes/ui/ui-theme-properties.min.css',
     maxSize: '5kB',
diff --git a/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts b/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts
index 91b7b25cecd..30d8443c31f 100644
--- a/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts
+++ b/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts
@@ -77,7 +77,6 @@ async function runThemeFactory() {
       ),
       ...processToNamesIgnoreList,
     ],
-    customContent: ({ name }) => `@use './${name}-theme-forms.scss';`,
     // output
     targetFile: 'components', // ui-theme-components.scss
     scssOutputPath: path.resolve(__dirname, '../../../src/style/themes'),
@@ -110,47 +109,6 @@ async function runThemeFactory() {
     }
   })
 
-  // extensions
-  await runFactory({
-    // input
-    filesToFindGlob: [
-      path.resolve(
-        __dirname,
-        '../../../src/extensions/**/style/themes/**/*-theme-*.scss'
-      ),
-      ...processToNamesIgnoreList,
-    ].concat(['!**/forms/style/themes/*']),
-    // output
-    targetFile: 'extensions', // ui-theme-extensions.scss
-    scssOutputPath: path.resolve(__dirname, '../../../src/style/themes'),
-  }).then(() => {
-    if (isCLI) {
-      log.succeed(
-        '> PrePublish: "themeFactory" Created the themes files with all the components, elements, fragments and extensions'
-      )
-    }
-  })
-
-  // forms
-  await runFactory({
-    // input
-    filesToFindGlob: [
-      path.resolve(
-        __dirname,
-        '../../../src/extensions/forms/**/style/themes/**/*-theme-*.scss'
-      ),
-      ...processToNamesIgnoreList,
-    ].concat(['!**/forms/style/themes/*']),
-    // output
-    targetFile: 'forms', // ui-theme-forms.scss
-    scssOutputPath: path.resolve(__dirname, '../../../src/style/themes'),
-  }).then(() => {
-    if (isCLI) {
-      log.succeed(
-        '> PrePublish: "themeFactory" Created the themes files with all the components, elements, fragments and extensions'
-      )
-    }
-  })
 }
 
 export async function runFactory({
diff --git a/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-components.scss b/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-components.scss
index e2fa8469c73..348cdca2f3b 100644
--- a/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-components.scss
+++ b/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-components.scss
@@ -16,5 +16,3 @@ $fonts-path: '../../../../assets/fonts/dnb' !default;
  * NB: The content below is auto generated by the "themeFactory".
  * You may want to update it by running "yarn build" locally.
  */
-
-@use './carnegie-theme-forms.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-extensions.scss
deleted file mode 100644
index 779398b0228..00000000000
--- a/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-extensions.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-// Add "ui" themes, if file don't exists
-$THEME_FALLBACK: 'ui';
-
-// Import shared styles
-@use '../../dnb-ui-extensions.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */
diff --git a/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-forms.scss
deleted file mode 100644
index 61233cf3d4b..00000000000
--- a/packages/dnb-eufemia/src/style/themes/carnegie/carnegie-theme-forms.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-// Add "ui" themes, if file don't exists
-$THEME_FALLBACK: 'ui';
-
-// Import shared styles
-@use '../../dnb-ui-forms.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */
diff --git a/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-components.scss b/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-components.scss
index 5036a83d16a..b167a289ad5 100644
--- a/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-components.scss
+++ b/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-components.scss
@@ -19,4 +19,3 @@ $fonts-path: '../../../../assets/fonts/dnb' !default;
 
 @use '../../../components/anchor/style/themes/dnb-anchor-theme-eiendom.scss';
 @use '../../../components/button/style/themes/dnb-button-theme-eiendom.scss';
-@use './eiendom-theme-forms.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-extensions.scss
deleted file mode 100644
index 779398b0228..00000000000
--- a/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-extensions.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-// Add "ui" themes, if file don't exists
-$THEME_FALLBACK: 'ui';
-
-// Import shared styles
-@use '../../dnb-ui-extensions.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */
diff --git a/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-forms.scss
deleted file mode 100644
index 61233cf3d4b..00000000000
--- a/packages/dnb-eufemia/src/style/themes/eiendom/eiendom-theme-forms.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-// Add "ui" themes, if file don't exists
-$THEME_FALLBACK: 'ui';
-
-// Import shared styles
-@use '../../dnb-ui-forms.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */
diff --git a/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-components.scss b/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-components.scss
index 1924125a8ca..348cdca2f3b 100644
--- a/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-components.scss
+++ b/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-components.scss
@@ -16,5 +16,3 @@ $fonts-path: '../../../../assets/fonts/dnb' !default;
  * NB: The content below is auto generated by the "themeFactory".
  * You may want to update it by running "yarn build" locally.
  */
-
-@use './sbanken-theme-forms.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-extensions.scss
deleted file mode 100644
index 779398b0228..00000000000
--- a/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-extensions.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-// Add "ui" themes, if file don't exists
-$THEME_FALLBACK: 'ui';
-
-// Import shared styles
-@use '../../dnb-ui-extensions.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */
diff --git a/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-forms.scss
deleted file mode 100644
index 61233cf3d4b..00000000000
--- a/packages/dnb-eufemia/src/style/themes/sbanken/sbanken-theme-forms.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-// Add "ui" themes, if file don't exists
-$THEME_FALLBACK: 'ui';
-
-// Import shared styles
-@use '../../dnb-ui-forms.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */
diff --git a/packages/dnb-eufemia/src/style/themes/ui/extensions.ts b/packages/dnb-eufemia/src/style/themes/ui/extensions.ts
index 653bb6c4449..f4bae5a5669 100644
--- a/packages/dnb-eufemia/src/style/themes/ui/extensions.ts
+++ b/packages/dnb-eufemia/src/style/themes/ui/extensions.ts
@@ -2,5 +2,3 @@
  * Imports only the extensions
  *
  */
-
-import './ui-theme-extensions.scss'
diff --git a/packages/dnb-eufemia/src/style/themes/ui/ui-theme-components.scss b/packages/dnb-eufemia/src/style/themes/ui/ui-theme-components.scss
index 4b1ab82452a..dc2ff42e1b9 100644
--- a/packages/dnb-eufemia/src/style/themes/ui/ui-theme-components.scss
+++ b/packages/dnb-eufemia/src/style/themes/ui/ui-theme-components.scss
@@ -12,5 +12,3 @@ $fonts-path: '../../../../assets/fonts/dnb' !default;
  * NB: The content below is auto generated by the "themeFactory".
  * You may want to update it by running "yarn build" locally.
  */
-
-@use './ui-theme-forms.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/ui/ui-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/ui/ui-theme-extensions.scss
deleted file mode 100644
index 85b6831934d..00000000000
--- a/packages/dnb-eufemia/src/style/themes/ui/ui-theme-extensions.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-@use '../../dnb-ui-extensions.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */
diff --git a/packages/dnb-eufemia/src/style/themes/ui/ui-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/ui/ui-theme-forms.scss
deleted file mode 100644
index 61233cf3d4b..00000000000
--- a/packages/dnb-eufemia/src/style/themes/ui/ui-theme-forms.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * ATTENTION: This file is auto generated by using "themeFactory".
- * But you still can change the content of this file on the very top.
- */
-
-// Add "ui" themes, if file don't exists
-$THEME_FALLBACK: 'ui';
-
-// Import shared styles
-@use '../../dnb-ui-forms.scss';
-
-/**
- * NB: The content below is auto generated by the "themeFactory".
- * You may want to update it by running "yarn build" locally.
- */

From 883b3e5818d649692b394de0baa10f22f1713710 Mon Sep 17 00:00:00 2001
From: joakbjerk <joakbjerk@gmail.com>
Date: Fri, 12 Jun 2026 13:29:37 +0200
Subject: [PATCH 2/5] remove empty theme-extensions and theme-forms files and
 dead extension imports

---
 .../src/docs/uilib/extensions.mdx                         | 8 --------
 packages/dnb-eufemia/src/style/extensions.ts              | 6 ------
 packages/dnb-eufemia/src/style/themes/ui/extensions.ts    | 4 ----
 3 files changed, 18 deletions(-)
 delete mode 100644 packages/dnb-eufemia/src/style/extensions.ts
 delete mode 100644 packages/dnb-eufemia/src/style/themes/ui/extensions.ts

diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions.mdx
index 0fa35be0728..a458295289f 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/extensions.mdx
+++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions.mdx
@@ -25,14 +25,6 @@ There are several great reasons behind opting for having extensions separated:
 import { ... } from '@dnb/eufemia/extensions'
 ```
 
-### Import extensions styles
-
-The styles for extensions are not a part of the default styles, so you have to import them explicitly.
-
-```js
-import '@dnb/eufemia/style/themes/ui/extensions'
-```
-
 ## Available Extensions
 
 <ListExtensions />
diff --git a/packages/dnb-eufemia/src/style/extensions.ts b/packages/dnb-eufemia/src/style/extensions.ts
deleted file mode 100644
index 3ac5c0e8683..00000000000
--- a/packages/dnb-eufemia/src/style/extensions.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Imports only the extensions
- *
- */
-
-import './themes/ui/extensions'
diff --git a/packages/dnb-eufemia/src/style/themes/ui/extensions.ts b/packages/dnb-eufemia/src/style/themes/ui/extensions.ts
deleted file mode 100644
index f4bae5a5669..00000000000
--- a/packages/dnb-eufemia/src/style/themes/ui/extensions.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Imports only the extensions
- *
- */

From daf7df4f59b33a01d3d3236f33b94d2fc0dfc6dc Mon Sep 17 00:00:00 2001
From: joakbjerk <joakbjerk@gmail.com>
Date: Fri, 12 Jun 2026 13:37:47 +0200
Subject: [PATCH 3/5] fix lint issue

---
 packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts b/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts
index 30d8443c31f..583f5ab4dae 100644
--- a/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts
+++ b/packages/dnb-eufemia/scripts/prebuild/tasks/themeFactory.ts
@@ -108,7 +108,6 @@ async function runThemeFactory() {
       )
     }
   })
-
 }
 
 export async function runFactory({

From c63e9f12fd8f6db8e351f8160429f58c938a42d0 Mon Sep 17 00:00:00 2001
From: joakbjerk <joakbjerk@gmail.com>
Date: Fri, 12 Jun 2026 14:58:09 +0200
Subject: [PATCH 4/5] remove @charset assertions from makeMainStyle test after
 forms removal

---
 .../scripts/prebuild/tasks/__tests__/makeMainStyle.test.ts      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeMainStyle.test.ts b/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeMainStyle.test.ts
index fe91f044a7e..6e9179d3de7 100644
--- a/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeMainStyle.test.ts
+++ b/packages/dnb-eufemia/scripts/prebuild/tasks/__tests__/makeMainStyle.test.ts
@@ -75,11 +75,9 @@ if (isCI) {
       expect(global.components[0]).toContain(
         'ATTENTION: This file is auto generated'
       )
-      expect(global.components[0]).toContain('@charset "UTF-8";')
       expect(global.components[0]).not.toContain(';--')
       expect(global.components[0]).not.toContain('}:root{--')
 
-      expect(global.components[1]).toContain('@charset "UTF-8";')
       expect(global.components[1]).toContain(';--')
       expect(global.components[1]).toContain('}:root{--')
     })

From 8619f453614cfff3558625199be6d5e99ddfe7d8 Mon Sep 17 00:00:00 2001
From: joakbjerk <joakbjerk@gmail.com>
Date: Fri, 12 Jun 2026 16:10:29 +0200
Subject: [PATCH 5/5] Update postbuild test to reflect forms styles no longer
 in theme-components

---
 .../dnb-eufemia/scripts/postbuild/__tests__/postbuild.test.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dnb-eufemia/scripts/postbuild/__tests__/postbuild.test.ts b/packages/dnb-eufemia/scripts/postbuild/__tests__/postbuild.test.ts
index d731f21b88a..2d433e75502 100644
--- a/packages/dnb-eufemia/scripts/postbuild/__tests__/postbuild.test.ts
+++ b/packages/dnb-eufemia/scripts/postbuild/__tests__/postbuild.test.ts
@@ -845,7 +845,7 @@ describe('style build', () => {
         ),
         'utf-8'
       )
-      expect(content).toContain(`.dnb-forms-`)
+      expect(content).not.toContain(`.dnb-forms-`)
     }
 
     {