diff --git a/themes/fid_adlr/scss/_common.scss b/themes/fid_adlr/scss/_common.scss
index 88a6fba2fbcdba4a6ad48afdfb4e4af8198eeb26..f19efe1051ac65c21dd12225e8a4e875ea4b873b 100644
--- a/themes/fid_adlr/scss/_common.scss
+++ b/themes/fid_adlr/scss/_common.scss
@@ -1,3 +1,5 @@
+// Fixme: move scss into theming or appropriate components
+
 // This file ist for common basic elements, such as
 // empty containers,
 // tooltips
diff --git a/themes/fid_adlr/scss/_customComponents.scss b/themes/fid_adlr/scss/_customComponents.scss
new file mode 100644
index 0000000000000000000000000000000000000000..4bdb3d231cb3046551bd4ab484df9ffc8bec05bf
--- /dev/null
+++ b/themes/fid_adlr/scss/_customComponents.scss
@@ -0,0 +1,19 @@
+@import 'components/lightbox';
+@import 'components/getItBox';
+@import 'components/accordions-collapse-elements';
+@import 'components/alerts';
+@import 'components/buttons';
+@import 'components/dropdowns';
+@import 'components/forms';
+@import 'components/header-navbar';
+@import 'components/headings';
+@import 'components/home-page';
+@import 'components/media-styled-based-account-icons-and-status-colors';
+@import 'components/record';
+@import 'components/record-tabs';
+@import 'components/result-list';
+@import 'components/search';
+@import 'components/search-control-elements';
+@import 'components/sidebar';
+@import 'components/tables';
+@import 'components/footer';
\ No newline at end of file
diff --git a/themes/fid_adlr/scss/_customFonts.scss b/themes/fid_adlr/scss/_customFonts.scss
index 457ff6f610af2b0867200d55dc01714c9ed918f2..e1f2dc345a0747dcb044bfef45a99e3dfdaf4f28 100644
--- a/themes/fid_adlr/scss/_customFonts.scss
+++ b/themes/fid_adlr/scss/_customFonts.scss
@@ -134,11 +134,11 @@ $icon-arrow-font-size: 30px;
   font-style: normal;
 }
 
-@import 'iconfont';
+@import 'icons/iconfont';
 // IcoMoon Custom Icons Font - END
 
 // category icons
-@import 'iconcategory';
+@import 'icons/iconcategory';
 // category icons - END
 
 //// Base font size
