diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
index 0f2f4f61c..a8435cde5 100644
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -1,3 +1,4 @@
+/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
 require('./brewRenderer.less');
 const React = require('react');
 const createClass = require('create-react-class');
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index a7dbb5c50..29c193323 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -152,6 +152,8 @@ const MetadataEditor = createClass({
 	},
 
 	renderThemeDropdown : function(){
+		if(!global.enable_themes) return;
+
 		const listThemes = (renderer)=>{
 			return _.map(_.values(Themes[renderer]), (theme)=>{
 				return <div className='item' key={''} onClick={()=>this.handleTheme(theme)} title={''}>
diff --git a/client/homebrew/editor/snippetbar/snippetbar.jsx b/client/homebrew/editor/snippetbar/snippetbar.jsx
index c357f2efa..9dbee4280 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -67,7 +67,7 @@ const Snippetbar = createClass({
 	},
 
 	mergeCustomizer : function(valueA, valueB, key) {
-		if(key == "snippets") {
+		if(key == 'snippets') {
 			const result = _.reverse(_.unionBy(_.reverse(valueB), _.reverse(valueA), 'name')); // Join snippets together, with preference for the current theme over the base theme
 			return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
 		}
@@ -77,15 +77,14 @@ const Snippetbar = createClass({
 		let compiledSnippets = snippets;
 		const baseSnippetsPath = Themes[rendererPath][themePath].baseSnippets;
 
-		let objB = _.keyBy(compiledSnippets, 'groupName');
+		const objB = _.keyBy(compiledSnippets, 'groupName');
 
 		if(baseSnippetsPath) {
-			let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
+			const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
 			compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
 			compiledSnippets = this.compileSnippets(rendererPath, baseSnippetsPath, _.cloneDeep(compiledSnippets));
-		}
-		else {
-			let objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
+		} else {
+			const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
 			compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
 		}
 		return compiledSnippets;
diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx
index ff5c06b33..8666b7d58 100644
--- a/client/homebrew/homebrew.jsx
+++ b/client/homebrew/homebrew.jsx
@@ -54,6 +54,7 @@ const Homebrew = createClass({
 		global.account = this.props.account;
 		global.version = this.props.version;
 		global.enable_v3 = this.props.enable_v3;
+		global.enable_themes = this.props.enable_themes;
 		global.config = this.props.config;
 
 		return {};
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index 137ddd996..251f169c9 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -75,7 +75,7 @@ const NewPage = createClass({
 			// brew.title = metaStorage?.title || this.state.brew.title;
 			// brew.description = metaStorage?.description || this.state.brew.description;
 			brew.renderer = metaStorage?.renderer ?? brew.renderer;
-			brew.renderer = metaStorage?.theme    ?? brew.theme;
+			brew.theme    = metaStorage?.theme    ?? brew.theme;
 
 			this.setState({
 				brew : brew
diff --git a/server/app.js b/server/app.js
index e8c4c246e..98e2c778c 100644
--- a/server/app.js
+++ b/server/app.js
@@ -287,14 +287,15 @@ app.use(asyncHandler(async (req, res, next)=>{
 		environment : nodeEnv
 	};
 	const props = {
-		version     : require('./../package.json').version,
-		url         : req.originalUrl,
-		brew        : req.brew,
-		brews       : req.brews,
-		googleBrews : req.googleBrews,
-		account     : req.account,
-		enable_v3   : config.get('enable_v3'),
-		config      : configuration
+		version       : require('./../package.json').version,
+		url           : req.originalUrl,
+		brew          : req.brew,
+		brews         : req.brews,
+		googleBrews   : req.googleBrews,
+		account       : req.account,
+		enable_v3     : config.get('enable_v3'),
+		enable_themes : config.get('enable_themes'),
+		config        : configuration
 	};
 	const title = req.brew ? req.brew.title : '';
 	const page = await templateFn('homebrew', title, props)