diff --git a/src/app/claims/directLinking/directLinking-routing.module.ts b/src/app/claims/directLinking/directLinking-routing.module.ts
index 2b77562..45d32e6 100644
--- a/src/app/claims/directLinking/directLinking-routing.module.ts
+++ b/src/app/claims/directLinking/directLinking-routing.module.ts
@@ -5,13 +5,14 @@ import {OpenaireDirectLinkingComponent} from './directLinking.component';
 import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: properties.errorLink,  community : 'openaire'
         }, canDeactivate: [PreviousRouteRecorder]},
 
     ])
diff --git a/src/app/claims/linking/linking-routing.module.ts b/src/app/claims/linking/linking-routing.module.ts
index 95e60b6..40d66a5 100644
--- a/src/app/claims/linking/linking-routing.module.ts
+++ b/src/app/claims/linking/linking-routing.module.ts
@@ -4,13 +4,14 @@ import {OpenaireLinkingComponent} from './linkingGeneric.component';
 import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: properties.errorLink,  community : 'openaire'
         }, canDeactivate: [PreviousRouteRecorder]},
 
     ])
diff --git a/src/app/claims/myClaims/myClaims-routing.module.ts b/src/app/claims/myClaims/myClaims-routing.module.ts
index 9509165..ca7e43f 100644
--- a/src/app/claims/myClaims/myClaims-routing.module.ts
+++ b/src/app/claims/myClaims/myClaims-routing.module.ts
@@ -5,13 +5,14 @@ import {OpenaireMyClaimsComponent} from './myClaims.component';
 import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireMyClaimsComponent, canActivate: [IsRouteEnabled, LoginGuard],
-      data: {redirect: '/error',  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
+      data: {redirect: properties.errorLink,  community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
   ]
 })
 export class MyClaimsRoutingModule { }
diff --git a/src/app/deposit/deposit-routing.module.ts b/src/app/deposit/deposit-routing.module.ts
index 4d6c5c7..8af8110 100644
--- a/src/app/deposit/deposit-routing.module.ts
+++ b/src/app/deposit/deposit-routing.module.ts
@@ -3,12 +3,13 @@ import {RouterModule} from '@angular/router';
 import {OpenaireDepositComponent} from './deposit.component';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
+import {properties} from "../../environments/environment";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireDepositComponent, data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder], canActivate: [IsRouteEnabled] }
 
     ])
diff --git a/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts b/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts
index ca1f6ee..3dd5eb7 100644
--- a/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts
+++ b/src/app/deposit/searchDataprovidersToDeposit-routing.module.ts
@@ -3,13 +3,14 @@ import {RouterModule} from '@angular/router';
 import {OpenaireSearchDataprovidersToDepositComponent} from './searchDataprovidersToDeposit.component';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
+import {properties} from "../../environments/environment";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
         path: '', component: OpenaireSearchDataprovidersToDepositComponent, data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder], canActivate: [IsRouteEnabled]
       }
     
diff --git a/src/app/develop/develop.component.ts b/src/app/develop/develop.component.ts
index da39bb8..ceb6ad6 100644
--- a/src/app/develop/develop.component.ts
+++ b/src/app/develop/develop.component.ts
@@ -131,7 +131,7 @@ export class DevelopComponent implements OnInit {
   }
 
   private navigateToError() {
-    this._router.navigate(['/error'], {queryParams: {'page': this._router.url}});
+    this._router.navigate([properties.errorLink], {queryParams: {'page': this._router.url}});
   }
 
 
diff --git a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
index 357c8ab..316ccf6 100644
--- a/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
+++ b/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
@@ -4,13 +4,14 @@ import { RouterModule } from '@angular/router';
 import { OpenaireDataProviderComponent } from './dataProvider.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireDataProviderComponent, canActivate: [FreeGuard], data: {
-        redirect: '/error'
+        redirect: properties.errorLink
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/dataset/dataset-routing.module.ts b/src/app/landingPages/dataset/dataset-routing.module.ts
index 58caa2c..455ca4e 100644
--- a/src/app/landingPages/dataset/dataset-routing.module.ts
+++ b/src/app/landingPages/dataset/dataset-routing.module.ts
@@ -4,13 +4,14 @@ import { RouterModule } from '@angular/router';
 import { OpenaireDatasetComponent } from './dataset.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireDatasetComponent, canActivate: [FreeGuard], data: {