diff --git a/themes/fid_adlr/scss/_customTheme.scss b/themes/fid_adlr/scss/_customTheme.scss
new file mode 100644
index 0000000000000000000000000000000000000000..c215568f69e8db0e9584ee56b772d95a1b5a02e2
--- /dev/null
+++ b/themes/fid_adlr/scss/_customTheme.scss
@@ -0,0 +1,361 @@
+@import 'common';
+
+// *****************************************************************
+// ********** HTML basics ******************************************
+// *****************************************************************
+// Use this section to style your document body/html
+// including top-padding to accommodate for navbar height
+
+
+// BODY
+body {
+  background-color: $white;
+  // set default font to OPEN SANS
+  font-family: $font-family-sans-serif;
+  // give central position
+  margin: 0 auto;
+  // Make sure, outer container doesn't spill over max designed content width
+  max-width: $max-designed-body-width;
+
+  overflow: hidden;
+  padding-top: 0;
+
+  // override finc 17720
+  @media (max-width: $screen-xs-max) {
+    padding-top: unset;
+  }
+
+  // no padding for advanced search
+  &.template-name-advanced {
+    padding-top: 0;
+  }
+}
+
+#content {
+  // override finc: Push content below header
+  @media (max-width: $screen-xs-max) {
+    padding-top: 0;
+  }
+}
+
+// LISTS
+
+ul {
+  list-style-type: none;
+  padding-left: 0;
+
+  li {
+    color: $asphalt;
+
+    // added active class for creating more specific selector to override in vufind6 introduced styles
+    // Hotfix - ToDo: Find more generic way for styling links in record tabs: refs #22739, refs #22776
+    .active #hierarchyTree &,
+    .active .openurls & {
+      a,
+      a:visited {
+        color: $asphalt;
+
+        &:hover {
+          color: $database-link-hover-color;
+        }
+      }
+    }
+  }
+}
+
+.worldcat .openurls {
+  ul {
+    padding-left: 1em;
+  }
+}
+
+// LISTS - END
+
+
+// LINKS
+
+a {
+  color: $black;
+  outline: none;
+  text-decoration: none;
+
+  &:focus {
+    outline: none;
+    text-decoration: underline;
+  }
+
+  &:hover {
+    text-decoration: none;
+  }
+
+  &:not(.btn):not(.search-filter-toggle):not(.text):visited {
+    .home-links &,
+    .navbar-header &,
+    .header-menu-collapse &,
+    .language & {
+      color: $white;
+    }
+
+    .navbar-header & {
+      @media (max-width: $screen-md-max) {
+        color: $azure;
+      }
+    }
+
+    .dbis_content & {
+      color: $asphalt;
+    }
+  }
+}
+
+// LINKS - END
+
+
+// *****************************************************************
+// ********** Main Content Container (.main, .container, footer ...*
+// *****************************************************************
+
+.main {
+  padding-bottom: 20px;
+  padding-top: 20px;
+
+  @media (min-width: $screen-lg-min) {
+    background-image: url('../images/background-shape-left.svg'),
+    url('../images/background-shape-right.svg');
+    background-position: center left,
+    bottom right;
+    background-repeat: no-repeat;
+  }
+
+  .container {
+    background: transparent;
+    border: 0;
+    max-width: 1284px;
+
+    @media (min-width: $screen-lg-min) {
+      min-width: $main-content-container-min-width-lg;
+    }
+
+    @media (min-width: $screen-xl-min) {
+      max-width: $main-content-container-max-width-xl;
+      width: 70%;
+    }
+
+    .mainbody {
+      @media (max-width: $screen-xs-max) {
+        width: 100%;
+      }
+
+      @media (min-width: $screen-lg-min) {
+        padding-right: 70px;
+      }
+    }
+  }
+}
+
+
+// *****************************************************************
+// ********** Sizing ***********************************************
+// *****************************************************************
+
+.flex-box-20 {
+  flex-basis: $pagination-flexbox-basis-20-percent;
+}
+
+.flex-box-40 {
+  flex-basis: calc(2 * #{$pagination-flexbox-basis-20-percent});
+}
+
+.flex-box-60 {
+  flex-basis: calc(3 * #{$pagination-flexbox-basis-20-percent});
+}
+
+.flex-box-80 {
+  flex-basis: calc(4 * #{$pagination-flexbox-basis-20-percent});
+}
+
+.flex-column-default {
+  display: -webkit-flex;
+  -webkit-flex-direction: column;
+  display: flex;
+  flex-direction: column;
+}
+
+.flex-column-reverse {
+  display: -webkit-flex;
+  -webkit-flex-direction: column-reverse;
+  display: flex;
+  flex-direction: column-reverse;
+}
+
+
+// *****************************************************************
+// ********** Branding *********************************************
+// *****************************************************************
+
+// ++ BRANDING (branding for origin source ids / specific facets and mega_collections etc.)
+// see SID103 in finc compiled.scss
+.branding {
+  color: transparent;
+  display: none;
+  font-size: 16px;
+  font-weight: 700;
+  line-height: 22px;
+  margin-left: .5em;
+  margin-top: 4px;
+  vertical-align: middle;
+
+  &.SID51 {
+    // #16177 adapt the path to get the new releases logo
+    // background: url('../../fid_adlr/images/branding/new-item-vub3.png') 0 0 no-repeat;
+    background: $midnight-light;
+    color: $azure;
+    display: inline-block;
+  }
+
+  &.SID76,
+  &.collection-UBL-FID-EBC {
+    // #16177 adapt the path to get the 'adlr ebooks' logo
+    // FIXME set correct logo
+    background: $midnight-light;
+    color: $azure;
+    display: inline-block;
+  }
+
+  &.SID78 {
+    // #16177 adapt the path to get the IZI database logo
+    background: url('../../fid_adlr/images/branding/izi-database.png') 0 0 no-repeat;
+    background-size: 100%;
+    display: inline-block;
+    height: em(40px);
+    margin-top: 12px;
+    width: em(150px);
+  }
+
+  &.SID103 {
+    // #16177 adapt the path to get the Margaret-Herrick-Library logo
+    background: url('../../fid_adlr/images/branding/herrick-library.png') 0 0 no-repeat;
+    background-size: 100%;
+    display: inline-block;
+    height: 27px;
+    margin-top: 10px;
+    width: 230px;
+  }
+
+  &.facet-free {
+    // #16177 adapt the path to get the Open Access logo
+    // background: url('../../fid_adlr/images/branding/open-access-logo.svg') 0 0 no-repeat;
+    background: $midnight-light;
+    color: $azure;
+    display: inline-block;
+  }
+
+  &.collection-verbundkatalog-film {
+    // #16177 adapt the path to get the verbundkatalog film logo
+    // background: url('../../fid_adlr/images/branding/verbundkatalog-film.png') 0 0 no-repeat;
+    background: $midnight-light;
+    color: $azure;
+    display: inline-block;
+  }
+}
+
+
+// *****************************************************************
+// ********** ADLR specific content (licenses, dbis, boss) *********
+// *****************************************************************
+
+.main {
+  .licenses > li > a::before {
+    content: '\e913';
+    font-family: icomoon, sans-serif;
+    font-style: normal;
+    font-variant: normal;
+    font-weight: 400;
+    line-height: 1;
+    padding-right: 5px;
+  }
+
+  .dbis_content {
+    ul > li {
+      list-style: none;
+
+      span {
+        padding-right: .5em;
+      }
+    }
+
+    span[class^='dbis-list-accessinfo-access_']::after {
+      content: '\e913';
+      font-family: icomoon, sans-serif;
+      font-style: normal;
+      font-variant: normal;
+      font-weight: 400;
+      line-height: 1;
+      padding-left: 10px;
+    }
+  }
+
+  .dbis_description {
+    @include accordeon(false);
+
+    p {
+      margin: 1em;
+    }
+
+    .title {
+      -webkit-appearance: button;
+      background-color: transparent;
+      border: 0;
+      border-right-width: 1px;
+      color: $azure;
+      display: block;
+      font-family: $font-family-monospace;
+      font-weight: 700;
+      line-height: 1.5rem;
+      padding: .75em 1em;
+      text-align: inherit;
+      text-transform: uppercase;
+      width: 100%;
+
+      &::after {
+        float: right;
+      }
+    }
+  }
+}
+
+// Boss-Module
+.boss-networknotice {
+  @include default-border($black);
+  padding: 12px;
+}
+
+// #17031 user tracking opt-out (iframe) - RL
+#piwk {
+  border: 0;
+  min-height: 250px;
+  width: 100%;
+
+  @media (min-width: $screen-lg-min) {
+    min-height: unset;
+  }
+}
+
+// *****************************************************************
+// ********** view specific styling ********************************
+// *****************************************************************
+
+// Records Home view - linked via e-mail #22843
+// hide background, hide offcanvas-toggler (empty sitebar) #22843
+.template-dir-records.template-name-home {
+  .main {
+    &,
+    header {
+      background-image: none;
+    }
+
+    .offcanvas-toggler {
+      display: none;
+    }
+  }
+}
\ No newline at end of file
diff --git a/themes/fid_adlr/scss/_customVariables.scss b/themes/fid_adlr/scss/_customVariables.scss
index 708e59eea060759223423c1f9a98c03efe615f86..ce52dd923caa8f8375e6b044456d3faaf7a874f6 100644
--- a/themes/fid_adlr/scss/_customVariables.scss
+++ b/themes/fid_adlr/scss/_customVariables.scss
@@ -22,10 +22,9 @@
 // *****************************************************************
 
 @import 'components/functions';
-@import 'customFonts';
 
 // *****************************************************************
-// ************ Common colors referenced elsewhere in the code *****
+// **** 00 **** Common colors referenced elsewhere in the code *****
 // *****************************************************************
 
 $amber: #f7c525; // rgb(247, 197, 37)
@@ -40,8 +39,23 @@ $seafoam: #2bedca; // rgb(43, 237, 202)
 $violet: #a10df2; // rgb(161, 13, 242)
 $red: #d2322d;
 
+
 // *****************************************************************
-// ************ Theme basic colors *********************************
+// **** 05 **** Re-define BS Screen Widths for use in adlr *********
+// *****************************************************************
+// copies from bootstrap3/scss/vendor/bootstrap/variables
+$screen-sm-min:              768px !default;
+$screen-md-min:              992px !default;
+$screen-lg-min:              1200px !default;
+
+// So media queries don't overlap when required, provide a maximum
+$screen-xs-max:              ($screen-sm-min - 1) !default;
+$screen-sm-max:              ($screen-md-min - 1) !default;
+$screen-md-max:              ($screen-lg-min - 1) !default;
+
+
+// *****************************************************************
+// **** A0 **** Theme basic colors *********************************
 // *****************************************************************
 
 $brand-primary: $azure !default;
@@ -71,21 +85,7 @@ $form-dropdown-focus-hover-color: #262626 !default;
 
 
 // *****************************************************************
-// ************ Re-define BS Screen Widths for use in adlr *********
-// *****************************************************************
-// copies from bootstrap3/scss/vendor/bootstrap/variables
-$screen-sm-min:              768px !default;
-$screen-md-min:              992px !default;
-$screen-lg-min:              1200px !default;
-
-// So media queries don't overlap when required, provide a maximum
-$screen-xs-max:              ($screen-sm-min - 1) !default;
-$screen-sm-max:              ($screen-md-min - 1) !default;
-$screen-md-max:              ($screen-lg-min - 1) !default;
-
-
-// *****************************************************************
-// ************ General dimensions *********************************
+// **** A5 **** General dimensions *********************************
 // *****************************************************************
 
 $screen-xl: 1600px !default; // FIXME EXPERIMENTAL
@@ -162,27 +162,7 @@ $transition-duration: .1s;
 
 
 // *****************************************************************
-// ************ Radii **********************************************
-// *****************************************************************
-
-// GET RID of ALL ROUND CORNERS
-//$border-radius-base: 0 !default;
-//$border-radius-large: 0 !default;
-//$border-radius-small: 0 !default;
-
-//$pager-border-radius: 0 !default;
-
-//$badge-border-radius: 0 !default;
-
-//// labels.scss uses no variable! Therefore it will be necessary
-//// to overwite in compiled.scss!!, Fixme when done more elegantly in BS
-//$label-radius: 0 !default;
-
-// GET RID of ALL ROUND CORNERS - END
-
-
-// *****************************************************************
-// ************ Border styles **************************************
+// **** B5 **** Border styles **************************************
 // *****************************************************************
 
 //$border-color: $iron !default;
@@ -197,7 +177,21 @@ $border-default-styles: 0px;
 
 
 // *****************************************************************
-// ************ Button styles **************************************
+// **** C0 **** Default anchor/link styles general *****************
+// *****************************************************************
+//$link-color: $brand-primary !default;
+//$link-hover-color: darken($link-color, 15%) !default;
+$link-text-decoration: none;
+//$link-hover-decoration: underline !default;
+//$link-on-dark-bg-color: invert($link-color) !default;
+
+//// see also '$state-link-hover-color' below
+
+//$mainbody-link-text-decoration: $link-text-decoration;
+
+
+// *****************************************************************
+// **** C5 **** Button styles **************************************
 // *****************************************************************
 
 ////// Use darker text color when default-buttons are used on white BG (new class: bth-transparent
@@ -213,17 +207,7 @@ $search-button-clip-width-sm: 75px;
 
 
 // *****************************************************************
-// ************ Badge styles ***************************************
-// *****************************************************************
-
-//// BADGES (elements in sidebar that hold the hit numbers)
-//$badge-bg: transparent !default;
-//$badge-color: $jet !default;
-//// Sidebar Badge/fa Colors
-//$sidebar-badge-fa-color: darken($brand-secondary, 40%) !default;
-
-// *****************************************************************
-// ************ Form elements **************************************
+// **** G0 **** Form elements **************************************
 // *****************************************************************
 
 //// FORM ELEMENTS
@@ -235,27 +219,7 @@ $facet-range-form-padding: 0;
 
 
 // *****************************************************************
-// ************ Accordions/Collapse elements ***********************
-// *****************************************************************
-
-//// Dropdown Background - this is used for ALL dropdowns, incl. the language selector;
-//// originally defined under BS _variables.scss, and used in _dropdowns.scss; you could use a value such as
-//// $dropdown-link-hover-color: lighten($brand-primary, 15%);
-//// $dropdown-link-hover-bg: lighten($brand-primary, 50%);
-//// Other variables include $dropdown-link-active-color; $dropdown-link-active-bg; $dropdown-link-color ...
-
-
-// *****************************************************************
-// ************ Tooltips colors ************************************
-// *****************************************************************
-
-//$tooltip-color: $snow !default;
-//$tooltip-bg: lighten($brand-primary, 20%) !default;
-//$tooltip-arrow-color: $tooltip-bg !default;
-
-
-// *****************************************************************
-// ************ Header and navbar  *********************************
+// **** K5 **** Header and navbar  *********************************
 // *****************************************************************
 
 //// Header and header elements colors
@@ -276,8 +240,9 @@ $navbar-default-padding: 20px;
 $navbar-extended-padding: calc(2 * #{$navbar-default-padding});
 //// NAVBAR - END
 
+
 // *****************************************************************
-// ************ Search box ************************************
+// **** L5 **** Search box ************************************
 // *****************************************************************
 
 // ++ Search Form
@@ -326,35 +291,91 @@ $seachbox-width-lg: 710px;
 
 
 // *****************************************************************
-// ************ Advanced Search ************************************
+// **** M5 **** Advanced Search ************************************
 // *****************************************************************
 
 $adv-search-form-X-top-margin: 31px;
 
 
 // *****************************************************************
-// ************ Breadcrumbs ****************************************
+// **** N0 **** Active filters in header ***************************
+// *****************************************************************
+
+// **** filters at adlr.link are still in the sidebar ****
+
+//// Outer container for filter names and reset button;
+//// in searchbox without squashing right-hand menu;
+//$active-filters-outer-container-display:          $content-box-display !default;
+//$active-filters-outer-container-margin-bottom:    $content-box-margin-bottom !default;
+$active-filters-outer-container-padding:          0;
+//
+//$active-filters-outer-container-border:           $content-box-border !default;
+//$active-filters-outer-container-background-color:  $content-box-background-color !default;
+//
+//
+//// Define padding of filters' container for better alignment
+//$active-filters-filter-padding-left: 0 !default;
+//
+//
+//// Variables for 'Active filters' and 'Remove all filters' in Header
+//// Use orange and black for sufficient color contrast
+//$search-filter-remove-all-color: $black !default;
+//$search-filter-remove-all-bg: $brand-warning !default;
+//$search-filter-remove-all-float: right !default;
+//
+//$search-filter-text-decoration: none !default;
+//
+//// show-all-filters-toggler
+//$search-filter-all-filters-toggle: left !default;
+//
+//// Give these the same look on focus/hover as 'Remove all'
+//$search-filter-remove-hover-bg: $search-filter-remove-all-bg !default;
+//$search-filter-remove-hover-color: $search-filter-remove-all-color !default;
+//
+//// Note: the background value in BS3 is '$list-group-active-bg' = '$component-active-bg' = '$brand-primary';
+//// we insert new value here to make it overwritable in themes
+//$search-filter-values-remove-bg: $brand-primary !default;
+//$search-filter-values-remove-color: $white !default;
+//
+//$search-filters-margin-bottom: 4px !default;
+//$search-filters-padding: .5rem 5px !default;
+//
+//
+//$search-filter-remove-button-vertical-align: middle !default;
+//$search-filter-remove-button-text-display: inline-block !default;
+//$search-filter-remove-button-text-max-width: 200px !default;
+//$search-filter-remove-button-text-overflow: hidden !default;
+//$search-filter-remove-button-text-text-overflow: ellipsis !default;
+//$search-filter-remove-button-text-white-space: nowrap !default;
+//
+//$search-filter-remove-icon: '\f00d' !default;
+//$search-filter-remove-icon-display: inline-block !default;
+//$search-filter-remove-icon-hover-color: $red !default;
+//$search-filter-remove-icon-top-margin: -2px !default;
+//$search-filter-remove-icon-vertical-align: top !default;
+//$search-filter-remove-icon-in-dropdown-distance-from-right: 1rem !default;
+//$search-filter-remove-icon-in-dropdown-padding: 0 !default;
+//$search-filter-remove-icon-in-dropdown-position: absolute !default;
+//
+//// Unset the vertical alignment from BS to align dropdowns AND indiv. buttons
+//// The relevant definition is '.searchForm .btn {vertical-align: top;}'
+//$search-filter-dropdown-button-vertical-align: unset !default;
+//$search-filter-dropdown-button-float: none !default;
+
+
+// *****************************************************************
+// **** R0 **** Sidebar elements ***********************************
 // *****************************************************************
 
-//// Breadcrumbs
-//$breadcrumb-bg: $brand-primary !default;
-//$breadcrumb-color: $btn-primary-color !default;
-//// Link color for breadcrumb .active
-//$breadcrumb-active-color: $btn-primary-color !default;
-
-//// Separator between breadcrumb elements, use this variable to change it
-//// $breadcrumb-separator: '/' !default;
-
-
-// *****************************************************************
-// ************ Sidebar elements ***********************************
-// *****************************************************************
-
-//// Sidebar item hover effect (doesn't exist in VF out-of-the-box); active is for selected facets
 $get-it-button-offset-left: 42px;
 $get-it-link-offset-left: 10px;
-//$sidebar-item-hover-bg: transparentize($brand-secondary, .9) !default;
-//$sidebar-item-active-hover-bg: transparentize($brand-primary, .1) !default;
+
+//// Sidebar item hover effect (doesn't exist in VF out-of-the-box); active is for selected facets
+$sidebar-item-hover-bg: none;
+$sidebar-item-active-hover-bg: none;
+
+$sidebar-or-facet-text-indent: 0;
+$sidebar-facet-active-text-inside-padding-left: 0;
 
 //// Sidebar item padding
 //$sidebar-item-padding: .75em 1em !default;
@@ -366,26 +387,19 @@ $get-it-link-offset-left: 10px;
 // left padding on JSTree child icon elements
 //$jstree-li-left-padding: 1.5em !default;
 
-// *****************************************************************
-// ************ Modal/lightbox *************************************
-// *****************************************************************
-
-//$modal-lg: 900px !default;
-//$modal-md: 600px !default;
-//$modal-sm: 300px !default;
-
 
 // *****************************************************************
-// ************ Pagination (results)/pager (records) ***************
+// **** P5 **** Pagination (results)/pager (records) ***************
 // *****************************************************************
 
 $pagination-flexbox-basis-20-percent: 20%;
 
 
 // *****************************************************************
-// ************ Z-Index ********************************************
+// ************ adlr additionals ***********************************
 // *****************************************************************
 
+//// Z-Index
 $z-index: (
   banner : 200,
   menubar : 350,
@@ -398,17 +412,3 @@ $z-index: (
   navigation-overlay : 400,
 );
 //// Z-Index - END
-
-// *****************************************************************
-// ************ Default anchor/link styles general *****************
-// *****************************************************************
-//$link-color: $brand-primary !default;
-//$link-hover-color: darken($link-color, 15%) !default;
-$link-text-decoration: none;
-//$link-hover-decoration: underline !default;
-//$link-on-dark-bg-color: invert($link-color) !default;
-
-//// see also '$state-link-hover-color' below
-
-//$mainbody-link-text-decoration: $link-text-decoration;
-
diff --git a/themes/fid_adlr/scss/adlr.scss b/themes/fid_adlr/scss/adlr.scss
index 4180a79adcace36d800b6db19e2138db42582553..190ef4f290e196fd44c0680e81b340d6b843fced 100644
--- a/themes/fid_adlr/scss/adlr.scss
+++ b/themes/fid_adlr/scss/adlr.scss
@@ -1,402 +1,38 @@
 @charset "utf-8";
-// New Stylesheet for fid_adlr (VF6.x up)
 
 // *****************************************************************
-// **************************** Imports ****************************
+// ************ Import fid_adlr fonts ++++++++**********************
 // *****************************************************************
 
-// Make sure imports are grouped correctly so variables can be loaded!
-// Import functions into customVariables
-@import 'customVariables';
-
-@import '../../finc/scss/finc';
-@import '../../fid/scss/compiled';
-@import 'customMixins';
-@import 'common';
-@import 'lightbox';
-@import 'components/getItBox';
-@import 'components/accordions-collapse-elements';
-@import 'components/alerts';
-@import 'components/buttons';
-@import 'components/dropdowns';
-@import 'components/forms';
-@import 'components/header-navbar';
-@import 'components/headings';
-@import 'components/home-page';
-@import 'components/media-styled-based-account-icons-and-status-colors';
-@import 'components/record';
-@import 'components/record-tabs';
-@import 'components/result-list';
-@import 'components/search';
-@import 'components/search-control-elements';
-@import 'components/sidebar';
-@import 'components/tables';
-@import 'components/footer';
-
-
-// Activate the following imports in your library's theme:
-// 1. To make bulk action buttons visible on small devices (Accessibility)
-// @import 'activate-on-demand/bulkaction-visible-xs';
-// 2. To make visited links use a different color, use the import in anchors.scss
-// 3. ..............
-
-
-// *****************************************************************
-// ********** HTML basics ******************************************
-// *****************************************************************
-// Use this section to style your document body/html
-// including top-padding to accommodate for navbar height
-
-
-// BODY
-body {
-  background-color: $white;
-  // set default font to OPEN SANS
-  font-family: $font-family-sans-serif;
-  // give central position
-  margin: 0 auto;
-  // Make sure, outer container doesn't spill over max designed content width
-  max-width: $max-designed-body-width;
-
-  overflow: hidden;
-  padding-top: 0;
-
-  // override finc 17720
-  @media (max-width: $screen-xs-max) {
-    padding-top: unset;
-  }
-
-  // no padding for advanced search
-  &.template-name-advanced {
-    padding-top: 0;
-  }
-}
-
-#content {
-  // override finc: Push content below header
-  @media (max-width: $screen-xs-max) {
-    padding-top: 0;
-  }
-}
-
-// LISTS
-
-ul {
-  list-style-type: none;
-  padding-left: 0;
-
-  li {
-    color: $asphalt;
-
-    // added active class for creating more specific selector to override in vufind6 introduced styles
-    // Hotfix - ToDo: Find more generic way for styling links in record tabs: refs #22739, refs #22776
-    .active #hierarchyTree &,
-    .active .openurls & {
-      a,
-      a:visited {
-        color: $asphalt;
-
-        &:hover {
-          color: $database-link-hover-color;
-        }
-      }
-    }
-  }
-}
-
-.worldcat .openurls {
-  ul {
-    padding-left: 1em;
-  }
-}
-
-// LISTS - END
-
-
-// LINKS
-
-a {
-  color: $black;
-  outline: none;
-  text-decoration: none;
-
-  &:focus {
-    outline: none;
-    text-decoration: underline;
-  }
-
-  &:hover {
-    text-decoration: none;
-  }
-
-  &:not(.btn):not(.search-filter-toggle):not(.text):visited {
-    .home-links &,
-    .navbar-header &,
-    .header-menu-collapse &,
-    .language & {
-      color: $white;
-    }
-
-    .navbar-header & {
-      @media (max-width: $screen-md-max) {
-        color: $azure;
-      }
-    }
-
-    .dbis_content & {
-      color: $asphalt;
-    }
-  }
-}
-
-// LINKS - END
-
+@import 'customFonts';
 
 // *****************************************************************
-// ********** Main Content Container (.main, .container, footer ...*
+// ************ Import fid_adlr Variables **************************
 // *****************************************************************
 
-.main {
-  padding-bottom: 20px;
-  padding-top: 20px;
-
-  @media (min-width: $screen-lg-min) {
-    background-image: url('../images/background-shape-left.svg'),
-    url('../images/background-shape-right.svg');
-    background-position: center left,
-    bottom right;
-    background-repeat: no-repeat;
-  }
-
-  .container {
-    background: transparent;
-    border: 0;
-    max-width: 1284px;
-
-    @media (min-width: $screen-lg-min) {
-      min-width: $main-content-container-min-width-lg;
-    }
-
-    @media (min-width: $screen-xl-min) {
-      max-width: $main-content-container-max-width-xl;
-      width: 70%;
-    }
-
-    .mainbody {
-      @media (max-width: $screen-xs-max) {
-        width: 100%;
-      }
-
-      @media (min-width: $screen-lg-min) {
-        padding-right: 70px;
-      }
-    }
-  }
-}
-
+@import 'customVariables';
 
 // *****************************************************************
-// ********** Sizing ***********************************************
+// ************ Import fid_adlr Mixins *****************************
 // *****************************************************************
 
-.flex-box-20 {
-  flex-basis: $pagination-flexbox-basis-20-percent;
-}
-
-.flex-box-40 {
-  flex-basis: calc(2 * #{$pagination-flexbox-basis-20-percent});
-}
-
-.flex-box-60 {
-  flex-basis: calc(3 * #{$pagination-flexbox-basis-20-percent});
-}
-
-.flex-box-80 {
-  flex-basis: calc(4 * #{$pagination-flexbox-basis-20-percent});
-}
-
-.flex-column-default {
-  display: -webkit-flex;
-  -webkit-flex-direction: column;
-  display: flex;
-  flex-direction: column;
-}
-
-.flex-column-reverse {
-  display: -webkit-flex;
-  -webkit-flex-direction: column-reverse;
-  display: flex;
-  flex-direction: column-reverse;
-}
-
+@import 'customMixins';
 
 // *****************************************************************
-// ********** Branding *********************************************
+// ************ Import fid Parent SCSS ****************************
 // *****************************************************************
 
-// ++ BRANDING (branding for origin source ids / specific facets and mega_collections etc.)
-// see SID103 in finc compiled.scss
-.branding {
-  color: transparent;
-  display: none;
-  font-size: 16px;
-  font-weight: 700;
-  line-height: 22px;
-  margin-left: .5em;
-  margin-top: 4px;
-  vertical-align: middle;
-
-  &.SID51 {
-    // #16177 adapt the path to get the new releases logo
-    // background: url('../../fid_adlr/images/branding/new-item-vub3.png') 0 0 no-repeat;
-    background: $midnight-light;
-    color: $azure;
-    display: inline-block;
-  }
-
-  &.SID76,
-  &.collection-UBL-FID-EBC {
-    // #16177 adapt the path to get the 'adlr ebooks' logo
-    // FIXME set correct logo
-    background: $midnight-light;
-    color: $azure;
-    display: inline-block;
-  }
-
-  &.SID78 {
-    // #16177 adapt the path to get the IZI database logo
-    background: url('../../fid_adlr/images/branding/izi-database.png') 0 0 no-repeat;
-    background-size: 100%;
-    display: inline-block;
-    height: em(40px);
-    margin-top: 12px;
-    width: em(150px);
-  }
-
-  &.SID103 {
-    // #16177 adapt the path to get the Margaret-Herrick-Library logo
-    background: url('../../fid_adlr/images/branding/herrick-library.png') 0 0 no-repeat;
-    background-size: 100%;
-    display: inline-block;
-    height: 27px;
-    margin-top: 10px;
-    width: 230px;
-  }
-
-  &.facet-free {
-    // #16177 adapt the path to get the Open Access logo
-    // background: url('../../fid_adlr/images/branding/open-access-logo.svg') 0 0 no-repeat;
-    background: $midnight-light;
-    color: $azure;
-    display: inline-block;
-  }
-
-  &.collection-verbundkatalog-film {
-    // #16177 adapt the path to get the verbundkatalog film logo
-    // background: url('../../fid_adlr/images/branding/verbundkatalog-film.png') 0 0 no-repeat;
-    background: $midnight-light;
-    color: $azure;
-    display: inline-block;
-  }
-}
-
+//fixme: find out if fid-scss is still needed; if not load finc-scss directly
+@import '../../fid/scss/compiled';
 
 // *****************************************************************
-// ********** ADLR specific content (licenses, dbis, boss) *********
+// ************ Import fid_adlr common styles **********************
 // *****************************************************************
 
-.main {
-  .licenses > li > a::before {
-    content: '\e913';
-    font-family: icomoon, sans-serif;
-    font-style: normal;
-    font-variant: normal;
-    font-weight: 400;
-    line-height: 1;
-    padding-right: 5px;
-  }
-
-  .dbis_content {
-    ul > li {
-      list-style: none;
-
-      span {
-        padding-right: .5em;
-      }
-    }
-
-    span[class^='dbis-list-accessinfo-access_']::after {
-      content: '\e913';
-      font-family: icomoon, sans-serif;
-      font-style: normal;
-      font-variant: normal;
-      font-weight: 400;
-      line-height: 1;
-      padding-left: 10px;
-    }
-  }
-
-  .dbis_description {
-    @include accordeon(false);
-
-    p {
-      margin: 1em;
-    }
-
-    .title {
-      -webkit-appearance: button;
-      background-color: transparent;
-      border: 0;
-      border-right-width: 1px;
-      color: $azure;
-      display: block;
-      font-family: $font-family-monospace;
-      font-weight: 700;
-      line-height: 1.5rem;
-      padding: .75em 1em;
-      text-align: inherit;
-      text-transform: uppercase;
-      width: 100%;
-
-      &::after {
-        float: right;
-      }
-    }
-  }
-}
-
-// Boss-Module
-.boss-networknotice {
-  @include default-border($black);
-  padding: 12px;
-}
-
-// #17031 user tracking opt-out (iframe) - RL
-#piwk {
-  border: 0;
-  min-height: 250px;
-  width: 100%;
-
-  @media (min-width: $screen-lg-min) {
-    min-height: unset;
-  }
-}
+@import 'customTheme';
 
 // *****************************************************************
-// ********** view specific styling ********************************
+// ************ Import fid_adlr components *************************
 // *****************************************************************
 
-// Records Home view - linked via e-mail #22843
-// hide background, hide offcanvas-toggler (empty sitebar) #22843
-.template-dir-records.template-name-home {
-  .main {
-    &,
-    header {
-      background-image: none;
-    }
-
-    .offcanvas-toggler {
-      display: none;
-    }
-  }
-}
+@import 'customComponents';
\ No newline at end of file
diff --git a/themes/fid_adlr/scss/_lightbox.scss b/themes/fid_adlr/scss/components/_lightbox.scss
similarity index 100%
rename from themes/fid_adlr/scss/_lightbox.scss
rename to themes/fid_adlr/scss/components/_lightbox.scss
diff --git a/themes/fid_adlr/scss/components/_sidebar.scss b/themes/fid_adlr/scss/components/_sidebar.scss
index 7e554e820315ee4bc4111dfc176e31ac82980b2d..70ee4773cc5b5a1385d76bc5c97bb210fc890488 100644
--- a/themes/fid_adlr/scss/components/_sidebar.scss
+++ b/themes/fid_adlr/scss/components/_sidebar.scss
@@ -102,6 +102,7 @@
 
     margin-top: 1em;
 
+    .title,
     .facet,
     .facet:not(.btn):not(.search-filter-toggle):not(.text):visited {
       background-color: transparent;
diff --git a/themes/fid_adlr/scss/_iconcategory.scss b/themes/fid_adlr/scss/icons/_iconcategory.scss
similarity index 100%
rename from themes/fid_adlr/scss/_iconcategory.scss
rename to themes/fid_adlr/scss/icons/_iconcategory.scss
diff --git a/themes/fid_adlr/scss/_iconfont.scss b/themes/fid_adlr/scss/icons/_iconfont.scss
similarity index 100%
rename from themes/fid_adlr/scss/_iconfont.scss
rename to themes/fid_adlr/scss/icons/_iconfont.scss