diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx b/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx
index 71fd440da74..bc84b9fdcfa 100644
--- a/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx
+++ b/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx
@@ -6,13 +6,13 @@ import FieldPropsProvider from '../../Field/Provider'
 import SectionContainerProvider from './containers/SectionContainerProvider'
 import ViewContainer from './ViewContainer'
 import EditContainer from './EditContainer'
+import Toolbar from './Toolbar'
 
 import type { Props as DataContextProps } from '../../DataContext/Provider'
 import type { ContainerMode } from './containers/SectionContainer'
 import type { Path, FieldProps, OnChange } from '../../types'
 import type { JsonObject } from '../../utils/json-pointer'
 import type { SharedFieldBlockProps } from '../../FieldBlock'
-import Toolbar from './Toolbar'
 
 export type OverwritePropsDefaults = {
   [key: Path]:
diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-sbanken.scss b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss
similarity index 100%
rename from packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-sbanken.scss
rename to packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss
diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-ui.scss b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss
similarity index 100%
rename from packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-ui.scss
rename to packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss
diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js
index 7f7b31db976..a1bcab9f489 100644
--- a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js
+++ b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js
@@ -3,4 +3,4 @@
  *
  */
 
-import './dnb-section-theme-ui.scss'
+import './dnb-form-section-theme-ui.scss'
diff --git a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss
index 44ab8defe29..56a335f76cb 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss
@@ -16,5 +16,6 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
 @import '../../../extensions/payment-card/style/themes/dnb-payment-card-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss
index f88b254164d..bd193841dfa 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss
@@ -16,4 +16,5 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss
index 735ed3dd5d8..d2d8a5bf442 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss
@@ -16,5 +16,6 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-sbanken.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-sbanken.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-sbanken.scss';
 @import '../../../extensions/payment-card/style/themes/dnb-payment-card-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss
index 326e15d8a38..d27d0c49f78 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss
@@ -16,5 +16,5 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-sbanken.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-sbanken.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-sbanken.scss';
-@import '../../../extensions/forms/Form/Section/style/themes/dnb-section-theme-sbanken.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss
index bb638a401ba..b237d0fb93b 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss
@@ -12,5 +12,6 @@
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
 @import '../../../extensions/payment-card/style/themes/dnb-payment-card-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss
index 7215604584f..bd193841dfa 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss
@@ -16,5 +16,5 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
-@import '../../../extensions/forms/Form/Section/style/themes/dnb-section-theme-ui.scss';