diff --git a/src/app/app-header/app-header.component.scss b/src/app/app-header/app-header.component.scss
index 340be75..c67c470 100644
--- a/src/app/app-header/app-header.component.scss
+++ b/src/app/app-header/app-header.component.scss
@@ -1,4 +1,4 @@
-@import "../../_active/common";
+@import "src/styles/common";
 
 .navbar-collapse:not(.show) {
   justify-content: flex-end;
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 1d37670..a8713d6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -38,20 +38,20 @@ const ROUTE_PREFIX: string = 'ROUTES.';
 
 export const appInitializerFn = (appConfig: AppConfigService) => {
   return () => {
-     return appConfig.loadFromPromise(import(/* webpackMode: "eager" */ `../themes/_active/assets/config.json`));
+     return appConfig.loadFromPromise(import(/* webpackMode: "eager" */ `../assets/config.json`));
   };
 };
 
 export class WebpackTranslateLoader implements TranslateLoader {
   getTranslation(lang: string): Observable<any> {
-    return from(import(/* webpackMode: "eager" */ `../themes/_active/assets/i18n/${lang}.json`));
+    return from(import(/* webpackMode: "eager" */ `../assets/i18n/${lang}.json`));
   }
 }
 
 export class WebpackLocalizeRouterLoader extends LocalizeParser {
   load(routes: Routes): Promise<any> {
     return new Promise(resolve => {
-      import(/* webpackMode: "eager" */ `../themes/_active/assets/locales.json`).then(data => {
+      import(/* webpackMode: "eager" */ `../assets/locales.json`).then(data => {
         let config = <ILocalizeRouterParserConfig>(<any>data);
         this.locales = config.locales;
         this.prefix = config.prefix || '';
diff --git a/src/app/search/advanced-search.component.scss b/src/app/search/advanced-search.component.scss
index cfee4f4..6588571 100644
--- a/src/app/search/advanced-search.component.scss
+++ b/src/app/search/advanced-search.component.scss
@@ -1 +1 @@
-@import '../common';
+@import 'src/styles/common';
diff --git a/src/app/search/filters.component.scss b/src/app/search/filters.component.scss
index 2580801..8167a50 100644
--- a/src/app/search/filters.component.scss
+++ b/src/app/search/filters.component.scss
@@ -1,4 +1,4 @@
-@import "../common";
+@import "src/styles/common";
 
 .filter-item {
   cursor: pointer;
diff --git a/src/app/search/input.component.scss b/src/app/search/input.component.scss
index ee8b74b..931ea06 100644
--- a/src/app/search/input.component.scss
+++ b/src/app/search/input.component.scss
@@ -1,4 +1,4 @@
-@import '../common';
+@import 'src/styles/common';
 
 $input-border-color: lighten(rgba(theme-color(primary), 0.8), 10%);
 $input-border-active: #5c8de6;
diff --git a/src/app/shared/components/select/select.component.scss b/src/app/shared/components/select/select.component.scss
index cfee4f4..6588571 100644
--- a/src/app/shared/components/select/select.component.scss
+++ b/src/app/shared/components/select/select.component.scss
@@ -1 +1 @@
-@import '../common';
+@import 'src/styles/common';
diff --git a/src/app/timeline/timeline.scss b/src/app/timeline/timeline.scss
index 7eb807b..d7d903b 100644
--- a/src/app/timeline/timeline.scss
+++ b/src/app/timeline/timeline.scss
@@ -1,4 +1,4 @@
-@import '../common';
+@import 'src/styles/common';
 
 $timeline-border-color: $card-border-color;
 $timeline-border: 1px solid $timeline-border-color;
diff --git a/src/assets/map.png b/src/assets/map.png
index 48d7018..eaa4d82 100644
Binary files a/src/assets/map.png and b/src/assets/map.png differ
diff --git a/src/styles/_bootstrap.scss b/src/styles/_bootstrap.scss
index 0426af2..fbd7e77 100644
--- a/src/styles/_bootstrap.scss
+++ b/src/styles/_bootstrap.scss
@@ -1,13 +1,11 @@
 // replace me in your custom theme directory if you
 // use a separate module to provide bootstrap CSS
 
-@import "../_active/bootstrap.override";
-
-@import "../../../node_modules/bootstrap/scss/bootstrap";
+@import "./bootstrap.override";
+@import "../../node_modules/bootstrap/scss/bootstrap";
+@import "../../node_modules/font-awesome/scss/font-awesome";
 
 $fa-font-path: "../../../node_modules/font-awesome/fonts/";
-@import "../../../node_modules/font-awesome/scss/font-awesome";
-
 
 // Option to keep footer at the bottom of the page
 @each $breakpoint in map-keys($grid-breakpoints) {
diff --git a/src/styles/_common.scss b/src/styles/_common.scss
index 800c559..dce8b7c 100644
--- a/src/styles/_common.scss
+++ b/src/styles/_common.scss
@@ -1,6 +1,6 @@
 // define variables and functions for use by isolated components
 
-@import '../_active/bootstrap.override';
-@import '../../../node_modules/bootstrap/scss/functions';
-@import '../../../node_modules/bootstrap/scss/variables';
-@import '../../../node_modules/bootstrap/scss/mixins';
+@import './bootstrap.override';
+@import '../../node_modules/bootstrap/scss/functions';
+@import '../../node_modules/bootstrap/scss/variables';
+@import '../../node_modules/bootstrap/scss/mixins';