diff --git a/.gitignore b/.gitignore
index 32fc2c0..598474f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ typings/
 
 # nuxt.js build output
 .nuxt
+.nuxt*
 
 # Nuxt generate
 dist
diff --git a/nuxt.config.js b/nuxt.config.js
index d160e6a..85c5416 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,4 +1,6 @@
-require('dotenv').config()
+require('dotenv').config({ path: process.env.THEME ? ".env."+process.env.THEME : ".env"})
+
+console.log("We are running "+process.env.THEME+" theme");
 
 module.exports = {
   mode: 'universal',
@@ -51,7 +53,7 @@ module.exports = {
   ** Nuxt.js modules
   */
   modules: [
-    '@nuxtjs/dotenv',
+    ['@nuxtjs/dotenv', { filename: process.env.THEME ? ".env."+process.env.THEME : ".env" }],
   ],
   /*
   ** Build configuration
@@ -72,5 +74,6 @@ module.exports = {
   },
   serverMiddleware: [
 
-  ]
+  ],
+  buildDir: '.nuxt.'+(process.env.THEME || "yuriko")
 }