diff --git a/src/app/submission/edit/submission-edit.component.html b/src/app/submission/edit/submission-edit.component.html
index 9c0e9eae72..71702d8c7d 100644
--- a/src/app/submission/edit/submission-edit.component.html
+++ b/src/app/submission/edit/submission-edit.component.html
@@ -1,10 +1,10 @@
 <div class="submission-submit-container" >
-  <ds-submission-form [collectionId]="collectionId"
+  <ds-themed-submission-form [collectionId]="collectionId"
                       [sections]="sections"
                       [selfUrl]="selfUrl"
                       [submissionDefinition]="submissionDefinition"
                       [submissionErrors]="submissionErrors"
                       [item]="item"
                       [collectionModifiable]="collectionModifiable"
-                      [submissionId]="submissionId"></ds-submission-form>
+                      [submissionId]="submissionId"></ds-themed-submission-form>
 </div>
diff --git a/src/app/submission/form/themed-submission-form.component.ts b/src/app/submission/form/themed-submission-form.component.ts
new file mode 100644
index 0000000000..96b5ecebd5
--- /dev/null
+++ b/src/app/submission/form/themed-submission-form.component.ts
@@ -0,0 +1,44 @@
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { SubmissionFormComponent } from './submission-form.component';
+import { Component, Input } from '@angular/core';
+import { Item } from '../../core/shared/item.model';
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
+import { SubmissionError } from '../objects/submission-error.model';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+
+@Component({
+  selector: 'ds-themed-submission-form',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedSubmissionFormComponent extends ThemedComponent<SubmissionFormComponent> {
+  @Input() collectionId: string;
+
+  @Input() item: Item;
+
+  @Input() collectionModifiable: boolean | null = null;
+
+  @Input() sections: WorkspaceitemSectionsObject;
+
+  @Input() submissionErrors: SubmissionError;
+
+  @Input() selfUrl: string;
+
+  @Input() submissionDefinition: SubmissionDefinitionsModel;
+
+  @Input() submissionId: string;
+
+  protected inAndOutputNames: (keyof SubmissionFormComponent & keyof this)[] = ['collectionId', 'item', 'collectionModifiable', 'sections', 'submissionErrors', 'selfUrl', 'submissionDefinition', 'submissionId'];
+
+  protected getComponentName(): string {
+    return 'SubmissionFormComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/submission/form/submission-form.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./submission-form.component`);
+  }
+}
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 8807a76fe4..c710b3b297 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -69,6 +69,7 @@ import { SectionFormOperationsService } from './sections/form/section-form-opera
 import {SubmissionSectionIdentifiersComponent} from './sections/identifiers/section-identifiers.component';
 import { ThemedSubmissionSectionContainerComponent } from './sections/container/themed-section-container.component';
 import { ThemedSubmissionFormFooterComponent } from './form/footer/themed-submission-form-footer.component';
+import { ThemedSubmissionFormComponent } from './form/themed-submission-form.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -110,6 +111,7 @@ const DECLARATIONS = [
   ThemedSubmissionSectionUploadFileComponent,
   ThemedSubmissionSectionContainerComponent,
   ThemedSubmissionFormFooterComponent,
+  ThemedSubmissionFormComponent,
 ];
 
 @NgModule({
diff --git a/src/themes/custom/app/submission/form/submission-form.component.html b/src/themes/custom/app/submission/form/submission-form.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/submission/form/submission-form.component.scss b/src/themes/custom/app/submission/form/submission-form.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/submission/form/submission-form.component.ts b/src/themes/custom/app/submission/form/submission-form.component.ts
new file mode 100644
index 0000000000..15b52a2657
--- /dev/null
+++ b/src/themes/custom/app/submission/form/submission-form.component.ts
@@ -0,0 +1,15 @@
+import {
+  SubmissionFormComponent as BaseComponent
+} from '../../../../../app/submission/form/submission-form.component';
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-submission-form',
+  // styleUrls: ['./submission-form.component.scss'],
+  styleUrls: ['../../../../../app/submission/form/submission-form.component.scss'],
+  // templateUrl: './submission-form.component.html'
+  templateUrl: '../../../../../app/submission/form/submission-form.component.html'
+})
+export class SubmissionFormComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index a52ba8f04a..de7aea3243 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -158,6 +158,7 @@ import { FormModule } from '../../app/shared/form/form.module';
 import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
 import { SubmissionSectionContainerComponent } from './app/submission/sections/container/section-container.component';
 import { SubmissionFormFooterComponent } from './app/submission/form/footer/submission-form-footer.component';
+import { SubmissionFormComponent } from './app/submission/form/submission-form.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -243,6 +244,7 @@ const DECLARATIONS = [
   EditBitstreamPageComponent,
   SubmissionSectionContainerComponent,
   SubmissionFormFooterComponent,
+  SubmissionFormComponent,
 ];
 
 @NgModule({