-        redirect: '/error'
+        redirect: properties.errorLink
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/organization/organization-routing.module.ts b/src/app/landingPages/organization/organization-routing.module.ts
index 66a2282..3b0a2ab 100644
--- a/src/app/landingPages/organization/organization-routing.module.ts
+++ b/src/app/landingPages/organization/organization-routing.module.ts
@@ -4,13 +4,14 @@ import {RouterModule} from '@angular/router';
 import {OpenaireOrganizationComponent} from './organization.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireOrganizationComponent, canActivate: [FreeGuard], data: {
-        redirect: '/error'
+        redirect: properties.errorLink
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/orp/orp-routing.module.ts b/src/app/landingPages/orp/orp-routing.module.ts
index 32fc886..13003b9 100644
--- a/src/app/landingPages/orp/orp-routing.module.ts
+++ b/src/app/landingPages/orp/orp-routing.module.ts
@@ -3,13 +3,14 @@ import {RouterModule} from '@angular/router';
 import {OpenaireOrpComponent} from './orp.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireOrpComponent, canActivate: [FreeGuard], data: {
-        redirect: '/error'
+        redirect: properties.errorLink
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/landingPages/project/project-routing.module.ts b/src/app/landingPages/project/project-routing.module.ts
index c4ca2a3..9655032 100644
--- a/src/app/landingPages/project/project-routing.module.ts
+++ b/src/app/landingPages/project/project-routing.module.ts
@@ -4,13 +4,14 @@ import {RouterModule} from '@angular/router';
 import {OpenaireProjectComponent} from './project.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireProjectComponent, canActivate: [FreeGuard], data: {
-        redirect: '/error'
+        redirect: properties.errorLink
       },canDeactivate: [PreviousRouteRecorder]  }
   ])
  ]
diff --git a/src/app/landingPages/publication/publication-routing.module.ts b/src/app/landingPages/publication/publication-routing.module.ts
index 9064b2a..8161a3e 100644
--- a/src/app/landingPages/publication/publication-routing.module.ts
+++ b/src/app/landingPages/publication/publication-routing.module.ts
@@ -4,13 +4,14 @@ import {RouterModule} from '@angular/router';
 import {OpenairePublicationComponent} from './publication.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenairePublicationComponent, canActivate: [FreeGuard], data: {
-        redirect: '/error'
+        redirect: properties.errorLink
       },canDeactivate: [PreviousRouteRecorder]  }
   ])
 ]
diff --git a/src/app/landingPages/result/result-routing.module.ts b/src/app/landingPages/result/result-routing.module.ts
index 9b72a94..666fcc6 100644
--- a/src/app/landingPages/result/result-routing.module.ts
+++ b/src/app/landingPages/result/result-routing.module.ts
@@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router';
 
 import {OpenaireResultComponent } from './result.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireResultComponent,  data: {
-        redirect: '/error',  community : 'openaire'
+        redirect: properties.errorLink,  community : 'openaire'
       },canDeactivate: [PreviousRouteRecorder]  }
   ])
 ]
