diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
index f8a5fce0a..a41e01228 100644
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -134,7 +134,8 @@ const BrewRenderer = createClass({
 
 	renderStyle : function() {
 		if(!this.props.style) return;
-		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />;
+		//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />;
+		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.props.style}\n</style>` }} />;
 	},
 
 	renderPage : function(pageText, index){
diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less
index 57f868899..9c6bf3f08 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -97,7 +97,7 @@
 			background-color : #ddd;
 			.snippet{
 				.animate(background-color);
-				width     : max-content;
+				min-width : max-content;
 				padding   : 5px;
 				cursor    : pointer;
 				font-size : 10px;
diff --git a/client/homebrew/pages/printPage/printPage.jsx b/client/homebrew/pages/printPage/printPage.jsx
index c2e8c9b7b..37376d4b2 100644
--- a/client/homebrew/pages/printPage/printPage.jsx
+++ b/client/homebrew/pages/printPage/printPage.jsx
@@ -60,7 +60,8 @@ const PrintPage = createClass({
 
 	renderStyle : function() {
 		if(!this.state.brew.style) return;
-		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />;
+		//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />;
+		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.state.brew.style}\n</style>` }} />;
 	},
 
 	renderPages : function(){
diff --git a/client/icons/customIcons.less b/client/icons/customIcons.less
index f41a2fc83..b04d16684 100644
--- a/client/icons/customIcons.less
+++ b/client/icons/customIcons.less
@@ -13,3 +13,21 @@
 .position-bottom-right {
   content: url('../icons/position-bottom-right.svg');
 }
+.position-top {
+  content: url('../icons/position-top.svg');
+}
+.position-right {
+  content: url('../icons/position-right.svg');
+}
+.position-bottom {
+  content: url('../icons/position-bottom.svg');
+}
+.position-left {
+  content: url('../icons/position-left.svg');
+}
+.mask-edge {
+  content: url('../icons/mask-edge.svg');
+}
+.mask-corner {
+  content: url('../icons/mask-corner.svg');
+}
diff --git a/client/icons/mask-corner.svg b/client/icons/mask-corner.svg
new file mode 100644
index 000000000..3d9a88a8d
--- /dev/null
+++ b/client/icons/mask-corner.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="mask-corner.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139"><pattern
+       inkscape:collect="always"
+       xlink:href="#Strips1_1"
+       id="pattern3077"
+       patternTransform="matrix(23.131931,-23.131931,19.25517,19.25517,26.214281,-26.952711)" /><pattern
+       inkscape:collect="always"
+       patternUnits="userSpaceOnUse"
+       width="2"
+       height="1"
+       patternTransform="translate(0,0) scale(10,10)"
+       id="Strips1_1"
+       inkscape:stockid="Stripes 1:1"><rect
+         style="fill:black;stroke:none"
+         x="0"
+         y="-0.5"
+         width="1"
+         height="2"
+         id="rect2097" /></pattern></defs><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.95758074"
+     inkscape:cx="275.17262"
+     inkscape:cy="306.50157"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="M 48,-5.2e-6 C 21.40803,-5.2e-6 1.98e-5,21.408025 1.98e-5,47.999995 V 464 C 1.98e-5,490.59197 21.40803,512 48,512 h 352 c 26.59198,0 48,-21.40803 48,-48 V 47.999995 C 448,21.408025 426.59198,-5.2e-6 400,-5.2e-6 Z M 64,63.999995 H 384 V 448 H 64 Z" /><rect
+     style="fill:url(#pattern3077);fill-opacity:1;stroke:#000000;stroke-width:48;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206"
+     width="208"
+     height="240"
+     x="32.000011"
+     y="32.000011"
+     rx="48"
+     ry="48" /></svg>
diff --git a/client/icons/mask-edge.svg b/client/icons/mask-edge.svg
new file mode 100644
index 000000000..f24d11de0
--- /dev/null
+++ b/client/icons/mask-edge.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="mask-edge.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139"><pattern
+       inkscape:collect="always"
+       xlink:href="#Strips1_1"
+       id="pattern3077"
+       patternTransform="matrix(23.131931,-23.13193,19.25517,19.25517,26.214281,-26.952711)" /><pattern
+       inkscape:collect="always"
+       patternUnits="userSpaceOnUse"
+       width="2"
+       height="1"
+       patternTransform="translate(0,0) scale(10,10)"
+       id="Strips1_1"
+       inkscape:stockid="Stripes 1:1"><rect
+         style="fill:black;stroke:none"
+         x="0"
+         y="-0.5"
+         width="1"
+         height="2"
+         id="rect2097" /></pattern></defs><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.95758074"
+     inkscape:cx="231.31209"
+     inkscape:cy="171.78708"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="M 48,-5.2e-6 C 21.40803,-5.2e-6 1.98e-5,21.408025 1.98e-5,47.999995 V 464 C 1.98e-5,490.59197 21.40803,512 48,512 h 352 c 26.59198,0 48,-21.40803 48,-48 V 47.999995 C 448,21.408025 426.59198,-5.2e-6 400,-5.2e-6 Z M 64,63.999995 H 384 V 448 H 64 Z" /><rect
+     style="fill:url(#pattern3077);fill-opacity:1;stroke:#000000;stroke-width:48;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206"
+     width="208"
+     height="447.99997"
+     x="32.000011"
+     y="32.000011"
+     rx="48"
+     ry="48" /><rect
+     style="fill:#000000;fill-opacity:1;stroke-width:47.9999;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect4640"
+     width="48"
+     height="512"
+     x="216"
+     y="0" /></svg>
diff --git a/client/icons/position-bottom-left.svg b/client/icons/position-bottom-left.svg
index eb0709d8e..cb9e4c347 100644
--- a/client/icons/position-bottom-left.svg
+++ b/client/icons/position-bottom-left.svg
@@ -1 +1,46 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 495 495"><path fill-opacity=".995" d="M495 135.49V0H359.51v135.49M482.72 11.37v113.26H371.9V11.37zM135.49 315.245v-135.49H0v135.49m123.21-124.12v113.26H12.39v-113.26zm12.28-55.635V0H0v135.49M123.21 11.37v113.26H12.39V11.37zm192.035 124.12V0h-135.49v135.49m123.21-124.12v113.26h-110.82V11.37zm12.28 303.875v-135.49h-135.49v135.49m123.21-124.12v113.26h-110.82v-113.26zM495 315.245v-135.49H359.51v135.49m123.21-124.12v113.26H371.9v-113.26zM135.49 495V359.51H0V495Zm179.755 0V359.51h-135.49V495m123.21-124.12v113.26h-110.82V370.88zM495 495V359.51H359.51V495m123.21-124.12v113.26H371.9V370.88z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-bottom-left.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.70792086"
+     inkscape:cx="174.45453"
+     inkscape:cy="325.60137"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="m 48,511.99998 c -26.59197,0 -48.00000035682677,-21.40803 -48.00000035682677,-48 v -416 C -3.5682677e-7,21.40801 21.40803,-1.9692461e-5 48,-1.9692461e-5 h 352 c 26.59198,0 48,21.408029692461 48,47.999999692461 v 416 c 0,26.59197 -21.40802,48 -48,48 z m 16,-64 h 320 v -384 H 64 Z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206"
+     width="208"
+     height="240"
+     x="-3.5682677e-07"
+     y="-512"
+     rx="48"
+     ry="48"
+     transform="scale(1,-1)" /></svg>
diff --git a/client/icons/position-bottom-right.svg b/client/icons/position-bottom-right.svg
index f9cb7250a..37a8ee3b3 100644
--- a/client/icons/position-bottom-right.svg
+++ b/client/icons/position-bottom-right.svg
@@ -1 +1,46 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 495 495"><g fill-opacity=".995"><path d="M135.49 0H0v135.49h135.49M11.37 12.28h113.26V123.1H11.37zM315.245 359.51h-135.49V495h135.49m-124.12-123.21h113.26v110.82h-113.26zM135.49 359.51H0V495h135.49M11.37 371.79h113.26v110.82H11.37zM135.49 179.755H0v135.49h135.49M11.37 192.035h113.26v110.82H11.37zM315.245 179.755h-135.49v135.49h135.49m-124.12-123.21h113.26v110.82h-113.26zM315.245 0h-135.49v135.49h135.49M191.125 12.28h113.26V123.1h-113.26zM495 359.51H359.51V495H495ZM495 179.755H359.51v135.49H495m-124.12-123.21h113.26v110.82H370.88zM495 0H359.51v135.49H495M370.88 12.28h113.26V123.1H370.88z"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-bottom-right.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.70792086"
+     inkscape:cx="174.45453"
+     inkscape:cy="325.60137"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="m 400,511.99998 c 26.59197,0 48,-21.40803 48,-48 v -416 C 448,21.40801 426.59197,-1.9692461e-5 400,-1.9692461e-5 H 48 C 21.40802,-1.9692461e-5 -3.5682677e-7,21.40801 -3.5682677e-7,47.99998 v 416 c 0,26.59197 21.40802035682677,48 48.00000035682677,48 z m -16,-64 H 64 v -384 h 320 z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206"
+     width="208"
+     height="240"
+     x="-448"
+     y="-512"
+     rx="48"
+     ry="48"
+     transform="scale(-1)" /></svg>
diff --git a/client/icons/position-bottom.svg b/client/icons/position-bottom.svg
new file mode 100644
index 000000000..4bb2ab2e6
--- /dev/null
+++ b/client/icons/position-bottom.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-bottom.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="1.0011513"
+     inkscape:cx="273.18549"
+     inkscape:cy="216.25103"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201-2"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="m 48,512.00004 c -26.5919,0 -48,-21.4081 -48,-48 V 47.999996 C 0,21.408026 21.4081,-3.8146973e-6 48,-3.8146973e-6 h 352 c 26.592,0 48,21.4080298146973 48,47.9999998146973 V 464.00004 c 0,26.5919 -21.408,48 -48,48 z m 16,-64 H 384 V 63.999996 H 64 Z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30.0001;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206-8"
+     width="447.99997"
+     height="240"
+     x="1.40625e-05"
+     y="-512.00006"
+     rx="48"
+     ry="48"
+     transform="scale(1,-1)" /></svg>
diff --git a/client/icons/position-left.svg b/client/icons/position-left.svg
new file mode 100644
index 000000000..c425bcb51
--- /dev/null
+++ b/client/icons/position-left.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-left.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.70792086"
+     inkscape:cx="164.56642"
+     inkscape:cy="243.6713"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201-0"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="M 48,0 C 21.4081,0 0,21.40803 0,48 v 416 c 0,26.59197 21.4081,48 48,48 h 352.0001 c 26.5919,0 48,-21.40803 48,-48 V 48 c 0,-26.59197 -21.4081,-48 -48,-48 z M 64,64 H 384.0001 V 448 H 64 Z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206-2"
+     width="208"
+     height="512.00006"
+     x="7.0762391e-05"
+     y="-8.8710935e-05"
+     rx="48"
+     ry="48.000004" /></svg>
diff --git a/client/icons/position-right.svg b/client/icons/position-right.svg
new file mode 100644
index 000000000..f55121f6b
--- /dev/null
+++ b/client/icons/position-right.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-right.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.70792086"
+     inkscape:cx="164.56642"
+     inkscape:cy="243.6713"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201-0"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="m 400.0001,0 c 26.5919,0 48,21.40803 48,48 v 416 c 0,26.59197 -21.4081,48 -48,48 H 48 C 21.4081,512 0,490.59197 0,464 V 48 C 0,21.40803 21.4081,0 48,0 Z m -16,64 H 64 v 384 h 320.0001 z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206-2"
+     width="208"
+     height="512.00006"
+     x="-448.00003"
+     y="-8.8710935e-05"
+     rx="48"
+     ry="48.000004"
+     transform="scale(-1,1)" /></svg>
diff --git a/client/icons/position-top-left.svg b/client/icons/position-top-left.svg
index d8240d2a8..80776a80a 100644
--- a/client/icons/position-top-left.svg
+++ b/client/icons/position-top-left.svg
@@ -1 +1,45 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 495 495"><path fill-opacity=".995" d="M359.51 495H495V359.51H359.51m124.12 123.21H370.37V371.9h113.26zM179.755 135.49h135.49V0h-135.49m124.12 123.21h-113.26V12.39h113.26zM359.51 135.49H495V0H359.51m124.12 123.21H370.37V12.39h113.26zM359.51 315.245H495v-135.49H359.51m124.12 123.21H370.37v-110.82h113.26zM179.755 315.245h135.49v-135.49h-135.49m124.12 123.21h-113.26v-110.82h113.26zM179.755 495h135.49V359.51h-135.49m124.12 123.21h-113.26V371.9h113.26zM0 135.49h135.49V0H0ZM0 315.245h135.49v-135.49H0m124.12 123.21H10.86v-110.82h113.26zM0 495h135.49V359.51H0m124.12 123.21H10.86V371.9h113.26z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-top-left.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.70792086"
+     inkscape:cx="174.45453"
+     inkscape:cy="325.60137"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="M 48,0 C 21.40803,0 0,21.40803 0,48 v 416 c 0,26.59197 21.40803,48 48,48 h 352 c 26.59198,0 48,-21.40803 48,-48 V 48 C 448,21.40803 426.59198,0 400,0 Z M 64,64 H 384 V 448 H 64 Z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206"
+     width="208"
+     height="240"
+     x="-3.5682677e-07"
+     y="-1.9692461e-05"
+     rx="48"
+     ry="48" /></svg>
diff --git a/client/icons/position-top-right.svg b/client/icons/position-top-right.svg
index 4e998b4be..7c5b487d7 100644
--- a/client/icons/position-top-right.svg
+++ b/client/icons/position-top-right.svg
@@ -1 +1,46 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 495 495"><g fill-opacity=".995"><path d="M0 359.51V495h135.49V359.51M12.28 483.63V370.37H123.1v113.26zM359.51 179.755v135.49H495v-135.49m-123.21 124.12v-113.26h110.82v113.26zM359.51 359.51V495H495V359.51M371.79 483.63V370.37h110.82v113.26zM179.755 359.51V495h135.49V359.51m-123.21 124.12V370.37h110.82v113.26zM179.755 179.755v135.49h135.49v-135.49m-123.21 124.12v-113.26h110.82v113.26zM0 179.755v135.49h135.49v-135.49M12.28 303.875v-113.26H123.1v113.26zM359.51 0v135.49H495V0ZM179.755 0v135.49h135.49V0m-123.21 124.12V10.86h110.82v113.26zM0 0v135.49h135.49V0M12.28 124.12V10.86H123.1v113.26z"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-top-right.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="0.70792086"
+     inkscape:cx="174.45453"
+     inkscape:cy="325.60137"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="m 400,0 c 26.59197,0 48,21.40803 48,48 v 416 c 0,26.59197 -21.40803,48 -48,48 H 48 C 21.40802,512 -3.5682677e-7,490.59197 -3.5682677e-7,464 V 48 C -3.5682677e-7,21.40803 21.40802,0 48,0 Z M 384,64 H 64 v 384 h 320 z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206"
+     width="208"
+     height="240"
+     x="-448"
+     y="-1.9692461e-05"
+     rx="48"
+     ry="48"
+     transform="scale(-1,1)" /></svg>
diff --git a/client/icons/position-top.svg b/client/icons/position-top.svg
new file mode 100644
index 000000000..2903634cd
--- /dev/null
+++ b/client/icons/position-top.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 448 512"
+   version="1.1"
+   id="svg135"
+   sodipodi:docname="position-top.svg"
+   width="448"
+   height="512"
+   xml:space="preserve"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs139" /><sodipodi:namedview
+     id="namedview137"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="1.0011513"
+     inkscape:cx="273.18549"
+     inkscape:cy="216.25103"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg135" /><!--! Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path
+     id="rect12201-2"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     d="M 48,0 C 21.4081,0 0,21.4081 0,48 v 416.00004 c 0,26.59197 21.4081,48 48,48 h 352 c 26.592,0 48,-21.40803 48,-48 V 48 C 448,21.4081 426.592,0 400,0 Z M 64,64 H 384 V 448.00004 H 64 Z" /><rect
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:30.0001;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke;stop-color:#000000"
+     id="rect12206-8"
+     width="447.99997"
+     height="240"
+     x="1.40625e-05"
+     y="-3.8146973e-06"
+     rx="48"
+     ry="48" /></svg>
diff --git a/package-lock.json b/package-lock.json
index 8afc99987..d95e54d25 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,11 +10,11 @@
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.20.12",
-        "@babel/plugin-transform-runtime": "^7.19.6",
+        "@babel/core": "^7.21.0",
+        "@babel/plugin-transform-runtime": "^7.21.0",
         "@babel/preset-env": "^7.19.4",
         "@babel/preset-react": "^7.18.6",
-        "body-parser": "^1.20.1",
+        "body-parser": "^1.20.2",
         "classnames": "^2.3.2",
         "codemirror": "^5.65.6",
         "cookie-parser": "^1.4.6",
@@ -33,7 +33,7 @@
         "marked-extended-tables": "^1.0.5",
         "markedLegacy": "npm:marked@^0.3.19",
         "moment": "^2.29.4",
-        "mongoose": "^6.9.1",
+        "mongoose": "^6.9.2",
         "nanoid": "3.3.4",
         "nconf": "^0.12.0",
         "npm": "^8.10.0",
@@ -1484,20 +1484,20 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
-      "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+      "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
       "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
+        "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.0",
         "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helpers": "^7.20.7",
-        "@babel/parser": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.0",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.0",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.12",
-        "@babel/types": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -1513,12 +1513,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz",
-      "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==",
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+      "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
       "dependencies": {
-        "@babel/types": "^7.20.7",
+        "@babel/types": "^7.21.0",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -1663,12 +1664,12 @@
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1708,9 +1709,9 @@
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
-      "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.0.tgz",
+      "integrity": "sha512-eD/JQ21IG2i1FraJnTMbUarAUkA7G988ofehG5MDCRXaUU91rEBJuCeSoou2Sk1y4RbLYXzqEg1QLwEmRU4qcQ==",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-module-imports": "^7.18.6",
@@ -1718,8 +1719,8 @@
         "@babel/helper-split-export-declaration": "^7.18.6",
         "@babel/helper-validator-identifier": "^7.19.1",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.10",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1848,13 +1849,13 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz",
-      "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
       "dependencies": {
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1874,9 +1875,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
-      "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==",
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.1.tgz",
+      "integrity": "sha512-JzhBFpkuhBNYUY7qs+wTzNmyCWUHEaAFpQQD2YfU1rPL38/L43Wvid0fFkiOCnHvsGncRZgEPyGnltABLcVDTg==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -2814,12 +2815,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz",
+      "integrity": "sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==",
       "dependencies": {
         "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "babel-plugin-polyfill-corejs2": "^0.3.3",
         "babel-plugin-polyfill-corejs3": "^0.6.0",
         "babel-plugin-polyfill-regenerator": "^0.4.1",
@@ -3079,18 +3080,18 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz",
-      "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.0.tgz",
+      "integrity": "sha512-Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA==",
       "dependencies": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.0",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
+        "@babel/parser": "^7.21.0",
+        "@babel/types": "^7.21.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -3099,9 +3100,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.0.tgz",
+      "integrity": "sha512-uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.19.4",
         "@babel/helper-validator-identifier": "^7.19.1",
@@ -4820,12 +4821,12 @@
       "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -4833,7 +4834,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -5567,9 +5568,9 @@
       }
     },
     "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -6685,6 +6686,29 @@
         "serve-static": "^1.14.1"
       }
     },
