diff --git a/helpers.lua b/helpers.lua
index cfaeea1..ba1f086 100644
--- a/helpers.lua
+++ b/helpers.lua
@@ -586,7 +586,7 @@ function get_data_for(view)
     data['flash_fail'] = {flashs["fail"]}
     data['flash_win']  = {flashs["win"] }
     data['flash_info'] = {flashs["info"]}
-    data['theme_name'] = ""..conf["theme"]
+    data['theme'] = conf["theme"]
 
     return data
 end
diff --git a/portal/footer.ms b/portal/footer.ms
index cec80c9..1472f36 100644
--- a/portal/footer.ms
+++ b/portal/footer.ms
@@ -11,5 +11,8 @@
 
   <!-- Scripts -->
   <script src="assets/js/global.js"></script>
+  {{#theme}}
+  <script src="assets/themes/{{theme}}/global.js"></script>
+  {{/theme}}
 </body>
 </html>
diff --git a/portal/header.ms b/portal/header.ms
index 6024ae2..1041f91 100644
--- a/portal/header.ms
+++ b/portal/header.ms
@@ -13,7 +13,7 @@
 
   <!-- Stylesheets -->
   <link rel="stylesheet" href="assets/css/ynh-style.css">
-  <link rel="stylesheet" href="assets/themes/{{theme_name}}.css">
+  <link rel="stylesheet" href="assets/themes/{{theme}}/stylesheet.css">
 
   <!-- Icons -->
   <link rel="shortcut icon" href="assets/icons/favicon.ico">