diff --git a/src/app/landingPages/service/service-routing.module.ts b/src/app/landingPages/service/service-routing.module.ts
index f73bdf9..b3f753a 100644
--- a/src/app/landingPages/service/service-routing.module.ts
+++ b/src/app/landingPages/service/service-routing.module.ts
@@ -4,13 +4,14 @@ import { RouterModule } from '@angular/router';
 import { OpenaireServiceComponent } from './service.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
  imports: [
   RouterModule.forChild([
     { path: '', component: OpenaireServiceComponent, canActivate: [FreeGuard], data: {
-        redirect: '/error'
+        redirect: properties.errorLink
       },canDeactivate: [PreviousRouteRecorder] }
   ])
 ]
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 2fac23f..5fbdac1 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 2fac23fd10bcdee868fa51376d0fd2351f1ef8fd
+Subproject commit 5fbdac1dc3d43ae72a6b9fff510f707f4b597f24
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts b/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
index d842ed5..1f53f4f 100644
--- a/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders-routing.module.ts
@@ -2,13 +2,14 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
index 4251ee6..c04de0d 100644
--- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
@@ -4,13 +4,14 @@ import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 
 @Component({
   selector: 'openaire-advanced-search-dataprovider',
   template: `
     <search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/dataproviders':null"
-    [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
+    [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-dataproviders>
 
   `
@@ -19,6 +20,7 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
 export class OpenaireAdvancedSearchDataProvidersComponent {
   customFilter: SearchCustomFilter = null;
   properties: EnvProperties;
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts b/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
index 15e0c8a..d46cc46 100644
--- a/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations-routing.module.ts
@@ -3,13 +3,14 @@ import {RouterModule} from '@angular/router';
 
 import {OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent ,  data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         },canDeactivate: [PreviousRouteRecorder]}
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
index 24e0ac9..a0e4df6 100644
--- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
@@ -4,13 +4,14 @@ import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 
 @Component({
   selector: 'openaire-advanced-search-organizations',
   template: `
     <search-organizations  [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/organizations':null"
-                           [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
+                           [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-organizations>
 
   `
@@ -20,6 +21,7 @@ export class OpenaireAdvancedSearchOrganizationsComponent {
 
   customFilter:SearchCustomFilter= null;
   properties: EnvProperties;
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;
diff --git a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts b/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
index c5cd7a9..fb8875a 100644
--- a/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects-routing.module.ts
@@ -3,12 +3,13 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireAdvancedSearchProjectsComponent, data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
index 5a790fb..294a0d3 100644
--- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts
@@ -4,12 +4,13 @@ import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
     selector: 'openaire-advanced-search-projects',
     template: `
     <search-projects [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/projects':null"
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
+                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-projects>
 
     `
@@ -19,6 +20,7 @@ export class OpenaireAdvancedSearchProjectsComponent {
 
   customFilter:SearchCustomFilter= null;
   properties: EnvProperties;
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;
diff --git a/src/app/searchPages/advanced/advancedSearchServices-routing.module.ts b/src/app/searchPages/advanced/advancedSearchServices-routing.module.ts
index 30e19f3..b6b37ae 100644
--- a/src/app/searchPages/advanced/advancedSearchServices-routing.module.ts
+++ b/src/app/searchPages/advanced/advancedSearchServices-routing.module.ts
@@ -2,13 +2,14 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {OpenaireAdvancedSearchServicesComponent} from './advancedSearchServices.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireAdvancedSearchServicesComponent, data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts
index 73a280e..741f750 100644
--- a/src/app/searchPages/advanced/advancedSearchServices.component.ts
+++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts
@@ -24,7 +24,7 @@ export class OpenaireAdvancedSearchServicesComponent {
   customFilter: SearchCustomFilter = null;
   properties: EnvProperties;
   public openaireEntities = OpenaireEntities;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;
diff --git a/src/app/searchPages/advanced/searchResearchResults-routing.module.ts b/src/app/searchPages/advanced/searchResearchResults-routing.module.ts
index de0ce51..f2a372d 100644
--- a/src/app/searchPages/advanced/searchResearchResults-routing.module.ts
+++ b/src/app/searchPages/advanced/searchResearchResults-routing.module.ts
@@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchResearchResultsComponent, data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: properties.errorLink,  community : 'openaire'
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/advanced/searchResearchResults.component.ts b/src/app/searchPages/advanced/searchResearchResults.component.ts
index 58422d5..3a73f55 100644
--- a/src/app/searchPages/advanced/searchResearchResults.component.ts
+++ b/src/app/searchPages/advanced/searchResearchResults.component.ts
@@ -4,12 +4,13 @@ import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
     selector: 'openaire-search-results',
     template: `
       <search-research-results resultType="result" [simpleView]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes':null"
-                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"></search-research-results>
+                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
     `
 
 })
@@ -17,7 +18,8 @@ export class OpenaireSearchResearchResultsComponent {
     @Input() searchLink: string = "/search/advanced/research-results";
     customFilter:SearchCustomFilter= null;
     properties: EnvProperties;
-    constructor ( ) {}
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+  constructor ( ) {}
     ngOnInit() {
         this.properties = properties;
         let id = ConnectHelper.getCommunityFromDomain(properties.domain);
diff --git a/src/app/searchPages/find/search.component.ts b/src/app/searchPages/find/search.component.ts
index 63d4c60..ac91871 100644
--- a/src/app/searchPages/find/search.component.ts
+++ b/src/app/searchPages/find/search.component.ts
@@ -3,16 +3,19 @@ import {SearchCustomFilter} from "../../openaireLibrary/searchPages/searchUtils/
 import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
     selector: 'openaire-search-find',
     template: `
-    <search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter" [piwikSiteId]="piwikSiteId"></search-all>
+    <search-all logoURL = "/assets/common-assets/logo-small-aggregator.png" name="OpenAIRE" [customFilter]="customFilter" [piwikSiteId]="piwikSiteId" 
+                [searchForm]="searchForm"></search-all>
     `,
  })
 export class OpenaireSearchComponent{
   customFilter:SearchCustomFilter= null;
   piwikSiteId = properties.piwikSiteId;
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     let id = ConnectHelper.getCommunityFromDomain(properties.domain);
diff --git a/src/app/searchPages/simple/searchDataProviders-routing.module.ts b/src/app/searchPages/simple/searchDataProviders-routing.module.ts
index 1cd462f..055279f 100644
--- a/src/app/searchPages/simple/searchDataProviders-routing.module.ts
+++ b/src/app/searchPages/simple/searchDataProviders-routing.module.ts
@@ -4,13 +4,14 @@ import {RouterModule} from '@angular/router';
 import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
 import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchDataprovidersComponent,data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts
index d77b396..bd86223 100644
--- a/src/app/searchPages/simple/searchDataproviders.component.ts
+++ b/src/app/searchPages/simple/searchDataproviders.component.ts
@@ -4,13 +4,14 @@ import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
   selector: 'openaire-search-dataproviders',
   template: `
 
     <search-dataproviders [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/dataproviders':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
+                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-dataproviders>
 
   `
@@ -18,6 +19,7 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
 export class OpenaireSearchDataprovidersComponent {
   customFilter: SearchCustomFilter = null;
   properties: EnvProperties;
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;
diff --git a/src/app/searchPages/simple/searchOrganizations-routing.module.ts b/src/app/searchPages/simple/searchOrganizations-routing.module.ts
index 171a5cc..38b457a 100644
--- a/src/app/searchPages/simple/searchOrganizations-routing.module.ts
+++ b/src/app/searchPages/simple/searchOrganizations-routing.module.ts
@@ -2,13 +2,14 @@ import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import {OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchOrganizationsComponent, data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder] }
 
     ])
diff --git a/src/app/searchPages/simple/searchOrganizations.component.ts b/src/app/searchPages/simple/searchOrganizations.component.ts
index 540651e..7c67cc7 100644
--- a/src/app/searchPages/simple/searchOrganizations.component.ts
+++ b/src/app/searchPages/simple/searchOrganizations.component.ts
@@ -4,13 +4,14 @@ import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
     selector: 'openaire-search-organizations',
     template: `
 
     <search-organizations [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/organizations':null"
-                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
+                          [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-organizations>
 
     `
@@ -19,7 +20,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
 export class OpenaireSearchOrganizationsComponent {
     customFilter:SearchCustomFilter= null;
     properties: EnvProperties;
-    constructor ( ) {}
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+  constructor ( ) {}
     ngOnInit() {
         this.properties = properties;
         let id = ConnectHelper.getCommunityFromDomain(properties.domain);
diff --git a/src/app/searchPages/simple/searchProjects-routing.module.ts b/src/app/searchPages/simple/searchProjects-routing.module.ts
index 5c74a25..0282cb8 100644
--- a/src/app/searchPages/simple/searchProjects-routing.module.ts
+++ b/src/app/searchPages/simple/searchProjects-routing.module.ts
@@ -3,13 +3,14 @@ import {RouterModule} from '@angular/router';
 
 import {OpenaireSearchProjectsComponent} from './searchProjects.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchProjectsComponent, data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts
index 7597a3c..ba910da 100644
--- a/src/app/searchPages/simple/searchProjects.component.ts
+++ b/src/app/searchPages/simple/searchProjects.component.ts
@@ -4,21 +4,23 @@ import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
     selector: 'openaire-search-projects',
     template: `
 
     <search-projects [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/projects':null"
-                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
+                     [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm">
     </search-projects>
      `
 
 })
 export class OpenaireSearchProjectsComponent {
-    customFilter: SearchCustomFilter = null;
-    properties: EnvProperties;
-    constructor ( ) {}
+  customFilter: SearchCustomFilter = null;
+  properties: EnvProperties;
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
+  constructor ( ) {}
     ngOnInit() {
         this.properties = properties;
         let id = ConnectHelper.getCommunityFromDomain(properties.domain);
diff --git a/src/app/searchPages/simple/searchResearchResults-routing.module.ts b/src/app/searchPages/simple/searchResearchResults-routing.module.ts
index bac0a53..215f5f5 100644
--- a/src/app/searchPages/simple/searchResearchResults-routing.module.ts
+++ b/src/app/searchPages/simple/searchResearchResults-routing.module.ts
@@ -3,13 +3,14 @@ import { RouterModule } from '@angular/router';
 
 import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
      	{ path: '', component: OpenaireSearchResearchResultsComponent,  data: {
-          redirect: '/error',  community : 'openaire'
+          redirect: properties.errorLink,  community : 'openaire'
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchResearchResults.component.ts b/src/app/searchPages/simple/searchResearchResults.component.ts
index dd24e19..c996142 100644
--- a/src/app/searchPages/simple/searchResearchResults.component.ts
+++ b/src/app/searchPages/simple/searchResearchResults.component.ts
@@ -4,12 +4,13 @@ import {AggregatorInfo, PortalAggregators} from "../../utils/aggregators";
 import {ConnectHelper} from "../../openaireLibrary/connect/connectHelper";
 import {properties} from "../../../environments/environment";
 import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
+import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
 
 @Component({
     selector: 'openaire-search-results',
     template: `
       <search-research-results resultType="result" [stickyForm]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes':null"
-                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"></search-research-results>
+                               [piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false" [searchForm]="searchForm"></search-research-results>
     `
 
 })
@@ -17,6 +18,7 @@ export class OpenaireSearchResearchResultsComponent {
   @Input() searchLink: string = "/search/research-results";
   customFilter:SearchCustomFilter= null;
   properties: EnvProperties;
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;
diff --git a/src/app/searchPages/simple/searchServices-routing.module.ts b/src/app/searchPages/simple/searchServices-routing.module.ts
index a06cae2..6439c79 100644
--- a/src/app/searchPages/simple/searchServices-routing.module.ts
+++ b/src/app/searchPages/simple/searchServices-routing.module.ts
@@ -3,13 +3,14 @@ import {RouterModule} from '@angular/router';
 
 import {OpenaireSearchServicesComponent} from './searchServices.component';
 import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {properties} from "../../../environments/environment";
 
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: '', component: OpenaireSearchServicesComponent,data: {
-          redirect: '/error'
+          redirect: properties.errorLink
         }, canDeactivate: [PreviousRouteRecorder]  }
 
     ])
diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts
index 0ee893e..f1348b0 100644
--- a/src/app/searchPages/simple/searchServices.component.ts
+++ b/src/app/searchPages/simple/searchServices.component.ts
@@ -23,7 +23,7 @@ export class OpenaireSearchServicesComponent {
   customFilter: SearchCustomFilter = null;
   properties: EnvProperties;
   public openaireEntities = OpenaireEntities;
-  public searchForm: SearchForm = {class: 'search-form', dark: false};
+  public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true};
   constructor ( ) {}
   ngOnInit() {
     this.properties = properties;
diff --git a/src/assets/common-assets b/src/assets/common-assets
index e0ff412..170a049 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit e0ff4127402ee93a1c757c8aee246fe2c20b18af
+Subproject commit 170a0490e6ecf0d2e31d5a4cea3967cc14efa5af