+    "node_modules/express/node_modules/body-parser": {
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
     "node_modules/express/node_modules/cookie": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
@@ -6706,6 +6730,20 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/express/node_modules/raw-body": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -10436,9 +10474,9 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.1.tgz",
-      "integrity": "sha512-hOz1ZWV0w6WEVLrj89Wpk7PXDYtDDF6k7/NX79lY5iKqeFtZsceBXW8xW59YFNcW5O3cH32hQ8IbDlhgyBsDMA==",
+      "version": "6.9.2",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.2.tgz",
+      "integrity": "sha512-Yb9rWJhYm+7Yf839QuKx2dXcclbA0GAMxtdDiaedHsOQU+y28cD/8gKYp1wTwwyAjKesqaGfLG4ez7D9lKpwBw==",
       "dependencies": {
         "bson": "^4.7.0",
         "kareem": "2.5.1",
@@ -13865,9 +13903,9 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -17851,20 +17889,20 @@
       "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="
     },
     "@babel/core": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
-      "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+      "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
       "requires": {
-        "@ampproject/remapping": "^2.1.0",
+        "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.0",
         "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-module-transforms": "^7.20.11",
-        "@babel/helpers": "^7.20.7",
-        "@babel/parser": "^7.20.7",
+        "@babel/helper-module-transforms": "^7.21.0",
+        "@babel/helpers": "^7.21.0",
+        "@babel/parser": "^7.21.0",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.12",
-        "@babel/types": "^7.20.7",
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -17873,12 +17911,13 @@
       }
     },
     "@babel/generator": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz",
-      "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==",
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+      "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
       "requires": {
-        "@babel/types": "^7.20.7",
+        "@babel/types": "^7.21.0",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "dependencies": {
@@ -17988,12 +18027,12 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -18021,9 +18060,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.20.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz",
-      "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.0.tgz",
+      "integrity": "sha512-eD/JQ21IG2i1FraJnTMbUarAUkA7G988ofehG5MDCRXaUU91rEBJuCeSoou2Sk1y4RbLYXzqEg1QLwEmRU4qcQ==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
         "@babel/helper-module-imports": "^7.18.6",
@@ -18031,8 +18070,8 @@
         "@babel/helper-split-export-declaration": "^7.18.6",
         "@babel/helper-validator-identifier": "^7.19.1",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.10",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -18122,13 +18161,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz",
-      "integrity": "sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
       "requires": {
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.20.7",
-        "@babel/types": "^7.20.7"
+        "@babel/traverse": "^7.21.0",
+        "@babel/types": "^7.21.0"
       }
     },
     "@babel/highlight": {
@@ -18142,9 +18181,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz",
-      "integrity": "sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="
+      "version": "7.21.1",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.1.tgz",
+      "integrity": "sha512-JzhBFpkuhBNYUY7qs+wTzNmyCWUHEaAFpQQD2YfU1rPL38/L43Wvid0fFkiOCnHvsGncRZgEPyGnltABLcVDTg=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -18725,12 +18764,12 @@
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz",
+      "integrity": "sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==",
       "requires": {
         "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "babel-plugin-polyfill-corejs2": "^0.3.3",
         "babel-plugin-polyfill-corejs3": "^0.6.0",
         "babel-plugin-polyfill-regenerator": "^0.4.1",
@@ -18921,26 +18960,26 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.20.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz",
-      "integrity": "sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.0.tgz",
+      "integrity": "sha512-Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA==",
       "requires": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.7",
+        "@babel/generator": "^7.21.0",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
+        "@babel/parser": "^7.21.0",
+        "@babel/types": "^7.21.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
-      "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.0.tgz",
+      "integrity": "sha512-uR7NWq2VNFnDi7EYqiRz2Jv/VQIu38tu64Zy8TX2nQFQ6etJ9V/Rr2msW8BS132mum2rL645qpDrLtAJtVpuow==",
       "requires": {
         "@babel/helper-string-parser": "^7.19.4",
         "@babel/helper-validator-identifier": "^7.19.1",
@@ -20271,12 +20310,12 @@
       "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
     },
     "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "requires": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -20284,7 +20323,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -20902,9 +20941,9 @@
       }
     },
     "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "convert-source-map": {
       "version": "1.9.0",
@@ -21782,6 +21821,25 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "body-parser": {
+          "version": "1.20.1",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+          "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.11.0",
+            "raw-body": "2.5.1",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
         "cookie": {
           "version": "0.5.0",
           "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
@@ -21799,6 +21857,17 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+        },
+        "raw-body": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+          "requires": {
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          }
         }
       }
     },
@@ -24607,9 +24676,9 @@
       }
     },
     "mongoose": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.1.tgz",
