diff --git a/src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts b/src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts
index 9fbf1979b5..e92fe30ba9 100644
--- a/src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts
+++ b/src/app/+browse-by/+browse-by-switcher/themed-browse-by-switcher.component.ts
@@ -3,14 +3,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
 
+/**
+ * Themed wrapper for BrowseBySwitcherComponent
+ */
 @Component({
   selector: 'ds-themed-browse-by-switcher',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html'
 })
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
 export class ThemedBrowseBySwitcherComponent extends ThemedComponent<BrowseBySwitcherComponent> {
   protected getComponentName(): string {
     return 'BrowseBySwitcherComponent';
diff --git a/src/app/+collection-page/themed-collection-page.component.ts b/src/app/+collection-page/themed-collection-page.component.ts
index 7bbc720e30..4ad9ed87e3 100644
--- a/src/app/+collection-page/themed-collection-page.component.ts
+++ b/src/app/+collection-page/themed-collection-page.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CollectionPageComponent } from './collection-page.component';
 
+/**
+ * Themed wrapper for CollectionPageComponent
+ */
 @Component({
   selector: 'ds-themed-community-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedCollectionPageComponent extends ThemedComponent<CollectionPageComponent> {
   protected getComponentName(): string {
     return 'CollectionPageComponent';
diff --git a/src/app/+community-page/themed-community-page.component.ts b/src/app/+community-page/themed-community-page.component.ts
index b420789c5f..97dd59821c 100644
--- a/src/app/+community-page/themed-community-page.component.ts
+++ b/src/app/+community-page/themed-community-page.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CommunityPageComponent } from './community-page.component';
 
+/**
+ * Themed wrapper for CommunityPageComponent
+ */
 @Component({
   selector: 'ds-themed-community-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedCommunityPageComponent extends ThemedComponent<CommunityPageComponent> {
   protected getComponentName(): string {
     return 'CommunityPageComponent';
diff --git a/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts b/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
index 947a9f4eaa..e1bec33dfd 100644
--- a/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
+++ b/src/app/+lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ObjectNotFoundComponent } from './objectnotfound.component';
 
+/**
+ * Themed wrapper for ObjectNotFoundComponent
+ */
 @Component({
   selector: 'ds-themed-objnotfound',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedObjectNotFoundComponent extends ThemedComponent<ObjectNotFoundComponent> {
   protected getComponentName(): string {
     return 'ObjectNotFoundComponent';
diff --git a/src/app/+search-page/themed-configuration-search-page.component.ts b/src/app/+search-page/themed-configuration-search-page.component.ts
index 3528d3a326..9f7277be0e 100644
--- a/src/app/+search-page/themed-configuration-search-page.component.ts
+++ b/src/app/+search-page/themed-configuration-search-page.component.ts
@@ -4,15 +4,14 @@ import { ConfigurationSearchPageComponent } from './configuration-search-page.co
 import { Observable } from 'rxjs';
 import { Context } from '../core/shared/context.model';
 
+/**
+ * Themed wrapper for ConfigurationSearchPageComponent
+ */
 @Component({
   selector: 'ds-themed-configuration-search-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedConfigurationSearchPageComponent extends ThemedComponent<ConfigurationSearchPageComponent> {
   /**
    * The configuration to use for the search options
diff --git a/src/app/+search-page/themed-search-page.component.ts b/src/app/+search-page/themed-search-page.component.ts
index b23fff6289..0b2f673373 100644
--- a/src/app/+search-page/themed-search-page.component.ts
+++ b/src/app/+search-page/themed-search-page.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { SearchPageComponent } from './search-page.component';
 
+/**
+ * Themed wrapper for SearchPageComponent
+ */
 @Component({
   selector: 'ds-themed-search-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
-/**
- * This component represents the whole search page
- * It renders search results depending on the current search options
- */
 export class ThemedSearchPageComponent extends ThemedComponent<SearchPageComponent> {
 
   protected getComponentName(): string {
diff --git a/src/app/community-list-page/themed-community-list-page.component.ts b/src/app/community-list-page/themed-community-list-page.component.ts
index 6b374fca90..20fa97bedd 100644
--- a/src/app/community-list-page/themed-community-list-page.component.ts
+++ b/src/app/community-list-page/themed-community-list-page.component.ts
@@ -3,8 +3,7 @@ import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CommunityListPageComponent } from './community-list-page.component';
 
 /**
- * Page with title and the community list tree, as described in community-list.component;
- * navigated to with community-list.page.routing.module
+ * Themed wrapper for CommunityListPageComponent
  */
 @Component({
   selector: 'ds-themed-community-list-page',
diff --git a/src/app/forbidden/themed-forbidden.component.ts b/src/app/forbidden/themed-forbidden.component.ts
index bb3694cae2..830529c8fa 100644
--- a/src/app/forbidden/themed-forbidden.component.ts
+++ b/src/app/forbidden/themed-forbidden.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { ForbiddenComponent } from './forbidden.component';
 
+/**
+ * Themed wrapper for ForbiddenComponent
+ */
 @Component({
   selector: 'ds-themed-forbidden',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedForbiddenComponent extends ThemedComponent<ForbiddenComponent> {
   protected getComponentName(): string {
     return 'ForbiddenComponent';
diff --git a/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts b/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
index 6c76314e06..74eb545b8a 100644
--- a/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
 
+/**
+ * Themed wrapper for EndUserAgreementComponent
+ */
 @Component({
   selector: 'ds-themed-end-user-agreement',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedEndUserAgreementComponent extends ThemedComponent<EndUserAgreementComponent> {
 
   protected getComponentName(): string {
diff --git a/src/app/info/privacy/themed-privacy.component.ts b/src/app/info/privacy/themed-privacy.component.ts
index 5aed8d38af..7f2ee80ffc 100644
--- a/src/app/info/privacy/themed-privacy.component.ts
+++ b/src/app/info/privacy/themed-privacy.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { PrivacyComponent } from './privacy.component';
 
+/**
+ * Themed wrapper for PrivacyComponent
+ */
 @Component({
   selector: 'ds-themed-privacy',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedPrivacyComponent extends ThemedComponent<PrivacyComponent> {
   protected getComponentName(): string {
     return 'PrivacyComponent';
diff --git a/src/app/pagenotfound/themed-pagenotfound.component.ts b/src/app/pagenotfound/themed-pagenotfound.component.ts
index 68b06e2ac0..e6ef9eb700 100644
--- a/src/app/pagenotfound/themed-pagenotfound.component.ts
+++ b/src/app/pagenotfound/themed-pagenotfound.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { PageNotFoundComponent } from './pagenotfound.component';
 
+/**
+ * Themed wrapper for PageNotFoundComponent
+ */
 @Component({
   selector: 'ds-themed-search-page',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
-/**
- * This component represents the whole search page
- * It renders search results depending on the current search options
- */
 export class ThemedPageNotFoundComponent extends ThemedComponent<PageNotFoundComponent> {
 
   protected getComponentName(): string {
diff --git a/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
index 75cf60437f..dab96aef04 100644
--- a/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
+++ b/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
 
+/**
+ * Themed wrapper for CollectionStatisticsPageComponent
+ */
 @Component({
   selector: 'ds-themed-collection-statistics-page',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedCollectionStatisticsPageComponent extends ThemedComponent<CollectionStatisticsPageComponent> {
   protected getComponentName(): string {
     return 'CollectionStatisticsPageComponent';
diff --git a/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
index 34dc17e1b3..17f185f786 100644
--- a/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
+++ b/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
 
+/**
+ * Themed wrapper for CommunityStatisticsPageComponent
+ */
 @Component({
   selector: 'ds-themed-collection-statistics-page',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedCommunityStatisticsPageComponent extends ThemedComponent<CommunityStatisticsPageComponent> {
   protected getComponentName(): string {
     return 'CommunityStatisticsPageComponent';
diff --git a/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
index 4651269c54..50e26329a9 100644
--- a/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
+++ b/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ItemStatisticsPageComponent } from './item-statistics-page.component';
 
+/**
+ * Themed wrapper for ItemStatisticsPageComponent
+ */
 @Component({
   selector: 'ds-themed-item-statistics-page',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedItemStatisticsPageComponent extends ThemedComponent<ItemStatisticsPageComponent> {
   protected getComponentName(): string {
     return 'ItemStatisticsPageComponent';
diff --git a/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
index 4238cc788a..3f841163ed 100644
--- a/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
+++ b/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
@@ -2,15 +2,14 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SiteStatisticsPageComponent } from './site-statistics-page.component';
 
+/**
+ * Themed wrapper for SiteStatisticsPageComponent
+ */
 @Component({
   selector: 'ds-themed-site-statistics-page',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
 })
-
-/**
- * Component to render the news section on the home page
- */
 export class ThemedSiteStatisticsPageComponent extends ThemedComponent<SiteStatisticsPageComponent> {
   protected getComponentName(): string {
     return 'SiteStatisticsPageComponent';