diff --git a/src/app/pages/dashboard/usersMap/usersMap.service.ts b/src/app/pages/dashboard/usersMap/usersMap.service.ts
index ea1856bd..42b9460c 100644
--- a/src/app/pages/dashboard/usersMap/usersMap.service.ts
+++ b/src/app/pages/dashboard/usersMap/usersMap.service.ts
@@ -1,98 +1,103 @@
 import {Injectable} from '@angular/core';
-import {layoutColors, layoutPaths} from '../../../theme';
+import {BaThemeConfigProvider, layoutPaths} from '../../../theme';
 
 @Injectable()
 export class UsersMapService {
 
-  private _data = {
-    type: 'map',
-    theme: 'blur',
-    zoomControl: { zoomControlEnabled: false, panControlEnabled: false },
-
-    dataProvider: {
-      map: 'worldLow',
-      zoomLevel: 3.5,
-      zoomLongitude: 10,
-      zoomLatitude: 52,
-      areas: [
-        { title: 'Austria', id: 'AT', color: layoutColors.primary, customData: '1 244', groupId: '1'},
-        { title: 'Ireland', id: 'IE', color: layoutColors.primary, customData: '1 342', groupId: '1'},
-        { title: 'Denmark', id: 'DK', color: layoutColors.primary, customData: '1 973', groupId: '1'},
-        { title: 'Finland', id: 'FI', color: layoutColors.primary, customData: '1 573', groupId: '1'},
-        { title: 'Sweden', id: 'SE', color: layoutColors.primary, customData: '1 084', groupId: '1'},
-        { title: 'Great Britain', id: 'GB', color: layoutColors.primary, customData: '1 452', groupId: '1'},
-        { title: 'Italy', id: 'IT', color: layoutColors.primary, customData: '1 321', groupId: '1'},
-        { title: 'France', id: 'FR', color: layoutColors.primary, customData: '1 112', groupId: '1'},
-        { title: 'Spain', id: 'ES', color: layoutColors.primary, customData: '1 865', groupId: '1'},
-        { title: 'Greece', id: 'GR', color: layoutColors.primary, customData: '1 453', groupId: '1'},
-        { title: 'Germany', id: 'DE', color: layoutColors.primary, customData: '1 957', groupId: '1'},
-        { title: 'Belgium', id: 'BE', color: layoutColors.primary, customData: '1 011', groupId: '1'},
-        { title: 'Luxembourg', id: 'LU', color: layoutColors.primary, customData: '1 011', groupId: '1'},
-        { title: 'Netherlands', id: 'NL', color: layoutColors.primary, customData: '1 213', groupId: '1'},
-        { title: 'Portugal', id: 'PT', color: layoutColors.primary, customData: '1 291', groupId: '1'},
-        { title: 'Lithuania', id: 'LT', color: layoutColors.successLight, customData: '567', groupId: '2'},
-        { title: 'Latvia', id: 'LV', color: layoutColors.successLight, customData: '589', groupId: '2'},
-        { title: 'Czech Republic ', id: 'CZ', color: layoutColors.successLight, customData: '785', groupId: '2'},
-        { title: 'Slovakia', id: 'SK', color: layoutColors.successLight, customData: '965', groupId: '2'},
-        { title: 'Estonia', id: 'EE', color: layoutColors.successLight, customData: '685', groupId: '2'},
-        { title: 'Hungary', id: 'HU', color: layoutColors.successLight, customData: '854', groupId: '2'},
-        { title: 'Cyprus', id: 'CY', color: layoutColors.successLight, customData: '754', groupId: '2'},
-        { title: 'Malta', id: 'MT', color: layoutColors.successLight, customData: '867', groupId: '2'},
-        { title: 'Poland', id: 'PL', color: layoutColors.successLight, customData: '759', groupId: '2'},
-        { title: 'Romania', id: 'RO', color: layoutColors.success, customData: '302', groupId: '3'},
-        { title: 'Bulgaria', id: 'BG', color: layoutColors.success, customData: '102', groupId: '3'},
-        { title: 'Slovenia', id: 'SI', color: layoutColors.danger, customData: '23', groupId: '4'},
-        { title: 'Croatia', id: 'HR', color: layoutColors.danger, customData: '96', groupId: '4'}
-      ]
-    },
-
-    areasSettings: {
-      rollOverOutlineColor: '#FFFFFF',
-      rollOverColor: layoutColors.primaryDark,
-      alpha: 0.8,
-      unlistedAreasAlpha: 0.1,
-      balloonText: '[[title]]: [[customData]] users'
-    },
-    
-    legend: {
-      width: '100%',
-      marginRight: 27,
-      marginLeft: 27,
-      equalWidths: false,
-      backgroundAlpha: 0.5,
-      backgroundColor: '#FFFFFF',
-      borderColor: '#ffffff',
-      borderAlpha: 1,
-      top: 362,
-      left: 0,
-      horizontalGap: 10,
-      data: [
-        {
-          title: 'over 1 000 users',
-          color: layoutColors.primary
-        },
-        {
-          title: '500 - 1 000 users',
-          color: layoutColors.successLight
-        },
-        {
-          title: '100 - 500 users',
-          color: layoutColors.success
-        },
-        {
-          title: '0 - 100 users',
-          color: layoutColors.danger
-        }
-      ]
-    },
-    export: {
-      enabled: true
-    },
-    creditsPosition: 'bottom-right',
-    pathToImages: layoutPaths.images.amChart
-  };
+  constructor(private _baConfig:BaThemeConfigProvider) {
+  }
 
   getData() {
-    return this._data;
+    var layoutColors = this._baConfig.get().colors;
+
+    return {
+      type: 'map',
+      theme: 'blur',
+      zoomControl: { zoomControlEnabled: false, panControlEnabled: false },
+
+      dataProvider: {
+        map: 'worldLow',
+        zoomLevel: 3.5,
+        zoomLongitude: 10,
+        zoomLatitude: 52,
+        areas: [
+          { title: 'Austria', id: 'AT', color: layoutColors.primary, customData: '1 244', groupId: '1'},
+          { title: 'Ireland', id: 'IE', color: layoutColors.primary, customData: '1 342', groupId: '1'},
+          { title: 'Denmark', id: 'DK', color: layoutColors.primary, customData: '1 973', groupId: '1'},
+          { title: 'Finland', id: 'FI', color: layoutColors.primary, customData: '1 573', groupId: '1'},
+          { title: 'Sweden', id: 'SE', color: layoutColors.primary, customData: '1 084', groupId: '1'},
+          { title: 'Great Britain', id: 'GB', color: layoutColors.primary, customData: '1 452', groupId: '1'},
+          { title: 'Italy', id: 'IT', color: layoutColors.primary, customData: '1 321', groupId: '1'},
+          { title: 'France', id: 'FR', color: layoutColors.primary, customData: '1 112', groupId: '1'},
+          { title: 'Spain', id: 'ES', color: layoutColors.primary, customData: '1 865', groupId: '1'},
+          { title: 'Greece', id: 'GR', color: layoutColors.primary, customData: '1 453', groupId: '1'},
+          { title: 'Germany', id: 'DE', color: layoutColors.primary, customData: '1 957', groupId: '1'},
+          { title: 'Belgium', id: 'BE', color: layoutColors.primary, customData: '1 011', groupId: '1'},
+          { title: 'Luxembourg', id: 'LU', color: layoutColors.primary, customData: '1 011', groupId: '1'},
+          { title: 'Netherlands', id: 'NL', color: layoutColors.primary, customData: '1 213', groupId: '1'},
+          { title: 'Portugal', id: 'PT', color: layoutColors.primary, customData: '1 291', groupId: '1'},
+          { title: 'Lithuania', id: 'LT', color: layoutColors.successLight, customData: '567', groupId: '2'},
+          { title: 'Latvia', id: 'LV', color: layoutColors.successLight, customData: '589', groupId: '2'},
+          { title: 'Czech Republic ', id: 'CZ', color: layoutColors.successLight, customData: '785', groupId: '2'},
+          { title: 'Slovakia', id: 'SK', color: layoutColors.successLight, customData: '965', groupId: '2'},
+          { title: 'Estonia', id: 'EE', color: layoutColors.successLight, customData: '685', groupId: '2'},
+          { title: 'Hungary', id: 'HU', color: layoutColors.successLight, customData: '854', groupId: '2'},
+          { title: 'Cyprus', id: 'CY', color: layoutColors.successLight, customData: '754', groupId: '2'},
+          { title: 'Malta', id: 'MT', color: layoutColors.successLight, customData: '867', groupId: '2'},
+          { title: 'Poland', id: 'PL', color: layoutColors.successLight, customData: '759', groupId: '2'},
+          { title: 'Romania', id: 'RO', color: layoutColors.success, customData: '302', groupId: '3'},
+          { title: 'Bulgaria', id: 'BG', color: layoutColors.success, customData: '102', groupId: '3'},
+          { title: 'Slovenia', id: 'SI', color: layoutColors.danger, customData: '23', groupId: '4'},
+          { title: 'Croatia', id: 'HR', color: layoutColors.danger, customData: '96', groupId: '4'}
+        ]
+      },
+
+      areasSettings: {
+        rollOverOutlineColor: layoutColors.border,
+        rollOverColor: layoutColors.primaryDark,
+        alpha: 0.8,
+        unlistedAreasAlpha: 0.2,
+        unlistedAreasColor: layoutColors.defaultText,
+        balloonText: '[[title]]: [[customData]] users'
+      },
+
+
+      legend: {
+        width: '100%',
+        marginRight: 27,
+        marginLeft: 27,
+        equalWidths: false,
+        backgroundAlpha: 0.3,
+        backgroundColor: layoutColors.border,
+        borderColor: layoutColors.border,
+        borderAlpha: 1,
+        top: 362,
+        left: 0,
+        horizontalGap: 10,
+        data: [
+          {
+            title: 'over 1 000 users',
+            color: layoutColors.primary
+          },
+          {
+            title: '500 - 1 000 users',
+            color: layoutColors.successLight
+          },
+          {
+            title: '100 - 500 users',
+            color: layoutColors.success
+          },
+          {
+            title: '0 - 100 users',
+            color: layoutColors.danger
+          }
+        ]
+      },
+      export: {
+        enabled: true
+      },
+      creditsPosition: 'bottom-right',
+      pathToImages: layoutPaths.images.amChart
+    };
   }
 }