diff --git a/src/app/+home-page/home-news/home-news.component.ts b/src/app/+home-page/home-news/home-news.component.ts
index 2717157b60..2e38a7e6bb 100644
--- a/src/app/+home-page/home-news/home-news.component.ts
+++ b/src/app/+home-page/home-news/home-news.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'ds-home-news',
   styleUrls: ['./home-news.component.scss'],
   // templateUrl: './home-news.component.html',
-  templateUrl: './themes/home-news.component.preview-release.html'
+  templateUrl: './themes/home-news.component.mantis.html'
 })
 
 /**
diff --git a/src/app/+home-page/home-news/themes/home-news.component.preview-release.html b/src/app/+home-page/home-news/themes/home-news.component.mantis.html
similarity index 100%
rename from src/app/+home-page/home-news/themes/home-news.component.preview-release.html
rename to src/app/+home-page/home-news/themes/home-news.component.mantis.html
diff --git a/src/app/+home-page/home-news/themes/home-news.component.preview-release.scss b/src/app/+home-page/home-news/themes/home-news.component.mantis.scss
similarity index 64%
rename from src/app/+home-page/home-news/themes/home-news.component.preview-release.scss
rename to src/app/+home-page/home-news/themes/home-news.component.mantis.scss
index e21eb56a00..746f71d65d 100644
--- a/src/app/+home-page/home-news/themes/home-news.component.preview-release.scss
+++ b/src/app/+home-page/home-news/themes/home-news.component.mantis.scss
@@ -1,4 +1,4 @@
-:host-context(.preview-release) {
+:host-context(.mantis) {
     .jumbotron {
         background-color: transparent;
     }
diff --git a/src/app/+home-page/home-page.component.ts b/src/app/+home-page/home-page.component.ts
index 2b9178d96d..bc9f103ec0 100644
--- a/src/app/+home-page/home-page.component.ts
+++ b/src/app/+home-page/home-page.component.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'ds-home-page',
   styleUrls: ['./home-page.component.scss'],
   // templateUrl: './home-page.component.html'
-  templateUrl: './themes/home-page.component.preview-release.html'
+  templateUrl: './themes/home-page.component.mantis.html'
 })
 export class HomePageComponent {
 }
diff --git a/src/app/+home-page/themes/home-page.component.preview-release.html b/src/app/+home-page/themes/home-page.component.mantis.html
similarity index 100%
rename from src/app/+home-page/themes/home-page.component.preview-release.html
rename to src/app/+home-page/themes/home-page.component.mantis.html
diff --git a/src/app/+home-page/themes/home-page.component.preview-release.scss b/src/app/+home-page/themes/home-page.component.mantis.scss
similarity index 97%
rename from src/app/+home-page/themes/home-page.component.preview-release.scss
rename to src/app/+home-page/themes/home-page.component.mantis.scss
index cecbacf9a7..33d0e8569a 100644
--- a/src/app/+home-page/themes/home-page.component.preview-release.scss
+++ b/src/app/+home-page/themes/home-page.component.mantis.scss
@@ -1,6 +1,6 @@
 @import '../../../styles/variables.scss';
 
-:host-context(.preview-release) {
+:host-context(.mantis) {
     div.background-image {
         color: white;
         background-color: $info;
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index 03f7290cab..7d6e2c46f6 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -14,7 +14,7 @@ import { FilterType } from '../../../../search-service/filter-type.model';
   selector: 'ds-search-facet-option',
   styleUrls: ['./search-facet-option.component.scss'],
   // templateUrl: './search-facet-option.component.html',
-  templateUrl: './themes/search-facet-option.component.preview-release.html',
+  templateUrl: './themes/search-facet-option.component.mantis.html',
 })
 
 /**
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/themes/search-facet-option.component.mantis.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
rename to src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/themes/search-facet-option.component.mantis.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 4c9a4fbf30..b70f4d833d 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -19,7 +19,7 @@ const rangeDelimiter = '-';
   selector: 'ds-search-facet-range-option',
   styleUrls: ['./search-facet-range-option.component.scss'],
   // templateUrl: './search-facet-range-option.component.html',
-  templateUrl: './themes/search-facet-range-option.component.preview-release.html',
+  templateUrl: './themes/search-facet-range-option.component.mantis.html',
 })
 
 /**
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/themes/search-facet-range-option.component.mantis.html
similarity index 83%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
rename to src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/themes/search-facet-range-option.component.mantis.html
index 449d5b7337..bdb37cb52d 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
+++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/themes/search-facet-range-option.component.mantis.html
@@ -1,8 +1,8 @@
 <a *ngIf="isVisible | async" class="d-flex flex-row"
    [routerLink]="[getSearchLink()]"
    [queryParams]="changeQueryParams" queryParamsHandling="merge">
-    <span class="filter-value px-1">{{filterValue.label}}</span>
+    <span class="filter-value px-1">{{filterValue.value}}</span>
     <span class="float-right filter-value-count ml-auto">
                         <span class="badge badge-primary badge-pill">{{filterValue.count}}</span>
                     </span>
-</a>
+</a>
\ No newline at end of file
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
index 89c7f2b989..00915c1991 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
@@ -15,7 +15,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.c
   selector: 'ds-search-filter',
   styleUrls: ['./search-filter.component.scss'],
   // templateUrl: './search-filter.component.html',
-  templateUrl: './themes/search-filter.component.preview-release.html',
+  templateUrl: './themes/search-filter.component.mantis.html',
   animations: [slide],
 })
 
diff --git a/src/app/+search-page/search-filters/search-filter/search-range-filter/themes/search-range-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-range-filter/themes/search-range-filter.component.mantis.scss
similarity index 77%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/themes/search-range-filter.component.scss
rename to src/app/+search-page/search-filters/search-filter/search-range-filter/themes/search-range-filter.component.mantis.scss
index 28421b0f6d..cdd4f17d0c 100644
--- a/src/app/+search-page/search-filters/search-filter/search-range-filter/themes/search-range-filter.component.scss
+++ b/src/app/+search-page/search-filters/search-filter/search-range-filter/themes/search-range-filter.component.mantis.scss
@@ -1,6 +1,6 @@
 @import '../../../../../../styles/variables.scss';
 
-:host-context(.preview-release) {
+:host-context(.mantis) {
     ::ng-deep .noUi-connect {
         background: $info;
     }
diff --git a/src/app/+search-page/search-filters/search-filter/themes/search-filter.component.preview-release.html b/src/app/+search-page/search-filters/search-filter/themes/search-filter.component.mantis.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/themes/search-filter.component.preview-release.html
rename to src/app/+search-page/search-filters/search-filter/themes/search-filter.component.mantis.html
diff --git a/src/app/+search-page/search-filters/search-filter/themes/search-filter.component.preview-release.scss b/src/app/+search-page/search-filters/search-filter/themes/search-filter.component.mantis.scss
similarity index 82%
rename from src/app/+search-page/search-filters/search-filter/themes/search-filter.component.preview-release.scss
rename to src/app/+search-page/search-filters/search-filter/themes/search-filter.component.mantis.scss
index 30923e721f..48ed227f0d 100644
--- a/src/app/+search-page/search-filters/search-filter/themes/search-filter.component.preview-release.scss
+++ b/src/app/+search-page/search-filters/search-filter/themes/search-filter.component.mantis.scss
@@ -1,7 +1,7 @@
 @import '../../../../../styles/variables.scss';
 @import '../../../../../styles/mixins.scss';
 
-:host-context(.preview-release) .facet-filter {
+:host-context(.mantis) .facet-filter {
     background-color: map-get($theme-colors, light);
     border-radius: $border-radius;
 
diff --git a/src/app/+search-page/search-filters/search-filters.component.ts b/src/app/+search-page/search-filters/search-filters.component.ts
index bd1edcb9fa..10b42dde0d 100644
--- a/src/app/+search-page/search-filters/search-filters.component.ts
+++ b/src/app/+search-page/search-filters/search-filters.component.ts
@@ -14,7 +14,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.comp
 @Component({
   selector: 'ds-search-filters',
   styleUrls: ['./search-filters.component.scss'],
-  templateUrl: './themes/search-filters.component.preview-release.html',
+  templateUrl: './themes/search-filters.component.mantis.html',
 })
 
 /**
diff --git a/src/app/+search-page/search-filters/themes/search-filters.component.preview-release.html b/src/app/+search-page/search-filters/themes/search-filters.component.mantis.html
similarity index 100%
rename from src/app/+search-page/search-filters/themes/search-filters.component.preview-release.html
rename to src/app/+search-page/search-filters/themes/search-filters.component.mantis.html
diff --git a/src/app/+search-page/search-settings/search-settings.component.ts b/src/app/+search-page/search-settings/search-settings.component.ts
index 7811e9656d..49d92c6a34 100644
--- a/src/app/+search-page/search-settings/search-settings.component.ts
+++ b/src/app/+search-page/search-settings/search-settings.component.ts
@@ -11,7 +11,7 @@ import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.comp
   selector: 'ds-search-settings',
   styleUrls: ['./search-settings.component.scss'],
   // templateUrl: './search-settings.component.html'
-  templateUrl: './themes/search-settings.component.preview-release.html'
+  templateUrl: './themes/search-settings.component.mantis.html'
 })
 
 /**
diff --git a/src/app/+search-page/search-settings/themes/search-settings.component.preview-release.html b/src/app/+search-page/search-settings/themes/search-settings.component.mantis.html
similarity index 100%
rename from src/app/+search-page/search-settings/themes/search-settings.component.preview-release.html
rename to src/app/+search-page/search-settings/themes/search-settings.component.mantis.html
diff --git a/src/app/+search-page/search-settings/themes/search-settings.component.preview-release.scss b/src/app/+search-page/search-settings/themes/search-settings.component.mantis.scss
similarity index 76%
rename from src/app/+search-page/search-settings/themes/search-settings.component.preview-release.scss
rename to src/app/+search-page/search-settings/themes/search-settings.component.mantis.scss
index 72b3de93b1..4c7389b326 100644
--- a/src/app/+search-page/search-settings/themes/search-settings.component.preview-release.scss
+++ b/src/app/+search-page/search-settings/themes/search-settings.component.mantis.scss
@@ -1,6 +1,6 @@
 @import '../../../../styles/variables.scss';
 
-:host-context(.preview-release) .setting-option {
+:host-context(.mantis) .setting-option {
   background-color: map-get($theme-colors, light);
   border-radius: $border-radius;
 
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 5ef01e921a..e368a5ab6b 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,4 @@
-<div class="outer-wrapper preview-release">
+<div class="outer-wrapper mantis">
     <ds-admin-sidebar></ds-admin-sidebar>
     <div class="inner-wrapper"  [@slideSidebarPadding]="{
      value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
diff --git a/src/app/header/themes/header.component.preview-release.scss b/src/app/header/themes/header.component.mantis.scss
similarity index 73%
rename from src/app/header/themes/header.component.preview-release.scss
rename to src/app/header/themes/header.component.mantis.scss
index 52bf342fab..ad2eb79870 100644
--- a/src/app/header/themes/header.component.preview-release.scss
+++ b/src/app/header/themes/header.component.mantis.scss
@@ -1,6 +1,6 @@
 @import '../../../styles/variables.scss';
 
-:host-context(.preview-release) {
+:host-context(.mantis) {
     ::ng-deep a {
         //color: $dark;
     }
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index b65365423d..1d022efa33 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -14,7 +14,7 @@ import { HostWindowService } from '../shared/host-window.service';
   selector: 'ds-navbar',
   styleUrls: ['navbar.component.scss'],
   // templateUrl: './navbar.component.html',
-  templateUrl: './themes/navbar.component.preview-release.html',
+  templateUrl: './themes/navbar.component.mantis.html',
   animations: [slideMobileNav]
 })
 export class NavbarComponent extends MenuComponent implements OnInit {
diff --git a/src/app/navbar/themes/navbar.component.preview-release.html b/src/app/navbar/themes/navbar.component.mantis.html
similarity index 100%
rename from src/app/navbar/themes/navbar.component.preview-release.html
rename to src/app/navbar/themes/navbar.component.mantis.html
diff --git a/src/app/navbar/themes/navbar.component.preview-release.scss b/src/app/navbar/themes/navbar.component.mantis.scss
similarity index 76%
rename from src/app/navbar/themes/navbar.component.preview-release.scss
rename to src/app/navbar/themes/navbar.component.mantis.scss
index a07c55e720..9cbf0ccaa0 100644
--- a/src/app/navbar/themes/navbar.component.preview-release.scss
+++ b/src/app/navbar/themes/navbar.component.mantis.scss
@@ -1,6 +1,6 @@
 @import '../../../styles/variables.scss';
 
-:host-context(.preview-release) {
+:host-context(.mantis) {
     nav.navbar {
         border-bottom: 5px $green solid;
     }
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 91aa6a509d..3b65f77f88 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -15,7 +15,7 @@ import { MYDSPACE_ROUTE } from '../../+my-dspace-page/my-dspace-page.component';
   selector: 'ds-search-form',
   styleUrls: ['./search-form.component.scss'],
   // templateUrl: './search-form.component.html',
-  templateUrl: './themes/search-form.component.preview-release.html'
+  templateUrl: './themes/search-form.component.mantis.html'
 })
 
 /**
diff --git a/src/app/shared/search-form/themes/search-form.component.preview-release.html b/src/app/shared/search-form/themes/search-form.component.mantis.html
similarity index 100%
rename from src/app/shared/search-form/themes/search-form.component.preview-release.html
rename to src/app/shared/search-form/themes/search-form.component.mantis.html
diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss
index d224d1a8ed..0aa0948548 100644
--- a/src/styles/_variables.scss
+++ b/src/styles/_variables.scss
@@ -1,7 +1,7 @@
 @import '_functions.scss';
 @import '../../node_modules/bootstrap/scss/functions.scss';
-@import 'themes/bootstrap_variables.preview-release.scss';
+@import 'themes/bootstrap_variables.mantis.scss';
 @import 'bootstrap_variables.scss';
 @import '../../node_modules/bootstrap/scss/variables.scss';
-@import 'themes/custom_variables.preview-release.scss';
+@import 'themes/custom_variables.mantis.scss';
 @import 'custom_variables.scss';
\ No newline at end of file
diff --git a/src/styles/themes/_bootstrap_variables.preview-release.scss b/src/styles/themes/_bootstrap_variables.mantis.scss
similarity index 100%
rename from src/styles/themes/_bootstrap_variables.preview-release.scss
rename to src/styles/themes/_bootstrap_variables.mantis.scss
diff --git a/src/styles/themes/_custom_variables.preview-release.scss b/src/styles/themes/_custom_variables.mantis.scss
similarity index 100%
rename from src/styles/themes/_custom_variables.preview-release.scss
rename to src/styles/themes/_custom_variables.mantis.scss