diff --git a/package.json b/package.json
index 447dfc7..feed775 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "logchimp-cli",
   "description": "CLI Tool for LogChimp",
-  "version": "0.4.1",
+  "version": "0.4.1-beta.1",
   "author": "Yashu Mittal @mittalyashu",
   "bin": {
     "logchimp": "./bin/run"
diff --git a/src/commands/config/generate.js b/src/commands/config/generate.js
index c3d511b..279a304 100644
--- a/src/commands/config/generate.js
+++ b/src/commands/config/generate.js
@@ -54,6 +54,11 @@ class ConfigGenerateCommand extends Command {
           port: _.toNumber(process.env.LOGCHIMP_SERVER_PORT) || 3000,
           secretkey: process.env.LOGCHIMP_SECRET_KEY,
         },
+        theme: {
+          standalone: process.env.LOGCHIMP_THEME_STANDALONE ? process.env.LOGCHIMP_THEME_STANDALONE === 'true' : false,
+          port: _.toNumber(process.env.LOGCHIMP_SERVER_PORT) || 3000,
+          secretkey: process.env.LOGCHIMP_SECRET_KEY,
+        },
         database: {
           host: process.env.LOGCHIMP_DB_HOST,
           port: _.toNumber(process.env.LOGCHIMP_DB_PORT) || 5432,
@@ -84,6 +89,9 @@ class ConfigGenerateCommand extends Command {
         port: flags.port,
         secretkey: flags.secretkey ? flags.secretkey : generatePassword(),
       },
+      theme: {
+        standalone: flags.standalone,
+      },
       database: {
         host: flags.dbhost,
         name: flags.dbname,
@@ -128,6 +136,12 @@ ConfigGenerateCommand.flags = {
     default: false,
   }),
 
+  // theme
+  standalone: flags.boolean({
+    default: false,
+    description: 'Run theme separate from LogChimp APIs',
+  }),
+
   // server
   host: flags.string({
     description: 'Server host',
diff --git a/tests/command/config-generate.spec.js b/tests/command/config-generate.spec.js
index 9c5791f..73446d1 100644
--- a/tests/command/config-generate.spec.js
+++ b/tests/command/config-generate.spec.js
@@ -31,6 +31,9 @@ describe('config:generate command', () => {
       expect(config.server.host).toBe('127.0.0.1')
       expect(config.server.port).toBe(3000)
 
+      // theme
+      expect(config.theme.standalone).toBe(false)
+
       // database
       expect(config.database.port).toBe(5432)
       expect(config.database.ssl).toBe(true)
@@ -45,6 +48,7 @@ describe('config:generate command', () => {
         '--port=80',
         '--host=0.0.0.0',
         '--secretkey=mySecretKey',
+        '--standalone',
         '--dbhost=postgres-db.logchimp.codecarrot.net',
         '--dbuser=pg_db_user',
         '--dbpass=myDatabasePassword',
@@ -69,6 +73,10 @@ describe('config:generate command', () => {
       expect(config.server.host).toBe('0.0.0.0')
       expect(config.server.port).toBe(80)
       expect(config.server.secretkey).toBe('mySecretKey')
+
+      // theme
+      expect(config.theme.standalone).toBe(true)
+
       // database
       expect(config.database.host).toBe('postgres-db.logchimp.codecarrot.net')
       expect(config.database.name).toBe('pg_db')
@@ -176,6 +184,9 @@ LOGCHIMP_MAIL_PASSWORD=mail_password`
     expect(config.server.secretkey).toBe('secret-key')
     expect(config.server.port).toBe(3000)
 
+    // theme
+    expect(config.theme.standalone).toBe(false)
+
     // database
     expect(config.database.host).toBe('localhost')
     expect(config.database.user).toBe('logchimp')