Merge branch 'master' into autoPageNumberBrewVariable

2026-01-22 20:29:43 +00:00 · 2025-03-27 11:48:20 +13:00
parent 20f0d16a58 fc8654bff5
commit 9f68d60703
77 changed files with 2094 additions and 2401 deletions
--- a/changelog.md
+++ b/changelog.md
@@ -88,6 +88,20 @@ pre {
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).

+### Tuesday 03/18/2025 - v3.18.1
+
+{{taskList
+##### G-Ambatte
+* [x] Revert colon rendering from br elements to blank divs
+
+##### 5e-Cleric
+* [x] Allow for local connections within a same network when running a local version
+Fixes issue [#4094](https://github.com/naturalcrit/homebrewery/issues/4094)
+
+* [x] Add US Letter size page snippet
+Fixes issue [#3893](https://github.com/naturalcrit/homebrewery/issues/3893)
+}}
+
 ### Monday 03/10/2025 - v3.18.0

 {{taskList
--- a/client/admin/notificationUtils/notificationAdd/notificationAdd.less
+++ b/client/admin/notificationUtils/notificationAdd/notificationAdd.less
@@ -18,17 +18,15 @@
 			margin-bottom : unset;
 			font-family   : monospace;

-			&[type="date"] {
-				width:14ch;
-			}
+			&[type='date'] { width : 14ch; }
 		}
 	
 		textarea {
 			width      : 50ch;
 			min-height : 7em;
 			max-height : 20em;
-			resize     : vertical;
 			padding	   : 10px;
+			resize     : vertical;
 		}
 	}

--- a/client/components/Anchored.less
+++ b/client/components/Anchored.less
@@ -2,12 +2,10 @@

 .anchored-box {
 	position     : absolute;
+	visibility   : hidden;
+	justify-self : anchor-center;
 	@supports (inset-block-start: anchor(bottom)) {
 		inset-block-start : anchor(bottom);
 	}
-	justify-self: anchor-center;
-	visibility: hidden;
-	&.active {
-		visibility: visible;
-	}
+	&.active { visibility : visible; }
 }
--- a/client/components/combobox.less
+++ b/client/components/combobox.less
@@ -27,7 +27,7 @@
 			position    : relative;
 			padding     : 5px;
 			margin      : 0 3px;
-			font-family : "Open Sans";
+			font-family : 'Open Sans';
 			font-size   : 11px;
 			cursor      : default;
 			&:hover {
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -39,7 +39,7 @@ const BrewPage = (props)=>{
 		...props
 	};
 	const pageRef = useRef(null);
-	const cleanText = safeHTML(props.contents);
+	const cleanText = safeHTML(`${props.contents}\n<div class="columnSplit"></div>\n`);

 	useEffect(()=>{
 		if(!pageRef.current) return;
@@ -186,7 +186,7 @@ const BrewRenderer = (props)=>{
 		} else {
 			if(pageText.startsWith('\\page')) {
 				const firstLineTokens  = Markdown.marked.lexer(pageText.split('\n', 1)[0])[0].tokens;
-				const injectedTags = firstLineTokens.find((obj)=>obj.injectedTags !== undefined)?.injectedTags;
+				const injectedTags = firstLineTokens?.find((obj)=>obj.injectedTags !== undefined)?.injectedTags;
 				if(injectedTags) {
 					styles     = { ...styles, ...injectedTags.styles };
 					styles     = _.mapKeys(styles, (v, k)=>k.startsWith('--') ? k : _.camelCase(k)); // Convert CSS to camelCase for React
@@ -196,7 +196,7 @@ const BrewRenderer = (props)=>{
 				pageText = pageText.includes('\n') ? pageText.substring(pageText.indexOf('\n') + 1) : ''; // Remove the \page line
 			}

-			let html = Markdown.render(pageText, index);
+			const html = Markdown.render(pageText, index);

 			return <BrewPage className={classes} index={index} key={index} contents={html} style={styles} attributes={attributes} onVisibilityChange={handlePageVisibilityChange} />;
 		}
--- a/client/homebrew/brewRenderer/brewRenderer.less
+++ b/client/homebrew/brewRenderer/brewRenderer.less
@@ -1,21 +1,17 @@
@import (multiple, less) 'shared/naturalcrit/styles/reset.less';

 .brewRenderer {
+	height        : 100vh;
+	padding-top   : 60px;
 	overflow-y    : scroll;
 	will-change   : transform;
-	padding-top   : 60px;
-	height        : 100vh;
-	&:has(.facing, .flow) {
-		padding : 60px 30px;
-	}
-	&.deployment {
-		background-color: darkred;
-	}
+	&:has(.facing, .flow) { padding : 60px 30px; }
+	&.deployment { background-color : darkred; }
 	:where(.pages) {
 		&.facing {
 			display               : grid; 
-			grid-template-columns: repeat(2, auto); 
 			grid-template-rows    : repeat(3, auto); 
+			grid-template-columns : repeat(2, auto); 
 			gap                   : 10px 10px; 
 			justify-content       : safe center;
 			&.recto .page:first-child {
@@ -24,8 +20,8 @@
 				grid-column-start : 2; 
 			}
 			& :where(.page) {
-				margin-left: unset !important;
 				margin-right : unset !important;
+				margin-left  : unset !important;
 			}
 		}

@@ -36,8 +32,8 @@
 			justify-content : safe center;
 			& :where(.page) {
 				flex         : 0 0 auto;
-				margin-left: unset !important;
 				margin-right : unset !important;
+				margin-left  : unset !important;
 			}

 		}
@@ -50,9 +46,7 @@
 			margin-left   : auto;
 			box-shadow    : 1px 4px 14px #000000;
 		}
-		*[id] {
-			scroll-margin-top:100px;
-		}
+		*[id] { scroll-margin-top : 100px; }
 	}
 	&::-webkit-scrollbar {
 		width : 20px;
@@ -83,7 +77,5 @@
 			& > .page { box-shadow : unset; }
 		}
 	}
-	.headerNav {
-		visibility: hidden;
-	}
+	.headerNav { visibility : hidden; }
 }
--- a/client/homebrew/brewRenderer/headerNav/headerNav.jsx
+++ b/client/homebrew/brewRenderer/headerNav/headerNav.jsx
@@ -25,7 +25,7 @@ const HeaderNav = React.forwardRef(({}, pagesRef)=>{
 			'.toc'         : ()=>{ return 'Table of Contents'; },
 		};

-		const getHeaderContent = el => el.querySelector('h1')?.textContent;
+		const getHeaderContent = (el)=>el.querySelector('h1')?.textContent;

 		const topLevelPageSelector = Object.keys(topLevelPages).join(',');

@@ -52,25 +52,23 @@ const HeaderNav = React.forwardRef(({}, pagesRef)=>{
 				depth : 7,              // All unmatched elements with IDs are set to the maximum depth (7)
 				text  : el.textContent, // Use `textContent` because `innerText` is affected by rendering, e.g. 'content-visibility: auto'
 				link  : el.id
-			}
+			};
 			if(el.classList.contains('page')) {
 				let text = `Page ${el.id.slice(1)}`; // Get the page # by trimming off the 'p' from the ID
-				const pageType = Object.keys(topLevelPages).find(pageType => el.querySelector(pageType));
+				const pageType = Object.keys(topLevelPages).find((pageType)=>el.querySelector(pageType));
 				if(pageType)
-					text += ` - ${topLevelPages[pageType](el, pageType)}` // If a Top Level Page, add extra label
+					text += ` - ${topLevelPages[pageType](el, pageType)}`; // If a Top Level Page, add extra label

 				navEntry.depth     = 0; // Pages are always at the least indented level
 				navEntry.text      = text;
 				navEntry.className = 'pageLink';
-			}
-			else if(el.localName.match(/^h[1-6]/)){  // Header elements H1 through H6
+			} else if(el.localName.match(/^h[1-6]/)){  // Header elements H1 through H6
 				navEntry.depth = el.localName[1];      // Depth is set by the header level
 			}
 			navList.push(navEntry);
 		});

-		return _.map(navList, (navItem, index)=>
-			<HeaderNavItem {...navItem} key={index} />
+		return _.map(navList, (navItem, index)=><HeaderNavItem {...navItem} key={index} />
 		);
 	};

--- a/client/homebrew/brewRenderer/headerNav/headerNav.less
+++ b/client/homebrew/brewRenderer/headerNav/headerNav.less
@@ -2,38 +2,30 @@
 	position         : fixed;
 	top              : 32px;
 	left             : 0px;
-	padding: 5px 10px;
-	background-color: #ccc;
-	border-radius: 5px;
-	max-height: calc(100vh - 32px);
 	max-width        : 40vw;
+	max-height       : calc(100vh - 32px);
+	padding          : 5px 10px;
 	overflow-y       : auto;
+	background-color : #CCCCCC;
+	border-radius    : 5px;
 	&.active {
 		padding-bottom : 10px;
-        .navIcon {
-            padding-bottom: 10px;
-        }
-    }
-	.navIcon {
-		cursor: pointer;
+		.navIcon { padding-bottom : 10px; }
 	}
+	.navIcon { cursor : pointer; }
 	li {
 		list-style-type : none;
 		a {
 			display         : inline-block;
 			width           : 100%;
+			padding         : 2px;
 			font-family     : 'Open Sans';
 			font-size       : 12px;
-			padding: 2px;
 			color           : inherit;
 			text-decoration : none;
 			cursor          : pointer;
-			&:hover {
-				text-decoration: underline;
-			}
-			&.pageLink {
-				font-weight: 900;
-			}
+			&:hover { text-decoration : underline; }
+			&.pageLink { font-weight : 900; }

 			@depths: 0,1,2,3,4,5,6,7;

--- a/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less
+++ b/client/homebrew/brewRenderer/notificationPopup/notificationPopup.less
@@ -85,4 +85,9 @@
 		display          : inline-block;
 		width            : 100%;
 	}
+	.blank {
+		height     : 1em;
+		margin-top : 0;
+		& + * { margin-top : 0; }
+	}
 }
--- a/client/homebrew/brewRenderer/toolBar/toolBar.less
+++ b/client/homebrew/brewRenderer/toolBar/toolBar.less
@@ -156,7 +156,7 @@
 		min-width        : 46px;
 		height           : 100%;
 		&:hover { background-color : #444444; }
-		&:focus { border  : 1px solid #D3D3D3;outline : none;}
+		&:focus {outline : none; border  : 1px solid #D3D3D3;}
 		&:disabled {
 			color            : #777777;
 			background-color : unset !important;
@@ -182,8 +182,8 @@
 	position  : absolute;
 	left      : 0;
 	z-index   : 5;
+	display   : flex;
 	width     : 32px;
 	min-width : unset;
 	height    : 100%;
-	display   : flex;
 }
--- a/client/homebrew/editor/editor.less
+++ b/client/homebrew/editor/editor.less
@@ -45,26 +45,26 @@
 			color       : green;
 		}
 		.emoji:not(.cm-comment) {
-			margin-left    : 2px;
-			color          : #360034;
-			background     : #ffc8ff;
-			border-radius  : 6px;
-			font-weight    : bold;
 			padding-bottom : 1px;
+			margin-left    : 2px;
+			font-weight    : bold;
+			color          : #360034;
+			outline        : solid 2px #FF96FC;
 			outline-offset : -2px;
-			outline        : solid 2px #ff96fc;
+			background     : #FFC8FF;
+			border-radius  : 6px;
 		}
 		.superscript:not(.cm-comment) {
-			font-weight    : bold;
-			color          : goldenrod;
-			vertical-align : super;
 			font-size      : 0.9em;
+			font-weight    : bold;
+			vertical-align : super;
+			color          : goldenrod;
 		}
 		.subscript:not(.cm-comment) {
-			font-weight    : bold;
-			color          : rgb(123, 123, 15);
-			vertical-align : sub;
 			font-size      : 0.9em;
+			font-weight    : bold;
+			vertical-align : sub;
+			color          : rgb(123, 123, 15);
 		}
 		.dl-highlight {
 			&.dl-colon-highlight {
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -4,7 +4,6 @@ const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
 import request from '../../utils/request-middleware.js';
-const Nav = require('naturalcrit/nav/nav.jsx');
 const Combobox = require('client/components/combobox.jsx');
 const TagInput = require('../tagInput/tagInput.jsx');

@@ -110,6 +109,7 @@ const MetadataEditor = createClass({
 		}
 		this.props.onChange(this.props.metadata, 'renderer');
 	},
+
 	handlePublish : function(val){
 		this.props.onChange({
 			...this.props.metadata,
--- a/client/homebrew/editor/metadataEditor/metadataEditor.less
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.less
@@ -1,8 +1,8 @@
@import 'naturalcrit/styles/colors.less';

 .userThemeName {
-	padding-left: 10px;
 	padding-right : 10px;
+	padding-left  : 10px;
 }

 .metadataEditor {
@@ -12,8 +12,8 @@
 	height           : calc(100vh - 54px); // 54px is the height of the navbar + snippet bar.  probably a better way to dynamic get this.
 	padding          : 25px;
 	overflow-y       : auto;
-	background-color : #999999;
 	font-size        : 13px;
+	background-color : #999999;

 	h1 {
 		margin         : 0 0 40px;
@@ -24,8 +24,8 @@
 	h2 {
 		margin        : 20px 0;
 		font-weight   : bold;
+		color         : #555555;
 		border-bottom : 2px solid gray;
-		color: #555;
 	}

 	& > div { margin-bottom : 10px; }
@@ -54,10 +54,10 @@
 		min-width     : 200px;
 		& > label {
 			width          : 80px;
+			font-size      : 0.9em;
 			font-weight    : 800;
 			line-height    : 1.8em;
 			text-transform : uppercase;
-			font-size: .9em;
 		}
 		& > .value {
 			flex           : 1 1 auto;
@@ -96,8 +96,8 @@
 				text-overflow : auto;
 			}
 			button {
-				padding-left: 5px;
 				padding-right : 5px;
+				padding-left  : 5px;
 			}
 		}

@@ -136,8 +136,8 @@
 			margin-right   : 15px;
 			font-size      : 0.9em;
 			font-weight    : 800;
-			white-space    : nowrap;
 			vertical-align : middle;
+			white-space    : nowrap;
 			cursor         : pointer;
 			user-select    : none;
 		}
@@ -164,9 +164,7 @@
 			.colorButton(@red);
 		}
 	}
-	.authors.field .value {
-		line-height    : 1.5em;
-	}
+	.authors.field .value { line-height    : 1.5em; }

 	.themes.field {
 		& .dropdown-container {
@@ -174,9 +172,7 @@
 			z-index          : 100;
 			background-color : white;
 		}
-		& .dropdown-options {
-			overflow-y : visible;
-		}
+		& .dropdown-options { overflow-y : visible; }
 		.disabled {
 			font-style       : italic;
 			color            : dimgray;
--- a/client/homebrew/editor/snippetbar/snippetbar.jsx
+++ b/client/homebrew/editor/snippetbar/snippetbar.jsx
@@ -259,7 +259,7 @@ const Snippetbar = createClass({
 				</div>

 			</div>
-		)
+		);
 	},

 	render : function(){
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -22,7 +22,7 @@
 		justify-content : flex-end;
 		min-width       : 225px;

-		&:only-child { margin-left : auto;min-width:unset;}
+		&:only-child {min-width   : unset; margin-left : auto;}

 		>div {
 			display         : flex;
@@ -39,9 +39,7 @@
 				text-align  : center;
 				cursor      : pointer;

-				&.editorTool:not(.active) {
-					cursor:not-allowed;
-				}
+				&.editorTool:not(.active) { cursor : not-allowed; }

 				&:hover,&.selected { background-color : #999999; }
 				&.text {
@@ -151,9 +149,9 @@
 			position         : absolute;
 			top              : 100%;
 			z-index          : 1000;
+			visibility       : hidden;
 			padding          : 0px;
 			margin-left      : -5px;
-			visibility       : hidden;
 			background-color : #DDDDDD;
 			.snippet {
 				position    : relative;
--- a/client/homebrew/editor/tagInput/tagInput.jsx
+++ b/client/homebrew/editor/tagInput/tagInput.jsx
@@ -8,13 +8,13 @@ const TagInput = ({ unique = true, values = [], ...props }) => {
 	const [tagList, setTagList] = useState(values.map((value)=>({ value, editing: false })));

 	useEffect(()=>{
-		handleChange(tagList.map((context)=>context.value))
-	}, [tagList])
+		handleChange(tagList.map((context)=>context.value));
+	}, [tagList]);

 	const handleChange = (value)=>{
 		props.onChange({
 			target : { value }
-		})
+		});
 	};

 	const handleInputKeyDown = ({ evt, value, index, options = {} })=>{
@@ -35,7 +35,7 @@ const TagInput = ({ unique = true, values = [], ...props }) => {
 			}
 			// add new tag
 			if(originalValue === null){
-				return [...prevContext, { value: newValue, editing: false }]
+				return [...prevContext, { value: newValue, editing: false }];
 			}
 			// update existing tag
 			return prevContext.map((context, i)=>{
@@ -65,7 +65,7 @@ const TagInput = ({ unique = true, values = [], ...props }) => {
 				className='tag'
 				onClick={()=>editTag(index)}>
 				{context.value}
-				<button onClick={(evt)=>{evt.stopPropagation(); submitTag(null, context.value, index)}}><i className='fa fa-times fa-fw'/></button>
+				<button onClick={(evt)=>{evt.stopPropagation(); submitTag(null, context.value, index);}}><i className='fa fa-times fa-fw'/></button>
 			</li>
 		);
 	};
--- a/client/homebrew/homebrew.less
+++ b/client/homebrew/homebrew.less
@@ -3,14 +3,14 @@
 	height : 100%;
 	.sitePage {
 		display          : flex;
-		height           : 100%;
-		background-color : @steel;
 		flex-direction   : column;
+		height           : 100%;
 		overflow-y       : hidden;
+		background-color : @steel;
 		.content {
 			position   : relative;
-			height     : calc(~"100% - 29px"); //Navbar height
 			flex       : auto;
+			height     : calc(~'100% - 29px'); //Navbar height
 			overflow-y : hidden;
 		}
 		&.listPage .content {
@@ -19,18 +19,14 @@
 			&::-webkit-scrollbar {
 				width : 20px;
 				&:horizontal {
-					height: 20px;
 					width  : auto;
+					height : 20px;
 				}
 				&-thumb {
-					background: linear-gradient(90deg, #d3c1af 15px, #00000000 15px);
-					&:horizontal{
-						background: linear-gradient(0deg, #d3c1af 15px, #00000000 15px);
-					}
-				}
-				&-corner {
-					visibility: hidden;
+					background : linear-gradient(90deg, #D3C1AF 15px, #00000000 15px);
+					&:horizontal { background : linear-gradient(0deg, #D3C1AF 15px, #00000000 15px); }
 				}
+				&-corner { visibility : hidden; }
 			}
 		}
 	}
--- a/client/homebrew/navbar/error-navitem.less
+++ b/client/homebrew/navbar/error-navitem.less
@@ -4,75 +4,67 @@
 }

 .errorContainer {
-  animation-name: glideDown;
-  animation-duration: 0.4s;
 	position           : absolute;
 	top                : 100%;
 	left               : 50%;
 	z-index            : 1000;
 	width              : 140px;
 	padding            : 3px;
-  color            : white;
-  background-color : #333;
-  border           : 3px solid #444;
-  border-radius    : 5px;
-  transform        : translate(-50% + 3px, 10px);
-  text-align       : center;
 	font-size          : 10px;
 	font-weight        : 800;
+	color              : white;
+	text-align         : center;
 	text-transform     : uppercase;
-	.lowercase {
-		text-transform : none;
-	}
-  a{
-    color : @teal;
-  }
-  &:before {
-    content: "";
-    width: 0px;
-    height: 0px;
+	background-color   : #333333;
+	border             : 3px solid #444444;
+	border-radius      : 5px;
+	transform          : translate(-50% + 3px, 10px);
+	animation-name     : glideDown;
+	animation-duration : 0.4s;
+	.lowercase { text-transform : none; }
+	a { color : @teal; }
+	&::before {
 		position      : absolute;
-    border-left: 10px solid transparent;
-    border-right: 10px solid transparent;
-    border-top: 10px solid transparent;
-    border-bottom: 10px solid #444;
-    left: 53px;
 		top           : -23px;
-  }
-  &:after {
-    content: "";
+		left          : 53px;
 		width         : 0px;
 		height        : 0px;
-    position: absolute;
-    border-left: 10px solid transparent;
-    border-right: 10px solid transparent;
+		content       : '';
 		border-top    : 10px solid transparent;
-    border-bottom: 10px solid #333;
-    left: 53px;
+		border-right  : 10px solid transparent;
+		border-bottom : 10px solid #444444;
+		border-left   : 10px solid transparent;
+	}
+	&::after {
+		position      : absolute;
 		top           : -19px;
+		left          : 53px;
+		width         : 0px;
+		height        : 0px;
+		content       : '';
+		border-top    : 10px solid transparent;
+		border-right  : 10px solid transparent;
+		border-bottom : 10px solid #333333;
+		border-left   : 10px solid transparent;
 	}
 	.deny {
-    width            : 48%;
-    margin           : 1px;
-    padding          : 5px;
-    background-color : #333;
 		display          : inline-block;
-    border-left      : 1px solid #666;
+		width            : 48%;
+		padding          : 5px;
+		margin           : 1px;
+		background-color : #333333;
+		border-left      : 1px solid #666666;
 		.animate(background-color);
-    &:hover{
-      background-color : red;
-    }
+		&:hover { background-color : red; }
 	}
 	.confirm {
-    width            : 48%;
-    margin           : 1px;
-    padding          : 5px;
-    background-color : #333;
 		display          : inline-block;
+		width            : 48%;
+		padding          : 5px;
+		margin           : 1px;
 		color            : white;
+		background-color : #333333;
 		.animate(background-color);
-    &:hover{
-      background-color : teal;
-    }
+		&:hover { background-color : teal; }
 	}
 }
--- a/client/homebrew/navbar/navbar.less
+++ b/client/homebrew/navbar/navbar.less
@@ -24,11 +24,11 @@
 }

 .homebrew nav {
-	background-color : #333333;
 	position         : relative;
 	z-index          : 2;
 	display          : flex;
 	justify-content  : space-between;
+	background-color : #333333;
 	
 	.navSection {
 		display     : flex;
@@ -82,8 +82,8 @@
 		font-weight      : 800;
 		line-height      : 13px;
 		color            : white;
-		text-decoration  : none;
 		text-transform   : uppercase;
+		text-decoration  : none;
 		cursor           : pointer;
 		background-color : #333333;
 		i {
@@ -106,11 +106,11 @@
 			display          : block;
 			width            : 100%;
 			overflow         : hidden;
+			text-overflow    : ellipsis;
 			font-size        : 12px;
 			font-weight      : 800;
 			color            : white;
 			text-align       : center;
-			text-overflow    : ellipsis;
 			text-transform   : initial;	
 			white-space      : nowrap;
 			background-color : transparent;		
@@ -170,16 +170,16 @@
 					h4 {
 						box-sizing : border-box;
 						display    : block;
-						flex-basis : 20%;
 						flex-grow  : 1;
+						flex-basis : 20%;
 						min-width  : 76px;
 						padding    : 5px 0;
 						color      : #BBBBBB;
 						text-align : center;
 					}
 					p {
-						flex-basis     : 80%;
 						flex-grow      : 1;
+						flex-basis     : 80%;
 						padding        : 5px 0;
 						font-family    : 'Open Sans', sans-serif;
 						font-size      : 10px;
@@ -215,10 +215,10 @@
 				z-index          : 10000;
 				box-sizing       : border-box;
 				display          : block;
+				visibility       : hidden;
 				width            : 100%;
 				padding          : 13px 5px;
 				text-align       : center;
-				visibility       : hidden;
 				background-color : #333333;
 			}
 		}
--- a/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
+++ b/client/homebrew/pages/basePages/listPage/brewItem/brewItem.less
@@ -1,37 +1,36 @@

 .brewItem {
 	position                    : relative;
+	box-sizing                  : border-box;
 	display                     : inline-block;
-	vertical-align              : top;
-	box-sizing                  : border-box;
-	box-sizing                  : border-box;
-	overflow                    : hidden;
 	width                       : 48%;
 	min-height                  : 105px;
-	margin-right                : 15px;
-	margin-bottom               : 15px;
 	padding                     : 5px 15px 2px 6px;
 	padding-right               : 15px;
-	border                      : 1px solid #c9ad6a;
+	margin-right                : 15px;
+	margin-bottom               : 15px;
+	overflow                    : hidden;
+	vertical-align              : top;
+	background-color            : #CAB2802E;
+	border                      : 1px solid #C9AD6A;
 	border-radius               : 5px;
+	box-shadow                  : 0px 4px 5px 0px #333333;
+	break-inside                : avoid;
 	-webkit-column-break-inside : avoid;
 	page-break-inside           : avoid;
-	break-inside                : avoid;
-	box-shadow                  : 0px 4px 5px 0px #333;
-	background-color            : #cab2802e;
 	.thumbnail {
 		position            : absolute;
-		width: 150px;
-		height: 100%;
 		top                 : 0;
 		right               : 0;
 		z-index             : -1;
-		background-size: contain;
+		width               : 150px;
+		height              : 100%;
 		background-repeat   : no-repeat;
 		background-position : right top;
-		mask-image: linear-gradient(80deg, #0000 20%, #050 40%);
-		-webkit-mask-image: linear-gradient(80deg, #0000 20%, #050 40%);
+		background-size     : contain;
 		opacity             : 50%;
+		-webkit-mask-image  : linear-gradient(80deg, #00000000 20%, #005500 40%);
+		mask-image          : linear-gradient(80deg, #00000000 20%, #005500 40%);
 	}
 	.text {
 		min-height : 54px;
@@ -43,94 +42,76 @@
 	.info {
 		position    : initial;
 		bottom      : 2px;
-		font-family : ScalySansRemake;
+		font-family : "ScalySansRemake";
 		font-size   : 1.2em;
 		& > span {
 			margin-right : 12px;
 			line-height  : 1.5em;

-			a {
-				color:inherit;
-			}
+			a { color : inherit; }
 		}
 	}
 	.brewTags span {
-		background-color: #c8ac6e3b;
-		margin: 2px;
-		padding: 2px;
-		border: 1px solid #c8ac6e;
-		border-radius: 4px;
-		white-space: nowrap;
 		display          : inline-block;
+		padding          : 2px;
+		margin           : 2px;
 		font-weight      : bold;
-		border-color: currentColor;
+		white-space      : nowrap;
 		cursor           : pointer;
-		&:before {
+		background-color : #C8AC6E3B;
+		border           : 1px solid #C8AC6E;
+		border-color     : currentColor;
+		border-radius    : 4px;
+		&::before {
+			margin-right : 3px;
 			font-family  : 'Font Awesome 5 Free';
 			font-size    : 12px;
-			margin-right: 3px;
 		}
 		&.type {
-			background-color: #0080003b;
 			color            : #008000;
-			&:before{
-				content: '\f0ad';
-			}
+			background-color : #0080003B;
+			&::before { content : '\f0ad'; }
 		}
 		&.group {
-			background-color: #5050503b;
 			color            : #000000;
-			&:before{
-				content: '\f500';
-			}
+			background-color : #5050503B;
+			&::before { content : '\f500'; }
 		}
 		&.meta {
-			background-color: #0000803b;
 			color            : #000080;
-			&:before{
-				content: '\f05a';
-			}
+			background-color : #0000803B;
+			&::before { content : '\f05a'; }
 		}
 		&.system {
-			background-color: #8000003b;
 			color            : #800000;
-			&:before{
-				content: '\f518';
-			}
+			background-color : #8000003B;
+			&::before { content : '\f518'; }
 		}
 	}
 	&:hover {
-		.links{
-			opacity : 1;
-		}
-	}
-	&:nth-child(2n + 1){
-		margin-right : 0px;
+		.links { opacity : 1; }
 	}
+	&:nth-child(2n + 1) { margin-right : 0px; }
 	.links {
 		.animate(opacity);
 		position         : absolute;
 		top              : 0px;
 		right            : 0px;
-		height           : 100%;
 		width            : 2em;
-		opacity          : 0;
-		background-color : fade(black, 60%);
+		height           : 100%;
 		text-align       : center;
+		background-color : fade(black, 60%);
+		opacity          : 0;
 		a {
 			.animate(opacity);
 			display         : block;
 			margin          : 8px 0px;
-			opacity         : 0.6;
 			font-size       : 1.3em;
 			color           : white;
 			text-decoration : unset;
-			&:hover{
-				opacity : 1;
-			}
-			i{
-				cursor : pointer;
-			}
+			opacity         : 0.6;
+			&:hover { opacity : 1; }
+			i { cursor : pointer; }
 		}
 	}
 	.googleDriveIcon {
@@ -139,10 +120,10 @@
 		margin  : -5px;
 	}
 	.homebreweryIcon {
-		mix-blend-mode : darken;
-		height         : 24px;
 		position       : relative;
 		top            : 5px;
 		left           : -5px;
+		height         : 24px;
+		mix-blend-mode : darken;
 	}
 }
--- a/client/homebrew/pages/basePages/listPage/listPage.less
+++ b/client/homebrew/pages/basePages/listPage/listPage.less
@@ -20,170 +20,144 @@
 		z-index : 1;
 		.page {
 			.noColumns() !important; //Needed to override PHB Theme since this is on a lower @layer
-			&::after{
-				display : none;
-			}
+			&::after { display : none; }
 			.noBrews {
 				margin     : 10px 0px;
 				font-size  : 1.3em;
 				font-style : italic;
 			}
 			.brewCollection {
-				h1:hover{
-					cursor: pointer;
-				}
+				h1:hover { cursor : pointer; }
 				.active::before, .inactive::before {
-					font-family: 'Font Awesome 5 Free';
-					font-weight: 900;
-					font-size: 0.6cm;
 					padding-right : 0.5em;
+					font-family   : 'Font Awesome 5 Free';
+					font-size     : 0.6cm;
+					font-weight   : 900;
 				}
-				.active {
-					color: var(--HB_Color_HeaderText);
-				}
-				.active::before {
-					content: '\f107';
-				}
-				.inactive {
-					color: #707070;
-				}
-				.inactive::before {
-					content: '\f105';
-				}
+				.active { color : var(--HB_Color_HeaderText); }
+				.active::before { content : '\f107'; }
+				.inactive { color : #707070; }
+				.inactive::before { content : '\f105'; }
 			}
 		}
 	}
 	.sort-container {
-		font-family        : 'Open Sans', sans-serif;
 		position              : sticky;
 		top                   : 0;
 		left                  : 0;
-		width              : 100%;
-		height             : 30px;
-		background-color   : #555;
-		border-top         : 1px solid #666;
-		border-bottom         : 1px solid #666;
-		color              : white;
-		text-align         : center;
 		z-index               : 1;
 		display               : flex;
-		justify-content    : center;
-		align-items        : baseline;
-		column-gap         : 15px;
-		row-gap            : 5px;
 		flex-wrap             : wrap;
+		row-gap               : 5px;
+		column-gap            : 15px;
+		align-items           : baseline;
+		justify-content       : center;
+		width                 : 100%;
+		height                : 30px;
+		font-family           : 'Open Sans', sans-serif;
+		color                 : white;
+		text-align            : center;
+		background-color      : #555555;
+		border-top            : 1px solid #666666;
+		border-bottom         : 1px solid #666666;
 		h6 {
-			text-transform : uppercase;
 			font-family    : 'Open Sans', sans-serif;
 			font-size      : 11px;
 			font-weight    : bold;
+			text-transform : uppercase;
 		}
 		.sort-option {
 			display     : flex;
 			align-items : center;
-			padding: 0 8px;
-			color: #ccc;
 			height      : 100%;
+			padding     : 0 8px;
+			color       : #CCCCCC;

-			&:hover{
-				background-color : #444;
-			}
+			&:hover { background-color : #444444; }

 			&.active {
 				font-weight      : bold;
-			color: #ddd;
-			background-color: #333;
+				color            : #DDDDDD;
+				background-color : #333333;

 				button {
-				color: white;
-				font-weight: 800;
 					height      : 100%;
-				& + .sortDir {
-					padding-left: 5px;
-				}
+					font-weight : 800;
+					color       : white;
+					& + .sortDir { padding-left : 5px; }
 				}
 			}

 		}
 		.filter-option {
 			margin-left      : 20px;
-			background-color : transparent !important;
 			font-size        : 11px;
-			i{
-				padding-right : 5px;
-			}
+			background-color : transparent !important;
+			i { padding-right : 5px; }
 		}
 		button {
-				background-color : transparent;
-				font-family      : 'Open Sans', sans-serif;
-				text-transform   : uppercase;
-				font-weight      : normal;
-				font-size        : 11px;
-				color            : #ccc;
 			padding          : 0;
+			font-family      : 'Open Sans', sans-serif;
+			font-size        : 11px;
+			font-weight      : normal;
+			color            : #CCCCCC;
+			text-transform   : uppercase;
+			background-color : transparent;
 		}


 	}
 	.tags-container {
-		height             : 30px;
-		background-color   : #555;
-		border-top         : 1px solid #666;
-		border-bottom      : 1px solid #666;
-		color              : white;
 		display            : flex;
-		justify-content    : center;
-		align-items        : center;
-		column-gap         : 15px;
-		row-gap            : 5px;
 		flex-wrap          : wrap;
+		row-gap            : 5px;
+		column-gap         : 15px;
+		align-items        : center;
+		justify-content    : center;
+		height             : 30px;
+		color              : white;
+		background-color   : #555555;
+		border-top         : 1px solid #666666;
+		border-bottom      : 1px solid #666666;
 		span {
+			padding        : 3px;
 			font-family    : 'Open Sans', sans-serif;
 			font-size      : 11px;
 			font-weight    : bold;
+			color          : #DFDFDF;
+			cursor         : pointer;
 			border         : 1px solid;
 			border-radius  : 3px;
-			padding        : 3px;
-			cursor         : pointer;
-			color: #dfdfdf;
-			&:before {
-				font-family: 'Font Awesome 5 Free';
-				font-size: 12px;
+			&::before {
 				margin-right : 3px;
-			}
-			&:after {
-				content: '\f00d';
 				font-family  : 'Font Awesome 5 Free';
 				font-size    : 12px;
+			}
+			&::after {
 				margin-left : 3px;
+				font-family : 'Font Awesome 5 Free';
+				font-size   : 12px;
+				content     : '\f00d';
 			}
 			&.type {
 				background-color : #008000;
-				border-color: #00a000;
-				&:before{
-					content: '\f0ad';
-				}
+				border-color     : #00A000;
+				&::before { content : '\f0ad'; }
 			}
 			&.group {
 				background-color : #505050;
 				border-color     : #000000;
-				&:before{
-					content: '\f500';
-				}
+				&::before { content : '\f500'; }
 			}
 			&.meta {
 				background-color : #000080;
-				border-color: #0000a0;
-				&:before{
-					content: '\f05a';
-				}
+				border-color     : #0000A0;
+				&::before { content : '\f05a'; }
 			}
 			&.system {
 				background-color : #800000;
-				border-color: #a00000;
-				&:before{
-					content: '\f518';
-				}
+				border-color     : #A00000;
+				&::before { content : '\f518'; }
 			}
 		}
 	}
--- a/client/homebrew/pages/basePages/uiPage/uiPage.less
+++ b/client/homebrew/pages/basePages/uiPage/uiPage.less
@@ -1,7 +1,7 @@
 .homebrew {
 	.uiPage.sitePage {
 		.content {
-			width            : ~"min(90vw, 1000px)";
+			width            : ~'min(90vw, 1000px)';
 			padding          : 2% 4%;
 			margin-top       : 25px;
 			margin-right     : auto;
@@ -17,19 +17,19 @@
 				border        : 2px solid black;
 				border-radius : 5px;
 				button {
+					width            : 125px;
+					margin-right     : 5px;
+					color            : black;
 					background-color : transparent;
 					border           : 1px solid black;
 					border-radius    : 5px;
-					width            : 125px;
-					color            : black;
-					margin-right     : 5px;
 					&.active {
-						background-color: #0007;
 						color            : white;
-						&:before {
-							content: '\f00c';
-    						font-family: 'FONT AWESOME 5 FREE';
+						background-color : #00000077;
+						&::before {
 							margin-right : 5px;
+							font-family  : 'FONT AWESOME 5 FREE';
+							content      : '\f00c';
 						}
 					}
 				}
@@ -59,6 +59,11 @@
 				padding-left : 1.25em;
 				list-style   : square;
 			}
+			.blank {
+				height     : 1em;
+				margin-top : 0;
+				& + * { margin-top : 0; }
+			}
 		}
 	}
 }
--- a/client/homebrew/pages/editPage/editPage.less
+++ b/client/homebrew/pages/editPage/editPage.less
@@ -1,29 +1,25 @@
@keyframes glideDown {
-	0%   {transform : translate(-50% + 3px, 0px);
-				opacity   : 0;}
-	100% {transform : translate(-50% + 3px, 10px);
-				opacity   : 1;}
+	0% {
+		opacity   : 0;transform : translate(-50% + 3px, 0px);}
+	100% {
+		opacity   : 1;transform : translate(-50% + 3px, 10px);}
 }
 .editPage {
 	.navItem.save {
+		position   : relative;
 		width      : 106px;
 		text-align : center;
-		position   : relative;
 		&.saved {
+			color  : #666666;
 			cursor : initial;
-			color  : #666;
 		}
 	}
-	.googleDriveStorage {
-		position : relative;
-	}
+	.googleDriveStorage { position : relative; }
 	.googleDriveStorage img {
 		height  : 18px;
 		padding : 0px;
 		margin  : -5px;

-		&.inactive {
-			filter: grayscale(1);
-		}
+		&.inactive { filter : grayscale(1); }
 	}
 }
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -100,7 +100,7 @@ const HomePage = createClass({
 		return <div className='homePage sitePage'>
 			<Meta name='google-site-verification' content='NwnAQSSJZzAT7N-p5MY6ydQ7Njm67dtbu73ZSyE5Fy4' />
 			{this.renderNavbar()}
-			<div className="content">
+			<div className='content'>
 				<SplitPane onDragFinish={this.handleSplitMove}>
 					<Editor
 						ref={this.editor}
--- a/client/homebrew/pages/homePage/homePage.less
+++ b/client/homebrew/pages/homePage/homePage.less
@@ -3,48 +3,38 @@
 	a.floatingNewButton {
 		.animate(background-color);
 		position         : absolute;
-		display          : block;
 		right            : 70px;
 		bottom           : 50px;
-		z-index          : 100;
 		z-index          : 5001;
+		display          : block;
 		padding          : 1em;
-		background-color : @orange;
 		font-size        : 1.5em;
 		color            : white;
 		text-decoration  : none;
+		background-color : @orange;
 		box-shadow       : 3px 3px 15px black;
-		&:hover{
-			background-color : darken(@orange, 20%);
-		}
+		&:hover { background-color : darken(@orange, 20%); }
 	}
 	.floatingSaveButton {
 		.animateAll();
 		position         : absolute;
-		display          : block;
 		right            : 200px;
 		bottom           : 70px;
-		z-index          : 100;
 		z-index          : 5000;
+		display          : block;
 		padding          : 0.8em;
-		cursor           : pointer;
-		background-color : @blue;
 		font-size        : 0.8em;
 		color            : white;
 		text-decoration  : none;
+		cursor           : pointer;
+		background-color : @blue;
 		box-shadow       : 3px 3px 15px black;
-		&:hover{
-			background-color : darken(@blue, 20%);
-		}
-		&.show{
-			right : 350px;
-		}
+		&:hover { background-color : darken(@blue, 20%); }
+		&.show { right : 350px; }
 	}

 	.navItem.save {
 		background-color : @orange;
-		&:hover{
-			background-color: @green;
-		}
+		&:hover { background-color : @green; }
 	}
 }
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -223,7 +223,7 @@ const NewPage = createClass({
 	render : function(){
 		return <div className='newPage sitePage'>
 			{this.renderNavbar()}
-			<div className="content">
+			<div className='content'>
 				<SplitPane onDragFinish={this.handleSplitMove}>
 					<Editor
 						ref={this.editor}
--- a/client/homebrew/pages/newPage/newPage.less
+++ b/client/homebrew/pages/newPage/newPage.less
@@ -1,8 +1,6 @@
 .newPage {
 	.navItem.save {
 		background-color : @orange;
-		&:hover{
-			background-color: @green;
-		}
+		&:hover { background-color : @green; }
 	}
 }
--- a/client/homebrew/pages/sharePage/sharePage.less
+++ b/client/homebrew/pages/sharePage/sharePage.less
@@ -3,7 +3,5 @@
 		flex-grow       : 1;
 		justify-content : center;
 	}
-	.content{
-		overflow-y : hidden;
-	}
+	.content { overflow-y : hidden; }
 }
--- a/client/icons/customIcons.less
+++ b/client/icons/customIcons.less
@@ -1,84 +1,34 @@
 .fac {
 	display          : inline-block;
-	background-color : currentColor;
-	mask-size        : contain;
-	mask-repeat      : no-repeat;
-	mask-position    : center;
 	width            : 1em;
 	aspect-ratio     : 1;
+	background-color : currentColor;
+	mask-repeat      : no-repeat;
+	mask-position    : center;
+	mask-size        : contain;
 }
-.position-top-left {
-  mask-image: url('../icons/position-top-left.svg');
-}
-.position-top-right {
-  mask-image: url('../icons/position-top-right.svg');
-}
-.position-bottom-left {
-  mask-image: url('../icons/position-bottom-left.svg');
-}
-.position-bottom-right {
-  mask-image: url('../icons/position-bottom-right.svg');
-}
-.position-top {
-  mask-image: url('../icons/position-top.svg');
-}
-.position-right {
-  mask-image: url('../icons/position-right.svg');
-}
-.position-bottom {
-  mask-image: url('../icons/position-bottom.svg');
-}
-.position-left {
-  mask-image: url('../icons/position-left.svg');
-}
-.mask-edge {
-  mask-image: url('../icons/mask-edge.svg');
-}
-.mask-corner {
-  mask-image: url('../icons/mask-corner.svg');
-}
-.mask-center {
-  mask-image: url('../icons/mask-center.svg');
-}
-.book-front-cover {
-  mask-image: url('../icons/book-front-cover.svg');
-}
-.book-back-cover {
-  mask-image: url('../icons/book-back-cover.svg');
-}
-.book-inside-cover {
-  mask-image: url('../icons/book-inside-cover.svg');
-}
-.book-part-cover {
-  mask-image: url('../icons/book-part-cover.svg');
-}
-.image-wrap-left {
-  mask-image: url('../icons/image-wrap-left.svg');
-}
-.image-wrap-right {
-  mask-image: url('../icons/image-wrap-right.svg');
-}
-.davek {
-  mask-image: url('../icons/Davek.svg');
-}
-.rellanic {
-  mask-image: url('../icons/Rellanic.svg');
-}
-.iokharic {
-  mask-image: url('../icons/Iokharic.svg');
-}
-.zoom-to-fit {
-	mask-image: url('../icons/zoom-to-fit.svg');
-}
-.fit-width {
-	mask-image: url('../icons/fit-width.svg');
-}
-.single-spread {
-	mask-image: url('../icons/single-spread.svg');
-}
-.facing-spread {
-	mask-image: url('../icons/facing-spread.svg');
-}
-.flow-spread {
-	mask-image: url('../icons/flow-spread.svg');
-}
+.position-top-left { mask-image : url('../icons/position-top-left.svg'); }
+.position-top-right { mask-image : url('../icons/position-top-right.svg'); }
+.position-bottom-left { mask-image : url('../icons/position-bottom-left.svg'); }
+.position-bottom-right { mask-image : url('../icons/position-bottom-right.svg'); }
+.position-top { mask-image : url('../icons/position-top.svg'); }
+.position-right { mask-image : url('../icons/position-right.svg'); }
+.position-bottom { mask-image : url('../icons/position-bottom.svg'); }
+.position-left { mask-image : url('../icons/position-left.svg'); }
+.mask-edge { mask-image : url('../icons/mask-edge.svg'); }
+.mask-corner { mask-image : url('../icons/mask-corner.svg'); }
+.mask-center { mask-image : url('../icons/mask-center.svg'); }
+.book-front-cover { mask-image : url('../icons/book-front-cover.svg'); }
+.book-back-cover { mask-image : url('../icons/book-back-cover.svg'); }
+.book-inside-cover { mask-image : url('../icons/book-inside-cover.svg'); }
+.book-part-cover { mask-image : url('../icons/book-part-cover.svg'); }
+.image-wrap-left { mask-image : url('../icons/image-wrap-left.svg'); }
+.image-wrap-right { mask-image : url('../icons/image-wrap-right.svg'); }
+.davek { mask-image : url('../icons/Davek.svg'); }
+.rellanic { mask-image : url('../icons/Rellanic.svg'); }
+.iokharic { mask-image : url('../icons/Iokharic.svg'); }
+.zoom-to-fit { mask-image : url('../icons/zoom-to-fit.svg'); }
+.fit-width { mask-image : url('../icons/fit-width.svg'); }
+.single-spread { mask-image : url('../icons/single-spread.svg'); }
+.facing-spread { mask-image : url('../icons/facing-spread.svg'); }
+.flow-spread { mask-image : url('../icons/flow-spread.svg'); }
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,20 +1,20 @@
 {
  "name": "homebrewery",
-  "version": "3.18.0",
+  "version": "3.18.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "homebrewery",
-      "version": "3.18.0",
+      "version": "3.18.1",
      "hasInstallScript": true,
      "license": "MIT",
      "dependencies": {
-        "@babel/core": "^7.26.9",
-        "@babel/plugin-transform-runtime": "^7.26.9",
+        "@babel/core": "^7.26.10",
+        "@babel/plugin-transform-runtime": "^7.26.10",
        "@babel/preset-env": "^7.26.9",
        "@babel/preset-react": "^7.26.3",
-        "@googleapis/drive": "^8.16.0",
+        "@googleapis/drive": "^11.0.0",
        "body-parser": "^1.20.2",
        "classnames": "^2.5.1",
        "codemirror": "^5.65.6",
@@ -33,7 +33,7 @@
        "jwt-simple": "^0.5.6",
        "less": "^3.13.1",
        "lodash": "^4.17.21",
-        "marked": "14.0.0",
+        "marked": "14.1.4",
        "marked-emoji": "^2.0.0",
        "marked-extended-tables": "^2.0.1",
        "marked-gfm-heading-id": "^4.0.1",
@@ -41,23 +41,23 @@
        "marked-subsuper-text": "^1.0.3",
        "markedLegacy": "npm:marked@^0.3.19",
        "moment": "^2.30.1",
-        "mongoose": "^8.12.1",
-        "nanoid": "5.1.3",
+        "mongoose": "^8.13.0",
+        "nanoid": "5.1.5",
        "nconf": "^0.12.1",
        "react": "^18.3.1",
        "react-dom": "^18.3.1",
        "react-frame-component": "^4.1.3",
-        "react-router": "^7.3.0",
+        "react-router": "^7.4.0",
        "romans": "^3.0.0",
        "sanitize-filename": "1.6.3",
-        "superagent": "^10.1.1",
+        "superagent": "^10.2.0",
        "vitreum": "git+https://git@github.com/calculuschild/vitreum.git",
        "written-number": "^0.11.1"
      },
      "devDependencies": {
        "@stylistic/stylelint-plugin": "^3.1.2",
        "babel-plugin-transform-import-meta": "^2.3.2",
-        "eslint": "^9.22.0",
+        "eslint": "^9.23.0",
        "eslint-plugin-jest": "^28.11.0",
        "eslint-plugin-react": "^7.37.4",
        "globals": "^16.0.0",
@@ -65,10 +65,10 @@
        "jest-expect-message": "^1.1.3",
        "jsdom-global": "^3.0.2",
        "postcss-less": "^6.0.0",
-        "stylelint": "^16.15.0",
+        "stylelint": "^16.16.0",
        "stylelint-config-recess-order": "^6.0.0",
        "stylelint-config-recommended": "^15.0.0",
-        "supertest": "^7.0.0"
+        "supertest": "^7.1.0"
      },
      "engines": {
        "node": "^20.18.x",
@@ -112,21 +112,21 @@
      }
    },
    "node_modules/@babel/core": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz",
-      "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
+      "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
      "license": "MIT",
      "dependencies": {
        "@ampproject/remapping": "^2.2.0",
        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.9",
+        "@babel/generator": "^7.26.10",
        "@babel/helper-compilation-targets": "^7.26.5",
        "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helpers": "^7.26.9",
-        "@babel/parser": "^7.26.9",
+        "@babel/helpers": "^7.26.10",
+        "@babel/parser": "^7.26.10",
        "@babel/template": "^7.26.9",
-        "@babel/traverse": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/traverse": "^7.26.10",
+        "@babel/types": "^7.26.10",
        "convert-source-map": "^2.0.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.2",
@@ -142,13 +142,13 @@
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
-      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
+      "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
      "license": "MIT",
      "dependencies": {
-        "@babel/parser": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/parser": "^7.27.0",
+        "@babel/types": "^7.27.0",
        "@jridgewell/gen-mapping": "^0.3.5",
        "@jridgewell/trace-mapping": "^0.3.25",
        "jsesc": "^3.0.2"
@@ -378,25 +378,25 @@
      }
    },
    "node_modules/@babel/helpers": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
-      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
+      "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
      "license": "MIT",
      "dependencies": {
        "@babel/template": "^7.26.9",
-        "@babel/types": "^7.26.9"
+        "@babel/types": "^7.26.10"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
-      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
+      "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
      "license": "MIT",
      "dependencies": {
-        "@babel/types": "^7.26.9"
+        "@babel/types": "^7.27.0"
      },
      "bin": {
        "parser": "bin/babel-parser.js"
@@ -1408,15 +1408,15 @@
      }
    },
    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.26.9.tgz",
-      "integrity": "sha512-Jf+8y9wXQbbxvVYTM8gO5oEF2POdNji0NMltEkG7FtmzD9PVz7/lxpqSdTvwsjTMU5HIHuDVNf2SOxLkWi+wPQ==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.26.10.tgz",
+      "integrity": "sha512-NWaL2qG6HRpONTnj4JvDU6th4jYeZOJgu3QhmFTCihib0ermtOJqktA5BduGm3suhhVe9EMP9c9+mfJ/I9slqw==",
      "license": "MIT",
      "dependencies": {
        "@babel/helper-module-imports": "^7.25.9",
        "@babel/helper-plugin-utils": "^7.26.5",
        "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.10.6",
+        "babel-plugin-polyfill-corejs3": "^0.11.0",
        "babel-plugin-polyfill-regenerator": "^0.6.1",
        "semver": "^6.3.1"
      },
@@ -1642,19 +1642,6 @@
        "@babel/core": "^7.0.0-0"
      }
    },
-    "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
-      "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.3",
-        "core-js-compat": "^3.40.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
    "node_modules/@babel/preset-modules": {
      "version": "0.1.6-no-external-plugins",
      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
@@ -1690,9 +1677,10 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.9.tgz",
-      "integrity": "sha512-4zpTHZ9Cm6L9L+uIqghQX8ZXg8HKFcjYO3qHoO8zTmRm6HQUJ8SSJ+KRvbMBZn0EGVlT4DRYeQ/6hjlyXBh+Kg==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
+      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
+      "license": "MIT",
      "dependencies": {
        "regenerator-runtime": "^0.14.0"
      },
@@ -1701,30 +1689,30 @@
      }
    },
    "node_modules/@babel/template": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
-      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
+      "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
      "license": "MIT",
      "dependencies": {
        "@babel/code-frame": "^7.26.2",
-        "@babel/parser": "^7.26.9",
-        "@babel/types": "^7.26.9"
+        "@babel/parser": "^7.27.0",
+        "@babel/types": "^7.27.0"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
-      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
+      "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
      "license": "MIT",
      "dependencies": {
        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.9",
-        "@babel/parser": "^7.26.9",
-        "@babel/template": "^7.26.9",
-        "@babel/types": "^7.26.9",
+        "@babel/generator": "^7.27.0",
+        "@babel/parser": "^7.27.0",
+        "@babel/template": "^7.27.0",
+        "@babel/types": "^7.27.0",
        "debug": "^4.3.1",
        "globals": "^11.1.0"
      },
@@ -1742,9 +1730,9 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
-      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
+      "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
      "license": "MIT",
      "dependencies": {
        "@babel/helper-string-parser": "^7.25.9",
@@ -1879,9 +1867,9 @@
      }
    },
    "node_modules/@eslint/config-helpers": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.1.0.tgz",
-      "integrity": "sha512-kLrdPDJE1ckPo94kmPPf9Hfd0DU0Jw6oKYrhe+pwSC0iTUInmTa+w6fw8sGgcfkFJGNdWOUeOaDM4quW4a7OkA==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.0.tgz",
+      "integrity": "sha512-yJLLmLexii32mGrhW29qvU3QBVTu0GUmEf/J4XsBtVhp4JkIUFN/BjWqTF63yRvGApIDpZm5fa97LtYtINmfeQ==",
      "dev": true,
      "license": "Apache-2.0",
      "engines": {
@@ -1902,9 +1890,9 @@
      }
    },
    "node_modules/@eslint/eslintrc": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
-      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1939,9 +1927,9 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.22.0.tgz",
-      "integrity": "sha512-vLFajx9o8d1/oL2ZkpMYbkLv8nDB6yaIwFNt7nI4+I80U/z03SxmfOMsLbvWr3p7C+Wnoh//aOu2pQW8cS0HCQ==",
+      "version": "9.23.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz",
+      "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==",
      "dev": true,
      "license": "MIT",
      "engines": {
@@ -1973,9 +1961,9 @@
      }
    },
    "node_modules/@googleapis/drive": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-8.16.0.tgz",
-      "integrity": "sha512-Xi2mMrUTQ+gsfyouRGd0pfnL+jjg4n4sjKsJruM1y4DknuRfdSBTk5E//WrL0YJ/CqpcBgyd7L8DvaPRtxZD3Q==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@googleapis/drive/-/drive-11.0.0.tgz",
+      "integrity": "sha512-vhkl6/MZ8k5h5XOyenWOD4ys+SNdb8wKYvzU6OBGFx/TzJyHRm4JwgvE8uVDFU6efzNRS0mOiNRfY6nrmHOTtg==",
      "license": "Apache-2.0",
      "dependencies": {
        "googleapis-common": "^7.0.0"
@@ -3141,9 +3129,9 @@
      }
    },
    "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
      "dev": true,
      "license": "MIT",
      "bin": {
@@ -3705,12 +3693,13 @@
      }
    },
    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.10.6",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
-      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
+      "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
+      "license": "MIT",
      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
-        "core-js-compat": "^3.38.0"
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
+        "core-js-compat": "^3.40.0"
      },
      "peerDependencies": {
        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -3879,6 +3868,16 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
    "node_modules/bn.js": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
@@ -4401,6 +4400,20 @@
        "fsevents": "~2.3.2"
      }
    },
+    "node_modules/chokidar/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
    "node_modules/chokidar/node_modules/glob-parent": {
      "version": "5.1.2",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
@@ -5405,9 +5418,10 @@
      "license": "ISC"
    },
    "node_modules/elliptic": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz",
-      "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==",
+      "version": "6.6.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
+      "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
+      "license": "MIT",
      "dependencies": {
        "bn.js": "^4.11.9",
        "brorand": "^1.1.0",
@@ -5673,19 +5687,19 @@
      "license": "MIT"
    },
    "node_modules/eslint": {
-      "version": "9.22.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.22.0.tgz",
-      "integrity": "sha512-9V/QURhsRN40xuHXWjV64yvrzMjcz7ZyNoF2jJFmy9j/SLk0u1OLSZgXi28MrXjymnjEGSR80WCdab3RGMDveQ==",
+      "version": "9.23.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz",
+      "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
        "@eslint/config-array": "^0.19.2",
-        "@eslint/config-helpers": "^0.1.0",
+        "@eslint/config-helpers": "^0.2.0",
        "@eslint/core": "^0.12.0",
-        "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "9.22.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.23.0",
        "@eslint/plugin-kit": "^0.2.7",
        "@humanfs/node": "^0.16.6",
        "@humanwhocodes/module-importer": "^1.0.1",
@@ -6374,6 +6388,13 @@
        "node": ">=16.0.0"
      }
    },
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/fill-range": {
      "version": "7.1.1",
      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -6548,6 +6569,25 @@
      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
      "license": "ISC"
    },
+    "node_modules/fsevents": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+      "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "dependencies": {
+        "bindings": "^1.5.0",
+        "nan": "^2.12.1"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
    "node_modules/function-bind": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -8545,6 +8585,21 @@
        "fsevents": "^2.3.2"
      }
    },
+    "node_modules/jest-haste-map/node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
    "node_modules/jest-leak-detector": {
      "version": "29.7.0",
      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
@@ -9839,9 +9894,9 @@
      }
    },
    "node_modules/marked": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-14.0.0.tgz",
-      "integrity": "sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==",
+      "version": "14.1.4",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-14.1.4.tgz",
+      "integrity": "sha512-vkVZ8ONmUdPnjCKc5uTRvmkRbx4EAi2OkTOXmfTDhZz3OFqMNBM1oTTWwTr4HY4uAEojhzPf+Fy8F1DWa3Sndg==",
      "license": "MIT",
      "bin": {
        "marked": "bin/marked.js"
@@ -10219,9 +10274,9 @@
      }
    },
    "node_modules/mongodb-connection-string-url/node_modules/tr46": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
-      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.0.tgz",
+      "integrity": "sha512-IUWnUK7ADYR5Sl1fZlO1INDUhVhatWl7BtJWsIhwJ0UAK7ilzzIa8uIqOO/aYVWHZPJkKbEL+362wrzoeRF7bw==",
      "license": "MIT",
      "dependencies": {
        "punycode": "^2.3.1"
@@ -10240,12 +10295,12 @@
      }
    },
    "node_modules/mongodb-connection-string-url/node_modules/whatwg-url": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz",
-      "integrity": "sha512-mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==",
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz",
+      "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==",
      "license": "MIT",
      "dependencies": {
-        "tr46": "^5.0.0",
+        "tr46": "^5.1.0",
        "webidl-conversions": "^7.0.0"
      },
      "engines": {
@@ -10253,14 +10308,14 @@
      }
    },
    "node_modules/mongoose": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.12.1.tgz",
-      "integrity": "sha512-UW22y8QFVYmrb36hm8cGncfn4ARc/XsYWQwRTaj0gxtQk1rDuhzDO1eBantS+hTTatfAIS96LlRCJrcNHvW5+Q==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.13.0.tgz",
+      "integrity": "sha512-e/iYV1mPeOkg+SWAMHzt3t42/EZyER3OB1H2pjP9C3vQ+Qb5DMeV9Kb+YCUycKgScA3fbwL7dKG4EpinGlg21g==",
      "license": "MIT",
      "dependencies": {
        "bson": "^6.10.3",
        "kareem": "2.6.3",
-        "mongodb": "~6.14.0",
+        "mongodb": "~6.15.0",
        "mpath": "0.9.0",
        "mquery": "5.0.0",
        "ms": "2.1.3",
@@ -10336,9 +10391,9 @@
      }
    },
    "node_modules/mongoose/node_modules/mongodb": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.14.2.tgz",
-      "integrity": "sha512-kMEHNo0F3P6QKDq17zcDuPeaywK/YaJVCEQRzPF3TOM/Bl9MFg64YE5Tu7ifj37qZJMhwU1tl2Ioivws5gRG5Q==",
+      "version": "6.15.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz",
+      "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==",
      "license": "Apache-2.0",
      "dependencies": {
        "@mongodb-js/saslprep": "^1.1.9",
@@ -10407,10 +10462,17 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
    },
+    "node_modules/nan": {
+      "version": "2.22.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+      "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/nanoid": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.3.tgz",
-      "integrity": "sha512-zAbEOEr7u2CbxwoMRlz/pNSpRP0FdAU4pRaYunCdEezWohXFs+a0Xw7RfkKaezMsmSM1vttcLthJtwRnVtOfHQ==",
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
+      "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==",
      "funding": [
        {
          "type": "github",
@@ -11681,9 +11743,9 @@
      "license": "MIT"
    },
    "node_modules/react-router": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.3.0.tgz",
-      "integrity": "sha512-466f2W7HIWaNXTKM5nHTqNxLrHTyXybm7R0eBlVSt0k/u55tTCDO194OIx/NrYD4TS5SXKTNekXfT37kMKUjgw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.4.0.tgz",
+      "integrity": "sha512-Y2g5ObjkvX3VFeVt+0CIPuYd9PpgqCslG7ASSIdN73LwA1nNWzcMLaoMRJfP3prZFI92svxFwbn7XkLJ+UPQ6A==",
      "license": "MIT",
      "dependencies": {
        "@types/cookie": "^0.6.0",
@@ -13073,9 +13135,9 @@
      "license": "ISC"
    },
    "node_modules/stylelint": {
-      "version": "16.15.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.15.0.tgz",
-      "integrity": "sha512-OK6Rs7EPdcdmjqiDycadZY4fw3f5/TC1X6/tGjnF3OosbwCeNs7nG+79MCAtjEg7ckwqTJTsku08e0Rmaz5nUw==",
+      "version": "16.16.0",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.16.0.tgz",
+      "integrity": "sha512-40X5UOb/0CEFnZVEHyN260HlSSUxPES+arrUphOumGWgXERHfwCD0kNBVILgQSij8iliYVwlc0V7M5bcLP9vPg==",
      "dev": true,
      "funding": [
        {
@@ -13102,7 +13164,7 @@
        "debug": "^4.3.7",
        "fast-glob": "^3.3.3",
        "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^10.0.6",
+        "file-entry-cache": "^10.0.7",
        "global-modules": "^2.0.0",
        "globby": "^11.1.0",
        "globjoin": "^0.1.4",
@@ -13329,9 +13391,10 @@
      }
    },
    "node_modules/superagent": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.1.1.tgz",
-      "integrity": "sha512-9pIwrHrOj3uAnqg9gDlW7EA2xv+N5au/dSM0kM22HTqmUu8jBxNT+8uA7tA3UoCnmiqzpSbu8rasIUZvbyamMQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.0.tgz",
+      "integrity": "sha512-IKeoGox6oG9zyDeizaezkJ2/aK0wc5la9st7WsAKyrAkfJ56W3whVbVtF68k6wuc87/y9T85NyON5FLz7Mrzzw==",
+      "license": "MIT",
      "dependencies": {
        "component-emitter": "^1.3.0",
        "cookiejar": "^2.1.4",
@@ -13360,9 +13423,9 @@
      }
    },
    "node_modules/supertest": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.0.0.tgz",
-      "integrity": "sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.0.tgz",
+      "integrity": "sha512-5QeSO8hSrKghtcWEoPiO036fxH0Ii2wVQfFZSP0oqQhmjk8bOLhDFXr4JrvaFmPuEWUoq4znY3uSi8UzLKxGqw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "homebrewery",
  "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.18.0",
+  "version": "3.18.1",
  "type": "module",
  "engines": {
    "npm": "^10.2.x",
@@ -84,11 +84,11 @@
    ]
  },
  "dependencies": {
-    "@babel/core": "^7.26.9",
-    "@babel/plugin-transform-runtime": "^7.26.9",
+    "@babel/core": "^7.26.10",
+    "@babel/plugin-transform-runtime": "^7.26.10",
    "@babel/preset-env": "^7.26.9",
    "@babel/preset-react": "^7.26.3",
-    "@googleapis/drive": "^8.16.0",
+    "@googleapis/drive": "^11.0.0",
    "body-parser": "^1.20.2",
    "classnames": "^2.5.1",
    "codemirror": "^5.65.6",
@@ -107,7 +107,7 @@
    "jwt-simple": "^0.5.6",
    "less": "^3.13.1",
    "lodash": "^4.17.21",
-    "marked": "14.0.0",
+    "marked": "14.1.4",
    "marked-emoji": "^2.0.0",
    "marked-extended-tables": "^2.0.1",
    "marked-gfm-heading-id": "^4.0.1",
@@ -115,23 +115,23 @@
    "marked-subsuper-text": "^1.0.3",
    "markedLegacy": "npm:marked@^0.3.19",
    "moment": "^2.30.1",
-    "mongoose": "^8.12.1",
-    "nanoid": "5.1.3",
+    "mongoose": "^8.13.0",
+    "nanoid": "5.1.5",
    "nconf": "^0.12.1",
    "react": "^18.3.1",
    "react-dom": "^18.3.1",
    "react-frame-component": "^4.1.3",
-    "react-router": "^7.3.0",
+    "react-router": "^7.4.0",
    "romans": "^3.0.0",
    "sanitize-filename": "1.6.3",
-    "superagent": "^10.1.1",
+    "superagent": "^10.2.0",
    "vitreum": "git+https://git@github.com/calculuschild/vitreum.git",
    "written-number": "^0.11.1"
  },
  "devDependencies": {
    "@stylistic/stylelint-plugin": "^3.1.2",
    "babel-plugin-transform-import-meta": "^2.3.2",
-    "eslint": "^9.22.0",
+    "eslint": "^9.23.0",
    "eslint-plugin-jest": "^28.11.0",
    "eslint-plugin-react": "^7.37.4",
    "globals": "^16.0.0",
@@ -139,9 +139,9 @@
    "jest-expect-message": "^1.1.3",
    "jsdom-global": "^3.0.2",
    "postcss-less": "^6.0.0",
-    "stylelint": "^16.15.0",
+    "stylelint": "^16.16.0",
    "stylelint-config-recess-order": "^6.0.0",
    "stylelint-config-recommended": "^15.0.0",
-    "supertest": "^7.0.0"
+    "supertest": "^7.1.0"
  }
 }
--- a/scripts/buildHomebrew.js
+++ b/scripts/buildHomebrew.js
@@ -53,7 +53,7 @@ fs.emptyDirSync('./build');
 	const themes = { Legacy: {}, V3: {} };

 	let themeFiles = fs.readdirSync('./themes/Legacy');
-	for (let dir of themeFiles) {
+	for (const dir of themeFiles) {
 		const themeData = JSON.parse(fs.readFileSync(`./themes/Legacy/${dir}/settings.json`).toString());
 		themeData.path = dir;
 		themes.Legacy[dir] = (themeData);
@@ -70,7 +70,7 @@ fs.emptyDirSync('./build');
 	}

 	themeFiles = fs.readdirSync('./themes/V3');
-	for (let dir of themeFiles) {
+	for (const dir of themeFiles) {
 		const themeData = JSON.parse(fs.readFileSync(`./themes/V3/${dir}/settings.json`).toString());
 		themeData.path = dir;
 		themes.V3[dir] = (themeData);
@@ -113,7 +113,7 @@ fs.emptyDirSync('./build');
 	const stream = fs.createWriteStream(editorThemeFile, { flags: 'a' });
 	stream.write('[\n"default"');

-	for (let themeFile of editorThemeFiles) {
+	for (const themeFile of editorThemeFiles) {
 		stream.write(`,\n"${themeFile.slice(0, -4)}"`);
 	}
 	stream.write('\n]\n');
--- a/server/admin.api.spec.js
+++ b/server/admin.api.spec.js
@@ -75,7 +75,7 @@ describe('Tests for admin api', ()=>{

 			const response = await app
 				.post('/admin/notification/add')
-				.set('Authorization', 'Basic ' + Buffer.from('admin:password3').toString('base64'))
+				.set('Authorization', `Basic ${Buffer.from('admin:password3').toString('base64')}`)
 				.send(inputNotification);

 			expect(response.status).toBe(500);
--- a/server/app.js
+++ b/server/app.js
@@ -11,7 +11,6 @@ const version = packageJSON.version;
 import _       from 'lodash';
 import jwt     from 'jwt-simple';
 import express from 'express';
-import yaml    from 'js-yaml';
 import config  from './config.js';
 import fs      from 'fs-extra';

@@ -70,13 +69,11 @@ const corsOptions = {
 			'https://homebrewery-stage.herokuapp.com',
 		];

-		if(isLocalEnvironment) {
-			allowedOrigins.push('http://localhost:8000', 'http://localhost:8010');
-		}
+		const localNetworkRegex = /^http:\/\/(localhost|127\.0\.0\.1|10\.\d+\.\d+\.\d+|192\.168\.\d+\.\d+|172\.(1[6-9]|2\d|3[0-1])\.\d+\.\d+):\d+$/;

 		const herokuRegex = /^https:\/\/(?:homebrewery-pr-\d+\.herokuapp\.com|naturalcrit-pr-\d+\.herokuapp\.com)$/; // Matches any Heroku app

-		if(!origin || allowedOrigins.includes(origin) || herokuRegex.test(origin)) {
+		if(!origin || allowedOrigins.includes(origin) || herokuRegex.test(origin) || (isLocalEnvironment && localNetworkRegex.test(origin))) {
 			callback(null, true);
 		} else {
 			console.log(origin, 'not allowed');
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -181,6 +181,7 @@ const api = {
 			`${text}`;
 		return text;
 	},
+
 	getGoodBrewTitle : (text)=>{
 		const tokens = Markdown.marked.lexer(text);
 		return (tokens.find((token)=>token.type === 'heading' || token.type === 'paragraph')?.text || 'No Title')
@@ -294,7 +295,7 @@ const api = {

 				currentTheme = req.brew;
 				splitTextStyleAndMetadata(currentTheme);
-				if(!currentTheme.tags.some(tag => tag === "meta:theme" || tag === "meta:Theme"))
+				if(!currentTheme.tags.some((tag)=>tag === 'meta:theme' || tag === 'meta:Theme'))
 					throw { brewId: req.params.id, name: 'Invalid Theme Selected', message: 'Selected theme does not have the meta:theme tag', status: 422, HBErrorCode: '10' };
 				themeName   ??= currentTheme.title;
 				themeAuthor ??= currentTheme.authors?.[0];
--- a/shared/naturalcrit/markdown.js
+++ b/shared/naturalcrit/markdown.js
@@ -104,6 +104,11 @@ mathParser.functions.toWordsCaps = function (a) {
 	}).join(' ');
 };

+// Normalize variable names; trim edge spaces and shorten blocks of whitespace to 1 space
+const normalizeVarNames = (label)=>{
+	return label.trim().replace(/\s+/g, ' ');
+};
+
 //Processes the markdown within an HTML block if it's just a class-wrapper
 renderer.html = function (token) {
 	let html = token.text;
@@ -435,7 +440,7 @@ const forcedParagraphBreaks = {
 		}
 	},
 	renderer(token) {
-		return `<br>\n`.repeat(token.length);
+		return `<div class='blank'></div>\n`.repeat(token.length);
 	}
 };

@@ -553,7 +558,7 @@ const replaceVar = function(input, hoist=false, allowUnresolved=false) {
 	const match = regex.exec(input);

 	const prefix = match[1];
-	const label  = match[2];
+	const label  = normalizeVarNames(match[2]); // Ensure the label name is normalized as it should be in the var stack.

 	//v=====--------------------< HANDLE MATH >-------------------=====v//
 	const mathRegex = /[a-z]+\(|[+\-*/^(),]/g;
@@ -708,8 +713,8 @@ function MarkedVariables() {
 							});
 					}
 					if(match[3]) { // Block Definition
-						const label   = match[4] ? match[4].trim().replace(/\s+/g, ' ')    : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-						const content = match[5] ? match[5].trim().replace(/[ \t]+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
+						const label   = match[4] ? normalizeVarNames(match[4]) : null;
+						const content = match[5] ? match[5].trim().replace(/[ \t]+/g, ' ') : null; // Normalize text content (except newlines for block-level content)

 						varsQueue.push(
 							{ type    : 'varDefBlock',
@@ -718,7 +723,7 @@ function MarkedVariables() {
 							});
 					}
 					if(match[6]) { // Block Call
-						const label = match[7] ? match[7].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
+						const label = match[7] ? normalizeVarNames(match[7]) : null;

 						varsQueue.push(
 							{ type    : 'varCallBlock',
@@ -727,7 +732,7 @@ function MarkedVariables() {
 							});
 					}
 					if(match[8]) { // Inline Definition
-						const label = match[10] ? match[10].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
+						const label = match[10] ? normalizeVarNames(match[10]) : null;
 						let content = match[11] || null;

 						// In case of nested (), find the correct matching end )
@@ -759,7 +764,7 @@ function MarkedVariables() {
 							});
 					}
 					if(match[12]) { // Inline Call
-						const label = match[13] ? match[13].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
+						const label = match[13] ? normalizeVarNames(match[13]) : null;

 						varsQueue.push(
 							{ type    : 'varCallInline',
--- a/shared/naturalcrit/splitPane/splitPane.less
+++ b/shared/naturalcrit/splitPane/splitPane.less
@@ -21,8 +21,8 @@
 		background-color : #BBBBBB;
 		.dots {
 			display        : table-cell;
-			text-align     : center;
 			vertical-align : middle;
+			text-align     : center;
 			i {
 				display   : block !important;
 				margin    : 10px 0px;
--- a/shared/naturalcrit/styles/animations.less
+++ b/shared/naturalcrit/styles/animations.less
@@ -60,10 +60,10 @@


 .delay(@delay) {
-	animation-delay:@delay;
-	-webkit-animation-delay:@delay;
-	transition-delay:@delay;
 	-webkit-transition-delay : @delay;
+	transition-delay         : @delay;
+	-webkit-animation-delay  : @delay;
+	animation-delay          : @delay;
 }
 .keep() {
 	-webkit-animation-fill-mode : forwards;
@@ -75,26 +75,26 @@


 .sequentialDelay(@delayInc : 0.2s, @initialDelay : 0s) {
-	&:nth-child(1){.delay(0*@delayInc + @initialDelay)}
-	&:nth-child(2){.delay(1*@delayInc + @initialDelay)}
-	&:nth-child(3){.delay(2*@delayInc + @initialDelay)}
-	&:nth-child(4){.delay(3*@delayInc + @initialDelay)}
-	&:nth-child(5){.delay(4*@delayInc + @initialDelay)}
-	&:nth-child(6){.delay(5*@delayInc + @initialDelay)}
-	&:nth-child(7){.delay(6*@delayInc + @initialDelay)}
-	&:nth-child(8){.delay(7*@delayInc + @initialDelay)}
-	&:nth-child(9){.delay(8*@delayInc + @initialDelay)}
-	&:nth-child(10){.delay(9*@delayInc + @initialDelay)}
-	&:nth-child(11){.delay(10*@delayInc + @initialDelay)}
-	&:nth-child(12){.delay(11*@delayInc + @initialDelay)}
-	&:nth-child(13){.delay(12*@delayInc + @initialDelay)}
-	&:nth-child(14){.delay(13*@delayInc + @initialDelay)}
-	&:nth-child(15){.delay(14*@delayInc + @initialDelay)}
-	&:nth-child(16){.delay(15*@delayInc + @initialDelay)}
-	&:nth-child(17){.delay(16*@delayInc + @initialDelay)}
-	&:nth-child(18){.delay(17*@delayInc + @initialDelay)}
-	&:nth-child(19){.delay(18*@delayInc + @initialDelay)}
-	&:nth-child(20){.delay(19*@delayInc + @initialDelay)}
+	&:nth-child(1) {.delay(0*@delayInc + @initialDelay); }
+	&:nth-child(2) {.delay(1*@delayInc + @initialDelay); }
+	&:nth-child(3) {.delay(2*@delayInc + @initialDelay); }
+	&:nth-child(4) {.delay(3*@delayInc + @initialDelay); }
+	&:nth-child(5) {.delay(4*@delayInc + @initialDelay); }
+	&:nth-child(6) {.delay(5*@delayInc + @initialDelay); }
+	&:nth-child(7) {.delay(6*@delayInc + @initialDelay); }
+	&:nth-child(8) {.delay(7*@delayInc + @initialDelay); }
+	&:nth-child(9) {.delay(8*@delayInc + @initialDelay); }
+	&:nth-child(10) {.delay(9*@delayInc + @initialDelay); }
+	&:nth-child(11) {.delay(10*@delayInc + @initialDelay); }
+	&:nth-child(12) {.delay(11*@delayInc + @initialDelay); }
+	&:nth-child(13) {.delay(12*@delayInc + @initialDelay); }
+	&:nth-child(14) {.delay(13*@delayInc + @initialDelay); }
+	&:nth-child(15) {.delay(14*@delayInc + @initialDelay); }
+	&:nth-child(16) {.delay(15*@delayInc + @initialDelay); }
+	&:nth-child(17) {.delay(16*@delayInc + @initialDelay); }
+	&:nth-child(18) {.delay(17*@delayInc + @initialDelay); }
+	&:nth-child(19) {.delay(18*@delayInc + @initialDelay); }
+	&:nth-child(20) {.delay(19*@delayInc + @initialDelay); }
 }


--- a/shared/naturalcrit/styles/colors.less
+++ b/shared/naturalcrit/styles/colors.less
@@ -23,47 +23,47 @@
@grey        : #7F8C8D;

 #backgroundColors {
-  &.tealLight{ background-color : @tealLight };
-  &.teal{ background-color : @teal };
-  &.greenLight{ background-color : @greenLight };
-  &.green{ background-color : @green };
-  &.blueLight{ background-color : @blueLight };
-  &.blue{ background-color : @blue };
-  &.purpleLight{ background-color : @purpleLight };
-  &.purple{ background-color : @purple };
-  &.steelLight{ background-color : @steelLight };
-  &.steel{ background-color : @steel };
-  &.yellowLight{ background-color : @yellowLight };
-  &.yellow{ background-color : @yellow };
-  &.orangeLight{ background-color : @orangeLight };
-  &.orange{ background-color : @orange };
-  &.redLight{ background-color : @redLight };
-  &.red{ background-color : @red };
-  &.silverLight{ background-color : @silverLight };
-  &.silver{ background-color : @silver };
-  &.greyLight{ background-color : @greyLight };
-  &.grey{ background-color : @grey };
+	&.tealLight { background-color : @tealLight; };
+	&.teal { background-color : @teal; };
+	&.greenLight { background-color : @greenLight; };
+	&.green { background-color : @green; };
+	&.blueLight { background-color : @blueLight; };
+	&.blue { background-color : @blue; };
+	&.purpleLight { background-color : @purpleLight; };
+	&.purple { background-color : @purple; };
+	&.steelLight { background-color : @steelLight; };
+	&.steel { background-color : @steel; };
+	&.yellowLight { background-color : @yellowLight; };
+	&.yellow { background-color : @yellow; };
+	&.orangeLight { background-color : @orangeLight; };
+	&.orange { background-color : @orange; };
+	&.redLight { background-color : @redLight; };
+	&.red { background-color : @red; };
+	&.silverLight { background-color : @silverLight; };
+	&.silver { background-color : @silver; };
+	&.greyLight { background-color : @greyLight; };
+	&.grey { background-color : @grey; };
 }

 #backgroundColorsHover {
-  &.tealLight:hover{ background-color : @tealLight };
-  &.teal:hover{ background-color : @teal };
-  &.greenLight:hover{ background-color : @greenLight };
-  &.green:hover{ background-color : @green };
-  &.blueLight:hover{ background-color : @blueLight };
-  &.blue:hover{ background-color : @blue };
-  &.purpleLight:hover{ background-color : @purpleLight };
-  &.purple:hover{ background-color : @purple };
-  &.steelLight:hover{ background-color : @steelLight };
-  &.steel:hover{ background-color : @steel };
-  &.yellowLight:hover{ background-color : @yellowLight };
-  &.yellow:hover{ background-color : @yellow };
-  &.orangeLight:hover{ background-color : @orangeLight };
-  &.orange:hover{ background-color : @orange };
-  &.redLight:hover{ background-color : @redLight };
-  &.red:hover{ background-color : @red };
-  &.silverLight:hover{ background-color : @silverLight };
-  &.silver:hover{ background-color : @silver };
-  &.greyLight:hover{ background-color : @greyLight };
-  &.grey:hover{ background-color : @grey };
+	&.tealLight:hover { background-color : @tealLight; };
+	&.teal:hover { background-color : @teal; };
+	&.greenLight:hover { background-color : @greenLight; };
+	&.green:hover { background-color : @green; };
+	&.blueLight:hover { background-color : @blueLight; };
+	&.blue:hover { background-color : @blue; };
+	&.purpleLight:hover { background-color : @purpleLight; };
+	&.purple:hover { background-color : @purple; };
+	&.steelLight:hover { background-color : @steelLight; };
+	&.steel:hover { background-color : @steel; };
+	&.yellowLight:hover { background-color : @yellowLight; };
+	&.yellow:hover { background-color : @yellow; };
+	&.orangeLight:hover { background-color : @orangeLight; };
+	&.orange:hover { background-color : @orange; };
+	&.redLight:hover { background-color : @redLight; };
+	&.red:hover { background-color : @red; };
+	&.silverLight:hover { background-color : @silverLight; };
+	&.silver:hover { background-color : @silver; };
+	&.greyLight:hover { background-color : @greyLight; };
+	&.grey:hover { background-color : @grey; };
 }
--- a/shared/naturalcrit/styles/core.less
+++ b/shared/naturalcrit/styles/core.less
@@ -18,31 +18,25 @@ html,body, #reactRoot{
 	margin      : 0;
 	font-family : 'Open Sans', sans-serif;
 }
-*{
-	box-sizing : border-box;
-}
+* { box-sizing : border-box; }
 .colorButton(@backgroundColor : @green) {
 	.animate(background-color);
 	display          : inline-block;
 	padding          : 0.6em 1.2em;
-	cursor           : pointer;
-	background-color : @backgroundColor;
 	font-family      : 'Open Sans', sans-serif;
 	font-size        : 0.8em;
 	font-weight      : 800;
 	color            : white;
-	text-decoration  : none;
 	text-transform   : uppercase;
-	border           : none;
+	text-decoration  : none;
+	cursor           : pointer;
 	outline          : none;
-	&:hover{
-		background-color : darken(@backgroundColor, 5%);
-	}
-	&:active{
-		background-color : darken(@backgroundColor, 10%);
-	}
+	background-color : @backgroundColor;
+	border           : none;
+	&:hover { background-color : darken(@backgroundColor, 5%); }
+	&:active { background-color : darken(@backgroundColor, 10%); }
 	&:disabled {
-		background-color : @silver !important;
 		cursor           : not-allowed;
+		background-color : @silver !important;
 	}
 }
--- a/shared/naturalcrit/styles/elements.less
+++ b/shared/naturalcrit/styles/elements.less
@@ -5,16 +5,16 @@ html, body{
 	position         : relative;
 	height           : 100%;
 	min-height       : 100%;
-	background-color : #eee;
 	font-family      : 'Lato', sans-serif;
 	color            : @copyGrey;
+	background-color : #EEEEEE;
 }
 .container {
 	position      : relative;
 	max-width     : @containerWidth;
-	margin        : 0 auto;
 	padding-right : 20px;
 	padding-left  : 20px;
+	margin        : 0 auto;
 }
 h1 {
 	margin-top    : 10px;
@@ -36,21 +36,17 @@ h3{
 p {
 	margin-bottom : 1em;
 	font-size     : 16px;
-	color         : @copyGrey;
 	line-height   : 1.5em;
+	color         : @copyGrey;
 }
 code {
-	background-color : #F8F8F8;
-	font-family      : 'Courier', mono;
+	font-family      : 'Courier', "mono";
 	color            : black;
 	white-space      : pre;
+	background-color : #F8F8F8;
 }
-a{
-	color : inherit;
-}
-strong{
-	font-weight : bold;
-}
+a { color : inherit; }
+strong { font-weight : bold; }
 button {
 	.button();
 }
@@ -58,29 +54,23 @@ button{
 	.animate(background-color);
 	display          : inline-block;
 	padding          : 0.6em 1.2em;
-	cursor           : pointer;
-	background-color : @backgroundColor;
-	font-family      : "Lato", Helvetica, Arial, sans-serif;
+	font-family      : 'Lato', "Helvetica", "Arial", sans-serif;
 	font-size        : 15px;
 	color            : white;
 	text-decoration  : none;
-	border           : none;
+	cursor           : pointer;
 	outline          : none;
-	&:hover{
-		background-color : darken(@backgroundColor, 5%);
-	}
-	&:active{
-		background-color : darken(@backgroundColor, 10%);
-	}
-	&:disabled{
-		background-color : @silver !important;
-	}
+	background-color : @backgroundColor;
+	border           : none;
+	&:hover { background-color : darken(@backgroundColor, 5%); }
+	&:active { background-color : darken(@backgroundColor, 10%); }
+	&:disabled { background-color : @silver !important; }
 }
 .iconButton(@backgroundColor : @green) {
 	padding          : 0.6em;
-	cursor           : pointer;
-	background-color : @backgroundColor;
 	font-size        : 14px;
 	color            : white;
 	text-align       : center;
+	cursor           : pointer;
+	background-color : @backgroundColor;
 }
--- a/shared/naturalcrit/styles/reset.less
+++ b/shared/naturalcrit/styles/reset.less
@@ -1,33 +1,23 @@
-:where(html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,button,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video){
-  border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0
+:where(html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,button,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video) {padding        : 0;margin         : 0;font           : inherit;font-size      : 100%;vertical-align : baseline;
+	border         : 0;
 }

-:where(article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section){
-  display:block
-}
+:where(article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section) { display : block; }

-:where(body){
-  line-height:1
-}
+:where(body) { line-height : 1; }

-:where(ol,ul){
-  list-style:none
-}
+:where(ol,ul) { list-style : none; }

-:where(blockquote,q){
-  quotes:none
-}
+:where(blockquote,q) { quotes : none; }

-:where(blockquote:before,blockquote:after,q:before,q:after){
-  content:none
-}
+:where(blockquote::before,blockquote::after,q::before,q::after) { content : none; }

-:where(table){
-  border-collapse:collapse;border-spacing:0
+:where(table) {border-spacing  : 0;
+	border-collapse : collapse;
 }

 :where(button) {
-	background-color: unset;
-	text-transform: unset;
 	color            : unset;
+	text-transform   : unset;
+	background-color : unset;
 }
--- a/shared/naturalcrit/styles/tooltip.less
+++ b/shared/naturalcrit/styles/tooltip.less
@@ -22,96 +22,95 @@
 }
 .tooltipTop(@content) {
 	.tooltipBase(@content);
-	&:before {
+	&::before {
 		margin-bottom    : -@arrowSize * 2;
 		border-top-color : @tooltipColor;
 	}
-	&:after{ margin-left: -18px; }
-	&:before, &:after{
+	&::after { margin-left : -18px; }
+	&::before, &::after {
 		bottom : 100%;
 		left   : 50%;
 	}
-	&:hover:after, &:hover:before, &:focus:after, &:focus:before {
+	&:hover::after, &:hover::before, &:focus::after, &:focus::before {
 		.transform(translateY(-(@arrowSize + 2)));
 	}
 }
 .tooltipBottom(@content) {
 	.tooltipBase(@content);
-	&:before {
+	&::before {
 		margin-top          : -@arrowSize * 2;
 		border-bottom-color : @tooltipColor;
 	}
-	&:after{ margin-left: -18px; }
-	&:before, &:after{
+	&::after { margin-left : -18px; }
+	&::before, &::after {
 		top  : 100%;
 		left : 50%;
 	}
-	&:hover:after, &:hover:before, &:focus:after, &:focus:before {
+	&:hover::after, &:hover::before, &:focus::after, &:focus::before {
 		.transform(translateY(@arrowSize + 2));
 	}
 }
 .tooltipLeft(@content) {
 	.tooltipBase(@content);
-	&:before {
+	&::before {
 		margin-right      : -@arrowSize * 2;
 		margin-bottom     : -@arrowSize;
 		border-left-color : @tooltipColor;
 	}
-	&:after{ margin-bottom: -14px;}
-	&:before, &:after {
+	&::after { margin-bottom : -14px;}
+	&::before, &::after {
 		right  : 100%;
 		bottom : 50%;
 	}
-	&:hover:after, &:hover:before, &:focus:after, &:focus:before {
+	&:hover::after, &:hover::before, &:focus::after, &:focus::before {
 		.transform(translateX(-(@arrowSize + 2)));
 	}
 }
 .tooltipRight(@content) {
 	.tooltipBase(@content);
-	&:before {
+	&::before {
 		margin-bottom      : -@arrowSize;
 		margin-left        : -@arrowSize * 2;
 		border-right-color : @tooltipColor;
 	}
-	&:after{ margin-bottom: -14px;}
-	&:before, &:after {
+	&::after { margin-bottom : -14px;}
+	&::before, &::after {
 		bottom : 50%;
 		left   : 100%;
 	}
-	&:hover:after, &:hover:before, &:focus:after, &:focus:before {
+	&:hover::after, &:hover::before, &:focus::after, &:focus::before {
 		.transform(translateX(@arrowSize + 2));
 	}
 }
-.tooltipShow(){
-}
+.tooltipShow(){ }
 .tooltipBase(@content) {
 	//position: relative;
-	&:before, &:after{
+	&::before, &::after {
 		.animateAll();
 		position       : absolute;
 		z-index        : 1000000;
-		opacity        : 0;
 		pointer-events : none;
+		opacity        : 0;
 	}
 	//Arrow
-	&:before{
-		content    : '';
+	&::before {
 		z-index    : 1000001;
+		content    : '';
 		background : transparent;
 		border     : @arrowSize solid transparent;
 	}
 	//Box
-	&:after{
-		content     : @content;
+	&::after {
 		visibility  : hidden;
 		padding     : 8px 10px;
-		background  : @tooltipColor;
 		font-size   : 12px;
-		color       : white;
 		line-height : 12px;
+		color       : white;
 		white-space : nowrap;
+		content     : @content;
+		background  : @tooltipColor;
 	}
-	&:hover:before, &:hover:after {
+	&:hover::before, &:hover::after {
 		visibility : visible;
 		opacity    : 1;
 	}
--- a/tests/markdown/basic.test.js
+++ b/tests/markdown/basic.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+

 import Markdown from 'naturalcrit/markdown.js';

--- a/tests/markdown/definition-lists.test.js
+++ b/tests/markdown/definition-lists.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+

 import Markdown from 'naturalcrit/markdown.js';

@@ -92,12 +92,12 @@ describe('Multiline Definition Lists', ()=>{
 	test('Multiline Definition Term must have at least one non-empty Definition', function() {
 		const source = 'Term 1\n::';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>Term 1</p>\n<br>\n<br>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>Term 1</p>\n<div class='blank'></div>\n<div class='blank'></div>`);
 	});

 	test('Multiline Definition List must have at least one non-newline character after ::', function() {
 		const source = 'Term 1\n::\nDefinition 1\n\n';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>Term 1</p>\n<br>\n<br>\n<p>Definition 1</p>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>Term 1</p>\n<div class='blank'></div>\n<div class='blank'></div>\n<p>Definition 1</p>`);
 	});
 });
--- a/tests/markdown/hard-breaks.test.js
+++ b/tests/markdown/hard-breaks.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+

 import Markdown from 'naturalcrit/markdown.js';

@@ -6,37 +6,37 @@ describe('Hard Breaks', ()=>{
 	test('Single Break', function() {
 		const source = ':\n\n';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<br>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class='blank'></div>`);
 	});

 	test('Double Break', function() {
 		const source = '::\n\n';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<br>\n<br>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class='blank'></div>\n<div class='blank'></div>`);
 	});

 	test('Triple Break', function() {
 		const source = ':::\n\n';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<br>\n<br>\n<br>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>`);
 	});

 	test('Many Break', function() {
 		const source = '::::::::::\n\n';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<br>\n<br>\n<br>\n<br>\n<br>\n<br>\n<br>\n<br>\n<br>\n<br>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>`);
 	});

 	test('Multiple sets of Breaks', function() {
 		const source = ':::\n:::\n:::';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<br>\n<br>\n<br>\n<br>\n<br>\n<br>\n<br>\n<br>\n<br>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>\n<div class='blank'></div>`);
 	});

 	test('Break directly between two paragraphs', function() {
 		const source = 'Line 1\n::\nLine 2';
 		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>Line 1</p>\n<br>\n<br>\n<p>Line 2</p>`);
+		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>Line 1</p>\n<div class='blank'></div>\n<div class='blank'></div>\n<p>Line 2</p>`);
 	});

 	test('Ignored inside a code block', function() {
--- a/tests/markdown/non-breaking-spaces.test.js
+++ b/tests/markdown/non-breaking-spaces.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+

 import Markdown from 'naturalcrit/markdown.js';

--- a/tests/markdown/paragraph-justification.test.js
+++ b/tests/markdown/paragraph-justification.test.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+

 import Markdown from 'naturalcrit/markdown.js';

--- a/tests/markdown/variables.test.js
+++ b/tests/markdown/variables.test.js
@@ -410,6 +410,30 @@ describe('Regression Tests', ()=>{
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered).toBe('<table><thead><tr><th>title 1</th><th>title 2</th><th>title 3</th><th>title 4</th></tr></thead><tbody><tr><td><a href=\"bar\">foo</a></td><td>Ipsum</td><td>)</td><td>)</td></tr></tbody></table>');
 	});
+  
+	it('Handle Extra spaces in image alt-text 1', function(){
+		const source='![ where is my image??](http://i.imgur.com/hMna6G0.png)';
+		const rendered = Markdown.render(source).trimReturns();
+		expect(rendered).toBe('<p><img src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
+	});
+
+	it('Handle Extra spaces in image alt-text 2', function(){
+		const source='![where  is my image??](http://i.imgur.com/hMna6G0.png)';
+		const rendered = Markdown.render(source).trimReturns();
+		expect(rendered).toBe('<p><img src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
+	});
+
+	it('Handle Extra spaces in image alt-text 3', function(){
+		const source='![where is my image?? ](http://i.imgur.com/hMna6G0.png)';
+		const rendered = Markdown.render(source).trimReturns();
+		expect(rendered).toBe('<p><img src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\"></p>');
+	});
+
+	it('Handle Extra spaces in image alt-text 4', function(){
+		const source='![where is my image??](http://i.imgur.com/hMna6G0.png){height=20%,width=20%}';
+		const rendered = Markdown.render(source).trimReturns();
+		expect(rendered).toBe('<p><img style=\"--HB_src:url(http://i.imgur.com/hMna6G0.png);\" src=\"http://i.imgur.com/hMna6G0.png\" alt=\"where is my image??\" height=\"20%\" width=\"20%\"></p>');
+	}); 
 });

 describe('Custom Math Function Tests', ()=>{
--- a/themes/Legacy/5ePHB/style.less
+++ b/themes/Legacy/5ePHB/style.less
@@ -10,20 +10,16 @@
@monsterStatBackground : #FDF1DC; // Lighter parchment
@captionText           : #766649; // Brown
@page { margin : 0; }
-body {
-	counter-reset : phb-page-numbers;
-}
-*{
-	-webkit-print-color-adjust : exact;
-}
+body { counter-reset : phb-page-numbers; }
+* { -webkit-print-color-adjust : exact; }
 .useSansSerif() {
-	font-family : ScalySans;
+	font-family : 'ScalySans';
 	em {
-		font-family : ScalySans;
+		font-family : 'ScalySans';
 		font-style  : italic;
 	}
 	strong {
-		font-family    : ScalySans;
+		font-family    : 'ScalySans';
 		font-weight    : 800;
 		letter-spacing : -0.02em;
 	}
@@ -42,19 +38,19 @@ body {
 }
 .phb, .page {
 	.useColumns();
-	counter-increment      : phb-page-numbers;
 	position               : relative;
 	z-index                : 15;
 	box-sizing             : border-box;
-	overflow               : hidden;
-	height                 : 279.4mm;
 	width                  : 215.9mm;
+	height                 : 279.4mm;
 	padding                : 1.0cm 1.7cm;
 	padding-bottom         : 1.5cm;
+	overflow               : hidden;
+	font-family            : 'BookSanity';
+	font-size              : 0.317cm;
+	counter-increment      : phb-page-numbers;
 	background-color       : @background;
 	background-image       : @backgroundImage;
-	font-family            : BookSanity;
-	font-size              : 0.317cm;
 	text-rendering         : optimizeLegibility;
 	page-break-before      : always;
 	page-break-after       : always;
@@ -70,47 +66,39 @@ body {
 	p {
 		padding-bottom : 0.8em;
 		line-height    : 1.269em;
-		&+p{
-			margin-top : -0.8em;
-		}
+		& + p { margin-top : -0.8em; }
 	}
 	ul {
-		margin-bottom       : 0.8em;
 		padding-left        : 1.4em;
+		margin-bottom       : 0.8em;
 		line-height         : 1.269em;
 		list-style-position : outside;
 		list-style-type     : disc;
 	}
 	ol {
-		margin-bottom       : 0.8em;
 		padding-left        : 1.4em;
+		margin-bottom       : 0.8em;
 		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;
-	}
+	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;
-	}
+	em { font-style : italic; }
 	sup {
-		vertical-align : super;
 		font-size      : smaller;
 		line-height    : 0;
+		vertical-align : super;
 	}
 	sub {
-		vertical-align : sub;
 		font-size      : smaller;
 		line-height    : 0;
+		vertical-align : sub;
 	}
 	//*****************************
 	// *           HEADERS
@@ -118,7 +106,7 @@ body {
 	h1,h2,h3,h4 {
 		margin-top    : 0.2em;
 		margin-bottom : 0.2em;
-		font-family   : MrJeeves;
+		font-family   : 'MrJeeves';
 		font-weight   : 800;
 		color         : @headerText;
 	}
@@ -129,15 +117,13 @@ body {
 		-moz-column-span    : all;
 		& + p::first-letter {
 			float       : left;
-			font-family : Solberry;
+			font-family : 'Solberry';
 			font-size   : 10em;
-			color       : #222;
 			line-height : 0.795em;
+			color       : #222222;
 		}
 	}
-	h2{
-		font-size : 0.705cm;
-	}
+	h2 { font-size : 0.705cm; }
 	h3 {
 		font-size     : 0.529cm;
 		border-bottom : 2px solid @headerUnderline;
@@ -148,7 +134,7 @@ body {
 	}
 	h5 {
 		margin-bottom : 0.2em;
-		font-family   : ScalySansSmallCaps;
+		font-family   : 'ScalySansSmallCaps';
 		font-size     : 0.423cm;
 		font-weight   : 900;
 	}
@@ -164,20 +150,16 @@ body {
 			display     : table-row-group;
 			font-weight : 800;
 			th {
-				vertical-align : bottom;
-				padding-bottom : 0.3em;
 				padding-right  : 0.1em;
+				padding-bottom : 0.3em;
 				padding-left   : 0.1em;
+				vertical-align : bottom;
 			}
 		}
 		tbody {
 			tr {
-				td{
-					padding : 0.3em 0.1em;
-				}
-				&:nth-child(odd){
-					background-color : @noteGreen;
-				}
+				td { padding : 0.3em 0.1em; }
+				&:nth-child(odd) { background-color : @noteGreen; }
 			}
 		}
 	}
@@ -187,23 +169,21 @@ body {
 	blockquote {
 		.useSansSerif();
 		box-sizing          : border-box;
-		margin-bottom       : 1em;
 		padding             : 5px 10px;
+		margin-bottom       : 1em;
 		background-color    : @noteGreen;
 		border-style        : solid;
 		border-width        : 11px;
 		border-image        : @noteBorderImage 11;
 		border-image-outset : 9px 0px;
-		box-shadow          : 1px 4px 14px #888;
+		box-shadow          : 1px 4px 14px #888888;
 		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;
-	}
+	pre + blockquote, h2 + blockquote, h3 + blockquote, h4 + blockquote, h5 + blockquote { margin-top : 13px; }
 	//*****************************
 	// *    MONSTER STAT BLOCK
 	// *****************************/
@@ -217,18 +197,14 @@ body {
 		h2 {
 			margin-top    : -8px;
 			margin-bottom : 0px;
-			&+p{
-				padding-bottom : 0px;
-			}
+			& + p { padding-bottom : 0px; }
 		}
 		h3 {
-			font-family   : ScalySans;
-			font-weight   : 400;
+			font-family   : 'ScalySans';
+			font-weight   : normal;
 			border-bottom : 1px solid @headerText;
 		}
-		hr+ul{
-			color : @headerText;
-		}
+		hr + ul { color : @headerText; }
 		ul {
 			.useSansSerif();
 			padding-left : 1em;
@@ -241,17 +217,13 @@ body {
 			border-style        : none;
 			border-image        : none;
 			tbody {
-				tr:nth-child(odd), tr:nth-child(even){
-					background-color : transparent;
+				tr:nth-child(odd), tr:nth-child(even) { background-color : transparent; }
 			}
 		}
-		}
-		table{
-			color : @headerText;
-		}
+		table { color : @headerText; }
 		p + p {
-			margin-top     : 0em;
 			padding-bottom : 0.5em;
+			margin-top     : 0em;
 			text-indent    : 0em;
 		}
 		//Triangle dividers
@@ -273,23 +245,19 @@ body {
 	// *           FOOTER
 	// *****************************/
 	&:after {
-		content          : "";
 		position         : absolute;
 		bottom           : 0px;
 		left             : 0px;
 		z-index          : 100;
-		height           : 50px;
 		width            : 100%;
+		height           : 50px;
+		content          : '';
 		background-image : @footerAccentImage;
 		background-size  : cover;
 	}
 	&:nth-child(even) {
-		&:after{
-			transform : scaleX(-1);
-		}
-		.pageNumber{
-			left : 2px;
-		}
+		&::after { transform : scaleX(-1); }
+		.pageNumber { left : 2px; }
 		.footnote {
 			left       : 80px;
 			text-align : left;
@@ -301,11 +269,9 @@ body {
 		bottom     : 22px;
 		width      : 50px;
 		font-size  : 0.9em;
-		color      : #c9ad6a;
+		color      : #C9AD6A;
 		text-align : center;
-		&.auto::after {
-			content : counter(phb-page-numbers);
-		}
+		&.auto::after { content : counter(phb-page-numbers); }
 	}
 	.footnote {
 		position   : absolute;
@@ -314,7 +280,7 @@ body {
 		z-index    : 150;
 		width      : 200px;
 		font-size  : 0.8em;
-		color      : #c9ad6a;
+		color      : #C9AD6A;
 		text-align : right;
 	}
 	//*****************************
@@ -326,8 +292,8 @@ body {
 	}
 	//Modified unorder list, used in spells
 	hr + ul {
-		margin-bottom   : 0.5em;
 		padding-left    : 1em;
+		margin-bottom   : 0.5em;
 		text-indent     : -1em;
 		list-style-type : none;
 	}
@@ -346,13 +312,9 @@ body {
 		break-inside                : avoid;
 	}
 	//Better spacing for spell blocks
-	h4+p+hr+ul{
-		margin-top : -0.5em
-	}
+	h4 + p + hr + ul { margin-top : -0.5em; }
 	//Text indent right after table
-	table+p{
-		text-indent : 1em;
-	}
+	table + p { text-indent : 1em; }
 	// Nested lists
 	ul ul,ol ol,ul ol,ol ul {
 		margin-bottom : 0px;
@@ -370,33 +332,31 @@ body {
 .phb .spellList {
 	.useSansSerif();
 	column-count        : 4;
-	column-span         : all;
 	-webkit-column-span : all;
 	-moz-column-span    : all;
-	ul+h5{
-		margin-top : 15px;
-	}
+	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;
+		margin-bottom               : 0.5em;
 		text-indent                 : -1em;
 		list-style-type             : none;
+		break-inside                : auto;
 		-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;
+	column-span         : all;
 }
 //*****************************
 // *       CLASS TABLE
@@ -408,48 +368,42 @@ body {
 	background-color    : white;
 	border              : initial;
 	border-style        : solid;
+	border-image-source : @frameBorderImage;
+	border-image-slice  : 150 200 150 200;
+	border-image-width  : 47px;
 	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;
-	}
+	h5 { margin-bottom : 10px; }
 }
 //************************************
 // *       DESCRIPTIVE TEXT BOX
 // ************************************/
 .phb .descriptive {
 	margin-bottom       : 1em;
-	background-color    : #faf7ea;
-	font-family         : ScalySans;
+	font-family         : 'ScalySans';
+	background-color    : #FAF7EA;
 	border-style        : solid;
 	border-width        : 7px;
 	border-image        : @descriptiveBoxImage 12 stretch;
 	border-image-outset : 4px;
-	box-shadow          : 0px 0px 6px #faf7ea;
+	box-shadow          : 0px 0px 6px #FAF7EA;
 	p {
 		display        : block;
 		padding-bottom : 0px;
 		line-height    : 1.47em;
 	}
-	p + p {
-		padding-top : .8em;
-	}
+	p + p { padding-top : 0.8em; }
 	em {
-		font-family : ScalySans;
+		font-family : 'ScalySans';
 		font-style  : italic;
 	}
 	strong {
-		font-family    : ScalySans;
+		font-family    : 'ScalySans';
 		font-weight    : 800;
 		letter-spacing : -0.02em;
 	}
 }
-.phb pre+.descriptive{
-	margin-top : 8px;
-}
+.phb pre + .descriptive { margin-top : 8px; }

 //*****************************
 // *    ARTIST CREDIT BLOCK
@@ -457,25 +411,23 @@ body {
 .phb {
 	.artist {
 		position    : absolute;
-		text-align  : center;
-		font-family : WalterTurncoat;
+		font-family : 'WalterTurncoat';
 		font-size   : 0.27cm;
 		color       : @captionText;
+		text-align  : center;
 		p, p + p {
 			margin      : unset;
-			text-indent : unset;
 			line-height : 0.941em;
+			text-indent : unset;
 		}
 		h5 {
+			font-family : 'WalterTurncoat';
 			font-size   : 1.3em;
-			font-family : WalterTurncoat;
 		}
 		a {
 			color           : inherit;
 			text-decoration : unset;
-			&:hover {
-				text-decoration : underline;
-			}
+			&:hover { text-decoration : underline; }
 		}
 	}
 }
@@ -489,15 +441,11 @@ body {
 	a {
 		color           : black;
 		text-decoration : none;
-		&:hover{
-			text-decoration : underline;
-		}
+		&:hover { text-decoration : underline; }
 	}
 	ul {
 		padding-left    : 0;
 		list-style-type : none;
 	}
-	&>ul>li{
-		margin-bottom : 10px;
-	}
+	& > ul > li { margin-bottom : 10px; }
 }
--- a/themes/V3/5eDMG/snippets.js
+++ b/themes/V3/5eDMG/snippets.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+

 module.exports = [
 ];
--- a/themes/V3/5eDMG/style.less
+++ b/themes/V3/5eDMG/style.less
@@ -7,37 +7,29 @@
 }

 .page {
-	background-image : url(/assets/DMG_background.png);
+	background-image : url('/assets/DMG_background.png');
 	background-size  : cover;

 	/* TABLES WITHIN NOTES */
-	.note table tbody tr:nth-child(odd) {
-		background:#fff;
-	}
+	.note table tbody tr:nth-child(odd) { background : #FFFFFF; }

 	/* DROP CAP */
 	h1 + p::first-letter {
-		background-image: unset;
 		color            : black;
+		background-image : unset;
 	}

-	.quote p:first-child::first-line  {
-		all: unset;
-	}
+	.quote p:first-child::first-line { all : unset; }

-	&:after {
-		background-image : url(/assets/DMG_footerAccent.png);
+	&::after {
 		height           : 58px;
+		background-image : url('/assets/DMG_footerAccent.png');
 	}

-	.footnote {
-		bottom : 40px;
-	}
+	.footnote { bottom : 40px; }
 }

 .page:has(.partCover) {

-	.partCover {
-		background-image: @partCoverHeaderDMG;
-	}
+	.partCover { background-image : @partCoverHeaderDMG; }
 }
--- a/themes/V3/5ePHB/snippets.js
+++ b/themes/V3/5ePHB/snippets.js
@@ -6,164 +6,12 @@ const MonsterBlockGen    = require('./snippets/monsterblock.gen.js');
 const scriptGen          = require('./snippets/script.gen.js');
 const ClassFeatureGen    = require('./snippets/classfeature.gen.js');
 const CoverPageGen       = require('./snippets/coverpage.gen.js');
-const TableOfContentsGen = require('./snippets/tableOfContents.gen.js');
-const indexGen           = require('./snippets/index.gen.js');
 const QuoteGen 			 = require('./snippets/quote.gen.js');
 const dedent             = require('dedent-tabs').default;



 module.exports = [
-
-	{
-		groupName : 'Text Editor',
-		icon      : 'fas fa-pencil-alt',
-		view      : 'text',
-		snippets  : [
-			{
-				name         : 'Table of Contents',
-				icon         : 'fas fa-book',
-				gen          : TableOfContentsGen,
-				experimental : true,
-				subsnippets  : [
-					{
-						name         : 'Generate Table of Contents',
-						icon         : 'fas fa-book',
-						gen          : TableOfContentsGen,
-						experimental : true
-					},
-					{
-						name : 'Table of Contents Individual Inclusion',
-						icon : 'fas fa-book',
-						gen  : dedent `\n{{tocInclude# CHANGE # to your header level
-							}}\n`,
-						subsnippets : [
-							{
-								name : 'Individual Inclusion H1',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH1 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H2',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH2 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H3',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH3 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H4',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH4 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H5',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH5 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Inclusion H6',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocIncludeH6 \n
-									}}\n`,
-							}
-						]
-					},
-					{
-						name : 'Table of Contents Range Inclusion',
-						icon : 'fas fa-book',
-						gen  : dedent `\n{{tocDepthH3
-							}}\n`,
-						subsnippets : [
-							{
-								name : 'Include in ToC up to H3',
-								icon : 'fas fa-dice-three',
-								gen  : dedent `\n{{tocDepthH3
-									}}\n`,
-
-							},
-							{
-								name : 'Include in ToC up to H4',
-								icon : 'fas fa-dice-four',
-								gen  : dedent `\n{{tocDepthH4
-									}}\n`,
-							},
-							{
-								name : 'Include in ToC up to H5',
-								icon : 'fas fa-dice-five',
-								gen  : dedent `\n{{tocDepthH5
-									}}\n`,
-							},
-							{
-								name : 'Include in ToC up to H6',
-								icon : 'fas fa-dice-six',
-								gen  : dedent `\n{{tocDepthH6
-									}}\n`,
-							},
-						]
-					},
-					{
-						name : 'Table of Contents Individual Exclusion',
-						icon : 'fas fa-book',
-						gen  : dedent `\n{{tocExcludeH1 \n
-							}}\n`,
-						subsnippets : [
-							{
-								name : 'Individual Exclusion H1',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH1 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H2',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH2 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H3',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH3 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H4',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH4 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H5',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH5 \n
-									}}\n`,
-							},
-							{
-								name : 'Individual Exclusion H6',
-								icon : 'fas fa-book',
-								gen  : dedent `\n{{tocExcludeH6 \n
-									}}\n`,
-							},
-						]
-					},
-
-				]
-			},
-			{
-				name         : 'Index',
-				icon         : 'fas fa-bars',
-				gen          : indexGen,
-				experimental : true
-			}
-		]
-	},
 	{
 		groupName : 'Style Editor',
 		icon      : 'fas fa-pencil-alt',
@@ -192,70 +40,9 @@ module.exports = [
 							line-height: 1em;
 						}\n\n`
 			},
-			{
-				name        : 'Table of Contents Toggles',
-				icon        : 'fas fa-book',
-				subsnippets : [
-					{
-						name : 'Enable H1-H4 all pages',
-						icon : 'fas fa-dice-four',
-						gen  : `.page {\n\th4 {--TOC: include; }\n}\n\n`,
-					},
-					{
-						name : 'Enable H1-H5 all pages',
-						icon : 'fas fa-dice-five',
-						gen  : `.page {\n\th4, h5 {--TOC: include; }\n}\n\n`,
-					},
-					{
-						name : 'Enable H1-H6 all pages',
-						icon : 'fas fa-dice-six',
-						gen  : `.page {\n\th4, h5, h6 {--TOC: include; }\n}\n\n`,
-					},
-				]
-			}
 		]
 	},
-
-	/*********************** IMAGES *******************/
-	{
-		groupName : 'Images',
-		icon      : 'fas fa-images',
-		view      : 'text',
-		snippets  : [
-			{
-				name : 'Image',
-				icon : 'fas fa-image',
-				gen  : dedent`
-					![cat warrior](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:325px,mix-blend-mode:multiply}
-
-					{{artist,position:relative,top:-230px,left:10px,margin-bottom:-30px
-					##### Cat Warrior
-					[Kyoung Hwan Kim](https://www.artstation.com/tahra)
-					}}`
-			},
-			{
-				name : 'Background Image',
-				icon : 'fas fa-tree',
-				gen  : dedent`
-					![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,top:50px,right:30px,width:280px}
-
-					{{artist,top:80px,right:30px
-					##### Homebrew Mug
-					[naturalcrit](https://homebrew.naturalcrit.com)
-					}}`
-			},
-			{
-				name : 'Watermark',
-				icon : 'fas fa-id-card',
-				gen  : dedent`
-				{{watermark Homebrewery}}\n`
-			},
-		]
-	},
-
-
 	/************************* PHB ********************/
-
 	{
 		groupName : 'PHB',
 		icon      : 'fas fa-book',
@@ -450,9 +237,6 @@ module.exports = [
 		]
 	},

-
-
-
 	/**************** PAGE *************/

 	{
--- a/themes/V3/5ePHB/style.less
+++ b/themes/V3/5ePHB/style.less
@@ -305,12 +305,12 @@
 			margin-left           : -0.16cm;
 			background-color      : var(--HB_Color_MonsterStatBackground);
 			background-image      : @monsterBlockBackground;
-			background-blend-mode : overlay;
 			border-style          : solid;
 			border-width          : 7px 6px;
 			border-image          : @monsterBorderImage 14 round;
 			border-image-outset   : 0px 2px;
 			box-shadow            : 1px 4px 14px #888888;
+			background-blend-mode : overlay;
 		}

 		position      : relative;
@@ -335,9 +335,9 @@

 		//Triangle dividers
 		hr {
+			visibility       : visible;
 			height           : 6px;
 			margin           : 0.12cm 0cm;
-			visibility       : visible;
 			background-image : @redTriangleImage;
 			background-size  : 100% 100%;
 			border           : none;
@@ -456,8 +456,8 @@
 	// *          EXTRAS
 	// *****************************/
 	hr {
-		margin     : 0px;
 		visibility : hidden;
+		margin     : 0px;
 	}
 	//Text indent right after table
 	table + p { text-indent : 1em; }
@@ -525,10 +525,10 @@
 		content             : '';
 		background-image    : @classTableDecoration,
 			@classTableDecoration;
-		filter              : drop-shadow(0px 0px 1px #C8C5C080);
 		background-repeat   : no-repeat, no-repeat;
 		background-position : top, bottom;
 		background-size     : contain, contain;
+		filter              : drop-shadow(0px 0px 1px #C8C5C080);
 		transform           : translateY(-50%) translateX(-50%);
 	}
 	&.decoration.wide::before {
@@ -554,8 +554,8 @@
 		font-weight         : normal;
 		line-height         : 1.9cm;
 		color               : white;
-		text-shadow    : unset;
 		text-transform      : uppercase;
+		text-shadow         : unset;
 		-webkit-text-stroke : 0.2cm black;
 		paint-order         : stroke;
 	}
@@ -571,14 +571,14 @@
 	hr {
 		position         : relative;
 		display          : block;
+		visibility       : visible;
 		width            : 12cm;
 		height           : 0.5cm;
 		margin           : auto;
-		visibility       : visible;
 		background-image : @horizontalRule;
-		filter           : drop-shadow(0 0 3px black);
 		background-size  : 100% 100%;
 		border           : none;
+		filter           : drop-shadow(0 0 3px black);
 	}
 	.banner {
 		position         : absolute;
@@ -621,9 +621,7 @@
 		right      : 0;
 		left       : 0;
 		filter     : drop-shadow(0 0 0.075cm black);
-		img {
-			height : 2cm;
-		}
+		img { height : 2cm; }
 	}
 }
 // *****************************
@@ -652,10 +650,10 @@
 	hr {
 		position         : relative;
 		display          : block;
+		visibility       : visible;
 		width            : 12cm;
 		height           : 0.5cm;
 		margin           : auto;
-		visibility       : visible;
 		background-image : @horizontalRule;
 		background-size  : 100% 100%;
 		border           : none;
@@ -666,9 +664,7 @@
 		bottom   : 1cm;
 		left     : 0;
 		height   : 2cm;
-		img {
-			height : 2cm;
-		}
+		img { height : 2cm; }
 	}
 }
 // *****************************
@@ -676,9 +672,9 @@
 // *****************************/
 .page:has(.backCover) {
 	padding     : 2.25cm 1.3cm 2cm 1.3cm;
+	line-height : 1.4em;
 	color       : #FFFFFF;
 	columns     : 1;
-	line-height : 1.4em;
 	&::after { display : none; }
 	.columnWrapper { width : 7.6cm; }
 	.backCover {
@@ -689,6 +685,7 @@
 		background-repeat : no-repeat;
 		background-size   : contain;
 	}
+	.blank { height : 1.4em; }
 	h1 {
 		margin-bottom : 0.3cm;
 		font-family   : 'NodestoCapsCondensed';
@@ -706,12 +703,12 @@
 		height   : 100%;
 	}
 	hr {
+		visibility       : visible;
 		width            : 4.5cm;
 		height           : 0.53cm;
 		margin-top       : 1.1cm;
 		margin-right     : auto;
 		margin-left      : auto;
-		visibility       : visible;
 		background-image : @horizontalRule;
 		background-size  : 100% 100%;
 		border           : none;
@@ -794,53 +791,12 @@
 // *      TABLE OF CONTENTS
 // *****************************/

-// Default Exclusions
-// Anything not excluded is included, default Headers are H1, H2, and H3.
-h4,
-h5,
-h6,
-.page:has(.frontCover), 
-.page:has(.backCover), 
-.page:has(.insideCover), 
-.monster,
-.noToC,
-.toc { --TOC: exclude; }
-
-
-// Brew level default inclusion changes.
-// These add Headers 'back' to inclusion.
-
-//NOTE: DO NOT USE :HAS WITH .PAGES!!! EXTREMELY SLOW TO RENDER ON LARGE DOCS!
-
-// Block level inclusion changes
-// These include either a single  (include) or a range (depth)
-.tocIncludeH1 h1 {--TOC: include; }
-.tocIncludeH2 h2 {--TOC: include; }
-.tocIncludeH3 h3 {--TOC: include; }
-.tocIncludeH4 h4 {--TOC: include; }
-.tocIncludeH5 h5 {--TOC: include; }
-.tocIncludeH6 h6 {--TOC: include; }
-
-.tocDepthH2 :is(h1, h2) {--TOC: include; }
-.tocDepthH3 :is(h1, h2, h3) {--TOC: include; }
-.tocDepthH4 :is(h1, h2, h3, h4) {--TOC: include; }
-.tocDepthH5 :is(h1, h2, h3, h4, h5) {--TOC: include; }
-.tocDepthH6 :is(h1, h2, h3, h4, h5, h6) {--TOC: include; }
-
-// Block level exclusion changes
-// These exclude a single block level
-.tocExcludeH1 h1 {--TOC: exclude; }
-.tocExcludeH2 h2 {--TOC: exclude; }
-.tocExcludeH3 h3 {--TOC: exclude; }
-.tocExcludeH4 h4 {--TOC: exclude; }
-.tocExcludeH5 h5 {--TOC: exclude; }
-.tocExcludeH6 h6 {--TOC: exclude; }
+// Additional Default Exclusions
+.monster { --TOC : exclude; }

 .page:has(.partCover) {
 	--TOC : exclude;
-	& h1 {
-	  --TOC: include;
-	}
+	& h1 { --TOC : include; }
 }

 .page {
@@ -907,9 +863,7 @@ h6,
 			.useColumns(0.96, @fillMode: balance);
 		}
 	}
-	.toc.wide li {
-			break-inside: auto;
-	}
+	.toc.wide li { break-inside : auto; }
 }

 // *****************************
@@ -934,9 +888,7 @@ h6,

 .page h1 + * { margin-top : 0; }

-.page .descriptive.wide + * {
-	margin-top: 0;
-}
+.page .descriptive.wide + * { margin-top : 0; }

 //*****************************
 // *       RUNE TABLE
@@ -951,8 +903,8 @@ h6,
 				width          : 1.3cm;
 				height         : 1.3cm;
 				font-weight    : normal;
-				text-transform : uppercase;
 				vertical-align : middle;
+				text-transform : uppercase;
 				outline        : 1px solid #000000;
 			}
 			th {
@@ -973,6 +925,7 @@ h6,
 		}
 	}
 }
+
 // *****************************
 // *       INDEX
 // *****************************/
--- a/themes/V3/Blank/snippets.js
+++ b/themes/V3/Blank/snippets.js
@@ -4,6 +4,8 @@ const WatercolorGen = require('./snippets/watercolor.gen.js');
 const ImageMaskGen  = require('./snippets/imageMask.gen.js');
 const FooterGen     = require('./snippets/footer.gen.js');
 const dedent        = require('dedent-tabs').default;
+const TableOfContentsGen = require('./snippets/tableOfContents.gen.js');
+const indexGen           = require('./snippets/index.gen.js');

 module.exports = [

@@ -146,9 +148,55 @@ module.exports = [
 						[Homebrewery.Naturalcrit.com](https://homebrewery.naturalcrit.com)
 						}}\n\n`;
 				},
+			},
+			{
+				name         : 'Table of Contents',
+				icon         : 'fas fa-book',
+				gen          : TableOfContentsGen,
+				experimental : true,
+				subsnippets  : [
+					{
+						name         : 'Table of Contents',
+						icon         : 'fas fa-book',
+						gen          : TableOfContentsGen,
+						experimental : true
+					},
+					{
+						name : 'Include in ToC up to H3',
+						icon : 'fas fa-dice-three',
+						gen  : dedent `\n{{tocDepthH3
+							}}\n`,
+
+					},
+					{
+						name : 'Include in ToC up to H4',
+						icon : 'fas fa-dice-four',
+						gen  : dedent `\n{{tocDepthH4
+							}}\n`,
+					},
+					{
+						name : 'Include in ToC up to H5',
+						icon : 'fas fa-dice-five',
+						gen  : dedent `\n{{tocDepthH5
+							}}\n`,
+					},
+					{
+						name : 'Include in ToC up to H6',
+						icon : 'fas fa-dice-six',
+						gen  : dedent `\n{{tocDepthH6
+							}}\n`,
 					}
 				]
 			},
+			{
+				name         : 'Index',
+				icon         : 'fas fa-bars',
+				gen          : indexGen,
+				experimental : true
+			},
+
+		]
+	},
 	{
 		groupName : 'Style Editor',
 		icon      : 'fas fa-pencil-alt',
@@ -158,7 +206,7 @@ module.exports = [
 				name : 'Add Comment',
 				icon : 'fas fa-code',
 				gen  : '/* This is a comment that will not be rendered into your brew. */'
-			},
+			}
 		]
 	},

@@ -443,6 +491,15 @@ module.exports = [
 		icon      : 'fas fa-print',
 		view      : 'style',
 		snippets  : [
+			{
+				name : 'US Letter Page Size',
+				icon : 'far fa-file',
+				gen  : dedent`/* US Letter Page Size */
+					.page {
+						width  : 215.9mm; /* 8.5in */
+						height : 279.4mm; /* 11in */
+					}\n\n`,
+			},
 			{
 				name : 'A3 Page Size',
 				icon : 'far fa-file',
--- a/themes/V3/Blank/snippets/index.gen.js
+++ b/themes/V3/Blank/snippets/index.gen.js
--- a/themes/V3/Blank/snippets/tableOfContents.gen.js
+++ b/themes/V3/Blank/snippets/tableOfContents.gen.js
--- a/themes/V3/Blank/style.less
+++ b/themes/V3/Blank/style.less
@@ -5,6 +5,7 @@
@import (less) './themes/fonts/iconFonts/diceFont.less';
@import (less) './themes/fonts/iconFonts/gameIcons.less';
@import (less) './themes/fonts/iconFonts/fontAwesome.less';
+@import (less) './themes/fonts/Journal/fonts.less';

 :root {
 	//Colors
@@ -21,9 +22,9 @@ body { counter-reset : page-numbers 0; }
 // *****************************/
 .page {
 	.block {
-		break-inside      : avoid;
 		display           : inline-block;
 		width             : 100%;
+		break-inside      : avoid;
 		img { z-index : 0; }
 	}
 	.inline-block {
@@ -120,7 +121,7 @@ body { counter-reset : page-numbers 0; }
 	// *           CODE BLOCKS
 	// ************************************/
 	code {
-		font-family      : 'Courier New', "Courier", monospace;
+		font-family      : 'Courier New', 'Courier', monospace;
 		overflow-wrap    : break-word;
 		white-space      : pre-wrap;
 	}
@@ -133,10 +134,10 @@ body { counter-reset : page-numbers 0; }
 	// *          EXTRAS
 	// *****************************/
 	.columnSplit {
-		margin-top                 : 0;
 		visibility                 : hidden;
-		-webkit-column-break-after : always;
+		margin-top                 : 0;
 		break-after                : always;
+		-webkit-column-break-after : always;
 		-moz-column-break-after    : always;
 		& + * { margin-top : 0; }
 	}
@@ -199,11 +200,11 @@ body { counter-reset : page-numbers 0; }
 		background-color    : var(--HB_Color_WatercolorStain);			/* default color */
 		background-size     : cover;
 		-webkit-mask-image  : var(--wc);
-		-webkit-mask-size   : contain;
-		-webkit-mask-repeat : no-repeat;
 		mask-image          : var(--wc);
-		mask-size           : contain;
+		-webkit-mask-repeat : no-repeat;
 		mask-repeat         : no-repeat;
+		-webkit-mask-size   : contain;
+		mask-size           : contain;
 		--wc                : @watercolor1;         /* default image */
 	}

@@ -231,15 +232,15 @@ body { counter-reset : page-numbers 0; }
 		height                : 200%;
 		background-image      : var(--checkerboard);
 		background-size       : 20px;
-		transform             : translateY(50%) translateX(-50%) rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
 		-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);
+		-webkit-mask-repeat   : repeat-x;
 		mask-repeat           : repeat-x;
-		mask-size             : 50%;
+		-webkit-mask-position : 50% calc(50% - var(--offset));
 		mask-position         : 50% calc(50% - var(--offset));
+		-webkit-mask-size     : 50%; //Scale only X to fit page width, leave height at aspect ratio, designed to hang off the edge
+		mask-size             : 50%;
+		transform             : translateY(50%) translateX(-50%) rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
 		--rotation            : 0;
 		--revealer            : none;
 		--checkerboard        : none;
@@ -276,19 +277,19 @@ body { counter-reset : page-numbers 0; }
 		}
 		&.revealImage {
 			--revealer     : linear-gradient(0deg, rgba(0,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
+			--checkerboard : url('/assets/waterColorMasks/missingImage.png'); //shows any masked regions not filled by image
 		}
 	}

 	.imageMaskEdge {
-		&1 { --wc : url("/assets/waterColorMasks/edge/0001.webp"); }
-		&2 { --wc : url("/assets/waterColorMasks/edge/0002.webp"); }
-		&3 { --wc : url("/assets/waterColorMasks/edge/0003.webp"); }
-		&4 { --wc : url("/assets/waterColorMasks/edge/0004.webp"); }
-		&5 { --wc : url("/assets/waterColorMasks/edge/0005.webp"); }
-		&6 { --wc : url("/assets/waterColorMasks/edge/0006.webp"); }
-		&7 { --wc : url("/assets/waterColorMasks/edge/0007.webp"); }
-		&8 { --wc : url("/assets/waterColorMasks/edge/0008.webp"); }
+		&1 { --wc : url('/assets/waterColorMasks/edge/0001.webp'); }
+		&2 { --wc : url('/assets/waterColorMasks/edge/0002.webp'); }
+		&3 { --wc : url('/assets/waterColorMasks/edge/0003.webp'); }
+		&4 { --wc : url('/assets/waterColorMasks/edge/0004.webp'); }
+		&5 { --wc : url('/assets/waterColorMasks/edge/0005.webp'); }
+		&6 { --wc : url('/assets/waterColorMasks/edge/0006.webp'); }
+		&7 { --wc : url('/assets/waterColorMasks/edge/0007.webp'); }
+		&8 { --wc : url('/assets/waterColorMasks/edge/0008.webp'); }
 	}

 	[class*='imageMaskCenter'] {
@@ -296,15 +297,15 @@ body { counter-reset : page-numbers 0; }
 		left                  : calc(var(--offsetX));
 		width                 : 100%;
 		height                : 100%;
-		transform             : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
 		-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 : 0% 0%;
 		mask-image            : var(--wc), var(--revealer);
+		-webkit-mask-repeat   : no-repeat;
 		mask-repeat           : no-repeat;
-		mask-size             : 100% 100%; //Scale both dimensions to fit page size
+		-webkit-mask-position : 0% 0%;
 		mask-position         : 50% 50%;
+		-webkit-mask-size     : 100% 100%; //Scale both dimensions to fit page size
+		mask-size             : 100% 100%; //Scale both dimensions to fit page size
+		transform             : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));

 		& > p:has(img) {
 			position   : absolute;
@@ -321,23 +322,23 @@ body { counter-reset : page-numbers 0; }
 	}

 	.imageMaskCenter {
-		&1 { --wc : url("/assets/waterColorMasks/center/0001.webp"); }
-		&2 { --wc : url("/assets/waterColorMasks/center/0002.webp"); }
-		&3 { --wc : url("/assets/waterColorMasks/center/0003.webp"); }
-		&4 { --wc : url("/assets/waterColorMasks/center/0004.webp"); }
-		&5 { --wc : url("/assets/waterColorMasks/center/0005.webp"); }
-		&6 { --wc : url("/assets/waterColorMasks/center/0006.webp"); }
-		&7 { --wc : url("/assets/waterColorMasks/center/0007.webp"); }
-		&8 { --wc : url("/assets/waterColorMasks/center/0008.webp"); }
-		&9 { --wc : url("/assets/waterColorMasks/center/0009.webp"); }
-		&10 { --wc : url("/assets/waterColorMasks/center/0010.webp"); }
-		&11 { --wc : url("/assets/waterColorMasks/center/0011.webp"); }
-		&12 { --wc : url("/assets/waterColorMasks/center/0012.webp"); }
-		&13 { --wc : url("/assets/waterColorMasks/center/0013.webp"); }
-		&14 { --wc : url("/assets/waterColorMasks/center/0014.webp"); }
-		&15 { --wc : url("/assets/waterColorMasks/center/0015.webp"); }
-		&16 { --wc : url("/assets/waterColorMasks/center/0016.webp"); }
-		&special { --wc : url("/assets/waterColorMasks/center/special.webp"); }
+		&1 { --wc : url('/assets/waterColorMasks/center/0001.webp'); }
+		&2 { --wc : url('/assets/waterColorMasks/center/0002.webp'); }
+		&3 { --wc : url('/assets/waterColorMasks/center/0003.webp'); }
+		&4 { --wc : url('/assets/waterColorMasks/center/0004.webp'); }
+		&5 { --wc : url('/assets/waterColorMasks/center/0005.webp'); }
+		&6 { --wc : url('/assets/waterColorMasks/center/0006.webp'); }
+		&7 { --wc : url('/assets/waterColorMasks/center/0007.webp'); }
+		&8 { --wc : url('/assets/waterColorMasks/center/0008.webp'); }
+		&9 { --wc : url('/assets/waterColorMasks/center/0009.webp'); }
+		&10 { --wc : url('/assets/waterColorMasks/center/0010.webp'); }
+		&11 { --wc : url('/assets/waterColorMasks/center/0011.webp'); }
+		&12 { --wc : url('/assets/waterColorMasks/center/0012.webp'); }
+		&13 { --wc : url('/assets/waterColorMasks/center/0013.webp'); }
+		&14 { --wc : url('/assets/waterColorMasks/center/0014.webp'); }
+		&15 { --wc : url('/assets/waterColorMasks/center/0015.webp'); }
+		&16 { --wc : url('/assets/waterColorMasks/center/0016.webp'); }
+		&special { --wc : url('/assets/waterColorMasks/center/special.webp'); }
 	}


@@ -346,15 +347,15 @@ body { counter-reset : page-numbers 0; }
 		left                  : calc(-50% + var(--offsetX));
 		width                 : 200%;
 		height                : 200%;
-		transform             : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
 		-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);
+		-webkit-mask-repeat   : no-repeat;
 		mask-repeat           : no-repeat;
-		mask-size             : 100% 100%; //Scale both dimensions to fit page size
+		-webkit-mask-position : 50% 50%;
 		mask-position         : 50% 50%;
+		-webkit-mask-size     : 100% 100%; //Scale both dimensions to fit page size
+		mask-size             : 100% 100%; //Scale both dimensions to fit page size
+		transform             : rotate(calc(1deg * var(--rotation))) scaleX(var(--scaleX)) scaleY(var(--scaleY));
 		& > p:has(img) {
 			bottom     : 25%;
 			left       : 25%;
@@ -367,43 +368,43 @@ body { counter-reset : page-numbers 0; }
 		}
 	}
 	.imageMaskCorner {
-		&1 { --wc : url("/assets/waterColorMasks/corner/0001.webp"); }
-		&2 { --wc : url("/assets/waterColorMasks/corner/0002.webp"); }
-		&3 { --wc : url("/assets/waterColorMasks/corner/0003.webp"); }
-		&4 { --wc : url("/assets/waterColorMasks/corner/0004.webp"); }
-		&5 { --wc : url("/assets/waterColorMasks/corner/0005.webp"); }
-		&6 { --wc : url("/assets/waterColorMasks/corner/0006.webp"); }
-		&7 { --wc : url("/assets/waterColorMasks/corner/0007.webp"); }
-		&8 { --wc : url("/assets/waterColorMasks/corner/0008.webp"); }
-		&9 { --wc : url("/assets/waterColorMasks/corner/0009.webp"); }
-		&10 { --wc : url("/assets/waterColorMasks/corner/0010.webp"); }
-		&11 { --wc : url("/assets/waterColorMasks/corner/0011.webp"); }
-		&12 { --wc : url("/assets/waterColorMasks/corner/0012.webp"); }
-		&13 { --wc : url("/assets/waterColorMasks/corner/0013.webp"); }
-		&14 { --wc : url("/assets/waterColorMasks/corner/0014.webp"); }
-		&15 { --wc : url("/assets/waterColorMasks/corner/0015.webp"); }
-		&16 { --wc : url("/assets/waterColorMasks/corner/0016.webp"); }
-		&17 { --wc : url("/assets/waterColorMasks/corner/0017.webp"); }
-		&18 { --wc : url("/assets/waterColorMasks/corner/0018.webp"); }
-		&19 { --wc : url("/assets/waterColorMasks/corner/0019.webp"); }
-		&20 { --wc : url("/assets/waterColorMasks/corner/0020.webp"); }
-		&21 { --wc : url("/assets/waterColorMasks/corner/0021.webp"); }
-		&22 { --wc : url("/assets/waterColorMasks/corner/0022.webp"); }
-		&23 { --wc : url("/assets/waterColorMasks/corner/0023.webp"); }
-		&24 { --wc : url("/assets/waterColorMasks/corner/0024.webp"); }
-		&25 { --wc : url("/assets/waterColorMasks/corner/0025.webp"); }
-		&26 { --wc : url("/assets/waterColorMasks/corner/0026.webp"); }
-		&27 { --wc : url("/assets/waterColorMasks/corner/0027.webp"); }
-		&28 { --wc : url("/assets/waterColorMasks/corner/0028.webp"); }
-		&29 { --wc : url("/assets/waterColorMasks/corner/0029.webp"); }
-		&30 { --wc : url("/assets/waterColorMasks/corner/0030.webp"); }
-		&31 { --wc : url("/assets/waterColorMasks/corner/0031.webp"); }
-		&32 { --wc : url("/assets/waterColorMasks/corner/0032.webp"); }
-		&33 { --wc : url("/assets/waterColorMasks/corner/0033.webp"); }
-		&34 { --wc : url("/assets/waterColorMasks/corner/0034.webp"); }
-		&35 { --wc : url("/assets/waterColorMasks/corner/0035.webp"); }
-		&36 { --wc : url("/assets/waterColorMasks/corner/0036.webp"); }
-		&37 { --wc : url("/assets/waterColorMasks/corner/0037.webp"); }
+		&1 { --wc : url('/assets/waterColorMasks/corner/0001.webp'); }
+		&2 { --wc : url('/assets/waterColorMasks/corner/0002.webp'); }
+		&3 { --wc : url('/assets/waterColorMasks/corner/0003.webp'); }
+		&4 { --wc : url('/assets/waterColorMasks/corner/0004.webp'); }
+		&5 { --wc : url('/assets/waterColorMasks/corner/0005.webp'); }
+		&6 { --wc : url('/assets/waterColorMasks/corner/0006.webp'); }
+		&7 { --wc : url('/assets/waterColorMasks/corner/0007.webp'); }
+		&8 { --wc : url('/assets/waterColorMasks/corner/0008.webp'); }
+		&9 { --wc : url('/assets/waterColorMasks/corner/0009.webp'); }
+		&10 { --wc : url('/assets/waterColorMasks/corner/0010.webp'); }
+		&11 { --wc : url('/assets/waterColorMasks/corner/0011.webp'); }
+		&12 { --wc : url('/assets/waterColorMasks/corner/0012.webp'); }
+		&13 { --wc : url('/assets/waterColorMasks/corner/0013.webp'); }
+		&14 { --wc : url('/assets/waterColorMasks/corner/0014.webp'); }
+		&15 { --wc : url('/assets/waterColorMasks/corner/0015.webp'); }
+		&16 { --wc : url('/assets/waterColorMasks/corner/0016.webp'); }
+		&17 { --wc : url('/assets/waterColorMasks/corner/0017.webp'); }
+		&18 { --wc : url('/assets/waterColorMasks/corner/0018.webp'); }
+		&19 { --wc : url('/assets/waterColorMasks/corner/0019.webp'); }
+		&20 { --wc : url('/assets/waterColorMasks/corner/0020.webp'); }
+		&21 { --wc : url('/assets/waterColorMasks/corner/0021.webp'); }
+		&22 { --wc : url('/assets/waterColorMasks/corner/0022.webp'); }
+		&23 { --wc : url('/assets/waterColorMasks/corner/0023.webp'); }
+		&24 { --wc : url('/assets/waterColorMasks/corner/0024.webp'); }
+		&25 { --wc : url('/assets/waterColorMasks/corner/0025.webp'); }
+		&26 { --wc : url('/assets/waterColorMasks/corner/0026.webp'); }
+		&27 { --wc : url('/assets/waterColorMasks/corner/0027.webp'); }
+		&28 { --wc : url('/assets/waterColorMasks/corner/0028.webp'); }
+		&29 { --wc : url('/assets/waterColorMasks/corner/0029.webp'); }
+		&30 { --wc : url('/assets/waterColorMasks/corner/0030.webp'); }
+		&31 { --wc : url('/assets/waterColorMasks/corner/0031.webp'); }
+		&32 { --wc : url('/assets/waterColorMasks/corner/0032.webp'); }
+		&33 { --wc : url('/assets/waterColorMasks/corner/0033.webp'); }
+		&34 { --wc : url('/assets/waterColorMasks/corner/0034.webp'); }
+		&35 { --wc : url('/assets/waterColorMasks/corner/0035.webp'); }
+		&36 { --wc : url('/assets/waterColorMasks/corner/0036.webp'); }
+		&37 { --wc : url('/assets/waterColorMasks/corner/0037.webp'); }
 	}
 }

@@ -437,6 +438,11 @@ body { counter-reset : page-numbers 0; }
 		margin-bottom       : 1em;
 		& + * { margin-top : 0; }
 	}
+	.blank {
+		height     : 1em;
+		margin-top : 0;
+		& + * { margin-top : 0; }
+	}
 }

 //*****************************
@@ -461,8 +467,8 @@ body { counter-reset : page-numbers 0; }
 		height           : 1.5cm;
 		margin           : 0 auto;
 		background-color : black;
-		-webkit-mask     : url("/assets/naturalCritLogoWhite.svg") center / contain no-repeat;
-		mask             : url("/assets/naturalCritLogoWhite.svg") center / contain no-repeat;
+		-webkit-mask     : url('/assets/naturalCritLogoWhite.svg') center / contain no-repeat;
+		mask             : url('/assets/naturalCritLogoWhite.svg') center / contain no-repeat;
 	}
 	.homebreweryIcon.red { background-color : red; }
 	.homebreweryIcon.gold { background-image : linear-gradient(to top left, brown 22.5%, gold 40%, white 60%, gold 67.5%, brown 82.5%); }
@@ -486,12 +492,122 @@ body { counter-reset : page-numbers 0; }
 		.pageNumber { left : 30px; }
 	}

-	.resetCounting {
-		counter-set : page-numbers 1;
-	}
+	.resetCounting { counter-set : page-numbers 1; }

-	&:not(:has(.skipCounting)) {
-		counter-increment : page-numbers;
-	}
+	&:not(:has(.skipCounting)) { counter-increment : page-numbers; }

 }
+
+// *****************************
+// *       INDEX
+// *****************************/
+.page {
+	.index {
+
+		ul ul { margin : 0; }
+
+		ul {
+			padding-left    : 0;
+			text-indent     : 0;
+			list-style-type : none;
+		}
+
+		& > ul > li {
+			padding-left : 1.5em;
+			text-indent  : -1.5em;
+		}
+	}
+}
+
+// *****************************
+// *      TABLE OF CONTENTS
+// *****************************/
+
+// Default Exclusions
+// Anything not exlcuded is included, default Headers are H1, H2, and H3.
+h4,
+h5,
+h6,
+.page:has(.frontCover), 
+.page:has(.backCover), 
+.page:has(.insideCover), 
+.noToC,
+.toc { --TOC : exclude; }
+
+.tocDepthH2 :is(h1, h2) {--TOC : include; }
+.tocDepthH3 :is(h1, h2, h3) {--TOC : include; }
+.tocDepthH4 :is(h1, h2, h3, h4) {--TOC : include; }
+.tocDepthH5 :is(h1, h2, h3, h4, h5) {--TOC : include; }
+.tocDepthH6 :is(h1, h2, h3, h4, h5, h6) {--TOC : include; }
+
+.tocIncludeH1 h1 {--TOC : include; }
+.tocIncludeH2 h2 {--TOC : include; }
+.tocIncludeH3 h3 {--TOC : include; }
+.tocIncludeH4 h4 {--TOC : include; }
+.tocIncludeH5 h5 {--TOC : include; }
+.tocIncludeH6 h6 {--TOC : include; }
+
+.page {
+	&:has(.toc)::after { display : none; }
+	.toc {
+		-webkit-column-break-inside : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
+		h1 {
+			margin-bottom : 0.3cm;
+			text-align    : center;
+		}
+		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;
+			margin-top      : 0;
+			list-style-type : none;
+			a {
+				display         : flex;
+				flex-flow       : row nowrap;
+				justify-content : space-between;
+				width           : 100%;
+			}
+			li + li h3 {
+				margin-top  : 0.26cm;
+				line-height : 1em;
+			}
+			h3 span:first-child::after { border : none; }
+			span {
+				display : contents;
+				&:first-child::after {
+					bottom        : 0.08cm;
+					flex          : 1;
+					margin-right  : 0.16cm;
+					margin-bottom : 0.08cm;
+					margin-left   : 0.08cm;        /* Spacing before dot leaders */
+					content       : '';
+					border-bottom : 0.05cm dotted #000000;
+				}
+				&:last-child {
+					display     : inline-block;
+					align-self  : flex-end;
+					font-size   : 0.34cm;
+					font-weight : normal;
+				}
+			}
+			ul { /* List indent */
+				margin-left : 1em;
+			}
+		}
+		&.wide {
+			.useColumns(0.96, @fillMode: balance);
+		}
+	}
+	.toc.wide li { break-inside : auto; }
+}
--- a/themes/V3/Journal/snippets.js
+++ b/themes/V3/Journal/snippets.js
@@ -1,4 +1,4 @@
-/* eslint-disable max-lines */
+

 module.exports = [
 ];
--- a/themes/V3/Journal/style.less
+++ b/themes/V3/Journal/style.less
@@ -12,46 +12,34 @@
 }

 .useSansSerif() {
-	font-family : PermanentMarker;
+	font-family : 'PermanentMarker';
 	font-size   : 0.3cm;
 	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;
-	}
+	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;
+		font-weight : 800;
 	}
-	h5 + * {
-		margin-top : 0.1cm;
-	}
-}
-.useColumns(@multiplier : 1, @fillMode: balance){
-	column-gap           : 0.5cm;
+	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;
-	}
+	background-image    : url('/assets/Journal/Background1.webp');
+	background-repeat   : no-repeat;
+	background-size     : 200% 100%;
+	filter              : drop-shadow(1px 4px 14px black);
+	&:nth-of-type(2n + 1) { background-position : left; }
 	&:nth-of-type(2n) {
-		background-position : right;
 		padding             : 2.1cm 3.9cm 1.7cm 1.8cm;
+		background-position : right;
 	}
 	&:nth-of-type(2) {
-		background-image    : url(/assets/Journal/Background2.webp); //Only first page should show ribbon
+		background-image    : url('/assets/Journal/Background2.webp'); //Only first page should show ribbon
 	}

 	& .columnWrapper {
@@ -63,118 +51,92 @@
 // *            BASE
 	// *****************************/
 .page {
-	color       : var(--HB_Color_Text);
-	font-family : ReenieBeanie;
+	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;
-	}
+	color       : var(--HB_Color_Text);
+	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;
+		text-decoration : underline;
 	}
-	del{
-		text-decoration-style: double;
-	}
+	del { text-decoration-style : double; }

 	//Indents after p or lists
-	p+p, ul+p, ol+p{
-		text-indent : 1em;
-	}
+	p + p, ul + p, ol + p { text-indent : 1em; }
 	//*****************************
 	// *           HEADERS
 	// *****************************/
 	h1,h2,h3,h4,h5 {
-		font-family   : FrederickaTheGreat;
+		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;
+		line-height         : 1em;
 		& + 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;
+			padding-left            : 40px; //Allow background color to extend into margins
+			margin-top              : -0.3cm;
+			margin-right            : 0.1em;
+			margin-bottom           : -20px;
+			margin-left             : -40px;
+			font-family             : 'FrederickaTheGreat';
+			font-size               : 1.9em;
+			line-height             : 1em;
 		}
-		&+p::first-line{
-			font-variant : small-caps;
-		}
+		& + p::first-line { font-variant : small-caps; }
 	}
 	h2 {
 		font-size     : 0.62cm;
 		line-height   : 0.988em; //Font is misaligned. Shift up slightly
 	}
 	h3 {
+		margin-left   : -0.9em;
 		font-size     : 0.575cm;
 		line-height   : 0.995em; //Font is misaligned. Shift up slightly
-		margin-left   : -0.9em;
 	}
 	h4 {
+		padding-bottom : 5px;
 		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);
-		}
+		&:nth-of-type(2n) { transform : rotate(1deg); }
+		&:nth-of-type(3n) { transform : rotate(-1.5deg); }
 	}
 	h5 {
-		font-family   : PermanentMarker;
+		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;
-		}
+		color         : var(--HB_Color_Text2);
+		& + * { margin-top : 0.2cm; }
 	}
 	//*****************************
 	// *          TABLE
 	// *****************************/
 	table {
 		.useSansSerif();
-		& + * {
-			margin-top : 0.325cm;
-		}
+		& + * { margin-top : 0.325cm; }
 		thead {
 			th {
-				vertical-align : bottom;
 				padding        : 0.14em 0;
+				vertical-align : bottom;
 			}
 		}
 		tbody {
 			tr {
-				td{
-					padding : 0.14em 0;
-				}
-				&:nth-child(odd){
-					background-image : linear-gradient(to left, #41212100, #41212122, #41212100);
-				}
+				td { padding : 0.14em 0; }
+				&:nth-child(odd) { background-image : linear-gradient(to left, #41212100, #41212122, #41212100); }
 			}
 		}
 	}
@@ -183,43 +145,39 @@
 	// *****************************/
 	.note {
 		.useSansSerif();
+		padding             : 0.2cm;
+		background-image    : url('/assets/Journal/HashMarks.png'),
+			linear-gradient(to bottom right, #FF000000, #A36A4E14, #41212100);
+		background-repeat   : no-repeat;
+		background-position : center;
+		background-size     : 120% 120%;
 		border-style        : solid;
 		border-width        : 1px;
-		border-image-source : url(/assets/Journal/Border1.png);
+		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;
-		}
+		& + * { 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 { margin-top : 0.6cm; }
 	.descriptive {
 		.useSansSerif();
+		padding             : 0.2cm;
+		background-image    : url('/assets/Journal/HashMarks.png'),
+			linear-gradient(to bottom right, #FF000000, #41212114, #41212100);
+		background-repeat   : no-repeat;
+		background-position : center;
+		background-size     : 120% 120%;
 		border-style        : solid;
 		border-width        : 1px;
 		border-image-source : url('/assets/Journal/Border2.png');
@@ -227,27 +185,13 @@
 		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;
-		}
+		& + * { margin-top : 0.45cm; }
+		h5 { font-size : 0.375cm; }
+		p { padding-bottom : 0px; }
+		:last-child { margin-bottom : 0; }
 	}
 	//*****************************
 	// *    Images Snippets
@@ -257,25 +201,23 @@
 	.artist {
 		position    : absolute;
 		width       : auto;
-		text-align  : center;
-		font-family : WalterTurncoat;
+		font-family : 'WalterTurncoat';
 		font-size   : 0.27cm;
 		color       : var(--HB_Color_CaptionText);
+		text-align  : center;
 		p, p + p {
 			margin      : unset;
-			text-indent : unset;
 			line-height : 1em;
+			text-indent : unset;
 		}
 		h5 {
+			font-family : 'WalterTurncoat';
 			font-size   : 1.3em;
-			font-family : WalterTurncoat;
 		}
 		a {
 			color           : inherit;
 			text-decoration : unset;
-			&:hover {
-				text-decoration : underline;
-			}
+			&:hover { text-decoration : underline; }
 		}
 	}

@@ -285,6 +227,10 @@
 	.monster {
 		.useSansSerif();
 		&.frame {
+			padding               : 0.2cm;
+			background-image      : url('/assets/Journal/HashMarks.png'),
+				linear-gradient(to bottom right, #FF000000, #A36A4E14, #41212100);
+			background-size       : 100%;
 			border-style          : solid;
 			border-width          : 7px 6px;
 			border-image-source   : url('/assets/Journal/Border3.png');
@@ -292,31 +238,27 @@
 			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;

+		color             : var(--HB_Color_Text);
+
 		//Headers
 		h2 {
+			margin        : 0;
 			font-size     : 0.62cm;
 			line-height   : 1em;
-			margin        : 0;
 			& + p {
 				margin-bottom : 0; //Monster size and type subtext
 			}
 		}
 		h3 {
+			padding-bottom : 0.05cm;
 			margin-left    : 0;
 			font-variant   : small-caps;
-  		padding-bottom : 0.05cm;
 		}
 		hr {
 			visibility       : visible;
@@ -332,22 +274,16 @@
 		// Monster Ability table
 		hr + table:first-of-type {
 			margin              : 0;
-			column-span         : none;
+			color               : inherit;
 			background-image    : none;
 			border-style        : none;
 			border-image        : none;
-			color               : inherit;
-			tr {
-				background-image  : none;
-			}
-			td,th {
-				padding: 0px;
-			}
+			column-span         : none;
+			tr { background-image  : none; }
+			td,th { padding : 0px; }
 		}

-		:last-child {
-			margin-bottom : 0;
-		}
+		:last-child { margin-bottom : 0; }

 		strong, em {
 			font-style      : normal;
@@ -364,18 +300,16 @@
 	// *           FOOTER
 	// *****************************/
 	&:nth-child(odd) {
-		.pageNumber{
-			left : 3cm;
-		}
+		.pageNumber { left : 3cm; }
 		.footnote {
 			left       : 4.5cm;
 			text-align : left;
 		}
 	}
 	.pageNumber {
-		font-family : FrederickaTheGreat;
 		right       : 3cm;
 		bottom      : 1.25cm;
+		font-family : 'FrederickaTheGreat';
 		color       : var(--HB_Color_HeaderText);
 	}
 	.footnote {
@@ -392,49 +326,43 @@
 	// *           CODE BLOCKS
 	// ************************************/
 	code {
-		font-size        : 0.3cm;
 		padding          : 0px 4px;
-		color            : var(--HB_Color_Text);
+		font-size        : 0.3cm;
 		vertical-align   : middle;
-		background-color : #faf7ea;
+		color            : var(--HB_Color_Text);
+		background-color : #FAF7EA;
 		border-radius    : 4px;
 	}

 	pre code {
+		padding             : 0.15cm;
+		margin-bottom       : 2px;
 		border-style        : solid;
 		border-width        : 1px;
+		border-radius       : 12px;
 		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;
-		}
+		& + * { margin-top : 0.325cm; }
 	}
 	//*****************************
 	// *          EXTRAS
 	// *****************************/
 	hr {
 		visibility : hidden;
-		border     : none;
 		margin     : 0px;
+		border     : none;
 	}
 	//Text indent right after table
-	table+p{
-		text-indent : 1em;
-	}
+	table + p { text-indent : 1em; }
 	a, a:visited, a:hover {
 		color      : var(--HB_Color_Text);
 		transition : all 1s ease;
 	}
-	a:hover {
-		color:red;
-	}
+	a:hover { color : red; }
 }
 //*****************************
 // *         SPELL LIST
@@ -442,35 +370,27 @@

 .page .spellList {
 	.useSansSerif();
-	font-family  : PermanentMarker;
+	font-family  : 'PermanentMarker';
 	column-count : 2;
-	ul+h5{
-		margin-top : 15px;
-	}
+	ul + h5 { margin-top : 15px; }
 	ul {
-		margin-bottom               : 0.5em;
 		padding-left                : 1em;
+		margin-bottom               : 0.5em;
 		text-indent                 : -1em;
 		list-style-type             : none;
+		break-inside                : auto;
 		-webkit-column-break-inside : auto;
 		page-break-inside           : auto;
-		break-inside                : auto;
-	}
-	&.wide{
-		column-count : 4;
 	}
+	&.wide { column-count : 4; }
 }

 //*****************************
 // *       CLASS TABLE
 // *****************************/
 .page .classTable {
-	th[colspan]:not([rowspan]) {
-		white-space : nowrap;
-	}
-	h5 + table{
-		margin-top : 0.2cm;
-	}
+	th[colspan]:not([rowspan]) { white-space : nowrap; }
+	h5 + table { margin-top : 0.2cm; }
 }
 //*****************************
 // *      TABLE OF CONTENTS
@@ -480,57 +400,51 @@
 	page-break-inside           : avoid;
 	break-inside                : avoid;
 	h1 {
-		text-align    : center;
 		margin-bottom : 0.3cm;
+		text-align    : center;
 	}
 	a {
 		display         : inline;
 		color           : inherit;
 		text-decoration : none;
-		&:hover{
-			text-decoration : underline;
-		}
+		&:hover { text-decoration : underline; }
 	}
 	h4 {
 		margin-top  : 0.2cm;
 		line-height : 0.4cm;
-		& + ul li {
-			line-height: 1.2em;
-		}
+		& + 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;
+			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;
+					margin-left   : 0.06cm;        /* Spacing before dot leaders */
+					content       : '';
+					border-bottom : 0.05cm dotted #000000;
 				}
 			}
 			&: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 */
+				font-family    : 'ReenieBeanie';
+				font-size      : 0.34cm;
+				font-weight    : normal;
+				vertical-align : bottom; /* Keep page number bottom-aligned */
+				color          : black;
+				text-align     : right;
 				/* white-space  : nowrap; /* Uncomment if needed */
 			}
 		}
@@ -546,6 +460,4 @@
 //*****************************
 // *         WIDE
 // *****************************/
-.page .wide {
-	margin-bottom       : 0.45cm;
-}
+.page .wide { margin-bottom       : 0.45cm; }
--- a/themes/codeMirror/customEditorStyles.less
+++ b/themes/codeMirror/customEditorStyles.less
@@ -47,21 +47,16 @@
 	&.cm-s-vibrant-ink,
 	&.cm-s-xq-dark,
 	&.cm-s-yonce,
-    &.cm-s-zenburn
-     {
+	&.cm-s-zenburn {
 		.CodeMirror-code {
-            .block:not(.cm-comment) {
-                color: magenta;
-            }
+			.block:not(.cm-comment) { color : magenta; }
 			.columnSplit {
 				color            : black;
 				background-color : rgba(35,153,153,0.5);
 			}
 			.pageLine {
 				background-color : rgba(255,255,255,0.5);
-                & ~ pre.CodeMirror-line {
-                    color: black;
-                }
+				& ~ pre.CodeMirror-line { color : black; }
 			}
 		}
 	}
--- a/legacy/fonts.less
+++ b/legacy/fonts.less
@@ -1,61 +1,61 @@
 /* Main Font, serif */
@font-face {
-	font-family: BookSanity;
+	font-family : "BookSanity";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/5e legacy/Bookinsanity.woff2');
-	font-weight: normal;
-	font-style: normal;
 }
@font-face {
-	font-family: BookSanity;
+	font-family : "BookSanity";
+	font-style : normal;
+	font-weight : bold;
 	src : url('../../../fonts/5e legacy/Bookinsanity Bold.woff2');
-	font-weight: bold;
-	font-style: normal;
 }
@font-face {
-	font-family: BookSanity;
-	src: url('../../../fonts/5e legacy/Bookinsanity Italic.woff2');
+	font-family : "BookSanity";
+	font-style : italic;
 	font-weight : normal;
-	font-style: italic;
+	src : url('../../../fonts/5e legacy/Bookinsanity Italic.woff2');
 }
@font-face {
-	font-family: BookSanity;
-	src: url('../../../fonts/5e legacy/Bookinsanity Bold Italic.woff2');
-	font-weight: bold;
+	font-family : "BookSanity";
 	font-style : italic;
+	font-weight : bold;
+	src : url('../../../fonts/5e legacy/Bookinsanity Bold Italic.woff2');
 }

 /* Notes and Tables, sans-serif */
@font-face {
-	font-family: ScalySans;
+	font-family : "ScalySans";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/5e legacy/Scaly Sans.woff2');
-	font-weight: normal;
-	font-style: normal;
 }
@font-face {
-	font-family: ScalySansSmallCaps;
+	font-family : "ScalySansSmallCaps";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/5e legacy/Scaly Sans Caps.woff2');
-	font-weight: normal;
-	font-style: normal;
 }
@font-face {
-	font-family: WalterTurncoat;
-	src: url('../../../fonts/5e legacy/WalterTurncoat-Regular.woff2');
-	font-weight: normal;
+	font-family : "WalterTurncoat";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/5e legacy/WalterTurncoat-Regular.woff2');
 }

 /* Headers */
@font-face {
-	font-family: MrJeeves;
-	src: url('../../../fonts/5e legacy/Mr Eaves Small Caps.woff2');
-	font-weight: normal;
+	font-family : "MrJeeves";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/5e legacy/Mr Eaves Small Caps.woff2');
 }

 /* Fancy Drop Cap */
@font-face {
-	font-family: Solberry;
-	src: url('../../../fonts/5e legacy/Solbera Imitation.woff2');
-	font-weight: normal;
+	font-family : "Solberry";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/5e legacy/Solbera Imitation.woff2');
 }
--- a/themes/fonts/5e/fonts.less
+++ b/themes/fonts/5e/fonts.less
@@ -1,143 +1,143 @@
 /* Main Font, serif */
@font-face {
-	font-family: BookInsanityRemake;
+	font-family : "BookInsanityRemake";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/5e/Bookinsanity.woff2');
-	font-weight: normal;
-	font-style: normal;
 }
@font-face {
-	font-family: BookInsanityRemake;
+	font-family : "BookInsanityRemake";
+	font-style : normal;
+	font-weight : bold;
 	src : url('../../../fonts/5e/Bookinsanity Bold.woff2');
-	font-weight: bold;
-	font-style: normal;
 }
@font-face {
-	font-family: BookInsanityRemake;
-	src: url('../../../fonts/5e/Bookinsanity Italic.woff2');
+	font-family : "BookInsanityRemake";
+	font-style : italic;
 	font-weight : normal;
-	font-style: italic;
+	src : url('../../../fonts/5e/Bookinsanity Italic.woff2');
 }
@font-face {
-	font-family: BookInsanityRemake;
-	src: url('../../../fonts/5e/Bookinsanity Bold Italic.woff2');
-	font-weight: bold;
+	font-family : "BookInsanityRemake";
 	font-style : italic;
+	font-weight : bold;
+	src : url('../../../fonts/5e/Bookinsanity Bold Italic.woff2');
 }

 /* Notes and Tables, sans-serif */
@font-face {
-	font-family: ScalySansRemake;
+	font-family : "ScalySansRemake";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/5e/Scaly Sans.woff2');
-	font-weight: normal;
-	font-style: normal;
 }
@font-face {
-	font-family: ScalySansRemake;
+	font-family : "ScalySansRemake";
+	font-style : normal;
+	font-weight : bold;
 	src : url('../../../fonts/5e/Scaly Sans Bold.woff2');
-	font-weight: bold;
-	font-style: normal;
 }
@font-face {
-	font-family: ScalySansRemake;
+	font-family : "ScalySansRemake";
+	font-style : italic;
+	font-weight : normal;
 	src : url('../../../fonts/5e/Scaly Sans Italic.woff2');
-	font-weight: normal;
-	font-style: italic;
 }
@font-face {
-	font-family: ScalySansRemake;
-	src: url('../../../fonts/5e/Scaly Sans Bold Italic.woff2');
+	font-family : "ScalySansRemake";
+	font-style : italic;
 	font-weight : bold;
-	font-style: italic;
+	src : url('../../../fonts/5e/Scaly Sans Bold Italic.woff2');
 }
@font-face {
-	font-family: ScalySansSmallCapsRemake;
+	font-family : "ScalySansSmallCapsRemake";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/5e/Scaly Sans Caps.woff2');
-	font-weight: normal;
-	font-style: normal;
 }
@font-face {
-	font-family: WalterTurncoat;
-	src: url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
-	font-weight: normal;
+	font-family : "WalterTurncoat";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
 }

 /* Headers */
@font-face {
-	font-family: MrEavesRemake;
-	src: url('../../../fonts/5e/Mr Eaves Small Caps.woff2');
-	font-weight: normal;
+	font-family : "MrEavesRemake";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/5e/Mr Eaves Small Caps.woff2');
 }

 /* Fancy Drop Cap */
@font-face {
-	font-family: SolberaImitationRemake; //Tweaked 5e version
-	src: url('../../../fonts/5e/Solbera Imitation Tweak.woff2');
-	font-weight: 100 1000;
+	font-family : "SolberaImitationRemake"; //Tweaked 5e version
 	font-style : normal;
 	font-style : italic;
+	font-weight : 100 1000;
+	src : url('../../../fonts/5e/Solbera Imitation Tweak.woff2');
 }

 /* Cover Page */
@font-face {
-	font-family: NodestoCapsCondensed;
+	font-family : "NodestoCapsCondensed";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/5e/Nodesto Caps Condensed.woff2');
-	font-weight: normal;
-	font-style: normal;
 }

@font-face {
-	font-family: NodestoCapsCondensed;
+	font-family : "NodestoCapsCondensed";
+	font-style : normal;
+	font-weight : bold;
 	src : url('../../../fonts/5e/Nodesto Caps Condensed Bold.woff2');
-	font-weight: bold;
-	font-style: normal;
 }

@font-face {
-	font-family: NodestoCapsCondensed;
+	font-family : "NodestoCapsCondensed";
+	font-style : italic;
+	font-weight : normal;
 	src : url('../../../fonts/5e/Nodesto Caps Condensed Italic.woff2');
-	font-weight: normal;
-	font-style: italic;
 }

@font-face {
-	font-family: NodestoCapsCondensed;
-	src: url('../../../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
+	font-family : "NodestoCapsCondensed";
+	font-style : italic;
 	font-weight : bold;
-	font-style: italic;
+	src : url('../../../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
 }

@font-face {
-	font-family: NodestoCapsWide;
-	src: url('../../../fonts/5e/Nodesto Caps Wide.woff2');
+	font-family : "NodestoCapsWide";
+	font-style : normal;
 	font-weight : normal;
-	font-style: normal
+	src : url('../../../fonts/5e/Nodesto Caps Wide.woff2');
 }

@font-face {
-	font-family: Overpass;
+	font-family : "Overpass";
+	font-style : normal;
+	font-weight : 500;
 	src : url('../../../fonts/5e/Overpass Medium.woff2');
-	font-weight: 500;
-	font-style: normal;
 }

@font-face {
-	font-family: Davek;
+	font-family : "Davek";
+	font-style : normal;
+	font-weight : 500;
 	src : url('../../../fonts/5e/Davek.woff2');
-	font-weight: 500;
-	font-style: normal;
 }

@font-face {
-	font-family: Iokharic;
-	src: url('../../../fonts/5e/Iokharic.woff2');
-	font-weight: 500;
+	font-family : "Iokharic";
 	font-style : normal;
+	font-weight : 500;
+	src : url('../../../fonts/5e/Iokharic.woff2');
 }
@font-face {
-	font-family: Rellanic;
-	src: url('../../../fonts/5e/Rellanic.woff2');
-	font-weight: 500;
+	font-family : "Rellanic";
 	font-style : normal;
+	font-weight : 500;
+	src : url('../../../fonts/5e/Rellanic.woff2');
 }
--- a/themes/fonts/Blank/fonts.less
+++ b/themes/fonts/Blank/fonts.less
@@ -18,29 +18,29 @@ License:
 */

@font-face {
-	font-family: Pagella;
+	font-family : "Pagella";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../../../fonts/Blank/texgyrepagella-regular.woff2');
-	font-weight: normal;
-	font-style: normal;
 }

@font-face {
-	font-family: Pagella;
+	font-family : "Pagella";
+	font-style : normal;
+	font-weight : bold;
 	src : url('../../../fonts/Blank/texgyrepagella-bold.woff2');
-	font-weight: bold;
-	font-style: normal;
 }

@font-face {
-	font-family: Pagella;
-	src: url('../../../fonts/Blank/texgyrepagella-italic.woff2');
+	font-family : "Pagella";
+	font-style : italic;
 	font-weight : normal;
-	font-style: italic;
+	src : url('../../../fonts/Blank/texgyrepagella-italic.woff2');
 }

@font-face {
-	font-family: Pagella;
-	src: url('../../../fonts/Blank/texgyrepagella-bolditalic.woff2');
-	font-weight: bold;
+	font-family : "Pagella";
 	font-style : italic;
+	font-weight : bold;
+	src : url('../../../fonts/Blank/texgyrepagella-bolditalic.woff2');
 }
--- a/themes/fonts/Journal/fonts.less
+++ b/themes/fonts/Journal/fonts.less
@@ -1,58 +1,58 @@
 /* Main Font, serif */
@font-face {
-	font-family: ReenieBeanie;
-	src: url('../../../fonts/Journal/ReenieBeanie-Regular.woff2');
-	font-weight: normal;
+	font-family : "ReenieBeanie";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/Journal/ReenieBeanie-Regular.woff2');
 }

 /* Notes and Tables, sans-serif */
@font-face {
-	font-family: PermanentMarker;
-	src: url('../../../fonts/Journal/PermanentMarker-Regular.woff2');
-	font-weight: normal;
+	font-family : "PermanentMarker";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/Journal/PermanentMarker-Regular.woff2');
 }
@font-face {
-	font-family: WalterTurncoat;
-	src: url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
-	font-weight: normal;
+	font-family : "WalterTurncoat";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
 }

 /* Headers */
@font-face {
-	font-family: FrederickaTheGreat;
-	src: url('../../../fonts/Journal/FrederickaTheGreat-Regular.woff2');
-	font-weight: normal;
+	font-family : "FrederickaTheGreat";
 	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/Journal/FrederickaTheGreat-Regular.woff2');
 }

 /* Cover Page */
@font-face {
-	font-family: NodestoCapsCondensed;
+	font-family : "NodestoCapsCondensed";
+	font-style : normal;
+	font-weight : normal;
 	src : url('../fonts/5e/Nodesto Caps Condensed.woff2');
-	font-weight: normal;
-	font-style: normal;
 }

@font-face {
-	font-family: NodestoCapsCondensed;
+	font-family : "NodestoCapsCondensed";
+	font-style : normal;
+	font-weight : bold;
 	src : url('../fonts/5e/Nodesto Caps Condensed Bold.woff2');
-	font-weight: bold;
-	font-style: normal;
 }

@font-face {
-	font-family: NodestoCapsCondensed;
-	src: url('../fonts/5e/Nodesto Caps Condensed Italic.woff2');
+	font-family : "NodestoCapsCondensed";
+	font-style : italic;
 	font-weight : normal;
-	font-style: italic;
+	src : url('../fonts/5e/Nodesto Caps Condensed Italic.woff2');
 }

@font-face {
-	font-family: NodestoCapsCondensed;
-	src: url('../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
-	font-weight: bold;
+	font-family : "NodestoCapsCondensed";
 	font-style : italic;
+	font-weight : bold;
+	src : url('../fonts/5e/Nodesto Caps Condensed Bold Italic.woff2');
 }
--- a/themes/fonts/iconFonts/diceFont.less
+++ b/themes/fonts/iconFonts/diceFont.less
@@ -13,8 +13,8 @@
 	font-weight             : normal;
 	font-variant            : normal;
 	line-height             : 1;
-	text-decoration         : inherit;
 	text-transform          : none;
+	text-decoration         : inherit;
 	text-rendering          : optimizeLegibility;
 	
 	/* Better Font Rendering =========== */
--- a/themes/fonts/iconFonts/fontAwesome.js
+++ b/themes/fonts/iconFonts/fontAwesome.js
@@ -1,3 +1,5 @@
+/* eslint-disable max-lines */
+
 const fontAwesome = {
 	// FONT-AWESOME SOLID
 	'fas_0'                                      : 'fas fa-0',
--- a/themes/phb.depricated.less
+++ b/themes/phb.depricated.less
@@ -1,31 +1,31 @@
 .phb {
 	//Double hr for full width elements
 	hr + hr + blockquote {
-		column-span         : all;
 		-webkit-column-span : all;
 		-moz-column-span    : all;
+		column-span         : all;
 	}

 	//*****************************
 	// *      CLASS TABLE
 	// *****************************/
 	hr+table {
+		padding-top         : 10px;
 		margin-top          : -5px;
 		margin-bottom       : 50px;
-		padding-top         : 10px;
 		border-collapse     : separate;
 		background-color    : white;
 		border              : initial;
 		border-style        : solid;
+		border-image-source : @frameBorderImage;
+		border-image-slice  : 150 200 150 200;
+		border-image-width  : 47px;
 		border-image-outset : 37px 17px;
 		border-image-repeat : round;
-		border-image-slice  : 150 200 150 200;
-		border-image-source : @frameBorderImage;
-		border-image-width  : 47px;
 	}
 	h5 + hr + table {
-		column-span         : all;
 		-webkit-column-span : all;
 		-moz-column-span    : all;
+		column-span         : all;
 	}
 }