diff --git a/themes/5ePHB/settings.json b/themes/5ePHB/settings.json
new file mode 100644
index 000000000..cad767481
--- /dev/null
+++ b/themes/5ePHB/settings.json
@@ -0,0 +1,4 @@
+{
+  "renderer" : "V3",
+  "baseTheme" : false
+}
diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/themes/5ePHB/snippets.js
similarity index 94%
rename from client/homebrew/editor/snippetbar/snippets/snippets.js
rename to themes/5ePHB/snippets.js
index 7b008fe1e..727e17359 100644
--- a/client/homebrew/editor/snippetbar/snippets/snippets.js
+++ b/themes/5ePHB/snippets.js
@@ -1,13 +1,14 @@
 /* eslint-disable max-lines */
 
-const MagicGen = require('./magic.gen.js');
-const ClassTableGen = require('./classtable.gen.js');
-const MonsterBlockGen = require('./monsterblock.gen.js');
-const ClassFeatureGen = require('./classfeature.gen.js');
-const CoverPageGen = require('./coverpage.gen.js');
-const TableOfContentsGen = require('./tableOfContents.gen.js');
-const dedent = require('dedent-tabs').default;
-const watercolorGen = require('./watercolor.gen.js');
+const MagicGen           = require('./snippets/magic.gen.js');
+const ClassTableGen      = require('./snippets/classtable.gen.js');
+const MonsterBlockGen    = require('./snippets/monsterblock.gen.js');
+const ClassFeatureGen    = require('./snippets/classfeature.gen.js');
+const CoverPageGen       = require('./snippets/coverpage.gen.js');
+const TableOfContentsGen = require('./snippets/tableOfContents.gen.js');
+const WatercolorGen      = require('./snippets/watercolor.gen.js');
+const dedent             = require('dedent-tabs').default;
+
 
 
 module.exports = [
@@ -149,7 +150,7 @@ module.exports = [
 			{
 				name : 'Watercolor Splatter',
 				icon : 'fas fa-fill-drip',
-				gen  : watercolorGen,
+				gen  : WatercolorGen,
 			},
 			{
 				name : 'Watermark',
diff --git a/client/homebrew/editor/snippetbar/snippets/classfeature.gen.js b/themes/5ePHB/snippets/classfeature.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/classfeature.gen.js
rename to themes/5ePHB/snippets/classfeature.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippets/classtable.gen.js b/themes/5ePHB/snippets/classtable.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/classtable.gen.js
rename to themes/5ePHB/snippets/classtable.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippets/coverpage.gen.js b/themes/5ePHB/snippets/coverpage.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/coverpage.gen.js
rename to themes/5ePHB/snippets/coverpage.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippets/fullclass.gen.js b/themes/5ePHB/snippets/fullclass.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/fullclass.gen.js
rename to themes/5ePHB/snippets/fullclass.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippets/magic.gen.js b/themes/5ePHB/snippets/magic.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/magic.gen.js
rename to themes/5ePHB/snippets/magic.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippets/monsterblock.gen.js b/themes/5ePHB/snippets/monsterblock.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/monsterblock.gen.js
rename to themes/5ePHB/snippets/monsterblock.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippets/tableOfContents.gen.js b/themes/5ePHB/snippets/tableOfContents.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/tableOfContents.gen.js
rename to themes/5ePHB/snippets/tableOfContents.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippets/watercolor.gen.js b/themes/5ePHB/snippets/watercolor.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippets/watercolor.gen.js
rename to themes/5ePHB/snippets/watercolor.gen.js
diff --git a/themes/5ePhb.style.less b/themes/5ePHB/style.less
similarity index 100%
rename from themes/5ePhb.style.less
rename to themes/5ePHB/style.less
diff --git a/themes/5ePHBLegacy/settings.json b/themes/5ePHBLegacy/settings.json
new file mode 100644
index 000000000..0950fb45a
--- /dev/null
+++ b/themes/5ePHBLegacy/settings.json
@@ -0,0 +1,4 @@
+{
+  "renderer" : "legacy",
+  "baseTheme" : false
+}
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js b/themes/5ePHBLegacy/snippets.js
similarity index 93%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js
rename to themes/5ePHBLegacy/snippets.js
index 40c8405ac..e9134853c 100644
--- a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js
+++ b/themes/5ePHBLegacy/snippets.js
@@ -1,12 +1,12 @@
 /* eslint-disable max-lines */
 
-const MagicGen = require('./magic.gen.js');
-const ClassTableGen = require('./classtable.gen.js');
-const MonsterBlockGen = require('./monsterblock.gen.js');
-const ClassFeatureGen = require('./classfeature.gen.js');
-const CoverPageGen = require('./coverpage.gen.js');
-const TableOfContentsGen = require('./tableOfContents.gen.js');
-const dedent = require('dedent-tabs').default;
+const MagicGen           = require('./snippets/magic.gen.js');
+const ClassTableGen      = require('./snippets/classtable.gen.js');
+const MonsterBlockGen    = require('./snippets/monsterblock.gen.js');
+const ClassFeatureGen    = require('./snippets/classfeature.gen.js');
+const CoverPageGen       = require('./snippets/coverpage.gen.js');
+const TableOfContentsGen = require('./snippets/tableOfContents.gen.js');
+const dedent             = require('dedent-tabs').default;
 
 module.exports = [
 
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/classfeature.gen.js b/themes/5ePHBLegacy/snippets/classfeature.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/classfeature.gen.js
rename to themes/5ePHBLegacy/snippets/classfeature.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/classtable.gen.js b/themes/5ePHBLegacy/snippets/classtable.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/classtable.gen.js
rename to themes/5ePHBLegacy/snippets/classtable.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/coverpage.gen.js b/themes/5ePHBLegacy/snippets/coverpage.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/coverpage.gen.js
rename to themes/5ePHBLegacy/snippets/coverpage.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/fullclass.gen.js b/themes/5ePHBLegacy/snippets/fullclass.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/fullclass.gen.js
rename to themes/5ePHBLegacy/snippets/fullclass.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/magic.gen.js b/themes/5ePHBLegacy/snippets/magic.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/magic.gen.js
rename to themes/5ePHBLegacy/snippets/magic.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/monsterblock.gen.js b/themes/5ePHBLegacy/snippets/monsterblock.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/monsterblock.gen.js
rename to themes/5ePHBLegacy/snippets/monsterblock.gen.js
diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/tableOfContents.gen.js b/themes/5ePHBLegacy/snippets/tableOfContents.gen.js
similarity index 100%
rename from client/homebrew/editor/snippetbar/snippetsLegacy/tableOfContents.gen.js
rename to themes/5ePHBLegacy/snippets/tableOfContents.gen.js
diff --git a/themes/5ePhbLegacy.style.less b/themes/5ePHBLegacy/style.less
similarity index 100%
rename from themes/5ePhbLegacy.style.less
rename to themes/5ePHBLegacy/style.less