diff --git a/config/webpack.common.js b/config/webpack.common.js
index 0d2c3fe3..d08d967c 100644
--- a/config/webpack.common.js
+++ b/config/webpack.common.js
@@ -138,11 +138,11 @@ module.exports = {
       },
 
       {
-        test: /\.woff(2)?(\?v=.+)?$/, loader: "url-loader?limit=10000&mimetype=application/font-woff"
+        test: /\.woff(2)?(\?v=.+)?$/, loader: 'url-loader?limit=10000&mimetype=application/font-woff'
       },
 
       {
-        test: /\.(ttf|eot|svg)(\?v=.+)?$/, loader: "file-loader"
+        test: /\.(ttf|eot|svg)(\?v=.+)?$/, loader: 'file-loader'
       },
 
       {
@@ -239,15 +239,8 @@ module.exports = {
       jQuery: 'jquery',
       $: 'jquery',
       jquery: 'jquery',
-      "Tether": 'tether',
-      "window.Tether": "tether",
-      "GoogleMapsLoader": "google-maps",
-      "L": "leaflet",
-      "Chart": "chart.js",
-      "Chartist": "chartist",
-      "fullcalendar": "fullcalendar",
-      "moment": "moment",
-      "EasyPieChart": "easy-pie-chart"
+      'Tether': 'tether',
+      'window.Tether': 'tether'
     })
   ],
 
diff --git a/src/app/pages/charts/components/chartistJs/chartistJs.service.ts b/src/app/pages/charts/components/chartistJs/chartistJs.service.ts
index 1a3f661d..3c1eba63 100644
--- a/src/app/pages/charts/components/chartistJs/chartistJs.service.ts
+++ b/src/app/pages/charts/components/chartistJs/chartistJs.service.ts
@@ -99,7 +99,7 @@ export class ChartistJsService {
         reverseData: true,
         horizontalBars: true,
         axisX: {
-          labelInterpolationFnc: Chartist.noop
+          labelInterpolationFnc: (n) => n
         },
         axisY: {
           offset: 60
diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.component.ts b/src/app/pages/dashboard/trafficChart/trafficChart.component.ts
index 6f484652..18813e42 100644
--- a/src/app/pages/dashboard/trafficChart/trafficChart.component.ts
+++ b/src/app/pages/dashboard/trafficChart/trafficChart.component.ts
@@ -1,6 +1,6 @@
 import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
 
-import './trafficChart.loader.ts';
+import {Chart} from './trafficChart.loader.ts';
 import {TrafficChartService} from './trafficChart.service';
 
 @Component({
diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.loader.ts b/src/app/pages/dashboard/trafficChart/trafficChart.loader.ts
index 0ffb6de0..b1f1fcd4 100644
--- a/src/app/pages/dashboard/trafficChart/trafficChart.loader.ts
+++ b/src/app/pages/dashboard/trafficChart/trafficChart.loader.ts
@@ -1 +1 @@
-require('chart.js');
+export const Chart = require('chart.js');
diff --git a/src/app/pages/maps/components/googleMaps/googleMaps.component.ts b/src/app/pages/maps/components/googleMaps/googleMaps.component.ts
index 21bf8bb9..3be34051 100644
--- a/src/app/pages/maps/components/googleMaps/googleMaps.component.ts
+++ b/src/app/pages/maps/components/googleMaps/googleMaps.component.ts
@@ -1,5 +1,6 @@
-import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
+import {Component, ElementRef} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
+import {GoogleMapsLoader} from './googleMaps.loader';
 
 @Component({
   selector: 'google-maps',
diff --git a/src/app/pages/maps/components/googleMaps/googleMaps.loader.ts b/src/app/pages/maps/components/googleMaps/googleMaps.loader.ts
new file mode 100644
index 00000000..4ddd34d0
--- /dev/null
+++ b/src/app/pages/maps/components/googleMaps/googleMaps.loader.ts
@@ -0,0 +1 @@
+export const GoogleMapsLoader = require('google-maps');
diff --git a/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts b/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts
index 13a49dc0..aeca36cf 100644
--- a/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts
+++ b/src/app/pages/maps/components/leafletMaps/leafletMaps.component.ts
@@ -1,13 +1,14 @@
 import {Component, ViewEncapsulation, ElementRef} from '@angular/core';
 import {BaCard} from '../../../../theme/components';
 
+import './leafletMaps.loader';
+
 @Component({
   selector: 'leaflet-maps',
   pipes: [],
   providers: [],
-  // otherwise maps won't work
   encapsulation: ViewEncapsulation.None,
-  styles: [require('leaflet/dist/leaflet.css'), require('./leafletMaps.scss')],
+  styles: [require('./leafletMaps.scss')],
   directives: [BaCard],
   template: require('./leafletMaps.html'),
 })
diff --git a/src/app/pages/maps/components/leafletMaps/leafletMaps.loader.ts b/src/app/pages/maps/components/leafletMaps/leafletMaps.loader.ts
new file mode 100644
index 00000000..2ad06ae3
--- /dev/null
+++ b/src/app/pages/maps/components/leafletMaps/leafletMaps.loader.ts
@@ -0,0 +1,2 @@
+require('leaflet-map');
+require('style-loader!leaflet/dist/leaflet.css');
diff --git a/src/app/theme/components/baChartistChart/baChartistChart.component.ts b/src/app/theme/components/baChartistChart/baChartistChart.component.ts
index 3ef87dbd..5492ff85 100644
--- a/src/app/theme/components/baChartistChart/baChartistChart.component.ts
+++ b/src/app/theme/components/baChartistChart/baChartistChart.component.ts
@@ -1,5 +1,7 @@
 import {Component, ViewEncapsulation, Input, Output, ElementRef, EventEmitter} from '@angular/core';
 
+import {Chartist} from './baChartistChart.loader.ts';
+
 @Component({
   selector: 'ba-chartist-chart',
   encapsulation: ViewEncapsulation.None,
diff --git a/src/app/theme/components/baChartistChart/baChartistChart.loader.ts b/src/app/theme/components/baChartistChart/baChartistChart.loader.ts
index 8b137891..92856c1c 100644
--- a/src/app/theme/components/baChartistChart/baChartistChart.loader.ts
+++ b/src/app/theme/components/baChartistChart/baChartistChart.loader.ts
@@ -1 +1 @@
-
+export const Chartist = require('chartist');