diff --git a/src/app/browse-by/browse-by-page-routes.ts b/src/app/browse-by/browse-by-page-routes.ts
index 5147a81fef..cf9a61f4ab 100644
--- a/src/app/browse-by/browse-by-page-routes.ts
+++ b/src/app/browse-by/browse-by-page-routes.ts
@@ -2,8 +2,8 @@ import { Route } from '@angular/router';
 import { BrowseByGuard } from './browse-by-guard';
 import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
 import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
-import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
 import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
 
 export const ROUTES: Route[] = [
   {
@@ -19,7 +19,7 @@ export const ROUTES: Route[] = [
     children: [
       {
         path: ':id',
-        component: ThemedBrowseBySwitcherComponent,
+        component: BrowseByPageComponent,
         canActivate: [BrowseByGuard],
         resolve: { breadcrumb: BrowseByI18nBreadcrumbResolver },
         data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' }
diff --git a/src/app/browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
index 30a34eafbc..a64fcfd2fb 100644
--- a/src/app/browse-by/browse-by-page.module.ts
+++ b/src/app/browse-by/browse-by-page.module.ts
@@ -4,13 +4,11 @@ import { BrowseService } from '../core/browse/browse.service';
 import { BrowseByGuard } from './browse-by-guard';
 import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
 import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
-import { SharedModule } from '../shared/shared.module';
 
 
 @NgModule({
   imports: [
     SharedBrowseByModule,
-    BrowseByModule,
     BrowseByPageComponent
   ],
   providers: [
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
index 9df02562c6..cff8ff0344 100644
--- a/src/app/browse-by/browse-by-page/browse-by-page.component.ts
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
@@ -9,6 +9,7 @@ import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
   selector: 'ds-browse-by-page',
   templateUrl: './browse-by-page.component.html',
   styleUrls: ['./browse-by-page.component.scss'],
+  standalone: true
 })
 export class BrowseByPageComponent implements OnInit {
 
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index 46306683ba..35fc2ed945 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -2,11 +2,10 @@ import { Component, OnInit, OnChanges, OnDestroy, Input } from '@angular/core';
 import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { ActivatedRoute, RouterLink, Params } from '@angular/router';
-import { Observable, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { BrowseDefinition } from '../../core/shared/browse-definition.model';
 import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { map } from 'rxjs/operators';
-import { ThemeService } from '../../shared/theme-support/theme.service';
 import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
 import { VocabularyTreeviewComponent } from '../../shared/form/vocabulary-treeview/vocabulary-treeview.component';
 import { TranslateModule } from '@ngx-translate/core';
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts
index d442323b53..36cb4a4568 100644
--- a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts
@@ -4,7 +4,8 @@ import { Item } from '../../../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-item-page-img-field',
-  templateUrl: '../item-page-field.component.html'
+  templateUrl: '../item-page-field.component.html',
+  standalone: true
 })
 /**
  * Component that renders an inline image for a given field.
diff --git a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts
index de842eb1e5..bd48fa873a 100644
--- a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts
+++ b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts
@@ -7,7 +7,8 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/
 @Component({
   selector: 'ds-item-withdrawn-reinstate-modal',
   templateUrl: './item-withdrawn-reinstate-modal.component.html',
-  styleUrls: ['./item-withdrawn-reinstate-modal.component.scss']
+  styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'],
+  standalone: true
 })
 /**
  * Represents a modal component for withdrawing or reinstating an item.