-      "integrity": "sha512-hOz1ZWV0w6WEVLrj89Wpk7PXDYtDDF6k7/NX79lY5iKqeFtZsceBXW8xW59YFNcW5O3cH32hQ8IbDlhgyBsDMA==",
+      "version": "6.9.2",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.2.tgz",
+      "integrity": "sha512-Yb9rWJhYm+7Yf839QuKx2dXcclbA0GAMxtdDiaedHsOQU+y28cD/8gKYp1wTwwyAjKesqaGfLG4ez7D9lKpwBw==",
       "requires": {
         "bson": "^4.7.0",
         "kareem": "2.5.1",
@@ -26996,9 +27065,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "requires": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
diff --git a/package.json b/package.json
index 225913478..b3b47eee9 100644
--- a/package.json
+++ b/package.json
@@ -68,11 +68,11 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/core": "^7.21.0",
+    "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.19.4",
     "@babel/preset-react": "^7.18.6",
-    "body-parser": "^1.20.1",
+    "body-parser": "^1.20.2",
     "classnames": "^2.3.2",
     "codemirror": "^5.65.6",
     "cookie-parser": "^1.4.6",
@@ -91,7 +91,7 @@
     "marked-extended-tables": "^1.0.5",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.29.4",
-    "mongoose": "^6.9.1",
+    "mongoose": "^6.9.2",
     "nanoid": "3.3.4",
     "nconf": "^0.12.0",
     "npm": "^8.10.0",
diff --git a/themes/Legacy/5ePHB/style.less b/themes/Legacy/5ePHB/style.less
index 2544ff77d..2793958fe 100644
--- a/themes/Legacy/5ePHB/style.less
+++ b/themes/Legacy/5ePHB/style.less
@@ -1,499 +1,497 @@
-@layer Legacy_5ePHB {
-	@import (less) './themes/fonts/5e legacy/fonts.less';
-	@import (less) './themes/assets/assets.less';
-	@import (less) './themes/phb.depricated.less';
-	//Colors
-	@background            : #EEE5CE; // Light parchment
-	@noteGreen             : #e0e5c1; // Pastel green
-	@headerUnderline       : #c9ad6a; // Gold
-	@horizontalRule        : #9c2b1b; // Maroon
-	@headerText            : #58180D; // Dark maroon
-	@monsterStatBackground : #FDF1DC; // Lighter parchment
-	@captionText           : #766649; // Brown
-	@page { margin: 0; }
-	body {
-		counter-reset : phb-page-numbers;
-	}
-	*{
-		-webkit-print-color-adjust : exact;
-	}
-	.useSansSerif(){
+@import (less) './themes/fonts/5e legacy/fonts.less';
+@import (less) './themes/assets/assets.less';
+@import (less) './themes/phb.depricated.less';
+//Colors
+@background            : #EEE5CE; // Light parchment
+@noteGreen             : #e0e5c1; // Pastel green
+@headerUnderline       : #c9ad6a; // Gold
+@horizontalRule        : #9c2b1b; // Maroon
+@headerText            : #58180D; // Dark maroon
+@monsterStatBackground : #FDF1DC; // Lighter parchment
+@captionText           : #766649; // Brown
+@page { margin: 0; }
+body {
+	counter-reset : phb-page-numbers;
+}
+*{
+	-webkit-print-color-adjust : exact;
+}
+.useSansSerif(){
+	font-family : ScalySans;
+	em{
 		font-family : ScalySans;
-		em{
-			font-family : ScalySans;
-			font-style  : italic;
-		}
-		strong{
-			font-family    : ScalySans;
-			font-weight    : 800;
-			letter-spacing : -0.02em;
+		font-style  : italic;
+	}
+	strong{
+		font-family    : ScalySans;
+		font-weight    : 800;
+		letter-spacing : -0.02em;
+	}
+}
+.useColumns(@multiplier : 1){
+	column-count         : 2;
+	column-fill          : auto;
+	column-gap           : 1cm;
+	column-width         : 8cm * @multiplier;
+	-webkit-column-count : 2;
+	-moz-column-count    : 2;
+	-webkit-column-width : 8cm * @multiplier;
+	-moz-column-width    : 8cm * @multiplier;
+	-webkit-column-gap   : 1cm;
+	-moz-column-gap      : 1cm;
+}
+.phb{
+	.useColumns();
+	counter-increment : phb-page-numbers;
+	position          : relative;
+	z-index           : 15;
+	box-sizing        : border-box;
+	overflow          : hidden;
+	height            : 279.4mm;
+	width             : 215.9mm;
+	padding           : 1.0cm 1.7cm;
+	padding-bottom    : 1.5cm;
+	background-color  : @background;
+	background-image  : @backgroundImage;
+	font-family       : BookSanity;
+	font-size         : 0.317cm;
+	text-rendering    : optimizeLegibility;
+	page-break-before : always;
+	page-break-after  : always;
+	contain           : size;
+	//*****************************
+	// *            BASE
+	// *****************************/
+	p{
+		padding-bottom : 0.8em;
+		line-height    : 1.269em;
+		&+p{
+			margin-top : -0.8em;
 		}
 	}
-	.useColumns(@multiplier : 1){
-		column-count         : 2;
-		column-fill          : auto;
-		column-gap           : 1cm;
-		column-width         : 8cm * @multiplier;
-		-webkit-column-count : 2;
-		-moz-column-count    : 2;
-		-webkit-column-width : 8cm * @multiplier;
-		-moz-column-width    : 8cm * @multiplier;
-		-webkit-column-gap   : 1cm;
-		-moz-column-gap      : 1cm;
+	ul{
+		margin-bottom       : 0.8em;
+		padding-left        : 1.4em;
+		line-height         : 1.269em;
+		list-style-position : outside;
+		list-style-type     : disc;
 	}
-	.phb{
-		.useColumns();
-		counter-increment : phb-page-numbers;
-		position          : relative;
-		z-index           : 15;
-		box-sizing        : border-box;
-		overflow          : hidden;
-		height            : 279.4mm;
-		width             : 215.9mm;
-		padding           : 1.0cm 1.7cm;
-		padding-bottom    : 1.5cm;
-		background-color  : @background;
-		background-image  : @backgroundImage;
-		font-family       : BookSanity;
-		font-size         : 0.317cm;
-		text-rendering    : optimizeLegibility;
-		page-break-before : always;
-		page-break-after  : always;
-		contain           : size;
-		//*****************************
-		// *            BASE
-		// *****************************/
-		p{
-			padding-bottom : 0.8em;
-			line-height    : 1.269em;
-			&+p{
-				margin-top : -0.8em;
+	ol{
+		margin-bottom       : 0.8em;
+		padding-left        : 1.4em;
+		line-height         : 1.269em;
+		list-style-position : outside;
+		list-style-type     : decimal;
+	}
+	//Indents after p or lists
+	p+p, ul+p, ol+p{
+		text-indent : 1em;
+	}
+	img{
+		z-index : -1;
+	}
+	strong{
+		font-weight    : bold;
+		letter-spacing : 0.03em;
+	}
+	em{
+		font-style : italic;
+	}
+	sup{
+		vertical-align : super;
+		font-size      : smaller;
+		line-height    : 0;
+	}
+	sub{
+		vertical-align : sub;
+		font-size      : smaller;
+		line-height    : 0;
+	}
+	//*****************************
+	// *           HEADERS
+	// *****************************/
+	h1,h2,h3,h4{
+		margin-top    : 0.2em;
+		margin-bottom : 0.2em;
+		font-family   : MrJeeves;
+		font-weight   : 800;
+		color         : @headerText;
+	}
+	h1{
+		column-span         : all;
+		font-size           : 0.987cm;
+		-webkit-column-span : all;
+		-moz-column-span    : all;
+		&+p::first-letter{
+			float       : left;
+			font-family : Solberry;
+			font-size   : 10em;
+			color       : #222;
+			line-height : 0.795em;
+		}
+	}
+	h2{
+		font-size : 0.705cm;
+	}
+	h3{
+		font-size     : 0.529cm;
+		border-bottom : 2px solid @headerUnderline;
+	}
+	h4{
+		margin-bottom : 0.00em;
+		font-size     : 0.458cm;
+	}
+	h5{
+		margin-bottom : 0.2em;
+		font-family   : ScalySansSmallCaps;
+		font-size     : 0.423cm;
+		font-weight   : 900;
+	}
+	//*****************************
+	// *          TABLE
+	// *****************************/
+	table{
+		.useSansSerif();
+		width         : 100%;
+		margin-bottom : 1em;
+		font-size     : 10pt;
+		thead{
+			display: table-row-group;
+			font-weight : 800;
+			th{
+				vertical-align : bottom;
+				padding-bottom : 0.3em;
+				padding-right  : 0.1em;
+				padding-left   : 0.1em;
 			}
 		}
-		ul{
-			margin-bottom       : 0.8em;
-			padding-left        : 1.4em;
-			line-height         : 1.269em;
-			list-style-position : outside;
-			list-style-type     : disc;
-		}
-		ol{
-			margin-bottom       : 0.8em;
-			padding-left        : 1.4em;
-			line-height         : 1.269em;
-			list-style-position : outside;
-			list-style-type     : decimal;
-		}
-		//Indents after p or lists
-		p+p, ul+p, ol+p{
-			text-indent : 1em;
-		}
-		img{
-			z-index : -1;
-		}
-		strong{
-			font-weight    : bold;
-			letter-spacing : 0.03em;
-		}
-		em{
-			font-style : italic;
-		}
-		sup{
-			vertical-align : super;
-			font-size      : smaller;
-			line-height    : 0;
-		}
-		sub{
-			vertical-align : sub;
-			font-size      : smaller;
-			line-height    : 0;
-		}
-		//*****************************
-		// *           HEADERS
-		// *****************************/
-		h1,h2,h3,h4{
-			margin-top    : 0.2em;
-			margin-bottom : 0.2em;
-			font-family   : MrJeeves;
-			font-weight   : 800;
-			color         : @headerText;
-		}
-		h1{
-			column-span         : all;
-			font-size           : 0.987cm;
-			-webkit-column-span : all;
-			-moz-column-span    : all;
-			&+p::first-letter{
-				float       : left;
-				font-family : Solberry;
-				font-size   : 10em;
-				color       : #222;
-				line-height : 0.795em;
-			}
-		}
-		h2{
-			font-size : 0.705cm;
-		}
-		h3{
-			font-size     : 0.529cm;
-			border-bottom : 2px solid @headerUnderline;
-		}
-		h4{
-			margin-bottom : 0.00em;
-			font-size     : 0.458cm;
-		}
-		h5{
-			margin-bottom : 0.2em;
-			font-family   : ScalySansSmallCaps;
-			font-size     : 0.423cm;
-			font-weight   : 900;
-		}
-		//*****************************
-		// *          TABLE
-		// *****************************/
-		table{
-			.useSansSerif();
-			width         : 100%;
-			margin-bottom : 1em;
-			font-size     : 10pt;
-			thead{
-				display: table-row-group;
-				font-weight : 800;
-				th{
-					vertical-align : bottom;
-					padding-bottom : 0.3em;
-					padding-right  : 0.1em;
-					padding-left   : 0.1em;
+		tbody{
+			tr{
+				td{
+					padding : 0.3em 0.1em;
+				}
+				&:nth-child(odd){
+					background-color : @noteGreen;
 				}
 			}
-			tbody{
-				tr{
-					td{
-						padding : 0.3em 0.1em;
-					}
-					&:nth-child(odd){
-						background-color : @noteGreen;
-					}
-				}
-			}
-		}
-		//*****************************
-		// *            NOTE
-		// *****************************/
-		blockquote{
-			.useSansSerif();
-			box-sizing          : border-box;
-			margin-bottom       : 1em;
-			padding             : 5px 10px;
-			background-color    : @noteGreen;
-			border-style        : solid;
-			border-width        : 11px;
-			border-image        : @noteBorderImage 11;
-			border-image-outset : 9px 0px;
-			box-shadow          : 1px 4px 14px #888;
-			p, ul{
-				font-size   : 0.352cm;
-				line-height : 1.083em;
-			}
-		}
-		//If a note starts a column, give it space at the top to render border
-		pre+blockquote, h2+blockquote, h3+blockquote, h4+blockquote, h5+blockquote {
-			margin-top : 13px;
-		}
-		//*****************************
-		// *    MONSTER STAT BLOCK
-		// *****************************/
-		hr+blockquote{
-			position         : relative;
-			padding-top      : 15px;
-			background-color : @monsterStatBackground;
-			border-style     : solid;
-			border-width     : 10px;
-			border-image     : @monsterBorderImageLegacy 10;
-			h2{
-				margin-top    : -8px;
-				margin-bottom : 0px;
-				&+p{
-					padding-bottom : 0px;
-				}
-			}
-			h3{
-				font-family   : ScalySans;
-				font-weight   : 400;
-				border-bottom : 1px solid @headerText;
-			}
-			hr+ul{
-				color : @headerText;
-			}
-			ul{
-				.useSansSerif();
-				padding-left : 1em;
-				font-size    : 0.352cm;
-			}
-			// Monster Ability table
-			hr+table{
-				margin              : 0;
-				background-color    : transparent;
-				border-style        : none;
-				border-image        : none;
-				tbody{
-					tr:nth-child(odd), tr:nth-child(even){
-						background-color : transparent;
-					}
-				}
-			}
-			table{
-				color : @headerText;
-			}
-			p+p{
-				margin-top     : 0em;
-				padding-bottom : 0.5em;
-				text-indent    : 0em;
-			}
-			//Triangle dividers
-			hr{
-				visibility       : visible;
-				height           : 6px;
-				margin           : 4px 0px;
-				background-image : @redTriangleImage;
-				background-size  : 100% 100%;
-				border           : none;
-			}
-		}
-		//Full Width
-		hr+hr+blockquote{
-			.useColumns(0.96);
-		}
-		//*****************************
-		// *           FOOTER
-		// *****************************/
-		&:after{
-			content          : "";
-			position         : absolute;
-			bottom           : 0px;
-			left             : 0px;
-			z-index          : 100;
-			height           : 50px;
-			width            : 100%;
-			background-image : @footerAccentImage;
-			background-size  : cover;
-		}
-		&:nth-child(even){
-			&:after{
-				transform : scaleX(-1);
-			}
-			.pageNumber{
-				left : 2px;
-			}
-			.footnote{
-				left       : 80px;
-				text-align : left;
-			}
-		}
-		.pageNumber{
-			position   : absolute;
-			right      : 2px;
-			bottom     : 22px;
-			width      : 50px;
-			font-size  : 0.9em;
-			color      : #c9ad6a;
-			text-align : center;
-			&.auto::after {
-				content : counter(phb-page-numbers);
-			}
-		}
-		.footnote{
-			position   : absolute;
-			right      : 80px;
-			bottom     : 32px;
-			z-index    : 150;
-			width      : 200px;
-			font-size  : 0.8em;
-			color      : #c9ad6a;
-			text-align : right;
-		}
-		//*****************************
-		// *          EXTRAS
-		// *****************************/
-		hr{
-			visibility : hidden;
-			margin     : 0px;
-		}
-		//Modified unorder list, used in spells
-		hr+ul{
-			margin-bottom   : 0.5em;
-			padding-left    : 1em;
-			text-indent     : -1em;
-			list-style-type : none;
-		}
-		//Column Break
-		pre, code{
-			visibility                 : hidden;
-			-webkit-column-break-after : always;
-			break-after                : always;
-			-moz-column-break-after    : always;
-		}
-		//Avoid breaking up
-		p,blockquote,table{
-			z-index                     : 15;
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
-		}
-		//Better spacing for spell blocks
-		h4+p+hr+ul{
-			margin-top : -0.5em
-		}
-		//Text indent right after table
-		table+p{
-			text-indent : 1em;
-		}
-		// Nested lists
-		ul ul,ol ol,ul ol,ol ul{
-			margin-bottom : 0px;
-			margin-left   : 1.5em;
-		}
-		li{
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
 		}
 	}
 	//*****************************
-	// *         SPELL LIST
+	// *            NOTE
 	// *****************************/
-	.phb .spellList{
+	blockquote{
 		.useSansSerif();
-		column-count        : 4;
-		column-span         : all;
-		-webkit-column-span : all;
-		-moz-column-span    : all;
-		ul+h5{
-			margin-top : 15px;
-		}
+		box-sizing          : border-box;
+		margin-bottom       : 1em;
+		padding             : 5px 10px;
+		background-color    : @noteGreen;
+		border-style        : solid;
+		border-width        : 11px;
+		border-image        : @noteBorderImage 11;
+		border-image-outset : 9px 0px;
+		box-shadow          : 1px 4px 14px #888;
 		p, ul{
 			font-size   : 0.352cm;
-			line-height : 1.263em;
+			line-height : 1.083em;
+		}
+	}
+	//If a note starts a column, give it space at the top to render border
+	pre+blockquote, h2+blockquote, h3+blockquote, h4+blockquote, h5+blockquote {
+		margin-top : 13px;
+	}
+	//*****************************
+	// *    MONSTER STAT BLOCK
+	// *****************************/
+	hr+blockquote{
+		position         : relative;
+		padding-top      : 15px;
+		background-color : @monsterStatBackground;
+		border-style     : solid;
+		border-width     : 10px;
+		border-image     : @monsterBorderImageLegacy 10;
+		h2{
+			margin-top    : -8px;
+			margin-bottom : 0px;
+			&+p{
+				padding-bottom : 0px;
+			}
+		}
+		h3{
+			font-family   : ScalySans;
+			font-weight   : 400;
+			border-bottom : 1px solid @headerText;
+		}
+		hr+ul{
+			color : @headerText;
 		}
 		ul{
-			margin-bottom               : 0.5em;
-			padding-left                : 1em;
-			text-indent                 : -1em;
-			list-style-type             : none;
-			-webkit-column-break-inside : auto;
-			page-break-inside           : auto;
-			break-inside                : auto;
+			.useSansSerif();
+			padding-left : 1em;
+			font-size    : 0.352cm;
 		}
-	}
-	//*****************************
-	// *         WIDE
-	// *****************************/
-	.phb .wide{
-		column-span         : all;
-		-webkit-column-span : all;
-		-moz-column-span    : all;
-	}
-	//*****************************
-	// *       CLASS TABLE
-	// *****************************/
-	.phb .classTable{
-		margin-top          : 25px;
-		margin-bottom       : 40px;
-		border-collapse     : separate;
-		background-color    : white;
-		border              : initial;
-		border-style        : solid;
-		border-image-outset : 25px 17px;
-		border-image-repeat : stretch;
-		border-image-slice  : 150 200 150 200;
-		border-image-source : @frameBorderImage;
-		border-image-width  : 47px;
-		h5{
-			margin-bottom : 10px;
-		}
-	}
-	//************************************
-	// *       DESCRIPTIVE TEXT BOX
-	// ************************************/
-	.phb .descriptive{
-		margin-bottom       : 1em;
-		background-color    : #faf7ea;
-		font-family         : ScalySans;
-		border-style        : solid;
-		border-width        : 7px;
-		border-image        : @descriptiveBoxImage 12 stretch;
-		border-image-outset : 4px;
-		box-shadow          : 0px 0px 6px #faf7ea;
-		p{
-			display        : block;
-			padding-bottom : 0px;
-			line-height    : 1.47em;
-		}
-		p + p {
-			padding-top : .8em;
-		}
-		em {
-			font-family : ScalySans;
-			font-style  : italic;
-		}
-		strong {
-			font-family    : ScalySans;
-			font-weight    : 800;
-			letter-spacing : -0.02em;
-		}
-	}
-	.phb pre+.descriptive{
-		margin-top : 8px;
-	}
-
-	//*****************************
-	// *    ARTIST CREDIT BLOCK
-	// *****************************/
-	.phb {
-		.artist {
-			position    : absolute;
-			text-align  : center;
-			font-family : WalterTurncoat;
-			font-size   : 0.27cm;
-			color       : @captionText;
-			p, p + p {
-				margin      : unset;
-				text-indent : unset;
-				line-height : 0.941em;
-			}
-		 	h5 {
-				font-size   : 1.3em;
-				font-family : WalterTurncoat;
-			}
-			a{
-				color           : inherit;
-				text-decoration : unset;
-				&:hover {
-					text-decoration : underline;
+		// Monster Ability table
+		hr+table{
+			margin              : 0;
+			background-color    : transparent;
+			border-style        : none;
+			border-image        : none;
+			tbody{
+				tr:nth-child(odd), tr:nth-child(even){
+					background-color : transparent;
 				}
 			}
 		}
+		table{
+			color : @headerText;
+		}
+		p+p{
+			margin-top     : 0em;
+			padding-bottom : 0.5em;
+			text-indent    : 0em;
+		}
+		//Triangle dividers
+		hr{
+			visibility       : visible;
+			height           : 6px;
+			margin           : 4px 0px;
+			background-image : @redTriangleImage;
+			background-size  : 100% 100%;
+			border           : none;
+		}
+	}
+	//Full Width
+	hr+hr+blockquote{
+		.useColumns(0.96);
 	}
 	//*****************************
-	// *      TABLE OF CONTENTS
+	// *           FOOTER
 	// *****************************/
-	.phb .toc{
+	&:after{
+		content          : "";
+		position         : absolute;
+		bottom           : 0px;
+		left             : 0px;
+		z-index          : 100;
+		height           : 50px;
+		width            : 100%;
+		background-image : @footerAccentImage;
+		background-size  : cover;
+	}
+	&:nth-child(even){
+		&:after{
+			transform : scaleX(-1);
+		}
+		.pageNumber{
+			left : 2px;
+		}
+		.footnote{
+			left       : 80px;
+			text-align : left;
+		}
+	}
+	.pageNumber{
+		position   : absolute;
+		right      : 2px;
+		bottom     : 22px;
+		width      : 50px;
+		font-size  : 0.9em;
+		color      : #c9ad6a;
+		text-align : center;
+		&.auto::after {
+			content : counter(phb-page-numbers);
+		}
+	}
+	.footnote{
+		position   : absolute;
+		right      : 80px;
+		bottom     : 32px;
+		z-index    : 150;
+		width      : 200px;
+		font-size  : 0.8em;
+		color      : #c9ad6a;
+		text-align : right;
+	}
+	//*****************************
+	// *          EXTRAS
+	// *****************************/
+	hr{
+		visibility : hidden;
+		margin     : 0px;
+	}
+	//Modified unorder list, used in spells
+	hr+ul{
+		margin-bottom   : 0.5em;
+		padding-left    : 1em;
+		text-indent     : -1em;
+		list-style-type : none;
+	}
+	//Column Break
+	pre, code{
+		visibility                 : hidden;
+		-webkit-column-break-after : always;
+		break-after                : always;
+		-moz-column-break-after    : always;
+	}
+	//Avoid breaking up
+	p,blockquote,table{
+		z-index                     : 15;
 		-webkit-column-break-inside : avoid;
 		page-break-inside           : avoid;
 		break-inside                : avoid;
+	}
+	//Better spacing for spell blocks
+	h4+p+hr+ul{
+		margin-top : -0.5em
+	}
+	//Text indent right after table
+	table+p{
+		text-indent : 1em;
+	}
+	// Nested lists
+	ul ul,ol ol,ul ol,ol ul{
+		margin-bottom : 0px;
+		margin-left   : 1.5em;
+	}
+	li{
+		-webkit-column-break-inside : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
+	}
+}
+//*****************************
+// *         SPELL LIST
+// *****************************/
+.phb .spellList{
+	.useSansSerif();
+	column-count        : 4;
+	column-span         : all;
+	-webkit-column-span : all;
+	-moz-column-span    : all;
+	ul+h5{
+		margin-top : 15px;
+	}
+	p, ul{
+		font-size   : 0.352cm;
+		line-height : 1.263em;
+	}
+	ul{
+		margin-bottom               : 0.5em;
+		padding-left                : 1em;
+		text-indent                 : -1em;
+		list-style-type             : none;
+		-webkit-column-break-inside : auto;
+		page-break-inside           : auto;
+		break-inside                : auto;
+	}
+}
+//*****************************
+// *         WIDE
+// *****************************/
+.phb .wide{
+	column-span         : all;
+	-webkit-column-span : all;
+	-moz-column-span    : all;
+}
+//*****************************
+// *       CLASS TABLE
+// *****************************/
+.phb .classTable{
+	margin-top          : 25px;
+	margin-bottom       : 40px;
+	border-collapse     : separate;
+	background-color    : white;
+	border              : initial;
+	border-style        : solid;
+	border-image-outset : 25px 17px;
+	border-image-repeat : stretch;
+	border-image-slice  : 150 200 150 200;
+	border-image-source : @frameBorderImage;
+	border-image-width  : 47px;
+	h5{
+		margin-bottom : 10px;
+	}
+}
+//************************************
+// *       DESCRIPTIVE TEXT BOX
+// ************************************/
+.phb .descriptive{
+	margin-bottom       : 1em;
+	background-color    : #faf7ea;
+	font-family         : ScalySans;
+	border-style        : solid;
+	border-width        : 7px;
+	border-image        : @descriptiveBoxImage 12 stretch;
+	border-image-outset : 4px;
+	box-shadow          : 0px 0px 6px #faf7ea;
+	p{
+		display        : block;
+		padding-bottom : 0px;
+		line-height    : 1.47em;
+	}
+	p + p {
+		padding-top : .8em;
+	}
+	em {
+		font-family : ScalySans;
+		font-style  : italic;
+	}
+	strong {
+		font-family    : ScalySans;
+		font-weight    : 800;
+		letter-spacing : -0.02em;
+	}
+}
+.phb pre+.descriptive{
+	margin-top : 8px;
+}
+
+//*****************************
+// *    ARTIST CREDIT BLOCK
+// *****************************/
+.phb {
+	.artist {
+		position    : absolute;
+		text-align  : center;
+		font-family : WalterTurncoat;
+		font-size   : 0.27cm;
+		color       : @captionText;
+		p, p + p {
+			margin      : unset;
+			text-indent : unset;
+			line-height : 0.941em;
+		}
+	 	h5 {
+			font-size   : 1.3em;
+			font-family : WalterTurncoat;
+		}
 		a{
-			color           : black;
-			text-decoration : none;
-			&:hover{
+			color           : inherit;
+			text-decoration : unset;
+			&:hover {
 				text-decoration : underline;
 			}
 		}
-		ul{
-			padding-left    : 0;
-			list-style-type : none;
-		}
-		&>ul>li{
-			margin-bottom : 10px;
-		}
+	}
+}
+//*****************************
+// *      TABLE OF CONTENTS
+// *****************************/
+.phb .toc{
+	-webkit-column-break-inside : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
+	a{
+		color           : black;
+		text-decoration : none;
+		&:hover{
+			text-decoration : underline;
+		}
+	}
+	ul{
+		padding-left    : 0;
+		list-style-type : none;
+	}
+	&>ul>li{
+		margin-bottom : 10px;
 	}
 }
diff --git a/themes/V3/5eDMG/style.less b/themes/V3/5eDMG/style.less
index 02056a34b..50a3af0a3 100644
--- a/themes/V3/5eDMG/style.less
+++ b/themes/V3/5eDMG/style.less
@@ -1,21 +1,19 @@
-@layer V3_5eDMG {
-	:root {
-		//Colors
-		--HB_Color_Accent                : #EBCEC3; // Salmon
-		--HB_Color_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);
+	background-size  : cover;
+
+	&:after {
+		background-image : url(/assets/DMG_footerAccent.png);
+		height: 58px;
 	}
 
-	.page {
-		background-image : url(/assets/DMG_background.png);
-		background-size  : cover;
-
-		&:after {
-			background-image : url(/assets/DMG_footerAccent.png);
-			height: 58px;
-		}
-
-		.footnote {
-			bottom : 40px;
-		}
+	.footnote {
+		bottom : 40px;
 	}
 }
diff --git a/themes/V3/5ePHB/style.less b/themes/V3/5ePHB/style.less
index 85dc566f4..09f0dc790 100644
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -1,798 +1,796 @@
-@layer V3_5ePHB {
-	@import (less) './themes/fonts/5e/fonts.less';
-	@import (less) './themes/assets/assets.less';
+@import (less) './themes/fonts/5e/fonts.less';
+@import (less) './themes/assets/assets.less';
 
-	:root {
-		//Colors
-		--HB_Color_Background            : #EEE5CE; // Light parchment
-		--HB_Color_Accent                : #E0E5C1; // Pastel green
-		--HB_Color_HeaderUnderline       : #C0AD6A; // Gold
-		--HB_Color_HorizontalRule        : #9C2B1B; // Maroon
-		--HB_Color_HeaderText            : #58180D; // Dark Maroon
-		--HB_Color_MonsterStatBackground : #F2E5B5; // Light orange parchment
-		--HB_Color_CaptionText           : #766649; // Brown
-		--HB_Color_WatercolorStain       : #BBAD82; // Light brown
-		--HB_Color_Footnotes             : #C9AD6A; // Gold
-	}
+:root {
+	//Colors
+	--HB_Color_Background            : #EEE5CE; // Light parchment
+	--HB_Color_Accent                : #E0E5C1; // Pastel green
+	--HB_Color_HeaderUnderline       : #C0AD6A; // Gold
+	--HB_Color_HorizontalRule        : #9C2B1B; // Maroon
+	--HB_Color_HeaderText            : #58180D; // Dark Maroon
+	--HB_Color_MonsterStatBackground : #F2E5B5; // Light orange parchment
+	--HB_Color_CaptionText           : #766649; // Brown
+	--HB_Color_WatercolorStain       : #BBAD82; // Light brown
+	--HB_Color_Footnotes             : #C9AD6A; // Gold
+}
 
-	@page { margin: 0; }
-	body {
-		counter-reset : phb-page-numbers;
-	}
-	*{
-		-webkit-print-color-adjust : exact;
-	}
-	.useSansSerif(){
-		font-family : ScalySansRemake;
-		font-size   : 0.318cm;
+@page { margin: 0; }
+body {
+	counter-reset : phb-page-numbers;
+}
+*{
+	-webkit-print-color-adjust : exact;
+}
+.useSansSerif(){
+	font-family : ScalySansRemake;
+	font-size   : 0.318cm;
+	line-height : 1.2em;
+	p,dl,ul,ol {
 		line-height : 1.2em;
-		p,dl,ul,ol {
-			line-height : 1.2em;
+	}
+	ul, ol {
+		padding-left : 1em;
+	}
+	em{
+		font-style  : italic;
+	}
+	strong{
+		font-weight    : 800;
+		letter-spacing : -0.02em;
+	}
+	h5 + * {
+		margin-top : 0.1cm;
+	}
+}
+.useColumns(@multiplier : 1, @fillMode: balance){
+	column-count         : 2;
+	column-fill          : @fillMode;
+	column-gap           : 0.9cm;
+	column-width         : 8cm * @multiplier;
+	-webkit-column-count : 2;
+	-moz-column-count    : 2;
+	-webkit-column-width : 8cm * @multiplier;
+	-moz-column-width    : 8cm * @multiplier;
+	-webkit-column-gap   : 0.9cm;
+	-moz-column-gap      : 0.9cm;
+}
+.columnWrapper{
+	max-height        : 100%;
+	column-span       : all;
+	columns           : inherit;
+	column-gap        : inherit;
+}
+.page{
+	.useColumns();
+	counter-increment : phb-page-numbers;
+	position          : relative;
+	z-index           : 15;
+	box-sizing        : border-box;
+	overflow          : hidden;
+	height            : 279.4mm;
+	width             : 215.9mm;
+	background-color  : var(--HB_Color_Background);
+	background-image  : @backgroundImage;
+	padding           : 1.4cm 1.9cm 1.7cm;
+	font-family       : BookInsanityRemake;
+	font-size         : 0.34cm;
+	text-rendering    : optimizeLegibility;
+	page-break-before : always;
+	page-break-after  : always;
+}
+	//*****************************
+	// *            BASE
+	// *****************************/
+
+.page{
+	p{
+		overflow-wrap : break-word;		//TODO: MAKE ALL MARGINS TOP-ONLY. USE * + * STYLE SELECTORS
+		display       : block;
+		line-height   : 1.25em;
+		&+* {
+			margin-top : 0.325cm;
 		}
-		ul, ol {
-			padding-left : 1em;
-		}
-		em{
-			font-style  : italic;
-		}
-		strong{
-			font-weight    : 800;
-			letter-spacing : -0.02em;
-		}
-		h5 + * {
-			margin-top : 0.1cm;
+		&+p{
+			margin-top : 0;
 		}
 	}
-	.useColumns(@multiplier : 1, @fillMode: balance){
-		column-count         : 2;
-		column-fill          : @fillMode;
-		column-gap           : 0.9cm;
-		column-width         : 8cm * @multiplier;
-		-webkit-column-count : 2;
-		-moz-column-count    : 2;
-		-webkit-column-width : 8cm * @multiplier;
-		-moz-column-width    : 8cm * @multiplier;
-		-webkit-column-gap   : 0.9cm;
-		-moz-column-gap      : 0.9cm;
+	ul{
+		margin-bottom       : 0.8em;
+		padding-left        : 1.4em;
+		line-height         : 1.25em;
+		list-style-position : outside;
+		list-style-type     : disc;
 	}
-	.columnWrapper{
-		max-height        : 100%;
-		column-span       : all;
-		columns           : inherit;
-		column-gap        : inherit;
+	ol{
+		margin-bottom       : 0.8em;
+		padding-left        : 1.4em;
+		line-height         : 1.25em;
+		list-style-position : outside;
+		list-style-type     : decimal;
 	}
-	.page{
-		.useColumns();
-		counter-increment : phb-page-numbers;
-		position          : relative;
-		z-index           : 15;
-		box-sizing        : border-box;
-		overflow          : hidden;
-		height            : 279.4mm;
-		width             : 215.9mm;
-		background-color  : var(--HB_Color_Background);
-		background-image  : @backgroundImage;
-		padding           : 1.4cm 1.9cm 1.7cm;
-		font-family       : BookInsanityRemake;
-		font-size         : 0.34cm;
-		text-rendering    : optimizeLegibility;
-		page-break-before : always;
-		page-break-after  : always;
+	//Indents after p or lists
+	p+p, ul+p, ol+p{
+		text-indent : 1em;
 	}
-		//*****************************
-		// *            BASE
-		// *****************************/
-
-	.page{
-		p{
-			overflow-wrap : break-word;		//TODO: MAKE ALL MARGINS TOP-ONLY. USE * + * STYLE SELECTORS
-			display       : block;
-			line-height   : 1.25em;
-			&+* {
-				margin-top : 0.325cm;
-			}
-			&+p{
-				margin-top : 0;
-			}
-		}
-		ul{
-			margin-bottom       : 0.8em;
-			padding-left        : 1.4em;
-			line-height         : 1.25em;
-			list-style-position : outside;
-			list-style-type     : disc;
-		}
-		ol{
-			margin-bottom       : 0.8em;
-			padding-left        : 1.4em;
-			line-height         : 1.25em;
-			list-style-position : outside;
-			list-style-type     : decimal;
-		}
-		//Indents after p or lists
-		p+p, ul+p, ol+p{
-			text-indent : 1em;
-		}
-		img{
-			z-index : -1;
-		}
-		strong{
-			font-weight    : bold;
-			letter-spacing : -0.02em;
-		}
-		em{
-			font-style : italic;
-		}
-		sup{
-			vertical-align : super;
-			font-size      : smaller;
-			line-height    : 0;
-		}
-		sub{
-			vertical-align : sub;
-			font-size      : smaller;
-			line-height    : 0;
-		}
-		//*****************************
-		// *           HEADERS
-		// *****************************/
-		h1,h2,h3,h4{
-			font-family   : MrEavesRemake;
-			font-weight   : 800;
-			color         : var(--HB_Color_HeaderText);
-		}
-		h1{
-			margin-bottom       : 0.18cm; //Margin-bottom only because this is WIDE
-			column-span         : all;
-			font-size           : 0.89cm;
-			line-height         : 1em;
-			-webkit-column-span : all;
-			-moz-column-span    : all;
-			&+p::first-letter{
-				float                   : left;
-				font-family             : SolberaImitationRemake;
-				line-height             : 1em;
-				font-size               : 3.5cm;
-				padding-left            : 40px; //Allow background color to extend into margins
-				margin-left             : -40px;
-				margin-top              : -0.3cm;
-				padding-bottom          : 2px;
-				margin-bottom           : -20px;
-				background-image        : linear-gradient(-45deg, #322814, #998250, #322814);
-				background-clip         : text;
-				-webkit-background-clip : text;
-				color                   : rgba(0, 0, 0, 0);
-			}
-			&+p::first-line{
-				font-variant : small-caps;
-			}
-		}
-		h2{
-			//margin-top    : 0px; //Font is misaligned. Shift up slightly
-			//margin-bottom : 0.05cm;
-			font-size     : 0.75cm;
-			line-height   : 0.988em; //Font is misaligned. Shift up slightly
-		}
-		h3{
-			//margin-top    : -0.1cm; //Font is misaligned. Shift up slightly
-			//margin-bottom : 0.1cm;
-			font-size     : 0.575cm;
-			border-bottom : 2px solid var(--HB_Color_HeaderUnderline);;
-			line-height   : 0.995em; //Font is misaligned. Shift up slightly
-			& + * {
-				margin-top: 0.17cm;
-			}
-		}
-		* + h3 {
-			margin-top    : 0.155cm; //(0.325 - 0.17)
-		}
-		h4{
-			//margin-top    : -0.02cm; //Font is misaligned. Shift up slightly
-			//margin-bottom : 0.02cm;
-			font-size     : 0.458cm;
-			line-height   : 0.971em; //Font is misaligned. Shift up slightly
-			& + * {
-				margin-top: 0.09cm;
-			}
-		}
-		* + h4 {
-			margin-top    : 0.235cm; //(0.325 - 0.09)
-		}
-		h5{
-			//margin-top    : -0.02cm; //Font is misaligned. Shift up slightly
-			//margin-bottom : 0.02cm;
-			font-family   : ScalySansSmallCapsRemake;
-			font-size     : 0.423cm;
-			font-weight   : 900;
-			line-height   : 0.951em; //Font is misaligned. Shift up slightly
-			& + * {
-				margin-top : 0.2cm;
-			}
-		}
-		//*****************************
-		// *          TABLE
-		// *****************************/
-		table{
-			.useSansSerif();
-			width         : 100%;
-			line-height   : 16px;
-			& + * {
-				margin-top : 0.325cm;
-			}
-			thead{
-				display: table-row-group;
-				font-weight : 800;
-				th{
-					vertical-align : bottom;
-					//padding        : 0.14em 0.4em;
-					padding     : 0px 1.5px;   // Both of these are temporary, just to force
-					//line-height : 16px;        // PDF to render at same height until Chrome 108
-				}
-			}
-			tbody{
-				tr{
-					td{
-						//padding : 0.14em 0.4em;
-						padding     : 0px 1.5px;   // Both of these are temporary, just to force
-	          //line-height : 16px;        // PDF to render at same height until Chrome 108
-					}
-					&:nth-child(odd){
-						background-color : var(--HB_Color_Accent);
-					}
-				}
-			}
-		}
-		//*****************************
-		// *            NOTE
-		// *****************************/
-		.note{
-			.useSansSerif();
-			background-color    : var(--HB_Color_Accent);
-			border-style        : solid;
-			border-width        : 1px;
-			border-image        : @noteBorderImage 12 stretch;
-			border-image-outset : 9px 0px;
-			border-image-width  : 11px;
-			padding             : 0.13cm 0.16cm;
-			filter              : drop-shadow(1px 4px 6px #888);
-			.page :where(&) {
-				margin-top        : 9px; //Prevent top border getting cut off on colbreak
-			}
-			& + * {
-				margin-top : 0.45cm;
-			}
-			h5 {
-				font-size : 0.375cm;
-			}
-			p{
-				display        : block;
-				padding-bottom : 0px;
-			}
-			:last-child {
-				margin-bottom : 0;
-			}
-		}
-		//************************************
-		// *       DESCRIPTIVE TEXT BOX
-		// ************************************/
-		.descriptive{
-			.useSansSerif();
-			background-color    : #faf7ea;
-			border-style        : solid;
-			border-width        : 7px;
-			border-image        : @descriptiveBoxImage 12 stretch;
-			border-image-outset : 4px;
-			padding             : 0.1em;
-			filter              : drop-shadow(0 0 3px #faf7ea);
-			.page :where(&) {
-				margin-top        : 4px; //Prevent top border getting cut off on colbreak
-			}
-			& + * {
-				margin-top : 0.45cm;
-			}
-			h5 {
-				font-size : 0.375cm;
-			}
-			p{
-				display        : block;
-				padding-bottom : 0px;
-				line-height    : 1.5em;
-			}
-			:last-child {
-				margin-bottom : 0;
-			}
-		}
-		//*****************************
-		// *    Images Snippets
-		// *****************************/
-
-		/* Arist Credit */
-		.artist {
-			position    : absolute;
-			width       : auto;
-			text-align  : center;
-			font-family : WalterTurncoat;
-			font-size   : 0.27cm;
-			color       : var(--HB_Color_CaptionText);
-			p, p + p {
-				margin      : unset;
-				text-indent : unset;
-				line-height : 1em;
-			}
-		 	h5 {
-				font-size   : 1.3em;
-				font-family : WalterTurncoat;
-			}
-			a{
-				color           : inherit;
-				text-decoration : unset;
-				&:hover {
-					text-decoration : underline;
-				}
-			}
-		}
-
-		/* Watermark */
-		.watermark {
-			display         : grid !important;
-			place-items     : center;
-			justify-content	: center;
-			position        : absolute;
-			top             : 0;
-			left            : 0;
-			width           : 100%;
-			height          : 100%;
-			font-size       : 120px;
-			text-transform	: uppercase;
-			color           : black;
-			mix-blend-mode  : overlay;
-			opacity         : 30%;
-			transform       : rotate(-45deg);
-			z-index         : 500;
-			p {
-				margin-bottom : none;
-			}
-		}
-
-		/* Watercolor */
-		[class*="watercolor"] {
-			position            : absolute;
-			width               : 2000px;    /* dimensions need to be real big so the user can set */
-			height              : 2000px;    /* height or width and the image will maintain aspect ratio */
-			-webkit-mask-image  : var(--wc);
-			-webkit-mask-size   : contain;
-			-webkit-mask-repeat : no-repeat;
-			mask-image          : var(--wc);
-			mask-size           : contain;
-			mask-repeat         : no-repeat;
-			background-size     : cover;
-			background-color    : var(--HB_Color_WatercolorStain);			/*default color*/
-			--wc                : @watercolor1;         /*default image*/
-			z-index             : -2;
-		}
-
-		.watercolor1  { --wc : @watercolor1; }
-		.watercolor2  { --wc : @watercolor2; }
-		.watercolor3  { --wc : @watercolor3; }
-		.watercolor4  { --wc : @watercolor4; }
-		.watercolor5  { --wc : @watercolor5; }
-		.watercolor6  { --wc : @watercolor6; }
-		.watercolor7  { --wc : @watercolor7; }
-		.watercolor8  { --wc : @watercolor8; }
-		.watercolor9  { --wc : @watercolor9; }
-		.watercolor10 { --wc : @watercolor10; }
-		.watercolor11 { --wc : @watercolor11; }
-		.watercolor12 { --wc : @watercolor12; }
-
-		//*****************************
-		// *    MONSTER STAT BLOCK
-		// *****************************/
-		.monster {
-			.useSansSerif();
-			&.frame {
-				border-style          : solid;
-				border-width          : 7px 6px;
-				background-color      : var(--HB_Color_MonsterStatBackground);
-				background-image      : @monsterBlockBackground;
-				border-image          : @monsterBorderImage 14 round;
-				border-image-outset   : 0px 2px;
-				background-blend-mode : overlay;
-				background-attachment : fixed;
-				filter                : drop-shadow(1px 4px 6px #888);
-				padding               : 4px 2px;
-				margin-left           : -0.16cm;
-				margin-right          : -0.16cm;
-				width                 : calc(100% + 0.32cm);
-			}
-
-			position          : relative;
-			padding           : 0px;
-			margin-bottom     : 0.325cm;
-
-			//Headers
-			h2{
-				font-size     : 0.62cm;
-				line-height   : 1em;
-				margin        : 0;
-				&+p {
-					font-size     : 0.304cm; //Monster size and type subtext
-					margin-bottom : 0;
-				}
-			}
-			h3{
-				font-family    : ScalySansRemake;
-				font-weight    : 800;
-				font-variant   : small-caps;
-				border-bottom  : 2px solid var(--HB_Color_HeaderText);
-				// margin-top     : 0.05cm;  //Font is misaligned. Shift up slightly
-	  		padding-bottom : 0.05cm;
-			}
-
-			//Triangle dividers
-			hr{
-				visibility       : visible;
-				height           : 6px;
-				margin           : 0.12cm 0cm;
-				background-image : @redTriangleImage;
-				background-size  : 100% 100%;
-				border           : none;
-			}
-
-			//Attribute Lists - All text between HRs is red
-			hr ~ :is(dl,p) {
-				color : var(--HB_Color_HeaderText);
-			}
-			hr:last-of-type {
-				& ~ :is(dl,p) {
-					color : inherit; // After the HRs, reset text to black
-				}
-				& + * {
-					margin-top : 0.325cm; // Space after last HR
-				}
-			}
-
-			// Monster Ability table
-			hr + table:first-of-type{
-				margin              : 0;
-				column-span         : none;
-				color               : var(--HB_Color_HeaderText);
-				background-color    : transparent;
-				border-style        : none;
-				border-image        : none;
-				-webkit-column-span : none;
-				tr {
-					background-color : transparent;
-				}
-				td,th {
-					padding: 0px;
-				}
-			}
-
-			:last-child {
-				margin-bottom : 0;
-			}
-		}
-
-		//Full Width
-		.monster.wide{
-			.useColumns(0.96, @fillMode: balance);
-		}
-
-		//*****************************
-		// *           FOOTER
-		// *****************************/
-		&:after{
-			content          : "";
-			position         : absolute;
-			bottom           : 0px;
-			left             : 0px;
-			z-index          : 100;
-			height           : 50px;
-			width            : 100%;
-			background-image : @footerAccentImage;
-			background-size  : cover;
-		}
-		&:nth-child(even){
-			&:after{
-				transform : scaleX(-1);
-			}
-			.pageNumber{
-				left : 2px;
-			}
-			.footnote{
-				left       : 80px;
-				text-align : left;
-			}
-		}
-		.pageNumber{
-			position    : absolute;
-			right       : 2px;
-			bottom      : 22px;
-			width       : 50px;
-			font-size   : 0.9em;
-			color       : var(--HB_Color_Footnotes);
-			text-align  : center;
-			text-indent : 0;
-			&.auto::after {
-				content : counter(phb-page-numbers);
-			}
-		}
-		.footnote{
-			position   : absolute;
-			right      : 80px;
-			bottom     : 32px;
-			z-index    : 150;
-			width      : 200px;
-			font-size  : 0.8em;
-			color      : var(--HB_Color_Footnotes);
-			text-align : right;
-		}
-		//************************************
-		// *           CODE BLOCKS
-		// ************************************/
-		code{
-	    font-family      : "Courier New", Courier, monospace;
-			font-size        : 0.325;
-			padding          : 0px 4px;
-			color            : #58180d;
-			background-color : #faf7ea;
-			border-radius    : 4px;
-			white-space      : pre-wrap;
-			overflow-wrap    : break-word;
-		}
-
-		pre code{
-			width               : 100%;
-			display             : inline-block;
-			border-style        : solid;
-			border-width        : 1px;
-			border-image        : @codeBorderImage 26 stretch;
-			border-image-width  : 10px;
-			border-image-outset : 2px;
-			border-radius       : 12px;
-			margin-bottom       : 2px;
-			padding             : 0.15cm;
-			.page :where(&) {
-				margin-top        : 2px; //Prevent top border getting cut off on colbreak
-			}
-			& + * {
-				margin-top : 0.325cm;
-			}
-		}
-		//*****************************
-		// *          EXTRAS
-		// *****************************/
-		hr{
-			visibility : hidden;
-			margin     : 0px;
-		}
-		.columnSplit {
-			visibility                 : hidden;
-			-webkit-column-break-after : always;
-			break-after                : always;
-			-moz-column-break-after    : always;
-		}
-		//Avoid breaking up
-		blockquote,table{
-			z-index                     : 15;
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
-		}
-		//Text indent right after table
-		table+p{
-			text-indent : 1em;
-		}
-		// Nested lists
-		ul ul,ol ol,ul ol,ol ul{
-			margin-bottom : 0px;
-			margin-left   : 1.5em;
-		}
-		li{
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
-		}
+	img{
+		z-index : -1;
+	}
+	strong{
+		font-weight    : bold;
+		letter-spacing : -0.02em;
+	}
+	em{
+		font-style : italic;
+	}
+	sup{
+		vertical-align : super;
+		font-size      : smaller;
+		line-height    : 0;
+	}
+	sub{
+		vertical-align : sub;
+		font-size      : smaller;
+		line-height    : 0;
 	}
 	//*****************************
-	// *         SPELL LIST
+	// *           HEADERS
 	// *****************************/
-	.page .spellList{
-		.useSansSerif();
-		column-count        : 2;
-		ul+h5{
-			margin-top : 15px;
+	h1,h2,h3,h4{
+		font-family   : MrEavesRemake;
+		font-weight   : 800;
+		color         : var(--HB_Color_HeaderText);
+	}
+	h1{
+		margin-bottom       : 0.18cm; //Margin-bottom only because this is WIDE
+		column-span         : all;
+		font-size           : 0.89cm;
+		line-height         : 1em;
+		-webkit-column-span : all;
+		-moz-column-span    : all;
+		&+p::first-letter{
+			float                   : left;
+			font-family             : SolberaImitationRemake;
+			line-height             : 1em;
+			font-size               : 3.5cm;
+			padding-left            : 40px; //Allow background color to extend into margins
+			margin-left             : -40px;
+			margin-top              : -0.3cm;
+			padding-bottom          : 2px;
+			margin-bottom           : -20px;
+			background-image        : linear-gradient(-45deg, #322814, #998250, #322814);
+			background-clip         : text;
+			-webkit-background-clip : text;
+			color                   : rgba(0, 0, 0, 0);
 		}
-		p, ul{
-			font-size   : 0.352cm;
-			line-height : 1.265em;
-		}
-		ul{
-			margin-bottom               : 0.5em;
-			padding-left                : 1em;
-			text-indent                 : -1em;
-			list-style-type             : none;
-			-webkit-column-break-inside : auto;
-			page-break-inside           : auto;
-			break-inside                : auto;
-		}
-		&.wide{
-			column-count : 4;
+		&+p::first-line{
+			font-variant : small-caps;
 		}
 	}
-
-	//*****************************
-	// *       CLASS TABLE
-	// *****************************/
-	.page .classTable{
-		th[colspan]:not([rowspan]) {
-			white-space : nowrap;
+	h2{
+		//margin-top    : 0px; //Font is misaligned. Shift up slightly
+		//margin-bottom : 0.05cm;
+		font-size     : 0.75cm;
+		line-height   : 0.988em; //Font is misaligned. Shift up slightly
+	}
+	h3{
+		//margin-top    : -0.1cm; //Font is misaligned. Shift up slightly
+		//margin-bottom : 0.1cm;
+		font-size     : 0.575cm;
+		border-bottom : 2px solid var(--HB_Color_HeaderUnderline);;
+		line-height   : 0.995em; //Font is misaligned. Shift up slightly
+		& + * {
+			margin-top: 0.17cm;
 		}
-		&.frame {
-			margin-top          : 0.7cm;
-			margin-bottom       : 0.9cm;
-			margin-left         : -0.1cm;
-			margin-right        : -0.1cm;
-			width               : calc(100% + 0.2cm);
-			border-collapse     : separate;
-			background-color    : white;
-			border              : initial;
-			border-style        : solid;
-			border-image-outset : 0.4cm 0.3cm;
-			border-image-repeat : stretch;
-			border-image-slice  : 200;
-			border-image-source : @frameBorderImage;
-			border-image-width  : 47px;
-			&.wide:first-child {
-				margin-top: 0.12cm;
-			}
-			& + * {
-				margin-top: 0;
-			}
+	}
+	* + h3 {
+		margin-top    : 0.155cm; //(0.325 - 0.17)
+	}
+	h4{
+		//margin-top    : -0.02cm; //Font is misaligned. Shift up slightly
+		//margin-bottom : 0.02cm;
+		font-size     : 0.458cm;
+		line-height   : 0.971em; //Font is misaligned. Shift up slightly
+		& + * {
+			margin-top: 0.09cm;
 		}
-		&.decoration {
-			position:relative;
-		}
-		&.decoration::before {
-			content             :'';
-			position            : absolute;
-			background-image    : @classTableDecoration,
-			                      @classTableDecoration;
-			background-size     : contain, contain;
-			background-repeat   : no-repeat, no-repeat;
-			background-position : top, bottom;
-			width               : 7.75cm;
-			height              : calc(100% + 3.3cm);
-			top                 : 50%;
-			left                : 50%;
-			transform           : translateY(-50%) translateX(-50%);
-			filter              : drop-shadow(0px 0px 1px #C8C5C080);
-			z-index             : -1;
-		}
-		&.decoration.wide::before {
-			width               : calc(100% + 3.3cm);
-			height              : 7.75cm;
-			background-position : left, right;
-		}
-		h5 + table{
+	}
+	* + h4 {
+		margin-top    : 0.235cm; //(0.325 - 0.09)
+	}
+	h5{
+		//margin-top    : -0.02cm; //Font is misaligned. Shift up slightly
+		//margin-bottom : 0.02cm;
+		font-family   : ScalySansSmallCapsRemake;
+		font-size     : 0.423cm;
+		font-weight   : 900;
+		line-height   : 0.951em; //Font is misaligned. Shift up slightly
+		& + * {
 			margin-top : 0.2cm;
 		}
 	}
 	//*****************************
-	// *      TABLE OF CONTENTS
+	// *          TABLE
 	// *****************************/
-	.page {
-		&:has(.toc):after {
-			display: none;
+	table{
+		.useSansSerif();
+		width         : 100%;
+		line-height   : 16px;
+		& + * {
+			margin-top : 0.325cm;
 		}
-		.toc {
+		thead{
+			display: table-row-group;
+			font-weight : 800;
+			th{
+				vertical-align : bottom;
+				//padding        : 0.14em 0.4em;
+				padding     : 0px 1.5px;   // Both of these are temporary, just to force
+				//line-height : 16px;        // PDF to render at same height until Chrome 108
+			}
+		}
+		tbody{
+			tr{
+				td{
+					//padding : 0.14em 0.4em;
+					padding     : 0px 1.5px;   // Both of these are temporary, just to force
+          //line-height : 16px;        // PDF to render at same height until Chrome 108
+				}
+				&:nth-child(odd){
+					background-color : var(--HB_Color_Accent);
+				}
+			}
+		}
+	}
+	//*****************************
+	// *            NOTE
+	// *****************************/
+	.note{
+		.useSansSerif();
+		background-color    : var(--HB_Color_Accent);
+		border-style        : solid;
+		border-width        : 1px;
+		border-image        : @noteBorderImage 12 stretch;
+		border-image-outset : 9px 0px;
+		border-image-width  : 11px;
+		padding             : 0.13cm 0.16cm;
+		filter              : drop-shadow(1px 4px 6px #888);
+		.page :where(&) {
+			margin-top        : 9px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.45cm;
+		}
+		h5 {
+			font-size : 0.375cm;
+		}
+		p{
+			display        : block;
+			padding-bottom : 0px;
+		}
+		:last-child {
+			margin-bottom : 0;
+		}
+	}
+	//************************************
+	// *       DESCRIPTIVE TEXT BOX
+	// ************************************/
+	.descriptive{
+		.useSansSerif();
+		background-color    : #faf7ea;
+		border-style        : solid;
+		border-width        : 7px;
+		border-image        : @descriptiveBoxImage 12 stretch;
+		border-image-outset : 4px;
+		padding             : 0.1em;
+		filter              : drop-shadow(0 0 3px #faf7ea);
+		.page :where(&) {
+			margin-top        : 4px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.45cm;
+		}
+		h5 {
+			font-size : 0.375cm;
+		}
+		p{
+			display        : block;
+			padding-bottom : 0px;
+			line-height    : 1.5em;
+		}
+		:last-child {
+			margin-bottom : 0;
+		}
+	}
+	//*****************************
+	// *    Images Snippets
+	// *****************************/
+
+	/* Arist Credit */
+	.artist {
+		position    : absolute;
+		width       : auto;
+		text-align  : center;
+		font-family : WalterTurncoat;
+		font-size   : 0.27cm;
+		color       : var(--HB_Color_CaptionText);
+		p, p + p {
+			margin      : unset;
+			text-indent : unset;
+			line-height : 1em;
+		}
+	 	h5 {
+			font-size   : 1.3em;
+			font-family : WalterTurncoat;
+		}
+		a{
+			color           : inherit;
+			text-decoration : unset;
+			&:hover {
+				text-decoration : underline;
+			}
+		}
+	}
+
+	/* Watermark */
+	.watermark {
+		display         : grid !important;
+		place-items     : center;
+		justify-content	: center;
+		position        : absolute;
+		top             : 0;
+		left            : 0;
+		width           : 100%;
+		height          : 100%;
+		font-size       : 120px;
+		text-transform	: uppercase;
+		color           : black;
+		mix-blend-mode  : overlay;
+		opacity         : 30%;
+		transform       : rotate(-45deg);
+		z-index         : 500;
+		p {
+			margin-bottom : none;
+		}
+	}
+
+	/* Watercolor */
+	[class*="watercolor"] {
+		position            : absolute;
+		width               : 2000px;    /* dimensions need to be real big so the user can set */
+		height              : 2000px;    /* height or width and the image will maintain aspect ratio */
+		-webkit-mask-image  : var(--wc);
+		-webkit-mask-size   : contain;
+		-webkit-mask-repeat : no-repeat;
+		mask-image          : var(--wc);
+		mask-size           : contain;
+		mask-repeat         : no-repeat;
+		background-size     : cover;
+		background-color    : var(--HB_Color_WatercolorStain);			/*default color*/
+		--wc                : @watercolor1;         /*default image*/
+		z-index             : -2;
+	}
+
+	.watercolor1  { --wc : @watercolor1; }
+	.watercolor2  { --wc : @watercolor2; }
+	.watercolor3  { --wc : @watercolor3; }
+	.watercolor4  { --wc : @watercolor4; }
+	.watercolor5  { --wc : @watercolor5; }
+	.watercolor6  { --wc : @watercolor6; }
+	.watercolor7  { --wc : @watercolor7; }
+	.watercolor8  { --wc : @watercolor8; }
+	.watercolor9  { --wc : @watercolor9; }
+	.watercolor10 { --wc : @watercolor10; }
+	.watercolor11 { --wc : @watercolor11; }
+	.watercolor12 { --wc : @watercolor12; }
+
+	//*****************************
+	// *    MONSTER STAT BLOCK
+	// *****************************/
+	.monster {
+		.useSansSerif();
+		&.frame {
+			border-style          : solid;
+			border-width          : 7px 6px;
+			background-color      : var(--HB_Color_MonsterStatBackground);
+			background-image      : @monsterBlockBackground;
+			border-image          : @monsterBorderImage 14 round;
+			border-image-outset   : 0px 2px;
+			background-blend-mode : overlay;
+			background-attachment : fixed;
+			filter                : drop-shadow(1px 4px 6px #888);
+			padding               : 4px 2px;
+			margin-left           : -0.16cm;
+			margin-right          : -0.16cm;
+			width                 : calc(100% + 0.32cm);
+		}
+
+		position          : relative;
+		padding           : 0px;
+		margin-bottom     : 0.325cm;
+
+		//Headers
+		h2{
+			font-size     : 0.62cm;
+			line-height   : 1em;
+			margin        : 0;
+			&+p {
+				font-size     : 0.304cm; //Monster size and type subtext
+				margin-bottom : 0;
+			}
+		}
+		h3{
+			font-family    : ScalySansRemake;
+			font-weight    : 800;
+			font-variant   : small-caps;
+			border-bottom  : 2px solid var(--HB_Color_HeaderText);
+			// margin-top     : 0.05cm;  //Font is misaligned. Shift up slightly
+  		padding-bottom : 0.05cm;
+		}
+
+		//Triangle dividers
+		hr{
+			visibility       : visible;
+			height           : 6px;
+			margin           : 0.12cm 0cm;
+			background-image : @redTriangleImage;
+			background-size  : 100% 100%;
+			border           : none;
+		}
+
+		//Attribute Lists - All text between HRs is red
+		hr ~ :is(dl,p) {
+			color : var(--HB_Color_HeaderText);
+		}
+		hr:last-of-type {
+			& ~ :is(dl,p) {
+				color : inherit; // After the HRs, reset text to black
+			}
+			& + * {
+				margin-top : 0.325cm; // Space after last HR
+			}
+		}
+
+		// Monster Ability table
+		hr + table:first-of-type{
+			margin              : 0;
+			column-span         : none;
+			color               : var(--HB_Color_HeaderText);
+			background-color    : transparent;
+			border-style        : none;
+			border-image        : none;
+			-webkit-column-span : none;
+			tr {
+				background-color : transparent;
+			}
+			td,th {
+				padding: 0px;
+			}
+		}
+
+		:last-child {
+			margin-bottom : 0;
+		}
+	}
+
+	//Full Width
+	.monster.wide{
+		.useColumns(0.96, @fillMode: balance);
+	}
+
+	//*****************************
+	// *           FOOTER
+	// *****************************/
+	&:after{
+		content          : "";
+		position         : absolute;
+		bottom           : 0px;
+		left             : 0px;
+		z-index          : 100;
+		height           : 50px;
+		width            : 100%;
+		background-image : @footerAccentImage;
+		background-size  : cover;
+	}
+	&:nth-child(even){
+		&:after{
+			transform : scaleX(-1);
+		}
+		.pageNumber{
+			left : 2px;
+		}
+		.footnote{
+			left       : 80px;
+			text-align : left;
+		}
+	}
+	.pageNumber{
+		position    : absolute;
+		right       : 2px;
+		bottom      : 22px;
+		width       : 50px;
+		font-size   : 0.9em;
+		color       : var(--HB_Color_Footnotes);
+		text-align  : center;
+		text-indent : 0;
+		&.auto::after {
+			content : counter(phb-page-numbers);
+		}
+	}
+	.footnote{
+		position   : absolute;
+		right      : 80px;
+		bottom     : 32px;
+		z-index    : 150;
+		width      : 200px;
+		font-size  : 0.8em;
+		color      : var(--HB_Color_Footnotes);
+		text-align : right;
+	}
+	//************************************
+	// *           CODE BLOCKS
+	// ************************************/
+	code{
+    font-family      : "Courier New", Courier, monospace;
+		font-size        : 0.325;
+		padding          : 0px 4px;
+		color            : #58180d;
+		background-color : #faf7ea;
+		border-radius    : 4px;
+		white-space      : pre-wrap;
+		overflow-wrap    : break-word;
+	}
+
+	pre code{
+		width               : 100%;
+		display             : inline-block;
+		border-style        : solid;
+		border-width        : 1px;
+		border-image        : @codeBorderImage 26 stretch;
+		border-image-width  : 10px;
+		border-image-outset : 2px;
+		border-radius       : 12px;
+		margin-bottom       : 2px;
+		padding             : 0.15cm;
+		.page :where(&) {
+			margin-top        : 2px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.325cm;
+		}
+	}
+	//*****************************
+	// *          EXTRAS
+	// *****************************/
+	hr{
+		visibility : hidden;
+		margin     : 0px;
+	}
+	.columnSplit {
+		visibility                 : hidden;
+		-webkit-column-break-after : always;
+		break-after                : always;
+		-moz-column-break-after    : always;
+	}
+	//Avoid breaking up
+	blockquote,table{
+		z-index                     : 15;
 		-webkit-column-break-inside : avoid;
 		page-break-inside           : avoid;
 		break-inside                : avoid;
-			h1 {
-				text-align    : center;
-				margin-bottom : 0.3cm;
-			}
-			a{
-				display         : inline;
-				color           : inherit;
-				text-decoration : none;
-				&:hover{
-					text-decoration : underline;
-				}
-			}
-			h4 {
-				margin-top  : 0.2cm;
-				line-height : 0.4cm;
-				& + ul li {
-					line-height: 1.2em;
-				}
-			}
-			ul{
-				padding-left    : 0;
-				list-style-type : none;
-				margin-top      : 0;
-				a {
-					width           : 100%;
-					display         : flex;
-					flex-flow       : row nowrap;
-					justify-content : space-between;
-				}
-				li + li h3 {
-					margin-top  : 0.26cm;
-					line-height : 1em
-				}
-				h3 span:first-child::after {
-					border : none;
-				}
-				span {
-					display : contents;
-					&:first-child::after {
-						content       : "";
-						bottom        : 0.08cm;
-						flex          : 1;
-						margin-left   : 0.08cm;        /* Spacing before dot leaders */
-						margin-right  : 0.16cm;
-						border-bottom : 0.05cm dotted #000;
-						margin-bottom : 0.08cm;
-					}
-					&:last-child {
-						display     : inline-block;
-						align-self  : flex-end;
-						font-family : "BookInsanityRemake";
-						font-size   : 0.34cm;
-						font-weight : normal;
-						color       : #000;
-					}
-				}
-				ul { /*List indent*/
-					margin-left : 1em;
-				}
-			}
-			&.wide{
-				.useColumns(0.96, @fillMode: balance);
-			}
-		}
 	}
-
-	//*****************************
-	// *    DEFINITION LISTS
-	// *****************************/
-	.page {
-		dl {
-			line-height  : 1.25em;
-			padding-left : 1em;
-			white-space  : pre-line;
-			& + * {
-				margin-top : 0.28cm;
-			}
-		}
-		dl + * {
-	  	margin-top : 0.17cm;
-	  }
-		p + dl {
-			margin-top: 0.17cm;
-		}
-	  dt {
-	    display      : inline;
-	    margin-right : 5px;
-			margin-left  : -1em;
-	  }
-	  dd {
-			display     : inline;
-			margin-left : 0px;
-			text-indent : 0px;
-	  }
+	//Text indent right after table
+	table+p{
+		text-indent : 1em;
 	}
-
-	//*****************************
-	// *         WIDE
-	// *****************************/
-	.page .wide{
-		margin-bottom       : 0.325cm;
+	// Nested lists
+	ul ul,ol ol,ul ol,ol ul{
+		margin-bottom : 0px;
+		margin-left   : 1.5em;
 	}
-
-	.page h1 + *{
-		margin-top : 0;
+	li{
+		-webkit-column-break-inside : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
 	}
 }
+//*****************************
+// *         SPELL LIST
+// *****************************/
+.page .spellList{
+	.useSansSerif();
+	column-count        : 2;
+	ul+h5{
+		margin-top : 15px;
+	}
+	p, ul{
+		font-size   : 0.352cm;
+		line-height : 1.265em;
+	}
+	ul{
+		margin-bottom               : 0.5em;
+		padding-left                : 1em;
+		text-indent                 : -1em;
+		list-style-type             : none;
+		-webkit-column-break-inside : auto;
+		page-break-inside           : auto;
+		break-inside                : auto;
+	}
+	&.wide{
+		column-count : 4;
+	}
+}
+
+//*****************************
+// *       CLASS TABLE
+// *****************************/
+.page .classTable{
+	th[colspan]:not([rowspan]) {
+		white-space : nowrap;
+	}
+	&.frame {
+		margin-top          : 0.7cm;
+		margin-bottom       : 0.9cm;
+		margin-left         : -0.1cm;
+		margin-right        : -0.1cm;
+		width               : calc(100% + 0.2cm);
+		border-collapse     : separate;
+		background-color    : white;
+		border              : initial;
+		border-style        : solid;
+		border-image-outset : 0.4cm 0.3cm;
+		border-image-repeat : stretch;
+		border-image-slice  : 200;
+		border-image-source : @frameBorderImage;
+		border-image-width  : 47px;
+		&.wide:first-child {
+			margin-top: 0.12cm;
+		}
+		& + * {
+			margin-top: 0;
+		}
+	}
+	&.decoration {
+		position:relative;
+	}
+	&.decoration::before {
+		content             :'';
+		position            : absolute;
+		background-image    : @classTableDecoration,
+		                      @classTableDecoration;
+		background-size     : contain, contain;
+		background-repeat   : no-repeat, no-repeat;
+		background-position : top, bottom;
+		width               : 7.75cm;
+		height              : calc(100% + 3.3cm);
+		top                 : 50%;
+		left                : 50%;
+		transform           : translateY(-50%) translateX(-50%);
+		filter              : drop-shadow(0px 0px 1px #C8C5C080);
+		z-index             : -1;
+	}
+	&.decoration.wide::before {
+		width               : calc(100% + 3.3cm);
+		height              : 7.75cm;
+		background-position : left, right;
+	}
+	h5 + table{
+		margin-top : 0.2cm;
+	}
+}
+//*****************************
+// *      TABLE OF CONTENTS
+// *****************************/
+.page {
+	&:has(.toc):after {
+		display: none;
+	}
+	.toc {
+	-webkit-column-break-inside : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
+		h1 {
+			text-align    : center;
+			margin-bottom : 0.3cm;
+		}
+		a{
+			display         : inline;
+			color           : inherit;
+			text-decoration : none;
+			&:hover{
+				text-decoration : underline;
+			}
+		}
+		h4 {
+			margin-top  : 0.2cm;
+			line-height : 0.4cm;
+			& + ul li {
+				line-height: 1.2em;
+			}
+		}
+		ul{
+			padding-left    : 0;
+			list-style-type : none;
+			margin-top      : 0;
+			a {
+				width           : 100%;
+				display         : flex;
+				flex-flow       : row nowrap;
+				justify-content : space-between;
+			}
+			li + li h3 {
+				margin-top  : 0.26cm;
+				line-height : 1em
+			}
+			h3 span:first-child::after {
+				border : none;
+			}
+			span {
+				display : contents;
+				&:first-child::after {
+					content       : "";
+					bottom        : 0.08cm;
+					flex          : 1;
+					margin-left   : 0.08cm;        /* Spacing before dot leaders */
+					margin-right  : 0.16cm;
+					border-bottom : 0.05cm dotted #000;
+					margin-bottom : 0.08cm;
+				}
+				&:last-child {
+					display     : inline-block;
+					align-self  : flex-end;
+					font-family : "BookInsanityRemake";
+					font-size   : 0.34cm;
+					font-weight : normal;
+					color       : #000;
+				}
+			}
+			ul { /*List indent*/
+				margin-left : 1em;
+			}
+		}
+		&.wide{
+			.useColumns(0.96, @fillMode: balance);
+		}
+	}
+}
+
+//*****************************
+// *    DEFINITION LISTS
+// *****************************/
+.page {
+	dl {
+		line-height  : 1.25em;
+		padding-left : 1em;
+		white-space  : pre-line;
+		& + * {
+			margin-top : 0.28cm;
+		}
+	}
+	dl + * {
+  	margin-top : 0.17cm;
+  }
+	p + dl {
+		margin-top: 0.17cm;
+	}
+  dt {
+    display      : inline;
+    margin-right : 5px;
+		margin-left  : -1em;
+  }
+  dd {
+		display     : inline;
+		margin-left : 0px;
+		text-indent : 0px;
+  }
+}
+
+//*****************************
+// *         WIDE
+// *****************************/
+.page .wide{
+	margin-bottom       : 0.325cm;
+}
+
+.page h1 + *{
+	margin-top : 0;
+}
diff --git a/themes/V3/Blank/snippets.js b/themes/V3/Blank/snippets.js
index cd508cccb..a8fd2fa2c 100644
--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -1,9 +1,8 @@
 /* eslint-disable max-lines */
 
-const WatercolorGen      = require('./snippets/watercolor.gen.js');
-const dedent             = require('dedent-tabs').default;
-
-
+const WatercolorGen = require('./snippets/watercolor.gen.js');
+const ImageMaskGen  = require('./snippets/imageMask.gen.js');
+const dedent        = require('dedent-tabs').default;
 
 module.exports = [
 
@@ -102,6 +101,60 @@ module.exports = [
 				icon : 'fas fa-fill-drip',
 				gen  : WatercolorGen,
 			},
+			{
+				name        : 'Watercolor Image Mask Edge',
+				icon        : 'fac mask-edge',
+				gen         : ImageMaskGen.edge('bottom'),
+				subsnippets : [
+					{
+						name : 'Top',
+						icon : 'fac position-top',
+						gen  : ImageMaskGen.edge('top'),
+					},
+					{
+						name : 'Right',
+						icon : 'fac position-right',
+						gen  : ImageMaskGen.edge('right'),
+					},
+					{
+						name : 'Bottom',
+						icon : 'fac position-bottom',
+						gen  : ImageMaskGen.edge('bottom'),
+					},
+					{
+						name : 'Left',
+						icon : 'fac position-left',
+						gen  : ImageMaskGen.edge('left'),
+					},
+				]
+			},
+			{
+				name        : 'Watercolor Image Mask Corner',
+				icon        : 'fac mask-corner',
+				gen         : ImageMaskGen.corner,
+				subsnippets : [
+					{
+						name : 'Top-Left',
+						icon : 'fac position-top-left',
+						gen  : ImageMaskGen.corner('top', 'left'),
+					},
+					{
+						name : 'Top-Right',
+						icon : 'fac position-top-right',
+						gen  : ImageMaskGen.corner('top', 'right'),
+					},
+					{
+						name : 'Bottom-Left',
+						icon : 'fac position-bottom-left',
+						gen  : ImageMaskGen.corner('bottom', 'left'),
+					},
+					{
+						name : 'Bottom-Right',
+						icon : 'fac position-bottom-right',
+						gen  : ImageMaskGen.corner('bottom', 'right'),
+					}
+				]
+			},
 			{
 				name : 'Watermark',
 				icon : 'fas fa-id-card',
diff --git a/themes/V3/Blank/snippets/imageMask.gen.js b/themes/V3/Blank/snippets/imageMask.gen.js
new file mode 100644
index 000000000..5c6193a05
--- /dev/null
+++ b/themes/V3/Blank/snippets/imageMask.gen.js
@@ -0,0 +1,36 @@
+const _ = require('lodash');
+const dedent = require('dedent-tabs').default;
+
+module.exports = {
+	edge : (side = 'bottom')=>{
+		const rotation = {
+			'bottom' : 0,
+			'top'    : 180,
+			'left'   : 90,
+			'right'  : 270
+		}[side];
+		return dedent`
+			{{imageMaskEdge${_.random(1, 8)},--offset:0cm,--rotation:${rotation}
+			  ![](https://i.imgur.com/GZfjDWV.png){height:100%}
+			}}
+			<!-- Use --offset to shift the mask toward or away from the page center.
+			     Use --rotation to set rotation angle in degrees. -->\n\n`;
+	},
+
+	corner : (y = 'top', x = 'left')=>{
+		const offsetX = (x == 'left' ? '-50%' : '50%');
+		const offsetY = (y == 'top'  ? '50%' : '-50%');
+		return dedent`
+			{{imageMaskCorner${_.random(1, 37)},--offsetX:${offsetX},--offsetY:${offsetY},--rotation:0
+			  ![](https://i.imgur.com/GZfjDWV.png){height:100%}
+			}}
+			<!-- Use --offsetX to shift the mask left or right (can use cm instead of %)
+			     Use --offsetY to shift the mask up or down
+			     Use --rotation to set rotation angle in degrees. -->\n\n`;
+	}
+
+};
+
+()=>{
+
+};
diff --git a/themes/V3/Blank/style.less b/themes/V3/Blank/style.less
index 387b6612f..9efa7c0b7 100644
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -16,6 +16,21 @@
 		-webkit-print-color-adjust : exact;
 	}
 
+	//*****************************
+	// *    MUSTACHE DIVS/SPANS
+	// *****************************/
+	.page {
+		.block {
+			break-inside      : avoid;
+			display           : inline-block;
+			width             : 100%;
+		}
+		.inline-block {
+			display     : inline-block;
+			text-indent : initial;
+		}
+	}
+
 	.useColumns(@multiplier : 1, @fillMode: balance){
 		column-fill          : @fillMode;
 		column-count         : 2;
@@ -116,6 +131,50 @@
 			margin-top : 0;	                        // have vertical spacing.
 		}
 
+		//************************************
+		// *           CODE BLOCKS
+		// ************************************/
+		code{
+	    font-family      : "Courier New", Courier, monospace;
+			white-space      : pre-wrap;
+			overflow-wrap    : break-word;
+		}
+
+		pre code{
+			width               : 100%;
+			display             : inline-block;
+		}
+		//*****************************
+		// *          EXTRAS
+		// *****************************/
+		.columnSplit {
+			visibility                 : hidden;
+			-webkit-column-break-after : always;
+			break-after                : always;
+			-moz-column-break-after    : always;
+			margin-top                 : 0;
+			& + * {
+				margin-top : 0;
+			}
+		}
+		//Avoid breaking up
+		blockquote,table{
+			z-index                     : 15;
+			-webkit-column-break-inside : avoid;
+			page-break-inside           : avoid;
+			break-inside                : avoid;
+		}
+		// Nested lists
+		ul ul,ol ol,ul ol,ol ul{
+			margin-bottom : 0px;
+			margin-left   : 1.5em;
+		}
+		li{
+			-webkit-column-break-inside : avoid;
+			page-break-inside           : avoid;
+			break-inside                : avoid;
+		}
+
 		/* Watermark */
 		.watermark {
 			display         : grid !important;
@@ -169,64 +228,139 @@
 		.watercolor11 { --wc : @watercolor11; }
 		.watercolor12 { --wc : @watercolor12; }
 
-		//************************************
-		// *           CODE BLOCKS
-		// ************************************/
-		code{
-	    font-family      : "Courier New", Courier, monospace;
-			white-space      : pre-wrap;
-			overflow-wrap    : break-word;
-		}
-
-		pre code{
-			width               : 100%;
-			display             : inline-block;
-		}
-		//*****************************
-		// *          EXTRAS
-		// *****************************/
-		.columnSplit {
-			visibility                 : hidden;
-			-webkit-column-break-after : always;
-			break-after                : always;
-			-moz-column-break-after    : always;
-			margin-top                 : 0;
-			& + * {
-				margin-top : 0;
+		/* Image Masks */
+		[class*="imageMask"] {
+			position              : absolute;
+			height                : 200%;
+			width                 : 200%;
+			left                  : 50%;
+			bottom                : 50%;
+			--rotation            : 0;
+			--revealer            : none;
+			--checkerboard        : none;
+			--scaleX              : 1;
+			--scaleY              : 1;
+			-webkit-mask-image    : var(--wc), var(--revealer);
+			-webkit-mask-repeat   : repeat-x;
+			-webkit-mask-size     : 50%; //Scale only X to fit page width, leave height at aspect ratio, designed to hang off the edge
+			-webkit-mask-position : 50% calc(50% - var(--offset));
+			mask-image            : var(--wc);
+			mask-repeat           : repeat-x;
+			mask-size             : 50%;
+			mask-position         : 50% calc(50% - var(--offset));
+			background-image      : var(--checkerboard);
+			background-size       : 20px;
+			z-index               : -1;
+			transform             : translateY(50%) translateX(-50%) rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
+			transition            : transform 2s;
+			& > p:has(img) {
+				position   : absolute;
+				width      : 50%;
+				height     : 50%;
+				bottom     : 50%;
+				left       : 50%;
+				transform  : translateX(-50%) translateY(50%) rotate(calc(-1deg * var(--rotation))) scaleX(calc(1 / var(--scaleX))) scaleY(calc(1 / var(--scaleY)));
+				transition : transform 2s;
+			}
+			& img {
+				position : absolute;
+				display  : block;
+				bottom   : 0;
+			}
+			&.bottom {
+				--rotation : 0;
+				& img {bottom: 0;}
+			}
+			&.top {
+				--rotation : 180;
+				& img {top: 0;}
+			}
+			&.left {
+				--rotation : 90;
+				& img {left: 0;}
+			}
+			&.right {
+				--rotation : -90;
+				& img {right: 0;}
+			}
+			&.revealImage {
+				--revealer : linear-gradient(0deg, rgba(0,0,0,.2) 0%, rgba(0,0,0,0.2));
+				--checkerboard : url(/assets/waterColorMasks/missingImage.png); //shows any masked regions not filled by image
 			}
 		}
-		//Avoid breaking up
-		blockquote,table{
-			z-index                     : 15;
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
-		}
-		// Nested lists
-		ul ul,ol ol,ul ol,ol ul{
-			margin-bottom : 0px;
-			margin-left   : 1.5em;
-		}
-		li{
-			-webkit-column-break-inside : avoid;
-			page-break-inside           : avoid;
-			break-inside                : avoid;
-		}
-	}
 
-	//*****************************
-	// *    MUSTACHE DIVS/SPANS
-	// *****************************/
-	.page {
-		.block {
-			break-inside      : avoid;
-			display           : inline-block;
-			width             : 100%;
-		}
-		.inline-block {
-			display     : inline-block;
-			text-indent : initial;
+		.imageMaskEdge1  { --wc : url(/assets/waterColorMasks/edge/0001.webp); }
+		.imageMaskEdge2  { --wc : url(/assets/waterColorMasks/edge/0002.webp); }
+		.imageMaskEdge3  { --wc : url(/assets/waterColorMasks/edge/0003.webp); }
+		.imageMaskEdge4  { --wc : url(/assets/waterColorMasks/edge/0004.webp); }
+		.imageMaskEdge5  { --wc : url(/assets/waterColorMasks/edge/0005.webp); }
+		.imageMaskEdge6  { --wc : url(/assets/waterColorMasks/edge/0006.webp); }
+		.imageMaskEdge7  { --wc : url(/assets/waterColorMasks/edge/0007.webp); }
+		.imageMaskEdge8  { --wc : url(/assets/waterColorMasks/edge/0008.webp); }
+
+		[class*="imageMaskCorner"] {
+			height                : 200%;
+			width                 : 200%;
+			left                  : calc(-50% + var(--offsetX));
+			bottom                : calc(-50% + var(--offsetY));
+			-webkit-mask-image    : var(--wc), var(--revealer);
+			-webkit-mask-repeat   : no-repeat;
+			-webkit-mask-size     : 100% 100%; //Scale both dimensions to fit page size
+			-webkit-mask-position : 50% 50%;
+			mask-image            : var(--wc), var(--revealer);
+			mask-repeat           : no-repeat;
+			mask-size             : 100% 100%; //Scale both dimensions to fit page size
+			mask-position         : 50% 50%;
+			transform             : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));;
+			& > p:has(img) {
+				width      : 50%;
+				height     : 50%; //Complex transform below to handle mix of % and cm offsets
+				left       : 25%;
+				bottom     : 25%;
+				transform  : scaleX(calc(1 / var(--scaleX))) scaleY(calc(1 / var(--scaleY)))
+										 rotate(calc(-1deg * var(--rotation)))
+				             translateX(calc(-1 * var(--offsetX)))
+										 translateY(calc(1 * var(--offsetY)));
+			}
 		}
+
+		.imageMaskCorner1  { --wc : url(/assets/waterColorMasks/corner/0001.webp); }
+		.imageMaskCorner2  { --wc : url(/assets/waterColorMasks/corner/0002.webp); }
+		.imageMaskCorner3  { --wc : url(/assets/waterColorMasks/corner/0003.webp); }
+		.imageMaskCorner4  { --wc : url(/assets/waterColorMasks/corner/0004.webp); }
+		.imageMaskCorner5  { --wc : url(/assets/waterColorMasks/corner/0005.webp); }
+		.imageMaskCorner6  { --wc : url(/assets/waterColorMasks/corner/0006.webp); }
+		.imageMaskCorner7  { --wc : url(/assets/waterColorMasks/corner/0007.webp); }
+		.imageMaskCorner8  { --wc : url(/assets/waterColorMasks/corner/0008.webp); }
+		.imageMaskCorner9  { --wc : url(/assets/waterColorMasks/corner/0009.webp); }
+		.imageMaskCorner10 { --wc : url(/assets/waterColorMasks/corner/0010.webp); }
+		.imageMaskCorner11 { --wc : url(/assets/waterColorMasks/corner/0011.webp); }
+		.imageMaskCorner12 { --wc : url(/assets/waterColorMasks/corner/0012.webp); }
+		.imageMaskCorner13 { --wc : url(/assets/waterColorMasks/corner/0013.webp); }
+		.imageMaskCorner14 { --wc : url(/assets/waterColorMasks/corner/0014.webp); }
+		.imageMaskCorner15 { --wc : url(/assets/waterColorMasks/corner/0015.webp); }
+		.imageMaskCorner16 { --wc : url(/assets/waterColorMasks/corner/0016.webp); }
+		.imageMaskCorner17 { --wc : url(/assets/waterColorMasks/corner/0017.webp); }
+		.imageMaskCorner18 { --wc : url(/assets/waterColorMasks/corner/0018.webp); }
+		.imageMaskCorner19 { --wc : url(/assets/waterColorMasks/corner/0019.webp); }
+		.imageMaskCorner20 { --wc : url(/assets/waterColorMasks/corner/0020.webp); }
+		.imageMaskCorner21 { --wc : url(/assets/waterColorMasks/corner/0021.webp); }
+		.imageMaskCorner22 { --wc : url(/assets/waterColorMasks/corner/0022.webp); }
+		.imageMaskCorner23 { --wc : url(/assets/waterColorMasks/corner/0023.webp); }
+		.imageMaskCorner24 { --wc : url(/assets/waterColorMasks/corner/0024.webp); }
+		.imageMaskCorner25 { --wc : url(/assets/waterColorMasks/corner/0025.webp); }
+		.imageMaskCorner26 { --wc : url(/assets/waterColorMasks/corner/0026.webp); }
+		.imageMaskCorner27 { --wc : url(/assets/waterColorMasks/corner/0027.webp); }
+		.imageMaskCorner28 { --wc : url(/assets/waterColorMasks/corner/0028.webp); }
+		.imageMaskCorner29 { --wc : url(/assets/waterColorMasks/corner/0029.webp); }
+		.imageMaskCorner30 { --wc : url(/assets/waterColorMasks/corner/0030.webp); }
+		.imageMaskCorner31 { --wc : url(/assets/waterColorMasks/corner/0031.webp); }
+		.imageMaskCorner32 { --wc : url(/assets/waterColorMasks/corner/0032.webp); }
+		.imageMaskCorner33 { --wc : url(/assets/waterColorMasks/corner/0033.webp); }
+		.imageMaskCorner34 { --wc : url(/assets/waterColorMasks/corner/0034.webp); }
+		.imageMaskCorner35 { --wc : url(/assets/waterColorMasks/corner/0035.webp); }
+		.imageMaskCorner36 { --wc : url(/assets/waterColorMasks/corner/0036.webp); }
+		.imageMaskCorner37 { --wc : url(/assets/waterColorMasks/corner/0037.webp); }
 	}
 
 	//*****************************
diff --git a/themes/V3/Journal/style.less b/themes/V3/Journal/style.less
index f3b70cec2..2e2ada5c8 100644
--- a/themes/V3/Journal/style.less
+++ b/themes/V3/Journal/style.less
@@ -1,561 +1,559 @@
-@layer V3_Journal {
-	@import (less) './themes/fonts/Journal/fonts.less';
-	@import (less) './themes/assets/assets.less';
+@import (less) './themes/fonts/Journal/fonts.less';
+@import (less) './themes/assets/assets.less';
 
-	:root {
-		//Colors
-		--HB_Color_Background            : unset; // Light parchment
-		--HB_Color_Text                  : #412121; // Dark Maroon Brown
-		--HB_Color_Text2                 : #261C13CC; //Dark Brown
-		--HB_Color_HeaderText            : #58180D; // Dark Maroon
-		--HB_Color_CaptionText           : #766649; // Brown
-		--HB_Color_WatercolorStain       : #BBAD82; // Light brown
-	}
+:root {
+	//Colors
+	--HB_Color_Background            : unset; // Light parchment
+	--HB_Color_Text                  : #412121; // Dark Maroon Brown
+	--HB_Color_Text2                 : #261C13CC; //Dark Brown
+	--HB_Color_HeaderText            : #58180D; // Dark Maroon
+	--HB_Color_CaptionText           : #766649; // Brown
+	--HB_Color_WatercolorStain       : #BBAD82; // Light brown
+}
 
-	.useSansSerif(){
-		font-family : PermanentMarker;
-		font-size   : 0.3cm;
+.useSansSerif(){
+	font-family : PermanentMarker;
+	font-size   : 0.3cm;
+	line-height : 1.2em;
+	color       : var(--HB_Color_Text2);
+	p,dl,ul,ol {
 		line-height : 1.2em;
-		color       : var(--HB_Color_Text2);
-		p,dl,ul,ol {
-			line-height : 1.2em;
-		}
-		ul, ol {
-			padding-left : 1em;
-		}
-		em{
-			font-style  : italic;
-		}
-		strong{
-			font-weight : 800;
-			font-size   : 1.1em;
-		}
-		h5 + * {
-			margin-top : 0.1cm;
-		}
 	}
-	.useColumns(@multiplier : 1, @fillMode: balance){
-		column-gap           : 0.5cm;
+	ul, ol {
+		padding-left : 1em;
+	}
+	em{
+		font-style  : italic;
+	}
+	strong{
+		font-weight : 800;
+		font-size   : 1.1em;
+	}
+	h5 + * {
+		margin-top : 0.1cm;
+	}
+}
+.useColumns(@multiplier : 1, @fillMode: balance){
+	column-gap           : 0.5cm;
+}
+
+.page{
+	background-size     : 200% 100%;
+	background-repeat   : no-repeat;
+	filter              : drop-shadow(1px 4px 14px black);
+	background-image    : url(/assets/Journal/Background1.webp);
+	padding             : 2.1cm 1.9cm 1.7cm 3.8cm;
+	&:nth-of-type(2n + 1) {
+		background-position : left;
+	}
+	&:nth-of-type(2n) {
+		background-position : right;
+		padding             : 2.1cm 3.9cm 1.7cm 1.8cm;
+	}
+	&:nth-of-type(2) {
+		background-image    : url(/assets/Journal/Background2.webp); //Only first page should show ribbon
 	}
 
-	.page{
-		background-size     : 200% 100%;
-		background-repeat   : no-repeat;
-		filter              : drop-shadow(1px 4px 14px black);
-		background-image    : url(/assets/Journal/Background1.webp);
-		padding             : 2.1cm 1.9cm 1.7cm 3.8cm;
-		&:nth-of-type(2n + 1) {
-			background-position : left;
+	& .columnWrapper {
+		//transform: rotate(-0.5deg);  // Breaks absolute positioning of images/footers. Wait for Chrome fix
+	}
+}
+
+	//*****************************
+	// *            BASE
+	// *****************************/
+.page{
+	color       : var(--HB_Color_Text);
+	font-family : ReenieBeanie;
+	font-size   : 0.53cm;
+	line-height : 0.8em;
+	p + * {
+		margin-top : 0.325cm;
+	}
+	p + p{
+		margin-top : 0;
+	}
+	ul{
+		margin-bottom       : 0.8em;
+	}
+	ol{
+		margin-bottom       : 0.8em;
+	}
+	em{
+		text-decoration : underline;
+  	font-style      : unset;
+	}
+	del{
+		text-decoration-style: double;
+	}
+
+	//Indents after p or lists
+	p+p, ul+p, ol+p{
+		text-indent : 1em;
+	}
+	//*****************************
+	// *           HEADERS
+	// *****************************/
+	h1,h2,h3,h4,h5{
+		font-family   : FrederickaTheGreat;
+		font-weight   : unset;
+		color         : var(--HB_Color_HeaderText);
+	}
+	h1{
+		margin-bottom       : 0.18cm; //Margin-bottom only because this is WIDE
+		font-size           : 0.89cm;
+		line-height         : 1em;
+		font-variant        : small-caps;
+		&+p::first-letter{
+			float                   : left;
+			font-family             : FrederickaTheGreat;
+			line-height             : 1em;
+			font-size               : 1.9em;
+			padding-left            : 40px; //Allow background color to extend into margins
+			margin-top              : -0.3cm;
+			margin-bottom           : -20px;
+			margin-left             : -40px;
+			margin-right            : 0.1em;
+			padding-top             : 0.3em;
+			padding-bottom          : 2px;
 		}
+		&+p::first-line{
+			font-variant : small-caps;
+		}
+	}
+	h2{
+		font-size     : 0.62cm;
+		line-height   : 0.988em; //Font is misaligned. Shift up slightly
+	}
+	h3{
+		font-size     : 0.575cm;
+		line-height   : 0.995em; //Font is misaligned. Shift up slightly
+		margin-left   : -0.9em;
+	}
+	h4{
+		font-size      : 0.55cm;
+		line-height    : 0.971em; //Font is misaligned. Shift up slightly
+		color          : var(--HB_Color_Text);
+		padding-bottom : 5px;
+		transform:rotate(0deg);
 		&:nth-of-type(2n) {
-			background-position : right;
-			padding             : 2.1cm 3.9cm 1.7cm 1.8cm;
+			transform:rotate(1deg);
 		}
-		&:nth-of-type(2) {
-			background-image    : url(/assets/Journal/Background2.webp); //Only first page should show ribbon
-		}
-
-		& .columnWrapper {
-			//transform: rotate(-0.5deg);  // Breaks absolute positioning of images/footers. Wait for Chrome fix
+		&:nth-of-type(3n) {
+			transform:rotate(-1.5deg);
 		}
 	}
-
-		//*****************************
-		// *            BASE
-		// *****************************/
-	.page{
-		color       : var(--HB_Color_Text);
-		font-family : ReenieBeanie;
-		font-size   : 0.53cm;
-		line-height : 0.8em;
-		p + * {
-			margin-top : 0.325cm;
-		}
-		p + p{
-			margin-top : 0;
-		}
-		ul{
-			margin-bottom       : 0.8em;
-		}
-		ol{
-			margin-bottom       : 0.8em;
-		}
-		em{
-			text-decoration : underline;
-	  	font-style      : unset;
-		}
-		del{
-			text-decoration-style: double;
-		}
-
-		//Indents after p or lists
-		p+p, ul+p, ol+p{
-			text-indent : 1em;
-		}
-		//*****************************
-		// *           HEADERS
-		// *****************************/
-		h1,h2,h3,h4,h5{
-			font-family   : FrederickaTheGreat;
-			font-weight   : unset;
-			color         : var(--HB_Color_HeaderText);
-		}
-		h1{
-			margin-bottom       : 0.18cm; //Margin-bottom only because this is WIDE
-			font-size           : 0.89cm;
-			line-height         : 1em;
-			font-variant        : small-caps;
-			&+p::first-letter{
-				float                   : left;
-				font-family             : FrederickaTheGreat;
-				line-height             : 1em;
-				font-size               : 1.9em;
-				padding-left            : 40px; //Allow background color to extend into margins
-				margin-top              : -0.3cm;
-				margin-bottom           : -20px;
-				margin-left             : -40px;
-				margin-right            : 0.1em;
-				padding-top             : 0.3em;
-				padding-bottom          : 2px;
-			}
-			&+p::first-line{
-				font-variant : small-caps;
-			}
-		}
-		h2{
-			font-size     : 0.62cm;
-			line-height   : 0.988em; //Font is misaligned. Shift up slightly
-		}
-		h3{
-			font-size     : 0.575cm;
-			line-height   : 0.995em; //Font is misaligned. Shift up slightly
-			margin-left   : -0.9em;
-		}
-		h4{
-			font-size      : 0.55cm;
-			line-height    : 0.971em; //Font is misaligned. Shift up slightly
-			color          : var(--HB_Color_Text);
-			padding-bottom : 5px;
-			transform:rotate(0deg);
-			&:nth-of-type(2n) {
-				transform:rotate(1deg);
-			}
-			&:nth-of-type(3n) {
-				transform:rotate(-1.5deg);
-			}
-		}
-		h5{
-			font-family   : PermanentMarker;
-			font-size     : 0.4cm;
-			color         : var(--HB_Color_Text2);
-			font-weight   : bold;
-			line-height   : 0.951em; //Font is misaligned. Shift up slightly
-			& + * {
-				margin-top : 0.2cm;
-			}
-		}
-		//*****************************
-		// *          TABLE
-		// *****************************/
-		table{
-			.useSansSerif();
-			& + * {
-				margin-top : 0.325cm;
-			}
-			thead{
-				th{
-					vertical-align : bottom;
-					padding        : 0.14em 0;
-				}
-			}
-			tbody{
-				tr{
-					td{
-						padding : 0.14em 0;
-					}
-					&:nth-child(odd){
-						background-image : linear-gradient(to left, #41212100, #41212122, #41212100);
-					}
-				}
-			}
-		}
-		//*****************************
-		// *            NOTE
-		// *****************************/
-		.note{
-			.useSansSerif();
-			border-style        : solid;
-			border-width        : 1px;
-			border-image-source : url(/assets/Journal/Border1.png);
-			border-image-slice  : 18 18 18 18;
-			border-image-width  : 6px 6px 6px 6px;
-			border-image-outset : 5px 5px 5px 5px;
-			border-image-repeat : stretch stretch;
-			background-image    : url(/assets/Journal/HashMarks.png),
-														linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
-			background-size     : 120% 120%;
-			background-repeat   : no-repeat;
-			background-position : center;
-			padding             : 0.2cm;
-			:where(&) {
-				margin-top        : 9px; //Prevent top border getting cut off on colbreak
-			}
-			& + * {
-				margin-top : 0.45cm;
-			}
-			h5 {
-				font-size : 0.375cm;
-			}
-			p{
-				padding-bottom : 0px;
-			}
-			:last-child {
-				margin-bottom : 0;
-			}
-		}
-		//************************************
-		// *       DESCRIPTIVE TEXT BOX
-		// ************************************/
-		* + .descriptive {
-			margin-top : 0.6cm;
-		}
-		.descriptive{
-			.useSansSerif();
-			border-style        : solid;
-			border-width        : 1px;
-			border-image-source : url('/assets/Journal/Border2.png');
-			border-image-slice  : 48 48 48 48;
-			border-image-width  : 20px;
-			border-image-outset : 16px 20px 16px 20px;
-			border-image-repeat : stretch stretch;
-			background-image    : url(/assets/Journal/HashMarks.png),
-														linear-gradient(to bottom right, #ff000000, #41212114, #41212100);
-			background-size     : 120% 120%;
-			background-repeat   : no-repeat;
-			background-position : center;
-			padding             : 0.2cm;
-			:where(&) {
-				margin-top        : 4px; //Prevent top border getting cut off on colbreak
-			}
-			& + * {
-				margin-top : 0.45cm;
-			}
-			h5 {
-				font-size : 0.375cm;
-			}
-			p{
-				padding-bottom : 0px;
-			}
-			:last-child {
-				margin-bottom : 0;
-			}
-		}
-		//*****************************
-		// *    Images Snippets
-		// *****************************/
-
-		/* Arist Credit */
-		.artist {
-			position    : absolute;
-			width       : auto;
-			text-align  : center;
-			font-family : WalterTurncoat;
-			font-size   : 0.27cm;
-			color       : var(--HB_Color_CaptionText);
-			p, p + p {
-				margin      : unset;
-				text-indent : unset;
-				line-height : 1em;
-			}
-		 	h5 {
-				font-size   : 1.3em;
-				font-family : WalterTurncoat;
-			}
-			a{
-				color           : inherit;
-				text-decoration : unset;
-				&:hover {
-					text-decoration : underline;
-				}
-			}
-		}
-
-		//*****************************
-		// *    MONSTER STAT BLOCK
-		// *****************************/
-		.monster {
-			.useSansSerif();
-			&.frame {
-				border-style          : solid;
-				border-width          : 7px 6px;
-				border-image-source   : url('/assets/Journal/Border3.png');
-				border-image-slice    : 63 74 63 74;
-				border-image-width    : 15px 20px 15px 20px;
-				border-image-outset   : 12px 12px 12px 12px;
-				border-image-repeat   : stretch round;
-				background-image      : url('/assets/Journal/HashMarks.png'),
-					                      linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
-				background-blend-mode : screen multiply;
-				background-size       : 100%;
-				padding               : 0.2cm;
-			}
-
-			color: var(--HB_Color_Text);
-			position          : relative;
-			padding           : 0px;
-			margin-bottom     : 0.325cm;
-
-			//Headers
-			h2{
-				font-size     : 0.62cm;
-				line-height   : 1em;
-				margin        : 0;
-				&+p {
-					margin-bottom : 0; //Monster size and type subtext
-				}
-			}
-			h3{
-				margin-left    : 0;
-				font-variant   : small-caps;
-	  		padding-bottom : 0.05cm;
-			}
-			hr{
-				visibility       : visible;
-				height           : 6px;
-				margin           : 0.12cm 0cm;
-				background-image : url('/assets/Journal/HorizontalRule.png');
-				background-size  : 100% 100%;
-			}
-			hr:last-of-type + * {
-				margin-top : 0.325cm; // Space after last HR
-			}
-
-			// Monster Ability table
-			hr + table:first-of-type{
-				margin              : 0;
-				column-span         : none;
-			  background-image    : none;
-				border-style        : none;
-				border-image        : none;
-				color               : inherit;
-				tr {
-					background-image  : none;
-				}
-				td,th {
-					padding: 0px;
-				}
-			}
-
-			:last-child {
-				margin-bottom : 0;
-			}
-
-			strong, em {
-				font-style      : normal;
-				text-decoration : none;
-			}
-		}
-
-		//Full Width
-		.monster.wide{
-			.useColumns(0.96, @fillMode: balance);
-		}
-
-		//*****************************
-		// *           FOOTER
-		// *****************************/
-		&:nth-child(odd){
-			.pageNumber{
-				left : 3cm;
-			}
-			.footnote{
-				left       : 4.5cm;
-				text-align : left;
-			}
-		}
-		.pageNumber{
-			font-family : FrederickaTheGreat;
-			position    : absolute;
-			right       : 3cm;
-			bottom      : 1.25cm;
-			width       : 50px;
-			font-size   : 0.9em;
-			color       : var(--HB_Color_HeaderText);
-			text-align  : center;
-			text-indent : 0;
-			&.auto::after {
-				content : counter(phb-page-numbers);
-			}
-		}
-		.footnote{
-			position   : absolute;
-			right      : 4.5cm;
-			bottom     : 1.25cm;
-			z-index    : 150;
-			width      : 200px;
-			font-size  : 0.8em;
-			color      : var(--HB_Color_HeaderText);
-			text-align : right;
-		}
-		//************************************
-		// *           CODE BLOCKS
-		// ************************************/
-		code{
-			font-size        : 0.3cm;
-			padding          : 0px 4px;
-			color            : var(--HB_Color_Text);
-			vertical-align   : middle;
-			background-color : #faf7ea;
-			border-radius    : 4px;
-		}
-
-		pre code{
-			border-style        : solid;
-			border-width        : 1px;
-			border-image        : @codeBorderImage 26 stretch;
-			border-image-width  : 10px;
-			border-image-outset : 2px;
-			border-radius       : 12px;
-			margin-bottom       : 2px;
-			padding             : 0.15cm;
-			.page :where(&) {
-				margin-top        : 2px; //Prevent top border getting cut off on colbreak
-			}
-			& + * {
-				margin-top : 0.325cm;
-			}
-		}
-		//*****************************
-		// *          EXTRAS
-		// *****************************/
-		hr{
-			visibility : hidden;
-			border     : none;
-			margin     : 0px;
-		}
-		//Text indent right after table
-		table+p{
-			text-indent : 1em;
-		}
-		a, a:visited, a:hover {
-			color: var(--HB_Color_Text);
-			transition:all 1s ease;
-		}
-		a:hover {
-			color:red;
-		}
-	}
-	//*****************************
-	// *         SPELL LIST
-	// *****************************/
-
-	.page .spellList{
-		.useSansSerif();
-		font-family  : PermanentMarker;
-		column-count : 2;
-		ul+h5{
-			margin-top : 15px;
-		}
-		ul{
-			margin-bottom               : 0.5em;
-			padding-left                : 1em;
-			text-indent                 : -1em;
-			list-style-type             : none;
-			-webkit-column-break-inside : auto;
-			page-break-inside           : auto;
-			break-inside                : auto;
-		}
-		&.wide{
-			column-count : 4;
-		}
-	}
-
-	//*****************************
-	// *       CLASS TABLE
-	// *****************************/
-	.page .classTable{
-		th[colspan]:not([rowspan]) {
-			white-space : nowrap;
-		}
-		h5 + table{
+	h5{
+		font-family   : PermanentMarker;
+		font-size     : 0.4cm;
+		color         : var(--HB_Color_Text2);
+		font-weight   : bold;
+		line-height   : 0.951em; //Font is misaligned. Shift up slightly
+		& + * {
 			margin-top : 0.2cm;
 		}
 	}
 	//*****************************
-	// *      TABLE OF CONTENTS
+	// *          TABLE
 	// *****************************/
-	.page .toc{
-		-webkit-column-break-inside : avoid;
-		page-break-inside           : avoid;
-		break-inside                : avoid;
-		h1 {
-			text-align    : center;
-			margin-bottom : 0.3cm;
+	table{
+		.useSansSerif();
+		& + * {
+			margin-top : 0.325cm;
+		}
+		thead{
+			th{
+				vertical-align : bottom;
+				padding        : 0.14em 0;
+			}
+		}
+		tbody{
+			tr{
+				td{
+					padding : 0.14em 0;
+				}
+				&:nth-child(odd){
+					background-image : linear-gradient(to left, #41212100, #41212122, #41212100);
+				}
+			}
+		}
+	}
+	//*****************************
+	// *            NOTE
+	// *****************************/
+	.note{
+		.useSansSerif();
+		border-style        : solid;
+		border-width        : 1px;
+		border-image-source : url(/assets/Journal/Border1.png);
+		border-image-slice  : 18 18 18 18;
+		border-image-width  : 6px 6px 6px 6px;
+		border-image-outset : 5px 5px 5px 5px;
+		border-image-repeat : stretch stretch;
+		background-image    : url(/assets/Journal/HashMarks.png),
+													linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
+		background-size     : 120% 120%;
+		background-repeat   : no-repeat;
+		background-position : center;
+		padding             : 0.2cm;
+		:where(&) {
+			margin-top        : 9px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.45cm;
+		}
+		h5 {
+			font-size : 0.375cm;
+		}
+		p{
+			padding-bottom : 0px;
+		}
+		:last-child {
+			margin-bottom : 0;
+		}
+	}
+	//************************************
+	// *       DESCRIPTIVE TEXT BOX
+	// ************************************/
+	* + .descriptive {
+		margin-top : 0.6cm;
+	}
+	.descriptive{
+		.useSansSerif();
+		border-style        : solid;
+		border-width        : 1px;
+		border-image-source : url('/assets/Journal/Border2.png');
+		border-image-slice  : 48 48 48 48;
+		border-image-width  : 20px;
+		border-image-outset : 16px 20px 16px 20px;
+		border-image-repeat : stretch stretch;
+		background-image    : url(/assets/Journal/HashMarks.png),
+													linear-gradient(to bottom right, #ff000000, #41212114, #41212100);
+		background-size     : 120% 120%;
+		background-repeat   : no-repeat;
+		background-position : center;
+		padding             : 0.2cm;
+		:where(&) {
+			margin-top        : 4px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.45cm;
+		}
+		h5 {
+			font-size : 0.375cm;
+		}
+		p{
+			padding-bottom : 0px;
+		}
+		:last-child {
+			margin-bottom : 0;
+		}
+	}
+	//*****************************
+	// *    Images Snippets
+	// *****************************/
+
+	/* Arist Credit */
+	.artist {
+		position    : absolute;
+		width       : auto;
+		text-align  : center;
+		font-family : WalterTurncoat;
+		font-size   : 0.27cm;
+		color       : var(--HB_Color_CaptionText);
+		p, p + p {
+			margin      : unset;
+			text-indent : unset;
+			line-height : 1em;
+		}
+	 	h5 {
+			font-size   : 1.3em;
+			font-family : WalterTurncoat;
 		}
 		a{
-			display         : inline;
 			color           : inherit;
-			text-decoration : none;
-			&:hover{
+			text-decoration : unset;
+			&:hover {
 				text-decoration : underline;
 			}
 		}
-		h4 {
-			margin-top  : 0.2cm;
-			line-height : 0.4cm;
-			& + ul li {
-				line-height: 1.2em;
-			}
-		}
-		ul{
-			padding-left    : 0;
-			list-style-type : none;
-			li + li h3 {
-				margin-top  : 0.26cm;
-				line-height : 1em
-			}
-			h3 span:first-child::after {
-				border : none;
-			}
-			span {
-				display : table-cell;
-				&:first-child {
-					position   :       relative;
-					overflow   :       hidden;
-					&::after {
-						content       : "";
-						position      : absolute;
-						bottom        : 0.08cm;
-						margin-left   : 0.06cm;        /* Spacing before dot leaders */
-						width         : 100%;
-						border-bottom : 0.05cm dotted #000;
-					}
-				}
-				&:last-child {
-					font-family    : ReenieBeanie;
-					font-size      : 0.34cm;
-					font-weight    : normal;
-					color          : black;
-					text-align     : right;
-					vertical-align : bottom; /* Keep page number bottom-aligned */
-					width          : 1%;
-					padding-left   : 0.06cm; /* Spacing after dot leaders */
-					/*white-space  : nowrap; /* Uncomment if needed */
-				}
-			}
-			ul { /*List indent*/
-				margin-left : 1em;
-			}
-		}
-		&.wide{
-			.useColumns(0.96, @fillMode: balance);
-		}
 	}
 
 	//*****************************
-	// *         WIDE
+	// *    MONSTER STAT BLOCK
 	// *****************************/
-	.page .wide {
-		margin-bottom       : 0.45cm;
+	.monster {
+		.useSansSerif();
+		&.frame {
+			border-style          : solid;
+			border-width          : 7px 6px;
+			border-image-source   : url('/assets/Journal/Border3.png');
+			border-image-slice    : 63 74 63 74;
+			border-image-width    : 15px 20px 15px 20px;
+			border-image-outset   : 12px 12px 12px 12px;
+			border-image-repeat   : stretch round;
+			background-image      : url('/assets/Journal/HashMarks.png'),
+				                      linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
+			background-blend-mode : screen multiply;
+			background-size       : 100%;
+			padding               : 0.2cm;
+		}
+
+		color: var(--HB_Color_Text);
+		position          : relative;
+		padding           : 0px;
+		margin-bottom     : 0.325cm;
+
+		//Headers
+		h2{
+			font-size     : 0.62cm;
+			line-height   : 1em;
+			margin        : 0;
+			&+p {
+				margin-bottom : 0; //Monster size and type subtext
+			}
+		}
+		h3{
+			margin-left    : 0;
+			font-variant   : small-caps;
+  		padding-bottom : 0.05cm;
+		}
+		hr{
+			visibility       : visible;
+			height           : 6px;
+			margin           : 0.12cm 0cm;
+			background-image : url('/assets/Journal/HorizontalRule.png');
+			background-size  : 100% 100%;
+		}
+		hr:last-of-type + * {
+			margin-top : 0.325cm; // Space after last HR
+		}
+
+		// Monster Ability table
+		hr + table:first-of-type{
+			margin              : 0;
+			column-span         : none;
+		  background-image    : none;
+			border-style        : none;
+			border-image        : none;
+			color               : inherit;
+			tr {
+				background-image  : none;
+			}
+			td,th {
+				padding: 0px;
+			}
+		}
+
+		:last-child {
+			margin-bottom : 0;
+		}
+
+		strong, em {
+			font-style      : normal;
+			text-decoration : none;
+		}
+	}
+
+	//Full Width
+	.monster.wide{
+		.useColumns(0.96, @fillMode: balance);
+	}
+
+	//*****************************
+	// *           FOOTER
+	// *****************************/
+	&:nth-child(odd){
+		.pageNumber{
+			left : 3cm;
+		}
+		.footnote{
+			left       : 4.5cm;
+			text-align : left;
+		}
+	}
+	.pageNumber{
+		font-family : FrederickaTheGreat;
+		position    : absolute;
+		right       : 3cm;
+		bottom      : 1.25cm;
+		width       : 50px;
+		font-size   : 0.9em;
+		color       : var(--HB_Color_HeaderText);
+		text-align  : center;
+		text-indent : 0;
+		&.auto::after {
+			content : counter(phb-page-numbers);
+		}
+	}
+	.footnote{
+		position   : absolute;
+		right      : 4.5cm;
+		bottom     : 1.25cm;
+		z-index    : 150;
+		width      : 200px;
+		font-size  : 0.8em;
+		color      : var(--HB_Color_HeaderText);
+		text-align : right;
+	}
+	//************************************
+	// *           CODE BLOCKS
+	// ************************************/
+	code{
+		font-size        : 0.3cm;
+		padding          : 0px 4px;
+		color            : var(--HB_Color_Text);
+		vertical-align   : middle;
+		background-color : #faf7ea;
+		border-radius    : 4px;
+	}
+
+	pre code{
+		border-style        : solid;
+		border-width        : 1px;
+		border-image        : @codeBorderImage 26 stretch;
+		border-image-width  : 10px;
+		border-image-outset : 2px;
+		border-radius       : 12px;
+		margin-bottom       : 2px;
+		padding             : 0.15cm;
+		.page :where(&) {
+			margin-top        : 2px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.325cm;
+		}
+	}
+	//*****************************
+	// *          EXTRAS
+	// *****************************/
+	hr{
+		visibility : hidden;
+		border     : none;
+		margin     : 0px;
+	}
+	//Text indent right after table
+	table+p{
+		text-indent : 1em;
+	}
+	a, a:visited, a:hover {
+		color: var(--HB_Color_Text);
+		transition:all 1s ease;
+	}
+	a:hover {
+		color:red;
 	}
 }
+//*****************************
+// *         SPELL LIST
+// *****************************/
+
+.page .spellList{
+	.useSansSerif();
+	font-family  : PermanentMarker;
+	column-count : 2;
+	ul+h5{
+		margin-top : 15px;
+	}
+	ul{
+		margin-bottom               : 0.5em;
+		padding-left                : 1em;
+		text-indent                 : -1em;
+		list-style-type             : none;
+		-webkit-column-break-inside : auto;
+		page-break-inside           : auto;
+		break-inside                : auto;
+	}
+	&.wide{
+		column-count : 4;
+	}
+}
+
+//*****************************
+// *       CLASS TABLE
+// *****************************/
+.page .classTable{
+	th[colspan]:not([rowspan]) {
+		white-space : nowrap;
+	}
+	h5 + table{
+		margin-top : 0.2cm;
+	}
+}
+//*****************************
+// *      TABLE OF CONTENTS
+// *****************************/
+.page .toc{
+	-webkit-column-break-inside : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
+	h1 {
+		text-align    : center;
+		margin-bottom : 0.3cm;
+	}
+	a{
+		display         : inline;
+		color           : inherit;
+		text-decoration : none;
+		&:hover{
+			text-decoration : underline;
+		}
+	}
+	h4 {
+		margin-top  : 0.2cm;
+		line-height : 0.4cm;
+		& + ul li {
+			line-height: 1.2em;
+		}
+	}
+	ul{
+		padding-left    : 0;
+		list-style-type : none;
+		li + li h3 {
+			margin-top  : 0.26cm;
+			line-height : 1em
+		}
+		h3 span:first-child::after {
+			border : none;
+		}
+		span {
+			display : table-cell;
+			&:first-child {
+				position   :       relative;
+				overflow   :       hidden;
+				&::after {
+					content       : "";
+					position      : absolute;
+					bottom        : 0.08cm;
+					margin-left   : 0.06cm;        /* Spacing before dot leaders */
+					width         : 100%;
+					border-bottom : 0.05cm dotted #000;
+				}
+			}
+			&:last-child {
+				font-family    : ReenieBeanie;
+				font-size      : 0.34cm;
+				font-weight    : normal;
+				color          : black;
+				text-align     : right;
+				vertical-align : bottom; /* Keep page number bottom-aligned */
+				width          : 1%;
+				padding-left   : 0.06cm; /* Spacing after dot leaders */
+				/*white-space  : nowrap; /* Uncomment if needed */
+			}
+		}
+		ul { /*List indent*/
+			margin-left : 1em;
+		}
+	}
+	&.wide{
+		.useColumns(0.96, @fillMode: balance);
+	}
+}
+
+//*****************************
+// *         WIDE
+// *****************************/
+.page .wide {
+	margin-bottom       : 0.45cm;
+}
diff --git a/themes/assets/dragonBackground.png b/themes/assets/dragonBackground.png
new file mode 100644
index 000000000..987e36e4d
Binary files /dev/null and b/themes/assets/dragonBackground.png differ
diff --git a/themes/assets/waterColorMasks/corner/0001.webp b/themes/assets/waterColorMasks/corner/0001.webp
new file mode 100644
index 000000000..65830dbf1
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0001.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0002.webp b/themes/assets/waterColorMasks/corner/0002.webp
new file mode 100644
index 000000000..250a94b38
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0002.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0003.webp b/themes/assets/waterColorMasks/corner/0003.webp
new file mode 100644
index 000000000..6a6c8e660
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0003.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0004.webp b/themes/assets/waterColorMasks/corner/0004.webp
new file mode 100644
index 000000000..d1fcc49f0
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0004.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0005.webp b/themes/assets/waterColorMasks/corner/0005.webp
new file mode 100644
index 000000000..3fd1f0d8b
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0005.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0006.webp b/themes/assets/waterColorMasks/corner/0006.webp
new file mode 100644
index 000000000..f5303afa7
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0006.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0007.webp b/themes/assets/waterColorMasks/corner/0007.webp
new file mode 100644
index 000000000..6d8d9b9a3
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0007.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0008.webp b/themes/assets/waterColorMasks/corner/0008.webp
new file mode 100644
index 000000000..a732854e1
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0008.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0009.webp b/themes/assets/waterColorMasks/corner/0009.webp
new file mode 100644
index 000000000..c84e69a07
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0009.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0010.webp b/themes/assets/waterColorMasks/corner/0010.webp
new file mode 100644
index 000000000..8fba1a496
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0010.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0011.webp b/themes/assets/waterColorMasks/corner/0011.webp
new file mode 100644
index 000000000..c6526f9d7
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0011.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0012.webp b/themes/assets/waterColorMasks/corner/0012.webp
new file mode 100644
index 000000000..0fafd03db
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0012.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0013.webp b/themes/assets/waterColorMasks/corner/0013.webp
new file mode 100644
index 000000000..040234864
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0013.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0014.webp b/themes/assets/waterColorMasks/corner/0014.webp
new file mode 100644
index 000000000..fa04254b2
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0014.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0015.webp b/themes/assets/waterColorMasks/corner/0015.webp
new file mode 100644
index 000000000..f64bdc954
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0015.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0016.webp b/themes/assets/waterColorMasks/corner/0016.webp
new file mode 100644
index 000000000..f727e56b5
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0016.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0017.webp b/themes/assets/waterColorMasks/corner/0017.webp
new file mode 100644
index 000000000..00c6a2ac2
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0017.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0018.webp b/themes/assets/waterColorMasks/corner/0018.webp
new file mode 100644
index 000000000..b9bd82283
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0018.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0019.webp b/themes/assets/waterColorMasks/corner/0019.webp
new file mode 100644
index 000000000..452268aba
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0019.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0020.webp b/themes/assets/waterColorMasks/corner/0020.webp
new file mode 100644
index 000000000..d8f9fbf60
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0020.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0021.webp b/themes/assets/waterColorMasks/corner/0021.webp
new file mode 100644
index 000000000..08343ea74
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0021.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0022.webp b/themes/assets/waterColorMasks/corner/0022.webp
new file mode 100644
index 000000000..6f64571e0
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0022.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0023.webp b/themes/assets/waterColorMasks/corner/0023.webp
new file mode 100644
index 000000000..2c88031c5
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0023.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0024.webp b/themes/assets/waterColorMasks/corner/0024.webp
new file mode 100644
index 000000000..a187a75b0
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0024.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0025.webp b/themes/assets/waterColorMasks/corner/0025.webp
new file mode 100644
index 000000000..4511b6303
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0025.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0026.webp b/themes/assets/waterColorMasks/corner/0026.webp
new file mode 100644
index 000000000..a5dd080ae
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0026.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0027.webp b/themes/assets/waterColorMasks/corner/0027.webp
new file mode 100644
index 000000000..d7198530c
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0027.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0028.webp b/themes/assets/waterColorMasks/corner/0028.webp
new file mode 100644
index 000000000..5b836ace9
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0028.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0029.webp b/themes/assets/waterColorMasks/corner/0029.webp
new file mode 100644
index 000000000..ecf4200fc
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0029.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0030.webp b/themes/assets/waterColorMasks/corner/0030.webp
new file mode 100644
index 000000000..73f2c954a
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0030.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0031.webp b/themes/assets/waterColorMasks/corner/0031.webp
new file mode 100644
index 000000000..9fc1785a9
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0031.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0032.webp b/themes/assets/waterColorMasks/corner/0032.webp
new file mode 100644
index 000000000..497aaa201
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0032.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0033.webp b/themes/assets/waterColorMasks/corner/0033.webp
new file mode 100644
index 000000000..6086a5576
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0033.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0034.webp b/themes/assets/waterColorMasks/corner/0034.webp
new file mode 100644
index 000000000..4e8885f2e
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0034.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0035.webp b/themes/assets/waterColorMasks/corner/0035.webp
new file mode 100644
index 000000000..f010e194f
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0035.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0036.webp b/themes/assets/waterColorMasks/corner/0036.webp
new file mode 100644
index 000000000..e662511d7
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0036.webp differ
diff --git a/themes/assets/waterColorMasks/corner/0037.webp b/themes/assets/waterColorMasks/corner/0037.webp
new file mode 100644
index 000000000..9e90d65c4
Binary files /dev/null and b/themes/assets/waterColorMasks/corner/0037.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0001.webp b/themes/assets/waterColorMasks/edge/0001.webp
new file mode 100644
index 000000000..6138a1a1b
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0001.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0002.webp b/themes/assets/waterColorMasks/edge/0002.webp
new file mode 100644
index 000000000..15766829b
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0002.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0003.webp b/themes/assets/waterColorMasks/edge/0003.webp
new file mode 100644
index 000000000..ef77e7577
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0003.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0004.webp b/themes/assets/waterColorMasks/edge/0004.webp
new file mode 100644
index 000000000..d18da828b
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0004.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0005.webp b/themes/assets/waterColorMasks/edge/0005.webp
new file mode 100644
index 000000000..f9c9c12e7
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0005.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0006.webp b/themes/assets/waterColorMasks/edge/0006.webp
new file mode 100644
index 000000000..f09e74316
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0006.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0007.webp b/themes/assets/waterColorMasks/edge/0007.webp
new file mode 100644
index 000000000..197915e90
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0007.webp differ
diff --git a/themes/assets/waterColorMasks/edge/0008.webp b/themes/assets/waterColorMasks/edge/0008.webp
new file mode 100644
index 000000000..bf6c90229
Binary files /dev/null and b/themes/assets/waterColorMasks/edge/0008.webp differ
diff --git a/themes/assets/waterColorMasks/missingImage.png b/themes/assets/waterColorMasks/missingImage.png
new file mode 100644
index 000000000..08dcb816c
Binary files /dev/null and b/themes/assets/waterColorMasks/missingImage.png differ