diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index 80e277776..87fda16f9 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -140,7 +140,7 @@ const MetadataEditor = createClass({
 			});
 		};
 
-		const currentTheme = Themes[this.props.metadata.renderer][this.props.metadata.theme];
+		const currentTheme = Themes[`${_.upperFirst(this.props.metadata.renderer)}`][this.props.metadata.theme];
 		let dropdown;
 
 		if(this.props.metadata.renderer == 'legacy') {
diff --git a/themes/V3/5eDMG/style.less b/themes/V3/5eDMG/style.less
index 4657828dd..ef40bacd4 100644
--- a/themes/V3/5eDMG/style.less
+++ b/themes/V3/5eDMG/style.less
@@ -2,8 +2,11 @@
 @import (less) './themes/assets/assets.less';
 @import (less) './themes/V3/5ePHB/style.less';
 
-@noteGreen : #ebcec3; // Salmon
-@footnotes : #5c5c5c; // Dark gray
+:root {
+	//Colors
+	--HB_Color_Accent                : #EBCEC3; // Salmon
+	--HB_Color_Footnotes             : #5C5C5C; // Dark gray
+}
 
 .page {
 	background-image : url(/assets/DMG_background.png);
@@ -14,12 +17,7 @@
 		height: 58px;
 	}
 
-	.pageNumber {
-		color : @footnotes;
-	}
-
 	.footnote {
-		color  : @footnotes;
 		bottom : 40px;
 	}
 }
diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less
index 6d634a716..8bcbed30e 100644
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -11,6 +11,7 @@
 	--HB_Color_MonsterStatBackground : #EEDBAB; // Light orange parchment
 	--HB_Color_CaptionText           : #766649; // Brown
 	--HB_Color_WatercolorStain       : #BBAD82; // Light brown
+	--HB_Color_Footnotes             : #C9AD6A; // Gold
 }
 
 @page { margin: 0; }
@@ -487,7 +488,7 @@ body {
 		bottom      : 22px;
 		width       : 50px;
 		font-size   : 0.9em;
-		color       : #c9ad6a;
+		color       : var(--HB_Color_Footnotes);
 		text-align  : center;
 		text-indent : 0;
 		&.auto::after {
@@ -501,7 +502,7 @@ body {
 		z-index    : 150;
 		width      : 200px;
 		font-size  : 0.8em;
-		color      : #c9ad6a;
+		color      : var(--HB_Color_Footnotes);
 		text-align : right;
 	}
 	//************************************