diff --git a/src/app/shared/abstract-component-loader/dynamic-component-loader.utils.ts b/src/app/shared/abstract-component-loader/dynamic-component-loader.utils.ts
index 395da651836..998e6f31694 100644
--- a/src/app/shared/abstract-component-loader/dynamic-component-loader.utils.ts
+++ b/src/app/shared/abstract-component-loader/dynamic-component-loader.utils.ts
@@ -1,8 +1,9 @@
 import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
-import { DEFAULT_THEME } from '../object-collection/shared/listable-object/listable-object.decorator';
 import { ThemeConfig } from '../../../config/theme.model';
 import { environment } from '../../../environments/environment';
 
+export const DEFAULT_THEME = '*';
+
 /**
  * A class used to compare two matches and their relevancy to determine which of the two gains priority over the other
  *
diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
index 84e1ea77b61..81ba0caf0f2 100644
--- a/src/app/shared/log-in/methods/log-in.methods-decorator.ts
+++ b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
@@ -1,7 +1,6 @@
 import { AuthMethodType } from '../../../core/auth/models/auth.method-type';
-import { DEFAULT_THEME } from '../../object-collection/shared/listable-object/listable-object.decorator';
+import { getMatch, DEFAULT_THEME } from '../../abstract-component-loader/dynamic-component-loader.utils';
 import { hasNoValue } from '../../empty.util';
-import { getMatch } from '../../abstract-component-loader/dynamic-component-loader.utils';
 
 export const DEFAULT_AUTH_METHOD_TYPE = AuthMethodType.Password;
 
diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
index 599db7b4639..b24db177689 100644
--- a/src/app/shared/metadata-representation/metadata-representation.decorator.ts
+++ b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
@@ -3,8 +3,8 @@ import { hasNoValue, hasValue } from '../empty.util';
 import { Context } from '../../core/shared/context.model';
 import { InjectionToken } from '@angular/core';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { DEFAULT_THEME, DEFAULT_CONTEXT } from '../object-collection/shared/listable-object/listable-object.decorator';
-import { getMatch } from '../abstract-component-loader/dynamic-component-loader.utils';
+import { DEFAULT_CONTEXT } from '../object-collection/shared/listable-object/listable-object.decorator';
+import { getMatch, DEFAULT_THEME } from '../abstract-component-loader/dynamic-component-loader.utils';
 
 export const METADATA_REPRESENTATION_COMPONENT_FACTORY = new InjectionToken<(entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context, theme: string) => GenericConstructor<any>>('getMetadataRepresentationComponent', {
   providedIn: 'root',
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
index b7f27d1553d..455751d659d 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.ts
@@ -6,10 +6,10 @@ import { ListableObject } from '../listable-object.model';
 import { environment } from '../../../../../environments/environment';
 import { ThemeConfig } from '../../../../../config/theme.model';
 import { InjectionToken } from '@angular/core';
+import { DEFAULT_THEME } from '../../../abstract-component-loader/dynamic-component-loader.utils';
 
 export const DEFAULT_VIEW_MODE = ViewMode.ListElement;
 export const DEFAULT_CONTEXT = Context.Any;
-export const DEFAULT_THEME = '*';
 
 /**
  * Factory to allow us to inject getThemeConfigFor so we can mock it in tests