diff --git a/build/copy-libs.js b/build/copy-libs.js
index 424747a62..27055c2ac 100755
--- a/build/copy-libs.js
+++ b/build/copy-libs.js
@@ -1,7 +1,9 @@
-const libs = require('../pages/_data/libs');
-const { exec } = require('child_process');
+const libs = require('../pages/_data/libs'),
+  path = require('path'),
+  { exec } = require('child_process');
 
 libs.forEach(function (lib) {
-  let cmd = `mkdir -p "dist/libs/${lib}" && cp -r node_modules/${lib} dist/libs/${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/pages/_includes/layout/css.html b/pages/_includes/layout/css.html
index a7342051f..6949987e9 100644
--- a/pages/_includes/layout/css.html
+++ b/pages/_includes/layout/css.html
@@ -1,3 +1,3 @@
-<link href="{{ site.base }}/dist/css/tabler.css{{ site.date | date: '%s' }}" rel="stylesheet" />
-<link href="{{ site.base }}/dist/css/tabler-flags.css{{ site.date | date: '%s' }}" rel="stylesheet" />
-<link href="{{ site.base }}/dist/css/tabler-charts.css{{ site.date | date: '%s' }}" rel="stylesheet" />
+<link href="{{ site.base }}/dist/css/tabler.css?{{ site.time | date: '%s' }}" rel="stylesheet" />
+<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 1036cb54f..8912b13bc 100644
--- a/pages/_includes/layout/js.html
+++ b/pages/_includes/layout/js.html
@@ -6,13 +6,13 @@
 
 <!-- Libs JS -->
 {% for lib in site.data.libs %}
-<script src="{{ site.base }}/{% if jekyll.environment == 'production' %}dist/libs{% else %}node_modules{% endif %}/{{ lib }}?{{ site.date | date: '%s' }}"></script>
+<script src="{{ site.base }}/{% if jekyll.environment == 'production' %}dist/libs{% else %}node_modules{% endif %}/{{ lib }}?{{ site.time | date: '%s' }}"></script>
 {% endfor %}
 
 <!-- Tabler Core -->
-<script src="{{ site.base }}/dist/js/tabler{% if jekyll.environment == 'production' %}.min{% endif %}.js?{{ site.date | date: '%s' }}"></script>
+<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.date | date: '%s' }}"></script>
+<script src="{{ site.base }}/dist/js/tabler-charts{% if jekyll.environment == 'production' %}.min{% endif %}.js?{{ site.time | date: '%s' }}"></script>