diff --git a/build/copy-libs.js b/build/copy-libs.js
index 27055c2ac90147eec711c2434fca19b647dbd986..f4e6525ccd4dd864c11c706986c5de51f32f6c82 100755
--- a/build/copy-libs.js
+++ b/build/copy-libs.js
@@ -2,7 +2,9 @@ const libs = require('../pages/_data/libs'),
   path = require('path'),
   { exec } = require('child_process');
 
-libs.forEach(function (lib) {
+const all_libs = libs.js.concat(libs.css);
+
+all_libs.forEach(function (lib) {
   let dirname = path.dirname(lib);
   let cmd = `mkdir -p "dist/libs/${dirname}" && cp -r node_modules/${lib} dist/libs/${lib}`;
   exec(cmd)
diff --git a/js/tabler.js b/js/tabler.js
index 0942a6762a21d1bbea3fcc293ca12c8679161146..e3e0914c8d5dbc42bcc8418296d0d761465e8760 100644
--- a/js/tabler.js
+++ b/js/tabler.js
@@ -134,7 +134,6 @@ $(document).ready(function() {
     (function() {
       const elements = document.querySelectorAll('[data-toggle="autosize"]');
 
-      console.log('elements.length', elements.length);
       if (elements.length) {
         elements.forEach(function(element) {
           console.log('1', element);
diff --git a/package.json b/package.json
index 5b3c8fb20b0abc45ae950a7336bff599dce9bd86..44ada661d8cb3588858be46d64aa8b9103b4ff6b 100644
--- a/package.json
+++ b/package.json
@@ -65,16 +65,16 @@
     "clean-css-cli": "4.3.0",
     "cross-env": "6.0.3",
     "eslint": "6.5.1",
-    "eslint-config-xo": "0.27.1",
+    "eslint-config-xo": "0.27.2",
     "eslint-plugin-import": "2.18.2",
     "eslint-plugin-unicorn": "12.1.0",
     "http-server": "0.11.1",
     "icon-font-generator": "2.1.10",
     "node-sass": "4.12.0",
-    "nodemon": "1.19.3",
+    "nodemon": "1.19.4",
     "npm-run-all": "4.1.5",
     "postcss-cli": "6.1.3",
-    "rollup": "1.24.0",
+    "rollup": "1.25.1",
     "rollup-plugin-babel": "4.3.3",
     "rollup-plugin-babel-minify": "9.1.0",
     "rollup-plugin-commonjs": "10.1.0",
@@ -94,8 +94,8 @@
     "bootstrap": "twbs/bootstrap#8d56c19",
     "imask": "5.2.1",
     "jquery": "3.4.1",
+    "jqvmap": "1.5.1",
     "peity": "3.3.0",
-    "popper.js": "1.15.0",
     "selectize": "0.12.6"
   },
   "bundlesize": [
diff --git a/pages/_data/libs.json b/pages/_data/libs.json
index 4e1b409b1f5cd418acab613e29ead8beef4e277f..296b41f79a1af1b216e103c6396102ae63f9bb9d 100644
--- a/pages/_data/libs.json
+++ b/pages/_data/libs.json
@@ -1,9 +1,19 @@
-[
-  "jquery/dist/jquery.min.js",
-  "bootstrap/dist/js/bootstrap.bundle.min.js",
-  "autosize/dist/autosize.min.js",
-  "imask/dist/imask.min.js",
-  "selectize/dist/js/standalone/selectize.min.js",
-  "apexcharts/dist/apexcharts.min.js",
-  "peity/jquery.peity.min.js"
-]
+{
+  "js": [
+    "jquery/dist/jquery.min.js",
+    "bootstrap/dist/js/bootstrap.bundle.min.js",
+    "autosize/dist/autosize.min.js",
+    "imask/dist/imask.min.js",
+
+    "selectize/dist/js/standalone/selectize.min.js",
+    "apexcharts/dist/apexcharts.min.js",
+    "jqvmap/dist/jquery.vmap.min.js",
+    "jqvmap/dist/maps/jquery.vmap.world.js",
+    "jqvmap/dist/maps/jquery.vmap.usa.js",
+    "jqvmap/dist/maps/continents/jquery.vmap.europe.js",
+    "peity/jquery.peity.min.js"
+  ],
+  "css": [
+    "jqvmap/dist/jqvmap.min.css"
+  ]
+}
diff --git a/pages/_data/maps.yml b/pages/_data/maps.yml
index 92aaf601ef4e6036cfd133a22887a7f8aad331bc..b74c2aaead039fd9b8dfeeb7d695dbf8850b75a6 100644
--- a/pages/_data/maps.yml
+++ b/pages/_data/maps.yml
@@ -1,23 +1,12 @@
 world:
-  map: "world_en"
-  backgroundColor: 'transparent'
-  borderColor: '#ffffff'
-  borderWidth: 0.25
-  borderOpacity: 0.25
-  color: 'rgba(120,130,140, 0.1)'
-  enableZoom: false
-  showTooltip: true
-  selectedColor: null
-  hoverColor: 'red'
+  title: World map
+  map: world_en
 
-france:
-  map: 'france_fr'
-  backgroundColor: 'transparent'
-  borderColor: '#ffffff'
-  borderWidth: 0.25
-  borderOpacity: 0.25
-  color: 'rgba(120,130,140, 0.1)'
-  enableZoom: false
-  showTooltip: true
-  selectedColor: null
-  hoverColor: null
\ No newline at end of file
+europe:
+  title: Map of Europe
+  map: europe_en
+  zoom: true
+
+usa:
+  title: Map of USA
+  map: usa_en
diff --git a/pages/_includes/js/maps.html b/pages/_includes/js/maps.html
index c01fd575d495b178dad2772e0b7427e50dba0bcf..6feb3ef77d89eb247a09c98f9c43fd28c624da4d 100644
--- a/pages/_includes/js/maps.html
+++ b/pages/_includes/js/maps.html
@@ -1,20 +1,9 @@
 <script>
 	$(document).ready(function () {
-		$(`#{{ include.id }}`).each(function () {
-			$(this).vectorMap(
-				{
-					map: `{{ include.data[1].map }}`,
-					backgroundColor: `{{ include.data[1].backgroundColor }}`,
-					borderColor: `{{ include.data[1].borderColor }}`,
-					borderWidth: `{{ include.data[1].borderWidth }}`,
-					borderOpacity: `{{ include.data[1].borderOpacity }}`,
-					color: `{{ include.data[1].color}}`,
-					enableZoom: `{{ include.data[1].enableZoom}}`,
-					showTooltip: `{{ include.data[1].showTooltip}}`,
-					selectedColor: `{{ include.data[1].selectedColor}}`,
-					hoverColor: `{{ include.data[1].hoverColor}}`
-				}
-			);
+		$('#{{ include.id }}').each(function () {
+			$(this).vectorMap({
+				map: '{{ include.data[1].map }}'
+			});
 		});
 	})
-</script>
\ No newline at end of file
+</script>
diff --git a/pages/_includes/layout/css.html b/pages/_includes/layout/css.html
index 6949987e98e1fd7d917647f770402a26d731c4ed..dc681ccf74ecc2d3a6d206dfae96a0ea45524e63 100644
--- a/pages/_includes/layout/css.html
+++ b/pages/_includes/layout/css.html
@@ -1,3 +1,13 @@
+{% if site.data.libs %}
+<!-- Libs CSS -->
+{% for lib in site.data.libs.css %}
+<link href="{{ site.base }}/{% if jekyll.environment == 'production' %}dist/libs{% else %}node_modules{% endif %}/{{ lib }}?{{ site.time | date: '%s' }}" rel="stylesheet" />
+{% endfor %}
+{% endif %}
+
+<!-- Tabler Core -->
 <link href="{{ site.base }}/dist/css/tabler.css?{{ site.time | date: '%s' }}" rel="stylesheet" />
+
+<!-- Tabler Plugins -->
 <link href="{{ site.base }}/dist/css/tabler-flags.css?{{ site.time | date: '%s' }}" rel="stylesheet" />
 <link href="{{ site.base }}/dist/css/tabler-charts.css?{{ site.time | date: '%s' }}" rel="stylesheet" />
diff --git a/pages/_includes/layout/js.html b/pages/_includes/layout/js.html
index 8912b13bca8c644d0906ae5e72c921d0a44657f1..928740860aa4c9e80aec1682b3e3d1b2d47f8ee7 100644
--- a/pages/_includes/layout/js.html
+++ b/pages/_includes/layout/js.html
@@ -4,15 +4,15 @@
 	};
 </script>
 
-<!-- Libs JS -->
-{% for lib in site.data.libs %}
-<script src="{{ site.base }}/{% if jekyll.environment == 'production' %}dist/libs{% else %}node_modules{% endif %}/{{ lib }}?{{ site.time | date: '%s' }}"></script>
-{% endfor %}
+{% if site.data.libs %}
+   <!-- Libs JS -->
+   {% for lib in site.data.libs.js %}
+   <script src="{{ site.base }}/{% if jekyll.environment == 'production' %}dist/libs{% else %}node_modules{% endif %}/{{ lib }}?{{ site.time | date: '%s' }}"></script>
+   {% endfor %}
+{% endif %}
 
 <!-- Tabler Core -->
 <script src="{{ site.base }}/dist/js/tabler{% if jekyll.environment == 'production' %}.min{% endif %}.js?{{ site.time | date: '%s' }}"></script>
 
 <!-- Tabler Plugins -->
 <script src="{{ site.base }}/dist/js/tabler-charts{% if jekyll.environment == 'production' %}.min{% endif %}.js?{{ site.time | date: '%s' }}"></script>
-
-
diff --git a/pages/_includes/ui/map.html b/pages/_includes/ui/map.html
new file mode 100644
index 0000000000000000000000000000000000000000..d2cc5cc03a16955157c15051bce1883c312483a9
--- /dev/null
+++ b/pages/_includes/ui/map.html
@@ -0,0 +1,18 @@
+{% assign id = include.map %}
+{% assign height = include.height | default: 20 %}
+{% assign data = site.data.maps[id] %}
+
+{% if data %}
+<div id="map-{{ id }}" style="height: {{ height }}rem"></div>
+<script>
+	$(document).ready(function () {
+		$('#map-{{ id }}').vectorMap({
+			map: '{{ data.map }}',
+			backgroundColor: 'transparent',
+			color: 'rgba(120, 130, 140, .1)',
+		  borderColor: 'transparent'
+			{% if data.zoom %}enableZoom: true,{% endif %}
+		});
+	});
+</script>
+{% endif %}
diff --git a/pages/_layouts/base.html b/pages/_layouts/base.html
index 4455d01d0ef6488c2e27b80e108bb7a4fdf92145..67724577a1e27a4dff59748a68cba9eea19e3bcf 100644
--- a/pages/_layouts/base.html
+++ b/pages/_layouts/base.html
@@ -26,9 +26,11 @@
    <meta name="description" content="{{ page.description | escape }}"/>
    {% endif %}
 
-   {% include layout/css.html %}
    {% include layout/og.html %}
 
+   {% include layout/css.html %}
+   {% include layout/js.html %}
+
    <style>body { display: none; }</style>
 </head>
 <body
@@ -42,7 +44,6 @@
 {% endif %}
 {% endif %}
 
-{% include layout/js.html %}
 <script>document.body.style.display = 'block';</script>
 </body>
 </html>
diff --git a/pages/maps.html b/pages/maps.html
index e5154517d11050a7b98ecf59fd91baa932196599..de971f19010f52086549a463c7f9e1dc0a569fe9 100644
--- a/pages/maps.html
+++ b/pages/maps.html
@@ -3,13 +3,16 @@ title: Maps
 page-title: Maps
 ---
 
+<div class="row">
+   {% for map in site.data.maps %}
+   <div class="col-lg-6">
 
-{% for map in site.data.maps %}
-{% assign title = map[0] %}
-{% assign key = 'map-' | append: title %}
-
-<div id="{{ key }}" style="height: 600px;"></div>
-
-{% include js/maps.html id=key data=map %}
-
-{% endfor %}
+      <div class="card">
+         <div class="card-body">
+            {% assign id = map[0] %}
+            {% include ui/map.html map=id %}
+         </div>
+      </div>
+   </div>
+   {% endfor %}
+</div>
diff --git a/scss/tabler.scss b/scss/tabler.scss
index 6fe8299743f4f2056b888707bc58f074674b04b7..45d21bf0f366146e3853c28f72c7e72956889b34 100644
--- a/scss/tabler.scss
+++ b/scss/tabler.scss
@@ -50,6 +50,7 @@
 
 @import "vendor/pace";
 @import "vendor/selectize";
+@import "vendor/jqvmap";
 
 @import "utils/border";
 @import "utils/background";
diff --git a/scss/vendor/_jqvmap.scss b/scss/vendor/_jqvmap.scss
new file mode 100644
index 0000000000000000000000000000000000000000..19d74f4538bf38cc79d212e6325d2ea7fc6854fb
--- /dev/null
+++ b/scss/vendor/_jqvmap.scss
@@ -0,0 +1,17 @@
+.jqvmap-zoomin,
+.jqvmap-zoomout {
+  @extend .btn;
+  @extend .btn-sm;
+  @extend .btn-secondary;
+  height: auto;
+  width: auto;
+  left: .5rem;
+}
+
+.jqvmap-zoomin {
+  top: .5rem;
+}
+
+.jqvmap-zoomout {
+  top: 2rem;
+}