diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 67170ab3..6238f2cb 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -1,13 +1,21 @@
 var Globalize = require('globalize')
   , fs = require('fs')
   , path = require('path')
+  , express = require('express')
 
-exports.availableLangs = {en: 'English'}
-fs.readdir(__dirname+"/../../locales", function(er, files) {
+var localesPath = __dirname+"/../../locales";
+
+var localeIndex = '[*]\r\n@import url(locales/en.ini)\r\n';
+exports.availableLangs = {en: 'English'};
+
+fs.readdir(localesPath, function(er, files) {
   files.forEach(function(locale) {
     locale = locale.split('.')[0]
     if(locale.toLowerCase() == 'en') return;
 
+    // build locale index
+    localeIndex += '['+locale+']\r\n@import url(locales/'+locale+'.ini)\r\n'
+    
     require('globalize/lib/cultures/globalize.culture.'+locale+'.js')
     var culture = Globalize.cultures[locale];
     exports.availableLangs[culture.name] = culture.nativeName;
@@ -16,13 +24,10 @@ fs.readdir(__dirname+"/../../locales", function(er, files) {
 
 exports.expressCreateServer = function(n, args) {
 
-  args.app.get('/locale.ini', function(req, res) {
-    // let gloablize find out the preferred locale and default to 'en'
-    Globalize.culture(req.cookies['language'] || req.header('Accept-Language') || 'en');
-    var localePath = path.normalize(__dirname +"/../../locales/"+Globalize.culture().name+".ini");
-    res.sendfile(localePath, function(er) {
-      if(er) console.error(er)
-    });
+  args.app.use('/locales', express.static(localesPath));
+  
+  args.app.get('/locales.ini', function(req, res) {
+    res.send(localeIndex);
   })
   
 }
\ No newline at end of file
diff --git a/src/templates/index.html b/src/templates/index.html
index 23f24c53..ee3009dd 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -32,7 +32,7 @@
         <meta charset="utf-8"> 
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
         <script type="text/javascript" src="static/js/l10n.js"></script>
-        <link rel="resource" type="application/l10n" href="locale.ini" />
+        <link rel="resource" type="application/l10n" href="locales.ini" />
         <link rel="shortcut icon" href="<%=settings.favicon%>">
 
         <style>
@@ -185,6 +185,12 @@
                 return randomstring;
             }
             
+            (function(document) {
+              // Set language for l10n
+              var language = document.cookie.match(/language=(\w{2})/);
+              document.documentElement.lang = language? language[1] : 'en';
+            })(document)
+            
             // start the custom js
             if (typeof customStart == "function") customStart();
         </script>
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 29516def..2e169cc0 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -34,7 +34,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
         <script type="text/javascript" src="../static/js/l10n.js"></script>
-        <link rel="resource" type="application/l10n" href="../locale.ini" />
+        <link rel="resource" type="application/l10n" href="../locales.ini" />
 
 
         <link rel="shortcut icon" href="<%=settings.favicon%>">
@@ -399,7 +399,9 @@
         <script type="text/javascript">
             var clientVars = {};
             (function () {
-              
+              // Set language for l10n
+              var language = document.cookie.match(/language=(\w{2})/);
+              document.documentElement.lang = language? language[1] : 'en';
               
               var pathComponents = location.pathname.split('/');
               
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index da67b6a1..b896f2c1 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -33,7 +33,7 @@
   <meta name="robots" content="noindex, nofollow">
   <link rel="shortcut icon" href="<%=settings.favicon%>">
   <script type="text/javascript" src="../../static/js/l10n.js"></script>
-  <link rel="resource" type="application/l10n" href="../../locale.ini" />
+  <link rel="resource" type="application/l10n" href="../../locales.ini" />
   <link rel="stylesheet" href="../../static/css/pad.css">
   <link rel="stylesheet" href="../../static/css/timeslider.css">
   <link rel="stylesheet" href="../../static/custom/timeslider.css">
@@ -184,6 +184,9 @@
   var clientVars = {};
   
   (function () {
+    // Set language for l10n
+    var language = document.cookie.match(/language=(\w{2})/);
+    document.documentElement.lang = language? language[1] : 'en';
     
     var pathComponents = location.pathname.split('/');