Merge branch 'createUIBasePage'

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: /r/Homebrewery Subreddit
+    url: https://www.reddit.com/r/homebrewery
+    about: The Homebrewery community on Reddit!
+  - name: Discord of Many Things
+    url: https://discord.gg/domt
+    about: "Join the conversation in the #formatting channel on DoMT!"

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,21 @@
+name: Feature Request
+description: Have an idea to improve the Homebrewery? Let us know!
+labels: ["feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: "We'd love to hear your idea!  Please be sure to [search the current Issues](https://github.com/naturalcrit/homebrewery/issues) for any duplicate requests."
+  - type: textarea
+    id: user-request
+    attributes:
+      label: "Your idea:"
+      description: The best feature requests provide an explanation of the current issue and then an explanation of how it could be improved.  Screenshots/images can be pasted right in as well!
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: "Please confirm:"
+      options:
+        - label: I have searched the Issues tracker for any duplicate requests and found none.
+          required: true

.github/ISSUE_TEMPLATE/general_issue.yml

@@ -0,0 +1,54 @@
+name: General Issue
+description: Report an issue unrelated to Saving
+body:
+  - type: markdown
+    attributes:
+      value: Please include as much information as possible.
+  - type: checkboxes
+    id: renderer
+    attributes:
+      label: Renderer
+      description: Which renderer does this issue occur on?  If you are unsure, you can check the renderer in the Properties Editor (click the "i" in the Snippet Menu bar above the editor).
+      options:
+        - label: Legacy
+        - label: v3
+    validations:
+      required: true
+  - type: dropdown
+    id: browser
+    attributes:
+      label: Browser
+      description: Which browser were you using when the issue occurred?
+      options:
+        - Chrome
+        - Firefox
+        - Edge
+        - Safari
+        - other
+    validations:
+      required: true
+  - type: dropdown
+    id: operating-system
+    attributes:
+      label: Operating System
+      description: Which OS were you using when the issue occurred?
+      options:
+        - Windows
+        - MacOS
+        - Linux
+        - other
+    validations:
+      required: true
+  - type: textarea
+    id: user-description
+    attributes:
+      label: "What happened?"
+      description: Please include any steps you took leading up to the issue and if you can reproduce it.  Let us know what you expected to happen, and what did happen.
+    validations:
+      required: true
+  - type: textarea
+    id: code
+    attributes:
+      label: Code
+      description: Paste in any relevant code snippet below.
+      render: gfm

.github/ISSUE_TEMPLATE/save_issue.yml

@@ -0,0 +1,26 @@
+name: Saving Issue
+description: Report an issue Saving
+labels: ["Saving"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Woops, sorry there was an issue Saving.  Please add any detail you can to this report and check back soon!
+  - type: textarea
+    id: error-code
+    attributes:
+      label: Error Code
+      render: shell
+  - type: textarea
+    id: user-description
+    attributes:
+      label: "Your description of what happened:"
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for the report.  Here are some steps that may help in the meantime:
+        1. Refreshing your Google credentials in Homebrewery by signing out, and back in (they expire after one year).
+        2. Waiting a few minutes and trying again - sometimes there is just a momentary blip in the server.
+        3. Check the Issues in Github or the /r/homebrewery subreddit to see if others are experiencing the same issue.

changelog.md

@@ -39,6 +39,121 @@ pre {
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
+### Friday 08/09/2022 - v3.2.2
+{{taskList
+
+##### Jeddai:
+
+* [x] Fix brews not deleting from User page when removed from Google Drive externally.
+
+  Fixes issues: [#2325](https://github.com/naturalcrit/homebrewery/issues/2325)
+
+##### G-Ambatte:
+
+* [x] Brew Tags are now searchable on the User page
+
+Fixes issues  [#2317](https://github.com/naturalcrit/homebrewery/issues/2317), [#2319](https://github.com/naturalcrit/homebrewery/issues/2319), [#2334](https://github.com/naturalcrit/homebrewery/issues/2334)
+
+* [x] Several tweaks to the User page
+
+ Fixes issues:  [#1797](https://github.com/naturalcrit/homebrewery/issues/1797), [#2315](https://github.com/naturalcrit/homebrewery/issues/2315), [#2326](https://github.com/naturalcrit/homebrewery/issues/2326), [#2328](https://github.com/naturalcrit/homebrewery/issues/2328)
+}}
+
+### Wednesday 31/08/2022 - v3.2.1
+{{taskList
+
+##### Calculuschild
+
+* [x] Reference Links should now work inside tables
+
+	Fixes issues: [#2307](https://github.com/naturalcrit/homebrewery/issues/2307)
+
+##### Jeddai:
+
+* [x] Fix printing from `/new` not working
+
+  Fixes issues: [#1789](https://github.com/naturalcrit/homebrewery/issues/1789), [#1806](https://github.com/naturalcrit/homebrewery/issues/1806)
+
+* [x] Fix broken snippet buttons on `/new`
+
+  Fixes issues: [#2311](https://github.com/naturalcrit/homebrewery/issues/2311)
+
+##### G-Ambatte:
+
+* [x] Several small tweaks to the User page
+
+  Fixes issues: [#2301](https://github.com/naturalcrit/homebrewery/issues/2301), [#2303](https://github.com/naturalcrit/homebrewery/issues/2303), [#2121](https://github.com/naturalcrit/homebrewery/issues/2121)
+}}
+
+\page
+
+### Saturday 27/08/2022 - v3.2.0
+{{taskList
+
+##### Calculuschild
+
+* [x] The V3 renderer is now the default for new brews.
+
+* [x] Small tweaks to the spacing around the `classTable` style
+
+##### Jeddai:
+
+* [x] Brew transfers between Homebrewery and Google Drive now keep the same share and edit links! Metadata is now also kept across transfers.
+
+  Fixes issues: [#1838](https://github.com/naturalcrit/homebrewery/issues/1838)
+
+* [x] Brews can now be labeled with tags; these will be searchable on the My Brews page in a future update.
+
+  Fixes issues: [#758](https://github.com/naturalcrit/homebrewery/issues/758)
+
+##### Jlgraves:
+
+* [x] Small tweaks to the `ClassFeature` snippet
+
+  Fixes issues: [#2215](https://github.com/naturalcrit/homebrewery/issues/2215)
+}}
+
+
+### Thursday 09/06/2022 - v3.1.1
+{{taskList
+
+##### Calculuschild:
+
+* [x] Fixed class table decorations appearing on top of the table in PDF output.
+
+  Fixes issues: [#1784](https://github.com/naturalcrit/homebrewery/issues/1784)
+
+* [x] Fix bottom decoration on half class tables disappearing when the table is too short.
+
+  Fixes issues: [#2202](https://github.com/naturalcrit/homebrewery/issues/2202)
+}}
+
+### Monday 06/06/2022 - v3.1.0
+{{taskList
+
+##### G-Ambatte:
+
+* [x] "Jump to Preview/Editor" buttons added to the divider bar. Easily sync between the editor and preview panels!
+
+  Fixes issues: [#1756](https://github.com/naturalcrit/homebrewery/issues/1756)
+
+* [x] Speedups to the user page for users with large and/or many brews.
+
+  Fixes issues: [#2147](https://github.com/naturalcrit/homebrewery/issues/2147)
+
+* [x] Search text on the user page is saved to the URL for easy bookmarking in your browser
+
+  Fixes issues: [#1858](https://github.com/naturalcrit/homebrewery/issues/1858)
+
+* [x] Added easy login system for offline installs.
+
+  Fixes issues: [#269](https://github.com/naturalcrit/homebrewery/issues/269)
+
+* [x] New **THUMBNAIL** option in the {{fa,fa-info-circle}} **Properties** menu. This image will show up in social media links.
+
+  Fixes issues: [#820](https://github.com/naturalcrit/homebrewery/issues/820)
+}}
+
 ### Wednesday 27/03/2022 - v3.0.8
 {{taskList
 * [x] Style updates to user page.

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -1,3 +1,4 @@
+/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
 require('./brewRenderer.less');
 const React = require('react');
 const createClass = require('create-react-class');
@@ -13,6 +14,8 @@ const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx');
 const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
 const Frame = require('react-frame-component').default;
 
+const Themes = require('themes/themes.json');
+
 const PAGE_HEIGHT = 1056;
 const PPR_THRESHOLD = 50;
 
@@ -23,6 +26,7 @@ const BrewRenderer = createClass({
 			text     : '',
 			style    : '',
 			renderer : 'legacy',
+			theme    : '5ePHB',
 			errors   : []
 		};
 	},
@@ -105,7 +109,12 @@ const BrewRenderer = createClass({
 
 	renderPageInfo : function(){
 		return <div className='pageInfo' ref='main'>
-			{this.state.viewablePageNumber + 1} / {this.state.pages.length}
+			<div>
+				{this.props.renderer}
+			</div>
+			<div>
+				{this.state.viewablePageNumber + 1} / {this.state.pages.length}
+			</div>
 		</div>;
 	},
 
@@ -113,7 +122,7 @@ const BrewRenderer = createClass({
 		if(!this.state.usePPR) return;
 
 		return <div className='ppr_msg'>
-			Partial Page Renderer enabled, because your brew is so large. May effect rendering.
+			Partial Page Renderer is enabled, because your brew is so large. May affect rendering.
 		</div>;
 	},
 
@@ -177,6 +186,9 @@ const BrewRenderer = createClass({
 	render : function(){
 		//render in iFrame so broken code doesn't crash the site.
 		//Also render dummy page while iframe is mounting.
+		const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
+		const themePath    = this.props.theme ?? '5ePHB';
+		const baseThemePath = Themes[rendererPath][themePath].baseTheme;
 
 		return (
 			<React.Fragment>
@@ -188,7 +200,7 @@ const BrewRenderer = createClass({
 					</div>
 	        : null}
 
-				<Frame initialContent={this.state.initialContent}
+				<Frame id='BrewRenderer' initialContent={this.state.initialContent}
 					style={{ width: '100%', height: '100%', visibility: this.state.visibility }}
 					contentDidMount={this.frameDidMount}>
 					<div className={'brewRenderer'}
@@ -200,7 +212,11 @@ const BrewRenderer = createClass({
 							<RenderWarnings />
 							<NotificationPopup />
 						</div>
-						<link href={`${this.props.renderer == 'legacy' ? '/themes/5ePhbLegacy.style.css' : '/themes/5ePhb.style.css'}`} rel='stylesheet'/>
+						<link href={`/themes/${rendererPath}/Blank/style.css`} rel='stylesheet'/>
+						{baseThemePath &&
+							<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} rel='stylesheet'/>
+						}
+						<link href={`/themes/${rendererPath}/${themePath}/style.css`} rel='stylesheet'/>
 						{/* Apply CSS from Style tab and render pages from Markdown tab */}
 						{this.state.isMounted
 							&&

client/homebrew/brewRenderer/brewRenderer.less

@@ -21,11 +21,17 @@
 	right            : 17px;
 	bottom           : 0;
 	z-index          : 1000;
-	padding          : 8px 10px;
 	background-color : #333;
 	font-size        : 10px;
 	font-weight      : 800;
 	color            : white;
+	div {
+		display: inline-block;
+		padding          : 8px 10px;
+		&:not(:last-child){
+			border-right: 1px solid #666;
+		}
+	}
 }
 .ppr_msg{
 	position         : absolute;

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

@@ -4,7 +4,7 @@ const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');	//Unused variable
 
-const DISMISS_KEY = 'dismiss_notification09-9-21';
+const DISMISS_KEY = 'dismiss_notification08-27-22';
 
 const NotificationPopup = createClass({
 	displayName     : 'NotificationPopup',
@@ -22,45 +22,45 @@ const NotificationPopup = createClass({
 	},
 	notifications : {
 		psa : function(){
-			return <li key='psa'>
-				<em>V3.0.0 Released!</em> <br />
-				After a long and bumpy road, we decided it was high time we finally release version 3 of the homebrewery into the wild. You can check out a
-				brief overview and see how to opt-in to the new features here:&nbsp;
-				<a target='_blank' href='https://homebrewery.naturalcrit.com/v3_preview'>V3 Welcome Page</a> and&nbsp;
-				<a target='_blank' href='https://homebrewery.naturalcrit.com/changelog'>the Changelog</a>.
-				<br /><br />
-				<em>BE WARNED:</em> As we continue to develop V3, expect small tweaks in the styling, fonts, and snippets; your brews may look slightly
-				different from day-to-day. All of your old documents will continue to work as normal; we are not touching them. If you don't want to deal
-				with the possibility of slight formatting changes, you may choose to stick with the Legacy renderer on any of your brews for as long as you like.
-				<br /><br />
-				With this in mind, if you still wish to try out V3, you can opt-in any of your brews to the the V3 renderer.
-				This will likely break much of your formatting as a lot of the Markdown code has been updated, and starting from scratch may be cleaner.
-				(Don't worry, you can always change the renderer back to Legacy	for any brew at any time).
-			</li>;
-		},
-		refreshGoogle : function (){
-			return <li key='refreshGoogle'>
-				<em>Refresh your Google Drive Credentials!</em> <br />
-				Currently a lot of people are striking issues with their Google credentials expiring, which happens one year after the last sign in via
-				Google. This can cause errors when trying to save your brews. If this happens, simply visit the&nbsp;
-				<a target='_blank' href='https://www.naturalcrit.com/login'>
-				logout page
-				</a>
-				, sign out, and then sign	back in "with Google" to refresh your credentials. See&nbsp;
-				<a target='_blank' href='https://github.com/naturalcrit/homebrewery/discussions/1580'>
-					this discussion on Github
-				</a> for more details.
-			</li>;
-		},
-		faq : function(){
-			return <li key='faq'>
-				<em>Protect your work! </em> <br />
-				If you opt not to use your Google Drive, keep in mind that we do not save a history of your projects. Please make frequent backups of your brews!&nbsp;
-				<a target='_blank' href='https://www.reddit.com/r/homebrewery/comments/adh6lh/faqs_psas_announcements/'>
-					See the FAQ
-				</a> to learn how to avoid losing your work!
-			</li>;
-		},
+			return (
+				<>
+					<li key='psa'>
+						<em>V3.2.0 Released!</em> <br />
+						We are happy to announce that after nearly a year of use by our many users,
+						we are making the V3 render mode the default setting for all new brews.
+						This mode has become quite popular, and has proven to be stable and powerful.
+						Of course, we will always keep the option to use the Legacy renderer for any
+						brew, which can still be accessed from the Properties menu.
+					</li>
+
+					<li key='stubs'>
+						<em>Change to Google Drive Storage!</em> <br />
+						We have made a change to the process of tranferring brews between Google
+						Drive and the Homebrewery storage. Starting now, any time a brew is
+						transferred, it will keep the same links instead of generating new ones!
+						We hope this change will help reduce issues where people "lost" their work
+						by trying to visit old links.
+					</li>
+
+					<li key='googleDriveFolder'>
+						<em>Don't delete your Homebrewery folder on Google Drive!</em> <br />
+						We have had several reports of users losing their brews, not realizing
+						that they had deleted the files on their Google Drive. If you have a Homebrewery folder
+						on your Google Drive with *.txt files inside, <em>do not delete it</em>!
+						We cannot help you recover files that you have deleted from your own
+						Google Drive.
+					</li>
+
+					<li key='faq'>
+						<em>Protect your work! </em> <br />
+						If you opt not to use your Google Drive, keep in mind that we do not save a history of your projects. Please make frequent backups of your brews!&nbsp;
+						<a target='_blank' href='https://www.reddit.com/r/homebrewery/comments/adh6lh/faqs_psas_announcements/'>
+							See the FAQ
+						</a> to learn how to avoid losing your work!
+					</li>
+				</>
+			);
+		}
 	},
 	checkNotifications : function(){
 		const hideDismiss = localStorage.getItem(DISMISS_KEY);

client/homebrew/editor/editor.jsx

@@ -61,8 +61,14 @@ const Editor = createClass({
 		window.removeEventListener('resize', this.updateEditorSize);
 	},
 
-	componentDidUpdate : function() {
+	componentDidUpdate : function(prevProps, prevState, snapshot) {
 		this.highlightCustomMarkdown();
+		if(prevProps.moveBrew !== this.props.moveBrew) {
+			this.brewJump();
+		};
+		if(prevProps.moveSource !== this.props.moveSource) {
+			this.sourceJump();
+		};
 	},
 
 	updateEditorSize : function() {
@@ -90,15 +96,20 @@ const Editor = createClass({
 	},
 
 	handleViewChange : function(newView){
+		this.props.setMoveArrows(newView === 'text');
 		this.setState({
 			view : newView
 		}, this.updateEditorSize);	//TODO: not sure if updateeditorsize needed
 	},
 
 	getCurrentPage : function(){
-		const lines = this.props.brew.text.split('\n').slice(0, this.cursorPosition.line + 1);
+		const lines = this.props.brew.text.split('\n').slice(0, this.refs.codeEditor.getCursorPosition().line + 1);
 		return _.reduce(lines, (r, line)=>{
-			if(line.indexOf('\\page') !== -1) r++;
+			if(
+				(this.props.renderer == 'legacy' && line.indexOf('\\page') !== -1)
+				||
+				(this.props.renderer == 'V3' && line.match(/^\\page$/))
+			) r++;
 			return r;
 		}, 1);
 	},
@@ -120,6 +131,7 @@ const Editor = createClass({
 					//reset custom line styles
 					codeMirror.removeLineClass(lineNumber, 'background', 'pageLine');
 					codeMirror.removeLineClass(lineNumber, 'text');
+					codeMirror.removeLineClass(lineNumber, 'wrap', 'sourceMoveFlash');
 
 					// Styling for \page breaks
 					if((this.props.renderer == 'legacy' && line.includes('\\page')) ||
@@ -174,9 +186,76 @@ const Editor = createClass({
 		}
 	},
 
-	brewJump : function(){
-		const currentPage = this.getCurrentPage();
-		window.location.hash = `p${currentPage}`;
+	brewJump : function(targetPage=this.getCurrentPage()){
+		if(!window) return;
+		// console.log(`Scroll to: p${targetPage}`);
+		const brewRenderer = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer')[0];
+		const currentPos = brewRenderer.scrollTop;
+		const targetPos = window.frames['BrewRenderer'].contentDocument.getElementById(`p${targetPage}`).getBoundingClientRect().top;
+		const interimPos = targetPos >= 0 ? -30 : 30;
+
+		const bounceDelay = 100;
+		const scrollDelay = 500;
+
+		if(!this.throttleBrewMove) {
+			this.throttleBrewMove = _.throttle((currentPos, interimPos, targetPos)=>{
+				brewRenderer.scrollTo({ top: currentPos + interimPos, behavior: 'smooth' });
+				setTimeout(()=>{
+					brewRenderer.scrollTo({ top: currentPos + targetPos, behavior: 'smooth', block: 'start' });
+				}, bounceDelay);
+			}, scrollDelay, { leading: true, trailing: false });
+		};
+		this.throttleBrewMove(currentPos, interimPos, targetPos);
+
+		// const hashPage = (page != 1) ? `p${page}` : '';
+		// window.location.hash = hashPage;
+	},
+
+	sourceJump : function(targetLine=null){
+		if(this.isText()) {
+			if(targetLine == null) {
+				targetLine = 0;
+
+				const pageCollection = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('page');
+				const brewRendererHeight = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer').item(0).getBoundingClientRect().height;
+
+				let currentPage = 1;
+				for (const page of pageCollection) {
+					if(page.getBoundingClientRect().bottom > (brewRendererHeight / 2)) {
+						currentPage = parseInt(page.id.slice(1)) || 1;
+						break;
+					}
+				}
+
+				const textSplit = this.props.renderer == 'V3' ? /^\\page$/gm : /\\page/;
+				const textString = this.props.brew.text.split(textSplit).slice(0, currentPage-1).join(textSplit);
+				const textPosition = textString.length;
+				const lineCount = textString.match('\n') ? textString.slice(0, textPosition).split('\n').length : 0;
+
+				targetLine = lineCount - 1; //Scroll to `\page`, which is one line back.
+
+				let currentY = this.refs.codeEditor.codeMirror.getScrollInfo().top;
+				let targetY  = this.refs.codeEditor.codeMirror.heightAtLine(targetLine, 'local', true);
+
+				//Scroll 1/10 of the way every 10ms until 1px off.
+				const incrementalScroll = setInterval(()=>{
+					currentY += (targetY - currentY) / 10;
+					this.refs.codeEditor.codeMirror.scrollTo(null, currentY);
+
+					// Update target: target height is not accurate until within +-10 lines of the visible window
+					if(Math.abs(targetY - currentY > 100))
+						targetY = this.refs.codeEditor.codeMirror.heightAtLine(targetLine, 'local', true);
+
+					// End when close enough
+					if(Math.abs(targetY - currentY) < 1) {
+						this.refs.codeEditor.codeMirror.scrollTo(null, targetY);  // Scroll any remaining difference
+						this.refs.codeEditor.setCursorPosition({ line: targetLine + 1, ch: 0 });
+						this.refs.codeEditor.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
+						clearInterval(incrementalScroll);
+					}
+				}, 10);
+			}
+		}
 	},
 
 	//Called when there are changes to the editor's dimensions
@@ -248,6 +327,7 @@ const Editor = createClass({
 					onInject={this.handleInject}
 					showEditButtons={this.props.showEditButtons}
 					renderer={this.props.renderer}
+					theme={this.props.brew.theme}
 					undo={this.undo}
 					redo={this.redo}
 					historySize={this.historySize()} />

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -1,9 +1,14 @@
+/* eslint-disable max-lines */
 require('./metadataEditor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 const request = require('superagent');
+const Nav = require('naturalcrit/nav/nav.jsx');
+const StringArrayEditor = require('../stringArrayEditor/stringArrayEditor.jsx');
+
+const Themes = require('themes/themes.json');
 
 const SYSTEMS = ['5e', '4e', '3.5e', 'Pathfinder'];
 
@@ -17,11 +22,12 @@ const MetadataEditor = createClass({
 				editId      : null,
 				title       : '',
 				description : '',
-				tags        : '',
+				tags        : [],
 				published   : false,
 				authors     : [],
 				systems     : [],
-				renderer    : 'legacy'
+				renderer    : 'legacy',
+				theme       : '5ePHB'
 			},
 			onChange : ()=>{}
 		};
@@ -45,9 +51,10 @@ const MetadataEditor = createClass({
 	},
 
 	handleFieldChange : function(name, e){
-		this.props.onChange(_.merge({}, this.props.metadata, {
+		this.props.onChange({
+			...this.props.metadata,
 			[name] : e.target.value
-		}));
+		});
 	},
 	handleSystem : function(system, e){
 		if(e.target.checked){
@@ -60,13 +67,22 @@ const MetadataEditor = createClass({
 	handleRenderer : function(renderer, e){
 		if(e.target.checked){
 			this.props.metadata.renderer = renderer;
+			if(renderer == 'legacy')
+				this.props.metadata.theme = '5ePHB';
 		}
 		this.props.onChange(this.props.metadata);
 	},
 	handlePublish : function(val){
-		this.props.onChange(_.merge({}, this.props.metadata, {
+		this.props.onChange({
+			...this.props.metadata,
 			published : val
-		}));
+		});
+	},
+
+	handleTheme : function(theme){
+		this.props.metadata.renderer = theme.renderer;
+		this.props.metadata.theme    = theme.path;
+		this.props.onChange(this.props.metadata);
 	},
 
 	handleDelete : function(){
@@ -135,6 +151,45 @@ const MetadataEditor = createClass({
 		</div>;
 	},
 
+	renderThemeDropdown : function(){
+		if(!global.enable_themes) return;
+
+		const listThemes = (renderer)=>{
+			return _.map(_.values(Themes[renderer]), (theme)=>{
+				return <div className='item' key={''} onClick={()=>this.handleTheme(theme)} title={''}>
+					{`${theme.renderer} : ${theme.name}`}
+					<img src={`/themes/${theme.renderer}/${theme.path}/dropdownTexture.png`}/>
+				</div>;
+			});
+		};
+
+		const currentTheme = Themes[`${_.upperFirst(this.props.metadata.renderer)}`][this.props.metadata.theme];
+		let dropdown;
+
+		if(this.props.metadata.renderer == 'legacy') {
+			dropdown =
+				<Nav.dropdown className='disabled' trigger='disabled'>
+					<div>
+						{`Themes are not supported in the Legacy Renderer`} <i className='fas fa-caret-down'></i>
+					</div>
+				</Nav.dropdown>;
+		} else {
+			dropdown =
+				<Nav.dropdown trigger='click'>
+					<div>
+						{`${_.upperFirst(currentTheme.renderer)} : ${currentTheme.name}`} <i className='fas fa-caret-down'></i>
+					</div>
+					{/*listThemes('Legacy')*/}
+					{listThemes('V3')}
+				</Nav.dropdown>;
+		}
+
+		return <div className='field themes'>
+			<label>theme</label>
+			{dropdown}
+		</div>;
+	},
+
 	renderRenderOptions : function(){
 		if(!global.enable_v3) return;
 
@@ -161,8 +216,8 @@ const MetadataEditor = createClass({
 					V3
 				</label>
 
-				<a href='/v3_preview' target='_blank' rel='noopener noreferrer'>
-					Click here for a quick intro to V3!
+				<a href='/legacy' target='_blank' rel='noopener noreferrer'>
+					Click here to see the demo page for the old Legacy renderer!
 				</a>
 			</div>
 		</div>;
@@ -193,13 +248,11 @@ const MetadataEditor = createClass({
 				</button>
 				{this.renderThumbnail()}
 			</div>
-			{/*}
-			<div className='field tags'>
-				<label>tags</label>
-				<textarea value={this.props.metadata.tags}
-					onChange={(e)=>this.handleFieldChange('tags', e)} />
-			</div>
-			*/}
+
+			<StringArrayEditor label='tags' valuePatterns={[/^(?:(?:group|meta|system|type):)?[A-Za-z0-9][A-Za-z0-9 \/.\-]{0,40}$/]}
+				placeholder='add tag' unique={true}
+				values={this.props.metadata.tags}
+				onChange={(e)=>this.handleFieldChange('tags', e)}/>
 
 			{this.renderAuthors()}
 
@@ -210,6 +263,8 @@ const MetadataEditor = createClass({
 				</div>
 			</div>
 
+			{this.renderThemeDropdown()}
+
 			{this.renderRenderOptions()}
 
 			<div className='field publish'>

client/homebrew/editor/metadataEditor/metadataEditor.less

@@ -1,3 +1,4 @@
+@import 'naturalcrit/styles/colors.less';
 
 .metadataEditor{
 	position         : absolute;
@@ -14,7 +15,7 @@
 			display        : inline-block;
 			vertical-align : top;
 			width          : 80px;
-			font-size      : 0.7em;
+			font-size      : 11px;
 			font-weight    : 800;
 			line-height    : 1.8em;
 			text-transform : uppercase;
@@ -108,4 +109,136 @@
 		font-size: 0.8em;
 		line-height    : 1.5em;
 	}
+
+	.themes.field{
+		font-size : 13.33px;
+		.navDropdownContainer {
+			background-color	: white;
+			width				: 100%;
+			position			: relative;
+			z-index				: 500;
+			&.disabled {
+				font-style			:italic;
+				font-style			: italic;
+				background-color	: darkgray;
+				color				: dimgray;
+			}
+			&>div:first-child {
+				border 				: 2px solid rgb(118,118,118);
+				padding 			: 6px 3px;
+				background-color 	: inherit;
+				i {
+					float	: right;
+				}
+				&:hover {
+					background-color	: @blue;
+					color				: white;
+				}
+			}
+			.navDropdown {
+				box-shadow	: 0px 5px 10px rgba(0, 0, 0, 0.3);
+				position	: absolute;
+				width		: 100%;
+				.item {
+					padding				: 3px 3px;
+					border-top			: 1px solid rgb(118, 118, 118);
+					position			: relative;
+					overflow			: hidden;
+					background-color	: white;
+					&:hover {
+						background-color	: @blue;
+						color				: white;
+					}
+					img {
+						mask-image			: linear-gradient(90deg, transparent, black 20%);
+						-webkit-mask-image	: linear-gradient(90deg, transparent, black 20%);
+				    position	: absolute;
+				    left		: ~"max(100px, 100% - 300px)";
+				    top			: 0px;
+					}
+				}
+			}
+		}
+	}
+	.field .list {
+		display: flex;
+		flex-wrap: wrap;
+
+		> * {
+			flex: 0 0 auto;
+		}
+
+		#groupedIcon {
+			#backgroundColors;
+			display: inline-block;
+			height: ~"calc(100% + 0.6em)";
+			position: relative;
+			top: -0.3em;
+			right: -0.3em;
+			cursor: pointer;
+			min-width: 20px;
+			text-align: center;
+			color: white;
+
+			i {
+				position: relative;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+
+			&:not(:last-child) {
+				border-right: 1px solid black;
+			}
+
+			&:last-child {
+				border-radius: 0 0.5em 0.5em 0;
+			}
+		}
+
+		.badge {
+			background-color: #dddddd;
+			border-radius: .5em;
+			font-size: .9em;
+			margin: 2px;
+			padding: .3em;
+
+			.icon {
+				#groupedIcon
+			}
+		}
+
+		.input-group {
+			height: ~"calc(.9em + 4px + .6em)";
+
+			input {
+				border-radius: .5em 0 0 .5em;
+			}
+
+			input:last-child {
+				border-radius: .5em;
+			}
+
+			.value {
+				width: 7.5vw;
+				min-width: 75px;
+				height: 100%;
+			}
+
+			.invalid:focus {
+				background-color: pink;
+			}
+
+			.icon {
+				#groupedIcon;
+				height: 97%;
+				font-size: .8em;
+				right: 1px;
+				top: -.54em;
+
+				i {
+					font-size: 1.125em;
+				}
+			}
+		}
+	}
 }

client/homebrew/editor/snippetbar/snippetbar.jsx

@@ -4,9 +4,16 @@ const createClass = require('create-react-class');
 const _     = require('lodash');
 const cx    = require('classnames');
 
+//Import all themes
 
-const SnippetsLegacy = require('./snippetsLegacy/snippets.js');
-const SnippetsV3 = require('./snippets/snippets.js');
+const Themes = require('themes/themes.json');
+
+const ThemeSnippets = {};
+ThemeSnippets['Legacy_5ePHB'] = require('themes/Legacy/5ePHB/snippets.js');
+ThemeSnippets['V3_5ePHB']     = require('themes/V3/5ePHB/snippets.js');
+ThemeSnippets['V3_5eDMG']     = require('themes/V3/5eDMG/snippets.js');
+ThemeSnippets['V3_Journal']   = require('themes/V3/Journal/snippets.js');
+ThemeSnippets['V3_Blank']     = require('themes/V3/Blank/snippets.js');
 
 const execute = function(val, brew){
 	if(_.isFunction(val)) return val(brew);
@@ -32,21 +39,63 @@ const Snippetbar = createClass({
 
 	getInitialState : function() {
 		return {
-			renderer : this.props.renderer
+			renderer : this.props.renderer,
+			snippets : []
 		};
 	},
 
+	componentDidMount : async function() {
+		const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
+		const themePath    = this.props.theme ?? '5ePHB';
+		let snippets = _.cloneDeep(ThemeSnippets[`${rendererPath}_${themePath}`]);
+		snippets = this.compileSnippets(rendererPath, themePath, snippets);
+		this.setState({
+			snippets : snippets
+		});
+	},
+
+	componentDidUpdate : async function(prevProps) {
+		if(prevProps.renderer != this.props.renderer || prevProps.theme != this.props.theme) {
+			const rendererPath = this.props.renderer == 'V3' ? 'V3' : 'Legacy';
+			const themePath    = this.props.theme ?? '5ePHB';
+			let snippets = _.cloneDeep(ThemeSnippets[`${rendererPath}_${themePath}`]);
+			snippets = this.compileSnippets(rendererPath, themePath, snippets);
+			this.setState({
+				snippets : snippets
+			});
+		}
+	},
+
+	mergeCustomizer : function(valueA, valueB, key) {
+		if(key == 'snippets') {
+			const result = _.reverse(_.unionBy(_.reverse(valueB), _.reverse(valueA), 'name')); // Join snippets together, with preference for the current theme over the base theme
+			return _.filter(result, 'gen'); //Only keep snippets with a 'gen' property.
+		}
+	},
+
+	compileSnippets : function(rendererPath, themePath, snippets) {
+		let compiledSnippets = snippets;
+		const baseSnippetsPath = Themes[rendererPath][themePath].baseSnippets;
+
+		const objB = _.keyBy(compiledSnippets, 'groupName');
+
+		if(baseSnippetsPath) {
+			const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_${baseSnippetsPath}`]), 'groupName');
+			compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
+			compiledSnippets = this.compileSnippets(rendererPath, baseSnippetsPath, _.cloneDeep(compiledSnippets));
+		} else {
+			const objA = _.keyBy(_.cloneDeep(ThemeSnippets[`${rendererPath}_Blank`]), 'groupName');
+			compiledSnippets = _.values(_.mergeWith(objA, objB, this.mergeCustomizer));
+		}
+		return compiledSnippets;
+	},
+
 	handleSnippetClick : function(injectedText){
 		this.props.onInject(injectedText);
 	},
 
 	renderSnippetGroups : function(){
-		let snippets = [];
-
-		if(this.props.renderer === 'V3')
-			snippets = SnippetsV3.filter((snippetGroup)=>snippetGroup.view === this.props.view);
-		else
-			snippets = SnippetsLegacy.filter((snippetGroup)=>snippetGroup.view === this.props.view);
+		const snippets = this.state.snippets.filter((snippetGroup)=>snippetGroup.view === this.props.view);
 
 		return _.map(snippets, (snippetGroup)=>{
 			return <SnippetGroup

client/homebrew/editor/stringArrayEditor/stringArrayEditor.jsx

@@ -0,0 +1,142 @@
+const React = require('react');
+const createClass = require('create-react-class');
+const _     = require('lodash');
+
+const StringArrayEditor = createClass({
+	displayName     : 'StringArrayEditor',
+	getDefaultProps : function() {
+		return {
+			label         : '',
+			values        : [],
+			valuePatterns : null,
+			placeholder   : '',
+			unique        : false,
+			cannotEdit    : [],
+			onChange      : ()=>{}
+		};
+	},
+
+	getInitialState : function() {
+		return {
+			valueContext : !!this.props.values ? this.props.values.map((value)=>({
+				value,
+				editing : false
+			})) : [],
+			temporaryValue : '',
+			updateValue    : ''
+		};
+	},
+
+	componentDidUpdate : function(prevProps) {
+		if(!_.eq(this.props.values, prevProps.values)) {
+			this.setState({
+				valueContext : this.props.values ? this.props.values.map((newValue)=>({
+					value   : newValue,
+					editing : this.state.valueContext.find(({ value })=>value === newValue)?.editing || false
+				})) : []
+			});
+		}
+	},
+
+	handleChange : function(value) {
+		this.props.onChange({
+			target : {
+				value
+			}
+		});
+	},
+
+	addValue : function(value){
+		this.handleChange(_.uniq([...this.props.values, value]));
+		this.setState({
+			temporaryValue : ''
+		});
+	},
+
+	removeValue : function(index){
+		this.handleChange(this.props.values.filter((_, i)=>i !== index));
+	},
+
+	updateValue : function(value, index){
+		const valueContext = this.state.valueContext;
+		valueContext[index].value = value;
+		valueContext[index].editing = false;
+		this.handleChange(valueContext.map((context)=>context.value));
+		this.setState({ valueContext, updateValue: '' });
+	},
+
+	editValue : function(index){
+		if(!!this.props.cannotEdit && this.props.cannotEdit.includes(this.props.values[index])) {
+			return;
+		}
+		const valueContext = this.state.valueContext.map((context, i)=>{
+			context.editing = index === i;
+			return context;
+		});
+		this.setState({ valueContext, updateValue: this.props.values[index] });
+	},
+
+	valueIsValid : function(value, index) {
+		const values = _.clone(this.props.values);
+		if(index !== undefined) {
+			values.splice(index, 1);
+		}
+		const matchesPatterns = !this.props.valuePatterns || this.props.valuePatterns.some((pattern)=>!!(value || '').match(pattern));
+		const uniqueIfSet = !this.props.unique || !values.includes(value);
+		return matchesPatterns && uniqueIfSet;
+	},
+
+	handleValueInputKeyDown : function(event, index) {
+		if(event.key === 'Enter') {
+			if(this.valueIsValid(event.target.value, index)) {
+				if(index !== undefined) {
+					this.updateValue(event.target.value, index);
+				} else {
+					this.addValue(event.target.value);
+				}
+			}
+		} else if(event.key === 'Escape') {
+			this.closeEditInput(index);
+		}
+	},
+
+	closeEditInput : function(index) {
+		const valueContext = this.state.valueContext;
+		valueContext[index].editing = false;
+		this.setState({ valueContext, updateValue: '' });
+	},
+
+	render : function() {
+		const valueElements = Object.values(this.state.valueContext).map((context, i)=>context.editing
+			? <React.Fragment key={i}>
+				<div className='input-group'>
+					<input type='text' className={`value ${this.valueIsValid(this.state.updateValue, i) ? '' : 'invalid'}`} autoFocus placeholder={this.props.placeholder}
+						value={this.state.updateValue}
+						onKeyDown={(e)=>this.handleValueInputKeyDown(e, i)}
+						onChange={(e)=>this.setState({ updateValue: e.target.value })}/>
+					{<div className='icon steel' onClick={(e)=>{ e.stopPropagation(); this.closeEditInput(i); }}><i className='fa fa-undo fa-fw'/></div>}
+					{this.valueIsValid(this.state.updateValue, i) ? <div className='icon steel'  onClick={(e)=>{ e.stopPropagation(); this.updateValue(this.state.updateValue, i); }}><i className='fa fa-check fa-fw'/></div> : null}
+				</div>
+			</React.Fragment>
+			: <div className='badge' key={i} onClick={()=>this.editValue(i)}>{context.value}
+				{!!this.props.cannotEdit && this.props.cannotEdit.includes(context.value) ? null : <div className='icon steel' onClick={(e)=>{ e.stopPropagation(); this.removeValue(i); }}><i className='fa fa-times fa-fw'/></div>}
+			</div>
+		);
+
+		return <div className='field values'>
+			<label>{this.props.label}</label>
+			<div className='list'>
+				{valueElements}
+				<div className='input-group'>
+					<input type='text' className={`value ${this.valueIsValid(this.state.temporaryValue) ? '' : 'invalid'}`} placeholder={this.props.placeholder}
+						value={this.state.temporaryValue}
+						onKeyDown={(e)=>this.handleValueInputKeyDown(e)}
+						onChange={(e)=>this.setState({ temporaryValue: e.target.value })}/>
+					{this.valueIsValid(this.state.temporaryValue) ? <div className='icon steel' onClick={(e)=>{ e.stopPropagation(); this.addValue(this.state.temporaryValue); }}><i className='fa fa-check fa-fw'/></div> : null}
+				</div>
+			</div>
+		</div>;
+	}
+});
+
+module.exports = StringArrayEditor;

client/homebrew/homebrew.jsx

@@ -1,8 +1,8 @@
 require('./homebrew.less');
 const React = require('react');
 const createClass = require('create-react-class');
-const { StaticRouter:Router, Switch, Route } = require('react-router-dom');
-const queryString = require('query-string');
+const { StaticRouter:Router } = require('react-router-dom/server');
+const { Route, Routes, useParams, useSearchParams } = require('react-router-dom');
 
 const HomePage = require('./pages/homePage/homePage.jsx');
 const EditPage = require('./pages/editPage/editPage.jsx');
@@ -13,6 +13,23 @@ const NewPage = require('./pages/newPage/newPage.jsx');
 const PrintPage = require('./pages/printPage/printPage.jsx');
 const AccountPage = require('./pages/accountPage/accountPage.jsx');
 
+const WithRoute = (props)=>{
+	const params = useParams();
+	const [searchParams] = useSearchParams();
+	const queryParams = {};
+	for (const [key, value] of searchParams?.entries() || []) {
+		queryParams[key] = value;
+	}
+	const Element = props.el;
+	const allProps = {
+		...props,
+		...params,
+		query : queryParams,
+		el    : undefined
+	};
+	return <Element {...allProps} />;
+};
+
 const Homebrew = createClass({
 	displayName     : 'Homebrewery',
 	getDefaultProps : function() {
@@ -38,6 +55,7 @@ const Homebrew = createClass({
 		global.account = this.props.account;
 		global.version = this.props.version;
 		global.enable_v3 = this.props.enable_v3;
+		global.enable_themes = this.props.enable_themes;
 		global.config = this.props.config;
 
 		return {};
@@ -59,7 +77,9 @@ const Homebrew = createClass({
 						<Route path='/faq' exact component={()=><SharePage brew={this.props.brew} />}/>
 						<Route path='/v3_preview' exact component={()=><HomePage brew={this.props.brew} />}/>
 						<Route path='/account' exact component={()=><AccountPage brew={this.props.brew} uiItems={this.props.brew.uiItems} />}/>
-						<Route path='/' component={()=><HomePage brew={this.props.brew} />}/>
+						<Route path='/legacy' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
+					  	<Route path='/' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
+					  	<Route path='/*' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
 					</Switch>
 				</div>
 			</Router>

client/homebrew/homebrew.less

@@ -6,10 +6,12 @@
 		height           : 100%;
 		background-color : @steel;
 		flex-direction   : column;
+		overflow-y       : hidden;
 		.content{
 			position   : relative;
 			height     : calc(~"100% - 29px"); //Navbar height
 			flex       : auto;
+			overflow-y : scroll;
 		}
 	}
 }

client/homebrew/navbar/help.navitem.jsx

@@ -12,10 +12,10 @@ module.exports = function(props){
 		</Nav.item>
 		<Nav.item color='red' icon='fas fa-fw fa-bug'
 			href={`https://www.reddit.com/r/homebrewery/submit?selftext=true&text=${encodeURIComponent(dedent`
-			**Browser(s)** :
-			**Operating System** :  
-			**Legacy or v3 Renderer** :
-			**Issue** :  `)}`}
+			- **Browser(s)** :
+			- **Operating System** :  
+			- **Legacy or v3 Renderer** :
+			- **Issue** :  `)}`}
 			newTab={true}
 			rel='noopener noreferrer'>
 			report issue

client/homebrew/navbar/navbar.less

@@ -91,7 +91,7 @@
 				&:nth-of-type(2){ background-color: darken(@purple, 30%); }
 			}
 			.item{
-				#backgroundColors;
+				#backgroundColorsHover;
 				.animate(background-color);
 				position         : relative;
 				display          : block;

client/homebrew/pages/basePages/listPage/brewItem/brewItem.jsx

@@ -16,8 +16,8 @@ const BrewItem = createClass({
 			brew : {
 				title       : '',
 				description : '',
-
-				authors : []
+				authors     : [],
+				stubbed     : true
 			}
 		};
 	},
@@ -50,7 +50,7 @@ const BrewItem = createClass({
 		if(!this.props.brew.editId) return;
 
 		let editLink = this.props.brew.editId;
-		if(this.props.brew.googleId) {
+		if(this.props.brew.googleId && !this.props.brew.stubbed) {
 			editLink = this.props.brew.googleId + editLink;
 		}
 
@@ -63,7 +63,7 @@ const BrewItem = createClass({
 		if(!this.props.brew.shareId) return;
 
 		let shareLink = this.props.brew.shareId;
-		if(this.props.brew.googleId) {
+		if(this.props.brew.googleId && !this.props.brew.stubbed) {
 			shareLink = this.props.brew.googleId + shareLink;
 		}
 
@@ -76,7 +76,7 @@ const BrewItem = createClass({
 		if(!this.props.brew.shareId) return;
 
 		let shareLink = this.props.brew.shareId;
-		if(this.props.brew.googleId) {
+		if(this.props.brew.googleId && !this.props.brew.stubbed) {
 			shareLink = this.props.brew.googleId + shareLink;
 		}
 
@@ -86,7 +86,7 @@ const BrewItem = createClass({
 	},
 
 	renderGoogleDriveIcon : function(){
-		if(!this.props.brew.gDrive) return;
+		if(!this.props.brew.googleId) return;
 
 		return <span>
 			<img className='googleDriveIcon' src={googleDriveIcon} alt='googleDriveIcon' />
@@ -95,17 +95,35 @@ const BrewItem = createClass({
 
 	render : function(){
 		const brew = this.props.brew;
+		if(Array.isArray(brew.tags)) {               // temporary fix until dud tags are cleaned
+			brew.tags = brew.tags?.filter((tag)=>tag); //remove tags that are empty strings
+		}
 		const dateFormatString = 'YYYY-MM-DD HH:mm:ss';
 
 		return <div className='brewItem'>
+			{brew.thumbnail &&
+				<div className='thumbnail' style={{ backgroundImage: `url(${brew.thumbnail})` }} >
+				</div>
+			}
 			<div className='text'>
 				<h2>{brew.title}</h2>
 				<p className='description'>{brew.description}</p>
 			</div>
 			<hr />
 			<div className='info'>
-				<span title={`Authors:\n${brew.authors.join('\n')}`}>
-					<i className='fas fa-user'/> {brew.authors.join(', ')}
+
+				{brew.tags?.length ? <>
+					<div className='brewTags' title={`Tags:\n${brew.tags.join('\n')}`}>
+						<i className='fas fa-tags'/>
+						{brew.tags.map((tag, idx)=>{
+							const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
+							return <span className={matches[1]}>{matches[2]}</span>;
+						})}
+					</div>
+				</> : <></>
+				}
+				<span title={`Authors:\n${brew.authors?.join('\n')}`}>
+					<i className='fas fa-user'/> {brew.authors?.join(', ')}
 				</span>
 				<br />
 				<span title={`Last viewed: ${moment(brew.lastViewed).local().format(dateFormatString)}`}>

client/homebrew/pages/basePages/listPage/brewItem/brewItem.less

@@ -10,7 +10,7 @@
 	min-height                  : 105px;
 	margin-right                : 15px;
 	margin-bottom               : 15px;
-	padding                     : 5px 15px 2px 8px;
+	padding                     : 5px 15px 2px 6px;
 	padding-right               : 15px;
 	border                      : 1px solid #c9ad6a;
 	border-radius               : 5px;
@@ -19,6 +19,20 @@
 	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;
+		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%);
+		opacity: 50%;
+	}
 	.text {
 		min-height : 54px;
 		h4{
@@ -29,13 +43,23 @@
 	.info{
 		position: initial;
 		bottom: 2px;
-		font-family : ScalySans;
+		font-family : ScalySansRemake;
 		font-size   : 1.2em;
 		&>span{
 			margin-right : 12px;
 			line-height  : 1.5em;
 		}
 	}
+	.brewTags span {
+		background-color: #c8ac6e3b;
+		margin: 2px;
+		padding: 2px;
+		border: 1px solid #c8ac6e;
+		border-radius: 4px;
+		white-space: nowrap;
+		display: inline-block;
+		font-weight: bold;
+	}
 	&:hover{
 		.links{
 			opacity : 1;

client/homebrew/pages/basePages/listPage/listPage.jsx

@@ -1,3 +1,4 @@
+/*eslint max-lines: ["warn", {"max": 300, "skipBlankLines": true, "skipComments": true}]*/
 require('./listPage.less');
 const React       = require('react');
 const createClass = require('create-react-class');
@@ -6,6 +7,11 @@ const moment      = require('moment');
 
 const BrewItem    = require('./brewItem/brewItem.jsx');
 
+const USERPAGE_KEY_PREFIX = 'HOMEBREWERY-LISTPAGE';
+
+const DEFAULT_SORT_TYPE = 'alpha';
+const DEFAULT_SORT_DIR = 'asc';
+
 const ListPage = createClass({
 	displayName     : 'ListPage',
 	getDefaultProps : function() {
@@ -21,14 +27,56 @@ const ListPage = createClass({
 		};
 	},
 	getInitialState : function() {
+		// HIDE ALL GROUPS UNTIL LOADED
+		const brewCollection = this.props.brewCollection.map((brewGroup)=>{
+			brewGroup.visible = false;
+			return brewGroup;
+		});
+
 		return {
-			sortType     : 'alpha',
-			sortDir      : 'asc',
-			filterString : this.props.query?.filter || '',
-			query        : this.props.query
+			filterString   : this.props.query?.filter || '',
+			sortType       : this.props.query?.sort || null,
+			sortDir        : this.props.query?.dir || null,
+			query          : this.props.query,
+			brewCollection : brewCollection
 		};
 	},
 
+	componentDidMount : function() {
+		// SAVE TO LOCAL STORAGE WHEN LEAVING PAGE
+		window.onbeforeunload = this.saveToLocalStorage;
+
+		// LOAD FROM LOCAL STORAGE
+		if(typeof window !== 'undefined') {
+			const newSortType = (this.state.sortType ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`) || DEFAULT_SORT_TYPE));
+			const newSortDir = (this.state.sortDir ?? (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`) || DEFAULT_SORT_DIR));
+			this.updateUrl(this.state.filterString, newSortType, newSortDir);
+
+			const brewCollection = this.props.brewCollection.map((brewGroup)=>{
+				brewGroup.visible = (localStorage.getItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`) ?? 'true')=='true';
+				return brewGroup;
+			});
+
+			this.setState({
+				brewCollection : brewCollection,
+				sortType       : newSortType,
+				sortDir        : newSortDir
+			});
+		};
+	},
+
+	componentWillUnmount : function() {
+		window.onbeforeunload = function(){};
+	},
+
+	saveToLocalStorage : function() {
+		this.state.brewCollection.map((brewGroup)=>{
+			localStorage.setItem(`${USERPAGE_KEY_PREFIX}-VISIBILITY-${brewGroup.class}`, `${brewGroup.visible}`);
+		});
+		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTTYPE`, this.state.sortType);
+		localStorage.setItem(`${USERPAGE_KEY_PREFIX}-SORTDIR`, this.state.sortDir);
+	},
+
 	renderBrews : function(brews){
 		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
 
@@ -50,14 +98,18 @@ const ListPage = createClass({
 	},
 
 	handleSortOptionChange : function(event){
+		this.updateUrl(this.state.filterString, event.target.value, this.state.sortDir);
 		this.setState({
 			sortType : event.target.value
 		});
 	},
 
 	handleSortDirChange : function(event){
+		const newDir = this.state.sortDir == 'asc' ? 'desc' : 'asc';
+
+		this.updateUrl(this.state.filterString, this.state.sortType, newDir);
 		this.setState({
-			sortDir : `${(this.state.sortDir == 'asc' ? 'desc' : 'asc')}`
+			sortDir : newDir
 		});
 	},
 
@@ -77,19 +129,22 @@ const ListPage = createClass({
 		this.setState({
 			filterString : e.target.value,
 		});
-		this.updateUrl(e.target.value);
+		this.updateUrl(e.target.value, this.state.sortType, this.state.sortDir);
 		return;
 	},
 
-	updateUrl : function(filterTerm){
+	updateUrl : function(filterTerm, sortType, sortDir){
 		const url = new URL(window.location.href);
 		const urlParams = new URLSearchParams(url.search);
-		if(urlParams.get('filter') == filterTerm)
-			return;
+
+		urlParams.set('sort', sortType);
+		urlParams.set('dir', sortDir);
+
 		if(!filterTerm)
 			urlParams.delete('filter');
 		else
 			urlParams.set('filter', filterTerm);
+
 		url.search = urlParams;
 		window.history.replaceState(null, null, url);
 	},
@@ -100,7 +155,6 @@ const ListPage = createClass({
 				<i className='fas fa-search'></i>
 				<input
 					type='search'
-					autoFocus={true}
 					placeholder='filter title/description'
 					onChange={this.handleFilterTextChange}
 					value={this.state.filterString}
@@ -142,32 +196,48 @@ const ListPage = createClass({
 
 	getSortedBrews : function(brews){
 		const testString = _.deburr(this.state.filterString).toLowerCase();
-		brews = _.filter(brews, (brew)=>{
-			return (_.deburr(brew.title).toLowerCase().includes(testString)) ||
-			(_.deburr(brew.description).toLowerCase().includes(testString));
-		});
 
+		brews = _.filter(brews, (brew)=>{
+			const brewStrings = _.deburr([
+				brew.title,
+				brew.description,
+				brew.tags].join('\n')
+				.toLowerCase());
+
+			return brewStrings.includes(testString);
+		});
 		return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
 	},
 
+	toggleBrewCollectionState : function(brewGroupClass) {
+		this.setState((prevState)=>({
+			brewCollection : prevState.brewCollection.map(
+				(brewGroup)=>brewGroup.class === brewGroupClass ? { ...brewGroup, visible: !brewGroup.visible } : brewGroup
+			)
+		}));
+	},
+
 	renderBrewCollection : function(brewCollection){
+		if(brewCollection == []) return <div className='brewCollection'>
+			<h1>No Brews</h1>
+		</div>;
 		return _.map(brewCollection, (brewGroup, idx)=>{
 			return <div key={idx} className={`brewCollection ${brewGroup.class ?? ''}`}>
-				<h1>{brewGroup.title || 'No Title'}</h1>
-				{this.renderBrews(this.getSortedBrews(brewGroup.brews))}
+				<h1 className={brewGroup.visible ? 'active' : 'inactive'} onClick={()=>{this.toggleBrewCollectionState(brewGroup.class);}}>{brewGroup.title || 'No Title'}</h1>
+				{brewGroup.visible ? this.renderBrews(this.getSortedBrews(brewGroup.brews)) : <></>}
 			</div>;
 		});
 	},
 
 	render : function(){
 		return <div className='listPage sitePage'>
-			<link href='/themes/5ePhbLegacy.style.css' rel='stylesheet'/>
+			<link href='/themes/V3/5ePHB/style.css' rel='stylesheet'/>
 			{this.props.navItems}
 
 			<div className='content V3'>
-				<div className='phb'>
+				<div className='phb page'>
 					{this.renderSortOptions()}
-					{this.renderBrewCollection(this.props.brewCollection)}
+					{this.renderBrewCollection(this.state.brewCollection)}
 				</div>
 			</div>
 		</div>;

client/homebrew/pages/basePages/listPage/listPage.less

@@ -13,7 +13,7 @@
 }
 .listPage{
 	.content{
-		overflow-y : scroll;
+		overflow-y : overlay;
 		.phb{
 			.noColumns();
 			height     : auto;
@@ -34,7 +34,7 @@
 		font-family        : 'Open Sans', sans-serif;
 		position           : fixed;
 		top                : 35px;
-		left               : calc(50vw - 408px);
+		left               : calc(50vw - 400px);
 		border             : 2px solid #58180D;
 		width              : 800px;
 		background-color   : #EEE5CE;
@@ -74,4 +74,26 @@
 			}
 		}
 	}
+	h1 {
+		cursor: pointer;
+		&.active {
+			color: #58180D;
+		}
+		&.inactive {
+			color: #707070;
+			
+		}
+		&.active::before, &.inactive::before {
+			font-family: 'Font Awesome 5 Free';
+			font-weight: 900;
+			font-size: 0.6cm;
+    			padding-right: 0.5em;
+		}
+		&.active::before {
+			content: '\f107';
+		}
+		&.inactive::before {
+			content: '\f105';
+		}
+	}
 }

client/homebrew/pages/editPage/editPage.jsx

@@ -114,7 +114,7 @@ const EditPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew       : _.merge({}, prevState.brew, { text: text }),
+			brew       : { ...prevState.brew, text: text },
 			isPending  : true,
 			htmlErrors : htmlErrors
 		}), ()=>this.trySave());
@@ -122,14 +122,17 @@ const EditPage = createClass({
 
 	handleStyleChange : function(style){
 		this.setState((prevState)=>({
-			brew      : _.merge({}, prevState.brew, { style: style }),
+			brew      : { ...prevState.brew, style: style },
 			isPending : true
 		}), ()=>this.trySave());
 	},
 
 	handleMetaChange : function(metadata){
 		this.setState((prevState)=>({
-			brew      : _.merge({}, prevState.brew, metadata),
+			brew : {
+				...prevState.brew,
+				...metadata
+			},
 			isPending : true,
 		}), ()=>this.trySave());
 
@@ -200,7 +203,7 @@ const EditPage = createClass({
 		const brew = this.state.brew;
 		brew.pageCount = ((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
 
-		const params = `${transfer ? `?transfer${this.state.saveGoogle ? 'To' : 'From'}Google=true` : ''}`;
+		const params = `${transfer ? `?${this.state.saveGoogle ? 'saveToGoogle' : 'removeFromGoogle'}=true` : ''}`;
 		const res = await request
 			.put(`/api/update/${brew.editId}${params}`)
 			.send(brew)
@@ -210,16 +213,14 @@ const EditPage = createClass({
 			});
 
 		this.savedBrew = res.body;
-		if(transfer) {
-			history.replaceState(null, null, `/edit/${this.savedBrew.googleId ?? ''}${this.savedBrew.editId}`);
-		}
+		history.replaceState(null, null, `/edit/${this.savedBrew.editId}`);
 
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, {
+			brew : { ...prevState.brew,
 				googleId : this.savedBrew.googleId ? this.savedBrew.googleId : null,
 				editId 	 : this.savedBrew.editId,
 				shareId  : this.savedBrew.shareId
-			}),
+			},
 			isPending : false,
 			isSaving  : false,
 		}));
@@ -321,7 +322,7 @@ const EditPage = createClass({
 				<div className='errorContainer'>
 					Looks like there was a problem saving. <br />
 					Report the issue <a target='_blank' rel='noopener noreferrer'
-						href={`https://github.com/naturalcrit/homebrewery/issues/new?body=${encodeURIComponent(errMsg)}`}>
+						href={`https://github.com/naturalcrit/homebrewery/issues/new?template=save_issue.yml&error-code=${encodeURIComponent(errMsg)}`}>
 						here
 					</a>.
 				</div>
@@ -340,7 +341,7 @@ const EditPage = createClass({
 	},
 
 	processShareId : function() {
-		return this.state.brew.googleId ?
+		return this.state.brew.googleId && !this.state.brew.stubbed ?
 					 this.state.brew.googleId + this.state.brew.shareId :
 					 this.state.brew.shareId;
 	},
@@ -417,7 +418,7 @@ const EditPage = createClass({
 						onMetaChange={this.handleMetaChange}
 						renderer={this.state.brew.renderer}
 					/>
-					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer} errors={this.state.htmlErrors} />
+					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer} theme={this.state.brew.theme} errors={this.state.htmlErrors} />
 				</SplitPane>
 			</div>
 		</div>;

client/homebrew/pages/homePage/homePage.jsx

@@ -52,7 +52,7 @@ const HomePage = createClass({
 	},
 	handleTextChange : function(text){
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, { text: text })
+			brew : { ...prevState.brew, text: text }
 		}));
 	},
 	renderNavbar : function(){

client/homebrew/pages/homePage/welcome_msg.md

@@ -1,50 +1,68 @@
-# The Homebrewery
+```css
+.page #example + table td {
+	border:1px dashed #00000030;
+}
+.page {
+	padding-bottom : 1.1cm;
+}
+```
 
+# The Homebrewery *V3*
 Welcome traveler from an antique land. Please sit and tell us of what you have seen. The unheard of monsters, who slither and bite. Tell us of the wondrous items and and artifacts you have found, their mysteries yet to be unlocked. Of the vexing vocations and surprising skills you have seen.
 
 ### Homebrew D&D made easy
 The Homebrewery makes the creation and sharing of authentic looking Fifth-Edition homebrews easy. It uses [Markdown](https://help.github.com/articles/markdown-basics/) with a little CSS magic to make your brews come to life.
 
-**Try it!** Simply edit the text on the left and watch it *update live* on the right.
-
-
+**Try it!** Simply edit the text on the left and watch it *update live* on the right. Note that not every button is visible on this demo page. Click New {{fas,fa-plus-square}} in the navbar above to start brewing with all the features!
 
 ### Editing and Sharing
-When you create your own homebrew you will be given a *edit url* and a *share url*.  Any changes you make will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew. So be careful about who you share it with.
+When you create your own homebrew, you will be given a *edit url* and a *share url*.
+
+Any changes you make while on the *edit url* will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew, so be careful about who you share it with.
 
 Anyone with the *share url* will be able to access a read-only version of your homebrew.
 
-## Helping out
+{{note
+##### PDF Creation
+PDF Printing works best in Google Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
+
+After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
+* Set the **Destination** to "Save as PDF"
+* Set **Paper Size** to "Letter"
+* If you are printing on A4 paper, make sure to have the **PRINT → {{far,fa-file}} A4 Pagesize** snippet in your brew
+* In **Options** make sure "Background Images" is selected.
+* Hit print and enjoy! You're done!
+
+If you want to save ink or have a monochrome printer, add the **PRINT → {{fas,fa-tint}} Ink Friendly** snippet to your brew!
+}}
+
+![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px}
+
+{{artist,bottom:160px,left:100px
+##### Homebrew Mug
+[naturalcrit](https://homebrew.naturalcrit.com)
+}}
+
+{{pageNumber 1}}
+{{footnote PART 1 | FANCINESS}}
+
+\column
+
+## New in V3.0.0
+We've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like `div` and `span` in most cases. No raw HTML tags should be needed in a brew (*but can still be used if you insist*).
+
+Much of the syntax and styling has changed in V3, so converting a Legacy brew to V3 (or vice-versa) will require tweaking your document. *However*, all brews made prior to the release of v3.0.0 will still render normally, and you may switch between the "Legacy" brew renderer and the newer "V3" renderer via the {{fa,fa-info-circle}} **Properties** button on your brew at any time.
+
+Scroll down to the next page for a brief summary of the changes and new features available in V3!
+
+#### New Things All The Time!
+Check out the latest updates in the full changelog [here](/changelog).
+
+### Helping out
 Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/Naturalcrit) to help me keep the servers running.
 
 This tool will **always** be free, never have ads, and I will never offer any "premium" features or whatever.
 
-
-
->##### PDF Exporting
-> PDF Printing works best in Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
->
-> After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
-> * Set the **Destination** to "Save as PDF"
-> * Set **Paper Size** to "Letter"
-> * If you are printing on A4 paper, make sure to have the "A4 page size snippet" in your brew
-> * In **Options** make sure "Background Images" is selected.
-> * Hit print and enjoy! You're done!
->
-> If you want to save ink or have a monochrome printer, add the **Ink Friendly** snippet to your brew before you print
-
-
-```
-```
-
-## V3.0.0 Released!
-With the latest major update to *The Homebrewery* we've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like **div** and **span** in most cases. No raw HTML tags should be needed in a brew, and going forward, raw HTML will no longer receive debugging support (*but can still be used if you insist*).
-
-**You can enable V3 via the <span class="fa fa-info-circle" style="text-indent:0"></span> Properties button!**
-
-## New Things All The Time!
-What's new in the latest update? Check out the full changelog [here](/changelog)
-
 ### Bugs, Issues, Suggestions?
 Take a quick look at our [Frequently Asked Questions page](/faq) to see if your question has a handy answer.
 
@@ -53,56 +71,105 @@ Need help getting started or just the right look for your brew? Head to [r/Homeb
 Have an idea to make The Homebrewery better? Or did you find something that wasn't quite right? Check out the [GitHub Repo](https://github.com/naturalcrit/homebrewery/) to report technical issues.
 
 ### Legal Junk
-The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). This means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
+The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). Which means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
 
-If you wish to sell or in some way gain profit for what you make on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
+If you wish to sell or in some way gain profit for what's created on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
 
-### More Resources
+#### Crediting Me
+If you'd like to credit me in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
+
+### More Homebrew Resources
 <a href='https://discord.gg/by3deKx' target='_blank'><img src='/assets/discordOfManyThings.svg' alt='Discord of Many Things Logo' title='Discord of Many Things Logo' style='width:50px; float: right; padding-left: 10px;'/></a>
 If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The <a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'>Discord of Many Things</a> is another great resource to connect with fellow homebrewers for help and feedback.
 
-<img src='https://i.imgur.com/hMna6G0.png' style='position:absolute;bottom:40px;right:30px;width:280px' />
-
-<div class='pageNumber'>1</div>
-<div class='footnote'>PART 1 | FANCINESS</div>
-
-<div style='position: absolute; top: 20px; right: 20px;'>
-<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'><img src='/assets/discord.png' style='height:30px'/></a>
+{{position:absolute;top:20px;right:20px;width:auto
+<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things' style='color: black;'><img src='/assets/discord.png' style='height:30px'/></a>
 <a href='https://github.com/naturalcrit/homebrewery' target='_blank' title='Github' style='color: black; padding-left: 5px;'><img src='/assets/github.png' style='height:30px'/></a>
 <a href='https://patreon.com/NaturalCrit' target='_blank' title='Patreon' style='color: black; padding-left: 5px;'><img src='/assets/patreon.png' style='height:30px'/></a>
 <a href='https://www.reddit.com/r/homebrewery/' target='_blank' title='Reddit' style='color: black; padding-left: 5px;'><img src='/assets/reddit.png' style='height:30px'/></a>
-</div>
+}}
 
 \page
 
-# Appendix
+## Markdown+
+The Homebrewery aims to make homebrewing as simple as possible, providing a live editor with Markdown syntax that is more human-readable and faster to write with than raw HTML.
 
-### Not quite Markdown
-Although the Homebrewery uses Markdown, to get all the styling features from the PHB, we had to get a little creative. Some base HTML elements are not used as expected and I've had to include a few new keywords.
+In version 3.0.0, with a goal of adding maximum flexibility without users resorting to complex HTML to accomplish simple tasks, Homebrewery provides an extended verision of Markdown with additional syntax.
+**You can enable V3 via the {{fa,fa-info-circle}} Properties button!**
 
-___
-* **Horizontal Rules** are generally used to *modify* existing elements into a different style. For example, a horizontal rule before a blockquote will give it the style of a Monster Stat Block instead of a note.
-* **New Pages** are controlled by the author. It's impossible for the site to detect when the end of a page is reached, so indicate you'd like to start a new page, use the new page snippet to get the syntax.
-* **Code Blocks** are used only to indicate column breaks. Since they don't allow for styling within them, they weren't that useful to use.
-* **HTML** can be used to get *just* the right look for your homebrew. I've included some examples in the snippet icons above the editor.
+### Curly Brackets
+The biggest change in V3 is the replacement of `<span></span>` and `<div></div>` with `{{ }}` for a cleaner custom formatting.  Inline spans and block elements can be created and given ID's and Classes, as well as css properties, each of which are comma separated with no spaces. Use double quotes if a value requires spaces. Spans and Blocks start the same:
+
+#### Span
+My favorite author is {{pen,#author,color:orange,font-family:"trebuchet ms" Brandon Sanderson}}.  The orange text has a class of `pen`, an id of `author`, is colored orange, and given a new font. The first space outside of quotes marks the beginning of the content.
 
 
+#### Block
+{{purple,#book,text-align:center,background:#aa88aa55
+My favorite book is Wheel of Time. This block has a class of `purple`, an id of `book`, and centered text with a colored background. The opening and closing brackets are on lines separate from the block contents.
+}}
 
-```
-```
+#### Injection
+For any element not inside a span or block, you can *inject* attributes using the same syntax but with single brackets in a single line immediately after the element.
 
+Inline elements like *italics* {color:#D35400} or images require the injection on the same line.
 
-### Images
-Images must be hosted online somewhere, like imgur. You use the address to that image to reference it in your brew. Images can be included 'inline' with the text using Markdown-style images. However for background images more control is needed.
+Block elements like headers require the injection to start on the line immediately following.
 
-Background images should be included as HTML-style img tags. Using inline CSS you can precisely position your image where you'd like it to be. I have added both a inflow image snippet and a background image snippet to give you exmaples of how to do it.
+##### A Purple Header
+{color:purple,text-align:center}
 
+\* *this does not currently work for tables yet*
 
+### Vertical Spacing
+A blank line can be achieved with a run of one or more `:` alone on a line. More `:`'s will create more space.
 
-### Crediting Me
-If you'd like to credit The Homebrewery in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
+::
 
+Much nicer than `<br><br><br><br><br>`
 
+### Definition Lists
+**Example** :: V3 uses HTML *definition lists* to create "lists" with hanging indents.
 
-<div class='pageNumber'>2</div>
-<div class='footnote'>PART 2 | BORING STUFF</div>
+### Column Breaks
+Column and page breaks with `\column` and `\page`.
+
+\column
+
+### Tables
+Tables now allow column & row spanning between cells. This is included in some updated snippets, but a simplified example is given below.
+
+A cell can be spanned across columns by grouping multiple pipe `|` characters at the end of a cell.
+
+Row spanning is achieved by adding a `^` at the end of a cell just before the `|`.  
+
+These can be combined to span a cell across both columns and rows. Cells must have the same colspan if they are to be rowspan'd.
+
+##### Example
+| Head A | Spanned Header ||
+| Head B | Head C | Head D |
+|:-------|:------:|:------:|
+| 1A     |    1B  |    1C  |
+| 2A    ^|    2B  |    2C  |
+| 3A    ^|    3B       3C ||
+| 4A     |    4B       4C^||
+| 5A    ^|    5B  |    5C  |
+| 6A     |    6B ^|    6C  |
+
+## Images
+Images must be hosted online somewhere, like [Imgur](https://www.imgur.com). You use the address to that image to reference it in your brew\*.
+
+Using *Curly Injection* you can assign an id, classes, or inline CSS properties to the Markdown image syntax.
+
+![alt-text](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:100px,border:"2px solid",border-radius:10px}
+
+\* *When using Imgur-hosted images, use the "direct link", which can be found when you click into your image in the Imgur interace.*
+
+## Snippets
+Homebrewery comes with a series of *code snippets* found at the top of the editor pane that make it easy to create brews as quickly as possible.  Just set your cursor where you want the code to appear in the editor pane, choose a snippet, and make the adjustments you need.
+
+## Style Editor Panel
+{{fa,fa-paint-brush}} Technically released prior to v3 but still new to many users, check out the new **Style Editor** located on the right side of the Snippet bar.  This editor accepts CSS for styling without requiring `<style>` tags-- anything that would have gone inside style tags before can now be placed here, and snippets that insert CSS styles are now located on that tab.
+
+{{pageNumber 2}}
+{{footnote PART 2 | BORING STUFF}}

client/homebrew/pages/homePage/welcome_msg_legacy.md

@@ -0,0 +1,108 @@
+# The Homebrewery
+
+Welcome traveler from an antique land. Please sit and tell us of what you have seen. The unheard of monsters, who slither and bite. Tell us of the wondrous items and and artifacts you have found, their mysteries yet to be unlocked. Of the vexing vocations and surprising skills you have seen.
+
+### Homebrew D&D made easy
+The Homebrewery makes the creation and sharing of authentic looking Fifth-Edition homebrews easy. It uses [Markdown](https://help.github.com/articles/markdown-basics/) with a little CSS magic to make your brews come to life.
+
+**Try it!** Simply edit the text on the left and watch it *update live* on the right.
+
+
+
+### Editing and Sharing
+When you create your own homebrew you will be given a *edit url* and a *share url*.  Any changes you make will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew. So be careful about who you share it with.
+
+Anyone with the *share url* will be able to access a read-only version of your homebrew.
+
+## Helping out
+Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/Naturalcrit) to help me keep the servers running.
+
+This tool will **always** be free, never have ads, and I will never offer any "premium" features or whatever.
+
+
+
+>##### PDF Exporting
+> PDF Printing works best in Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
+>
+> After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
+> * Set the **Destination** to "Save as PDF"
+> * Set **Paper Size** to "Letter"
+> * If you are printing on A4 paper, make sure to have the "A4 page size snippet" in your brew
+> * In **Options** make sure "Background Images" is selected.
+> * Hit print and enjoy! You're done!
+>
+> If you want to save ink or have a monochrome printer, add the **Ink Friendly** snippet to your brew before you print
+
+
+```
+```
+
+## V3.0.0 Released!
+With the latest major update to *The Homebrewery* we've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like **div** and **span** in most cases. No raw HTML tags should be needed in a brew, and going forward, raw HTML will no longer receive debugging support (*but can still be used if you insist*).
+
+**You can enable V3 via the <span class="fa fa-info-circle" style="text-indent:0"></span> Properties button!**
+
+## New Things All The Time!
+What's new in the latest update? Check out the full changelog [here](/changelog)
+
+### Bugs, Issues, Suggestions?
+Take a quick look at our [Frequently Asked Questions page](/faq) to see if your question has a handy answer.
+
+Need help getting started or just the right look for your brew? Head to [r/Homebrewery](https://www.reddit.com/r/homebrewery/submit?selftext=true&title=%5BIssue%5D%20Describe%20Your%20Issue%20Here) and let us know!
+
+Have an idea to make The Homebrewery better? Or did you find something that wasn't quite right? Check out the [GitHub Repo](https://github.com/naturalcrit/homebrewery/) to report technical issues.
+
+### Legal Junk
+The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). This means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
+
+If you wish to sell or in some way gain profit for what you make on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
+
+### More Resources
+<a href='https://discord.gg/by3deKx' target='_blank'><img src='/assets/discordOfManyThings.svg' alt='Discord of Many Things Logo' title='Discord of Many Things Logo' style='width:50px; float: right; padding-left: 10px;'/></a>
+If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The <a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'>Discord of Many Things</a> is another great resource to connect with fellow homebrewers for help and feedback.
+
+<img src='https://i.imgur.com/hMna6G0.png' style='position:absolute;bottom:40px;right:30px;width:280px' />
+
+<div class='pageNumber'>1</div>
+<div class='footnote'>PART 1 | FANCINESS</div>
+
+<div style='position: absolute; top: 20px; right: 20px;'>
+<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'><img src='/assets/discord.png' style='height:30px'/></a>
+<a href='https://github.com/naturalcrit/homebrewery' target='_blank' title='Github' style='color: black; padding-left: 5px;'><img src='/assets/github.png' style='height:30px'/></a>
+<a href='https://patreon.com/NaturalCrit' target='_blank' title='Patreon' style='color: black; padding-left: 5px;'><img src='/assets/patreon.png' style='height:30px'/></a>
+<a href='https://www.reddit.com/r/homebrewery/' target='_blank' title='Reddit' style='color: black; padding-left: 5px;'><img src='/assets/reddit.png' style='height:30px'/></a>
+</div>
+
+\page
+
+# Appendix
+
+### Not quite Markdown
+Although the Homebrewery uses Markdown, to get all the styling features from the PHB, we had to get a little creative. Some base HTML elements are not used as expected and I've had to include a few new keywords.
+
+___
+* **Horizontal Rules** are generally used to *modify* existing elements into a different style. For example, a horizontal rule before a blockquote will give it the style of a Monster Stat Block instead of a note.
+* **New Pages** are controlled by the author. It's impossible for the site to detect when the end of a page is reached, so indicate you'd like to start a new page, use the new page snippet to get the syntax.
+* **Code Blocks** are used only to indicate column breaks. Since they don't allow for styling within them, they weren't that useful to use.
+* **HTML** can be used to get *just* the right look for your homebrew. I've included some examples in the snippet icons above the editor.
+
+
+
+```
+```
+
+
+### Images
+Images must be hosted online somewhere, like imgur. You use the address to that image to reference it in your brew. Images can be included 'inline' with the text using Markdown-style images. However for background images more control is needed.
+
+Background images should be included as HTML-style img tags. Using inline CSS you can precisely position your image where you'd like it to be. I have added both a inflow image snippet and a background image snippet to give you exmaples of how to do it.
+
+
+
+### Crediting Me
+If you'd like to credit The Homebrewery in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
+
+
+
+<div class='pageNumber'>2</div>
+<div class='footnote'>PART 2 | BORING STUFF</div>

client/homebrew/pages/homePage/welcome_msg_v3.md

@@ -1,175 +0,0 @@
-```css
-.page #example + table td {
-	border:1px dashed #00000030;
-}
-.page {
-	padding-bottom : 1.1cm;
-}
-```
-
-# The Homebrewery *V3*
-Welcome traveler from an antique land. Please sit and tell us of what you have seen. The unheard of monsters, who slither and bite. Tell us of the wondrous items and and artifacts you have found, their mysteries yet to be unlocked. Of the vexing vocations and surprising skills you have seen.
-
-### Homebrew D&D made easy
-The Homebrewery makes the creation and sharing of authentic looking Fifth-Edition homebrews easy. It uses [Markdown](https://help.github.com/articles/markdown-basics/) with a little CSS magic to make your brews come to life.
-
-**Try it!** Simply edit the text on the left and watch it *update live* on the right. Note that not every button is visible on this demo page. Click New {{fas,fa-plus-square}} in the navbar above to start brewing with all the features!
-
-### Editing and Sharing
-When you create your own homebrew, you will be given a *edit url* and a *share url*.
-
-Any changes you make while on the *edit url* will be automatically saved to the database within a few seconds. Anyone with the edit url will be able to make edits to your homebrew, so be careful about who you share it with.
-
-Anyone with the *share url* will be able to access a read-only version of your homebrew.
-
-{{note
-##### PDF Creation
-PDF Printing works best in Google Chrome. If you are having quality/consistency issues, try using Chrome to print instead.
-
-After clicking the "Print" item in the navbar a new page will open and a print dialog will pop-up.
-* Set the **Destination** to "Save as PDF"
-* Set **Paper Size** to "Letter"
-* If you are printing on A4 paper, make sure to have the **PRINT → {{far,fa-file}} A4 Pagesize** snippet in your brew
-* In **Options** make sure "Background Images" is selected.
-* Hit print and enjoy! You're done!
-
-If you want to save ink or have a monochrome printer, add the **PRINT → {{fas,fa-tint}} Ink Friendly** snippet to your brew!
-}}
-
-![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px}
-
-{{artist,bottom:160px,left:100px
-##### Homebrew Mug
-[naturalcrit](https://homebrew.naturalcrit.com)
-}}
-
-{{pageNumber 1}}
-{{footnote PART 1 | FANCINESS}}
-
-\column
-
-## New in V3.0.0
-We've implemented an extended Markdown-like syntax for block and span elements, plus a few other changes, eliminating the need for HTML tags like `div` and `span` in most cases. No raw HTML tags should be needed in a brew (*but can still be used if you insist*).
-
-Much of the syntax and styling has changed in V3, so converting a Legacy brew to V3 (or vice-versa) will require tweaking your document. *However*, all brews made prior to the release of v3.0.0 will still render normally, and you may switch between the "Legacy" brew renderer and the newer "V3" renderer via the {{fa,fa-info-circle}} **Properties** button on your brew at any time.
-
-Scroll down to the next page for a brief summary of the changes and new features available in V3!
-
-#### New Things All The Time!
-Check out the latest updates in the full changelog [here](/changelog).
-
-### Helping out
-Like this tool? Want to buy me a beer? [Head here](https://www.patreon.com/Naturalcrit) to help me keep the servers running.
-
-This tool will **always** be free, never have ads, and I will never offer any "premium" features or whatever.
-
-### Bugs, Issues, Suggestions?
-Take a quick look at our [Frequently Asked Questions page](/faq) to see if your question has a handy answer.
-
-Need help getting started or just the right look for your brew? Head to [r/Homebrewery](https://www.reddit.com/r/homebrewery/submit?selftext=true&title=%5BIssue%5D%20Describe%20Your%20Issue%20Here) and let us know!
-
-Have an idea to make The Homebrewery better? Or did you find something that wasn't quite right? Check out the [GitHub Repo](https://github.com/naturalcrit/homebrewery/) to report technical issues.
-
-### Legal Junk
-The Homebrewery is licensed using the [MIT License](https://github.com/naturalcrit/homebrewery/blob/master/license). Which means you are free to use The Homebrewery codebase any way that you want, except for claiming that you made it yourself.
-
-If you wish to sell or in some way gain profit for what's created on this site, it's your responsibility to ensure you have the proper licenses/rights for any images or resources used.
-
-#### Crediting Me
-If you'd like to credit me in your brew, I'd be flattered! Just reference that you made it with The Homebrewery.
-
-### More Homebrew Resources
-<a href='https://discord.gg/by3deKx' target='_blank'><img src='/assets/discordOfManyThings.svg' alt='Discord of Many Things Logo' title='Discord of Many Things Logo' style='width:50px; float: right; padding-left: 10px;'/></a>
-If you are looking for more 5e Homebrew resources check out [r/UnearthedArcana](https://www.reddit.com/r/UnearthedArcana/) and their list of useful resources [here](https://www.reddit.com/r/UnearthedArcana/wiki/resources). The <a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things'>Discord of Many Things</a> is another great resource to connect with fellow homebrewers for help and feedback.
-
-{{position:absolute;top:20px;right:20px;width:auto
-<a href='https://discord.gg/by3deKx' target='_blank' title='Discord of Many Things' style='color: black;'><img src='/assets/discord.png' style='height:30px'/></a>
-<a href='https://github.com/naturalcrit/homebrewery' target='_blank' title='Github' style='color: black; padding-left: 5px;'><img src='/assets/github.png' style='height:30px'/></a>
-<a href='https://patreon.com/NaturalCrit' target='_blank' title='Patreon' style='color: black; padding-left: 5px;'><img src='/assets/patreon.png' style='height:30px'/></a>
-<a href='https://www.reddit.com/r/homebrewery/' target='_blank' title='Reddit' style='color: black; padding-left: 5px;'><img src='/assets/reddit.png' style='height:30px'/></a>
-}}
-
-\page
-
-## Markdown+
-The Homebrewery aims to make homebrewing as simple as possible, providing a live editor with Markdown syntax that is more human-readable and faster to write with than raw HTML.
-
-In version 3.0.0, with a goal of adding maximum flexibility without users resorting to complex HTML to accomplish simple tasks, Homebrewery provides an extended verision of Markdown with additional syntax.
-**You can enable V3 via the {{fa,fa-info-circle}} Properties button!**
-
-### Curly Brackets
-The biggest change in V3 is the replacement of `<span></span>` and `<div></div>` with `{{ }}` for a cleaner custom formatting.  Inline spans and block elements can be created and given ID's and Classes, as well as css properties, each of which are comma separated with no spaces. Use double quotes if a value requires spaces. Spans and Blocks start the same:
-
-#### Span
-My favorite author is {{pen,#author,color:orange,font-family:"trebuchet ms" Brandon Sanderson}}.  The orange text has a class of `pen`, an id of `author`, is colored orange, and given a new font. The first space outside of quotes marks the beginning of the content.
-
-
-#### Block
-{{purple,#book,text-align:center,background:#aa88aa55
-My favorite book is Wheel of Time. This block has a class of `purple`, an id of `book`, and centered text with a colored background. The opening and closing brackets are on lines separate from the block contents.
-}}
-
-#### Injection
-For any element not inside a span or block, you can *inject* attributes using the same syntax but with single brackets in a single line immediately after the element.
-
-Inline elements like *italics* {color:#D35400} or images require the injection on the same line.
-
-Block elements like headers require the injection to start on the line immediately following.
-
-##### A Purple Header
-{color:purple,text-align:center}
-
-\* *this does not currently work for tables yet*
-
-### Vertical Spacing
-A blank line can be achieved with a run of one or more `:` alone on a line. More `:`'s will create more space.
-
-::
-
-Much nicer than `<br><br><br><br><br>`
-
-### Definition Lists
-**Example** :: V3 uses HTML *definition lists* to create "lists" with hanging indents.
-
-### Column Breaks
-Column and page breaks with `\column` and `\page`.
-
-\column
-
-### Tables
-Tables now allow column & row spanning between cells. This is included in some updated snippets, but a simplified example is given below.
-
-A cell can be spanned across columns by grouping multiple pipe `|` characters at the end of a cell.
-
-Row spanning is achieved by adding a `^` at the end of a cell just before the `|`.  
-
-These can be combined to span a cell across both columns and rows. Cells must have the same colspan if they are to be rowspan'd.
-
-##### Example
-| Head A | Spanned Header ||
-| Head B | Head C | Head D |
-|:-------|:------:|:------:|
-| 1A     |    1B  |    1C  |
-| 2A    ^|    2B  |    2C  |
-| 3A    ^|    3B       3C ||
-| 4A     |    4B       4C^||
-| 5A    ^|    5B  |    5C  |
-| 6A     |    6B ^|    6C  |
-
-## Images
-Images must be hosted online somewhere, like [Imgur](https://www.imgur.com). You use the address to that image to reference it in your brew\*.
-
-Using *Curly Injection* you can assign an id, classes, or inline CSS properties to the Markdown image syntax.
-
-![alt-text](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:100px,border:"2px solid",border-radius:10px}
-
-\* *When using Imgur-hosted images, use the "direct link", which can be found when you click into your image in the Imgur interace.*
-
-## Snippets
-Homebrewery comes with a series of *code snippets* found at the top of the editor pane that make it easy to create brews as quickly as possible.  Just set your cursor where you want the code to appear in the editor pane, choose a snippet, and make the adjustments you need.
-
-## Style Editor Panel
-{{fa,fa-paint-brush}} Technically released prior to v3 but still new to many users, check out the new **Style Editor** located on the right side of the Snippet bar.  This editor accepts CSS for styling without requiring `<style>` tags-- anything that would have gone inside style tags before can now be placed here, and snippets that insert CSS styles are now located on that tab.
-
-{{pageNumber 2}}
-{{footnote PART 2 | BORING STUFF}}

client/homebrew/pages/newPage/newPage.jsx

@@ -27,55 +27,32 @@ const NewPage = createClass({
 	getDefaultProps : function() {
 		return {
 			brew : {
-				text      : '',
-				style     : undefined,
-				shareId   : null,
-				editId    : null,
-				createdAt : null,
-				updatedAt : null,
-				gDrive    : false,
-
+				text        : '',
+				style       : undefined,
 				title       : '',
 				description : '',
-				tags        : '',
-				published   : false,
-				authors     : [],
-				systems     : []
+				renderer    : 'V3',
+				theme       : '5ePHB'
 			}
 		};
 	},
 
 	getInitialState : function() {
-		const brew = this.props.brew;
+		let brew = this.props.brew;
 
-		if(typeof window !== 'undefined') { //Load from localStorage if in client browser
-			const brewStorage  = localStorage.getItem(BREWKEY);
-			const styleStorage = localStorage.getItem(STYLEKEY);
-			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
-
-			if(!brew.text || !brew.style){
-				brew.text = brew.text  || (brewStorage  ?? '');
-				brew.style = brew.style || (styleStorage ?? undefined);
-				// brew.title = metaStorage?.title || this.state.brew.title;
-				// brew.description = metaStorage?.description || this.state.brew.description;
-				brew.renderer = metaStorage?.renderer || brew.renderer;
-			}
+		if(this.props.brew.shareId) {
+			brew = {
+				text        : brew.text        ?? '',
+				style       : brew.style       ?? undefined,
+				title       : brew.title       ?? '',
+				description : brew.description ?? '',
+				renderer    : brew.renderer    ?? 'legacy',
+				theme       : brew.theme       ?? '5ePHB'
+			};
 		}
 
 		return {
-			brew : {
-				text        : brew.text || '',
-				style       : brew.style || undefined,
-				gDrive      : false,
-				title       : brew.title || '',
-				description : brew.description || '',
-				tags        : brew.tags || '',
-				published   : false,
-				authors     : [],
-				systems     : brew.systems || [],
-				renderer    : brew.renderer || 'legacy'
-			},
-
+			brew       : brew,
 			isSaving   : false,
 			saveGoogle : (global.account && global.account.googleId ? true : false),
 			errors     : null,
@@ -85,6 +62,29 @@ const NewPage = createClass({
 
 	componentDidMount : function() {
 		document.addEventListener('keydown', this.handleControlKeys);
+
+		const brew = this.state.brew;
+
+		if(!this.props.brew.shareId && typeof window !== 'undefined') { //Load from localStorage if in client browser
+			const brewStorage  = localStorage.getItem(BREWKEY);
+			const styleStorage = localStorage.getItem(STYLEKEY);
+			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
+
+			brew.text  = brewStorage  ?? brew.text;
+			brew.style = styleStorage ?? brew.style;
+			// brew.title = metaStorage?.title || this.state.brew.title;
+			// brew.description = metaStorage?.description || this.state.brew.description;
+			brew.renderer = metaStorage?.renderer ?? brew.renderer;
+			brew.theme    = metaStorage?.theme    ?? brew.theme;
+
+			this.setState({
+				brew : brew
+			});
+		}
+
+		localStorage.setItem(BREWKEY, brew.text);
+		localStorage.setItem(STYLEKEY, brew.style);
+		localStorage.setItem(METAKEY, JSON.stringify({ 'renderer': brew.renderer, 'theme': brew.theme }));
 	},
 	componentWillUnmount : function() {
 		document.removeEventListener('keydown', this.handleControlKeys);
@@ -112,7 +112,7 @@ const NewPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew       : _.merge({}, prevState.brew, { text: text }),
+			brew       : { ...prevState.brew, text: text },
 			htmlErrors : htmlErrors
 		}));
 		localStorage.setItem(BREWKEY, text);
@@ -120,19 +120,20 @@ const NewPage = createClass({
 
 	handleStyleChange : function(style){
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, { style: style }),
+			brew : { ...prevState.brew, style: style },
 		}));
 		localStorage.setItem(STYLEKEY, style);
 	},
 
 	handleMetaChange : function(metadata){
 		this.setState((prevState)=>({
-			brew : _.merge({}, prevState.brew, metadata),
+			brew : { ...prevState.brew, ...metadata },
 		}));
 		localStorage.setItem(METAKEY, JSON.stringify({
 			// 'title'       : this.state.brew.title,
 			// 'description' : this.state.brew.description,
-			'renderer' : this.state.brew.renderer
+			'renderer' : this.state.brew.renderer,
+			'theme'    : this.state.brew.theme
 		}));
 	},
 
@@ -162,7 +163,7 @@ const NewPage = createClass({
 		brew.pageCount=((brew.renderer=='legacy' ? brew.text.match(/\\page/g) : brew.text.match(/^\\page$/gm)) || []).length + 1;
 
 		const res = await request
-			.post(`/api${this.state.saveGoogle ? '?transferToGoogle=true' : ''}`)
+			.post(`/api${this.state.saveGoogle ? '?saveToGoogle=true' : ''}`)
 			.send(brew)
 			.catch((err)=>{
 				console.log(err);
@@ -174,7 +175,7 @@ const NewPage = createClass({
 		localStorage.removeItem(BREWKEY);
 		localStorage.removeItem(STYLEKEY);
 		localStorage.removeItem(METAKEY);
-		window.location = `/edit/${brew.googleId ?? ''}${brew.editId}`;
+		window.location = `/edit/${brew.editId}`;
 	},
 
 	renderSaveButton : function(){
@@ -290,7 +291,7 @@ const NewPage = createClass({
 						onMetaChange={this.handleMetaChange}
 						renderer={this.state.brew.renderer}
 					/>
-					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer} errors={this.state.htmlErrors}/>
+					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer} theme={this.state.brew.theme} errors={this.state.htmlErrors}/>
 				</SplitPane>
 			</div>
 		</div>;

client/homebrew/pages/printPage/printPage.jsx

@@ -7,6 +7,8 @@ const { Meta } = require('vitreum/headtags');
 const MarkdownLegacy = require('naturalcrit/markdownLegacy.js');
 const Markdown = require('naturalcrit/markdown.js');
 
+const Themes = require('themes/themes.json');
+
 const BREWKEY = 'homebrewery-new';
 const STYLEKEY = 'homebrewery-new-style';
 const METAKEY = 'homebrewery-new-meta';
@@ -45,7 +47,8 @@ const PrintPage = createClass({
 					brew : {
 						text     : brewStorage,
 						style    : styleStorage,
-						renderer : metaStorage.renderer || 'legacy'
+						renderer : metaStorage?.renderer || 'legacy',
+						theme    : metaStorage?.theme || '5ePHB'
 					}
 				};
 			});
@@ -82,9 +85,16 @@ const PrintPage = createClass({
 	},
 
 	render : function(){
+		const rendererPath = this.state.brew.renderer == 'V3' ? 'V3' : 'Legacy';
+		const themePath    = this.state.brew.theme ?? '5ePHB';
+		const baseThemePath = Themes[rendererPath][themePath].baseTheme;
+
 		return <div>
 			<Meta name='robots' content='noindex, nofollow' />
-			<link href={`${this.state.brew.renderer == 'legacy' ? '/themes/5ePhbLegacy.style.css' : '/themes/5ePhb.style.css'}`} rel='stylesheet'/>
+			{baseThemePath &&
+				<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} rel='stylesheet'/>
+			}
+			<link href={`/themes/${rendererPath}/${themePath}/style.css`} rel='stylesheet'/>
 			{/* Apply CSS from Style tab */}
 			{this.renderStyle()}
 			<div className='pages' ref='pages'>

client/homebrew/pages/sharePage/sharePage.jsx

@@ -49,7 +49,7 @@ const SharePage = createClass({
 	},
 
 	processShareId : function() {
-		return this.props.brew.googleId ?
+		return this.props.brew.googleId && !this.props.brew.stubbed ?
 					 this.props.brew.googleId + this.props.brew.shareId :
 					 this.props.brew.shareId;
 	},
@@ -86,7 +86,7 @@ const SharePage = createClass({
 			</Navbar>
 
 			<div className='content'>
-				<BrewRenderer text={this.props.brew.text} style={this.props.brew.style} renderer={this.props.brew.renderer} />
+				<BrewRenderer text={this.props.brew.text} style={this.props.brew.style} renderer={this.props.brew.renderer} theme={this.props.brew.theme} />
 			</div>
 		</div>;
 	}

client/homebrew/pages/userPage/userPage.jsx

@@ -23,7 +23,7 @@ const UserPage = createClass({
 		};
 	},
 	getInitialState : function() {
-		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `'` : `'s`);
+		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `’` : `’s`);
 
 		const brews = _.groupBy(this.props.brews, (brew)=>{
 			return (brew.published ? 'published' : 'private');

client/template.js

@@ -8,7 +8,7 @@ module.exports = async(name, title = '', props = {})=>{
 		<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
 		<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
 		<link href=${`/${name}/bundle.css`} rel='stylesheet' />
-		<link rel="icon" href="/assets/homebrew/favicon.ico" type="image/x-icon" />
+		<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
 		<meta property="og:title" content="${props.brew?.title || 'Homebrewery - Untitled Brew'}">
 		<meta property="og:url" content="${HOMEBREWERY_PUBLIC_URL}/${props.brew?.shareId ? `share/${props.brew.shareId}` : ''}">
 		<meta property="og:image" content="${props.brew?.thumbnail || `${HOMEBREWERY_PUBLIC_URL}/thumbnail.png`}">

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.0.8",
+  "version": "3.2.2",
   "engines": {
     "node": "16.11.x"
   },
@@ -34,7 +34,7 @@
     "build/*"
   ],
   "jest": {
-    "testTimeout" : 15000,
+    "testTimeout": 15000,
     "modulePaths": [
       "mode_modules",
       "shared",
@@ -51,45 +51,44 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/plugin-transform-runtime": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
-    "@babel/preset-react": "^7.16.7",
+    "@babel/core": "^7.19.1",
+    "@babel/plugin-transform-runtime": "^7.19.1",
+    "@babel/preset-env": "^7.19.1",
+    "@babel/preset-react": "^7.18.6",
     "body-parser": "^1.20.0",
-    "classnames": "^2.3.1",
-    "codemirror": "^5.65.3",
+    "classnames": "^2.3.2",
+    "codemirror": "^5.65.6",
     "cookie-parser": "^1.4.6",
     "create-react-class": "^15.7.0",
     "dedent-tabs": "^0.10.1",
     "express": "^4.18.1",
     "express-async-handler": "^1.2.0",
-    "express-static-gzip": "2.1.5",
+    "express-static-gzip": "2.1.7",
     "fs-extra": "10.1.0",
-    "googleapis": "100.0.0",
+    "googleapis": "107.0.0",
     "js-yaml": "^4.1.0",
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "4.0.14",
-    "marked-extended-tables": "^1.0.3",
+    "marked": "4.1.0",
+    "marked-extended-tables": "^1.0.5",
     "markedLegacy": "npm:marked@^0.3.19",
-    "moment": "^2.29.3",
-    "mongoose": "^6.3.1",
-    "nanoid": "3.3.3",
+    "moment": "^2.29.4",
+    "mongoose": "^6.6.1",
+    "nanoid": "3.3.4",
     "nconf": "^0.12.0",
-    "query-string": "7.1.1",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-frame-component": "4.1.3",
-    "react-router-dom": "5.3.0",
+    "react-router-dom": "6.3.0",
     "sanitize-filename": "1.6.3",
     "superagent": "^6.1.0",
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
   },
   "devDependencies": {
-    "eslint": "^8.14.0",
-    "eslint-plugin-react": "^7.29.4",
-    "jest": "^28.0.3",
-    "supertest": "^6.2.3"
+    "eslint": "^8.23.1",
+    "eslint-plugin-react": "^7.31.8",
+    "jest": "^29.0.3",
+    "supertest": "^6.2.4"
   }
 }

scripts/buildHomebrew.js

@@ -10,7 +10,7 @@ const assetTransform = require('vitreum/transforms/asset.js');
 const babel          = require('@babel/core');
 const less           = require('less');
 
-const babelify = async (code)=>(await babel.transformAsync(code, { presets: ['@babel/preset-env', '@babel/preset-react'], plugins: ['@babel/plugin-transform-runtime'] })).code;
+const babelify = async (code)=>(await babel.transformAsync(code, { presets: [['@babel/preset-env', { 'exclude': ['proposal-dynamic-import'] }], '@babel/preset-react'], plugins: ['@babel/plugin-transform-runtime'] })).code;
 
 const transforms = {
 	'.js'   : (code, filename, opts)=>babelify(code),
@@ -24,28 +24,8 @@ const build = async ({ bundle, render, ssr })=>{
 	await fs.outputFile('./build/homebrew/bundle.css', css);
 	await fs.outputFile('./build/homebrew/bundle.js', bundle);
 	await fs.outputFile('./build/homebrew/ssr.js', ssr);
-	await fs.copy('./themes/fonts', './build/fonts');
-	await fs.copy('./themes/assets', './build/assets');
-	let src = './themes/5ePhbLegacy.style.less';
-	//Parse brew theme files
-	less.render(fs.readFileSync(src).toString(), {
-		compress : !isDev
-	}, function(e, output) {
-		fs.outputFile('./build/themes/5ePhbLegacy.style.css', output.css);
-	});
-	src = './themes/5ePhb.style.less';
-	less.render(fs.readFileSync(src).toString(), {
-		compress : !isDev
-	}, function(e, output) {
-		fs.outputFile('./build/themes/5ePhb.style.css', output.css);
-	});
-	// await less.render(lessCode, {
-	// 	compress  : !dev,
-	// 	sourceMap : (dev ? {
-	// 		sourceMapFileInline: true,
-	// 		outputSourceFiles: true
-	// 	} : false),
-	// })
+
+	await fs.copy('./client/homebrew/favicon.ico', './build/assets/favicon.ico');
 
 	//compress files in production
 	if(!isDev){
@@ -60,16 +40,98 @@ const build = async ({ bundle, render, ssr })=>{
 };
 
 fs.emptyDirSync('./build');
-pack('./client/homebrew/homebrew.jsx', {
-	paths : ['./shared'],
-	libs  : Proj.libs,
-	dev   : isDev && build,
-	transforms
-})
-	.then(build)
-	.catch(console.error);
 
 
+(async ()=>{
+
+	//v==----------------------------- COMPILE THEMES --------------------------------==v//
+
+	// Update list of all Theme files
+	const themes = { Legacy: {}, V3: {} };
+
+	let themeFiles = fs.readdirSync('./themes/Legacy');
+	for (dir of themeFiles) {
+		const themeData = JSON.parse(fs.readFileSync(`./themes/Legacy/${dir}/settings.json`).toString());
+		themeData.path = dir;
+		themes.Legacy[dir] = (themeData);
+		//fs.copy(`./themes/Legacy/${dir}/dropdownTexture.png`, `./build/themes/Legacy/${dir}/dropdownTexture.png`);
+		const src = `./themes/Legacy/${dir}/style.less`;
+		((outputDirectory)=>{
+			less.render(fs.readFileSync(src).toString(), {
+				compress : !isDev
+			}, function(e, output) {
+				fs.outputFile(outputDirectory, output.css);
+			});
+		})(`./build/themes/Legacy/${dir}/style.css`);
+
+	}
+
+	themeFiles = fs.readdirSync('./themes/V3');
+	for (dir of themeFiles) {
+		const themeData = JSON.parse(fs.readFileSync(`./themes/V3/${dir}/settings.json`).toString());
+		themeData.path = dir;
+		themes.V3[dir] = (themeData);
+		fs.copy(`./themes/V3/${dir}/dropdownTexture.png`, `./build/themes/V3/${dir}/dropdownTexture.png`);
+		const src = `./themes/V3/${dir}/style.less`;
+	  ((outputDirectory)=>{
+			less.render(fs.readFileSync(src).toString(), {
+				compress : !isDev
+			}, function(e, output) {
+				fs.outputFile(outputDirectory, output.css);
+			});
+		})(`./build/themes/V3/${dir}/style.css`);
+	}
+
+	await fs.outputFile('./themes/themes.json', JSON.stringify(themes, null, 2));
+
+	// await less.render(lessCode, {
+	// 	compress  : !dev,
+	// 	sourceMap : (dev ? {
+	// 		sourceMapFileInline: true,
+	// 		outputSourceFiles: true
+	// 	} : false),
+	// })
+
+	// Move assets
+	await fs.copy('./themes/fonts', './build/fonts');
+	await fs.copy('./themes/assets', './build/assets');
+
+	//v==----------------------------- BUNDLE PACKAGES --------------------------------==v//
+
+	const bundles = await pack('./client/homebrew/homebrew.jsx', {
+		paths : ['./shared', './'],
+		libs  : Proj.libs,
+		dev   : isDev && build,
+		transforms
+	});
+	build(bundles);
+
+	// Possible method for generating separate bundles for theme snippets: factor-bundle first sending all common files to bundle.js, then again using default settings, keeping only snippet bundles
+	// await fs.outputFile('./build/junk.js', '');
+	// await fs.outputFile('./build/themes/Legacy/5ePHB/snippets.js', '');
+	//
+	// const files = ['./client/homebrew/homebrew.jsx','./themes/Legacy/5ePHB/snippets.js'];
+	//
+	// bundles = await pack(files, {
+	// 	dedupe: false,
+	// 	plugin : [['factor-bundle', { outputs: [ './build/junk.js','./build/themes/Legacy/5ePHB/snippets.js'], threshold : function(row, groups) {
+	// 		console.log(groups);
+	//     if (groups.some(group => /.*homebrew.jsx$/.test(group))) {
+	// 			console.log("found homebrewery")
+	// 			return true;
+	// 		}
+	//     return this._defaultThreshold(row, groups);
+	// 	}}]],
+	// 	paths  : ['./shared','./','./build'],
+	// 	libs   : Proj.libs,
+	// 	dev    : isDev && build,
+	// 	transforms
+	// });
+	// build(bundles);
+	//
+
+})().catch(console.error);
+
 //In development set up a watch server and livereload
 if(isDev){
 	livereload('./build');

scripts/project.json

@@ -15,6 +15,7 @@
 		"codemirror/addon/fold/foldcode.js",
 		"codemirror/addon/fold/foldgutter.js",
 		"codemirror/addon/fold/xml-fold.js",
+		"codemirror/addon/scroll/scrollpastend.js",
 		"codemirror/addon/search/search.js",
 		"codemirror/addon/search/searchcursor.js",
 		"codemirror/addon/search/jump-to-line.js",

server/app.js

@@ -9,54 +9,19 @@ const yaml = require('js-yaml');
 const app = express();
 const config = require('./config.js');
 
-const homebrewApi = require('./homebrew.api.js');
+const { homebrewApi, getBrew } = require('./homebrew.api.js');
 const GoogleActions = require('./googleActions.js');
 const serveCompressedStaticAssets = require('./static-assets.mv.js');
 const sanitizeFilename = require('sanitize-filename');
 const asyncHandler = require('express-async-handler');
 
-const brewAccessTypes = ['edit', 'share', 'raw'];
-
-//Get the brew object from the HB database or Google Drive
-const getBrewFromId = asyncHandler(async (id, accessType)=>{
-	if(!brewAccessTypes.includes(accessType))
-		throw ('Invalid Access Type when getting brew');
-	let brew;
-	if(id.length > 12) {
-		const googleId = id.slice(0, -12);
-		id             = id.slice(-12);
-		brew = await GoogleActions.getGoogleBrew(googleId, id, accessType);
-	} else {
-		brew = await HomebrewModel.get(accessType == 'edit' ? { editId: id } : { shareId: id });
-		brew = brew.toObject(); // Convert MongoDB object to standard Javascript Object
-	}
-
-	brew = sanitizeBrew(brew, accessType === 'edit' ? false : true);
-	//Split brew.text into text and style
-	//unless the Access Type is RAW, in which case return immediately
-	if(accessType == 'raw') {
-		return brew;
-	}
-	splitTextStyleAndMetadata(brew);
-	return brew;
-});
-
-const sanitizeBrew = (brew, full=false)=>{
-	delete brew._id;
-	delete brew.__v;
-	if(full){
-		delete brew.editId;
-	}
-	return brew;
-};
-
 const splitTextStyleAndMetadata = (brew)=>{
 	brew.text = brew.text.replaceAll('\r\n', '\n');
 	if(brew.text.startsWith('```metadata')) {
 		const index = brew.text.indexOf('```\n\n');
 		const metadataSection = brew.text.slice(12, index - 1);
 		const metadata = yaml.load(metadataSection);
-		Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer']));
+		Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer', 'theme']));
 		brew.text = brew.text.slice(index + 5);
 	}
 	if(brew.text.startsWith('```css')) {
@@ -64,6 +29,16 @@ const splitTextStyleAndMetadata = (brew)=>{
 		brew.style = brew.text.slice(7, index - 1);
 		brew.text = brew.text.slice(index + 5);
 	}
+	_.defaults(brew, { 'renderer': 'legacy', 'theme': '5ePHB' });
+};
+
+const sanitizeBrew = (brew, accessType)=>{
+	brew._id = undefined;
+	brew.__v = undefined;
+	if(accessType !== 'edit'){
+		brew.editId = undefined;
+	}
+	return brew;
 };
 
 app.use('/', serveCompressedStaticAssets(`build`));
@@ -93,12 +68,12 @@ app.use((req, res, next)=>{
 app.use(homebrewApi);
 app.use(require('./admin.api.js'));
 
-const HomebrewModel  = require('./homebrew.model.js').model;
-const welcomeText    = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
-const welcomeTextV3  = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_v3.md', 'utf8');
-const migrateText    = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
-const changelogText  = require('fs').readFileSync('changelog.md', 'utf8');
-const faqText        = require('fs').readFileSync('faq.md', 'utf8');
+const HomebrewModel     = require('./homebrew.model.js').model;
+const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
+const welcomeTextLegacy = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
+const migrateText       = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
+const changelogText     = require('fs').readFileSync('changelog.md', 'utf8');
+const faqText           = require('fs').readFileSync('faq.md', 'utf8');
 
 String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
 
@@ -108,63 +83,60 @@ app.get('/robots.txt', (req, res)=>{
 });
 
 //Home page
-app.get('/', async (req, res, next)=>{
-	const brew = {
-		text : welcomeText
+app.get('/', (req, res, next)=>{
+	req.brew = {
+		text     : welcomeText,
+		renderer : 'V3'
 	};
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 });
 
 //Home page v3
-app.get('/v3_preview', async (req, res, next)=>{
-	const brew = {
-		text     : welcomeTextV3,
-		renderer : 'V3'
+app.get('/legacy', (req, res, next)=>{
+	req.brew = {
+		text     : welcomeTextLegacy,
+		renderer : 'legacy'
 	};
-	splitTextStyleAndMetadata(brew);
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 });
 
 //Legacy/Other Document -> v3 Migration Guide
-app.get('/migrate', async (req, res, next)=>{
-	const brew = {
+app.get('/migrate', (req, res, next)=>{
+	req.brew = {
 		text     : migrateText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(brew);
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 });
 
 //Changelog page
 app.get('/changelog', async (req, res, next)=>{
-	const brew = {
+	req.brew = {
 		title    : 'Changelog',
 		text     : changelogText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(brew);
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 });
 
 //FAQ page
 app.get('/faq', async (req, res, next)=>{
-	const brew = {
+	req.brew = {
 		title    : 'FAQ',
 		text     : faqText,
 		renderer : 'V3'
 	};
-	splitTextStyleAndMetadata(brew);
-	req.brew = brew;
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 });
 
 //Source page
-app.get('/source/:id', asyncHandler(async (req, res)=>{
-	const brew = await getBrewFromId(req.params.id, 'raw');
+app.get('/source/:id', asyncHandler(getBrew('share')), (req, res)=>{
+	const { brew } = req;
 
 	const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
 	let text = brew.text;
@@ -173,11 +145,12 @@ app.get('/source/:id', asyncHandler(async (req, res)=>{
 	}
 	text = `<code><pre style="white-space: pre-wrap;">${text}</pre></code>`;
 	res.status(200).send(text);
-}));
+});
 
 //Download brew source page
-app.get('/download/:id', asyncHandler(async (req, res)=>{
-	const brew = await getBrewFromId(req.params.id, 'raw');
+app.get('/download/:id', asyncHandler(getBrew('share')), (req, res)=>{
+	const { brew } = req;
+	sanitizeBrew(brew, 'share');
 	const prefix = 'HB - ';
 
 	let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
@@ -188,23 +161,27 @@ app.get('/download/:id', asyncHandler(async (req, res)=>{
 		'Content-Disposition' : `attachment; filename="${fileName}.txt"`
 	});
 	res.status(200).send(brew.text);
-}));
+});
 
 //User Page
 app.get('/user/:username', async (req, res, next)=>{
 	const ownAccount = req.account && (req.account.username == req.params.username);
 
 	const fields = [
+		'googleId',
 		'title',
 		'pageCount',
 		'description',
 		'authors',
+		'published',
 		'views',
 		'shareId',
 		'editId',
 		'createdAt',
 		'updatedAt',
-		'lastViewed'
+		'lastViewed',
+		'thumbnail',
+		'tags'
 	];
 
 	let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields)
@@ -219,58 +196,71 @@ app.get('/user/:username', async (req, res, next)=>{
 				console.error(err);
 			});
 
-		if(googleBrews) {
+		if(googleBrews && googleBrews.length > 0) {
+			for (const brew of brews.filter((brew)=>brew.googleId)) {
+				const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
+				if(match !== -1) {
+					brew.googleId = googleBrews[match].googleId;
+					brew.stubbed = true;
+					brew.pageCount = googleBrews[match].pageCount;
+					brew.renderer = googleBrews[match].renderer;
+					brew.version = googleBrews[match].version;
+					googleBrews.splice(match, 1);
+				}
+			}
+
 			googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] }));
 			brews = _.concat(brews, googleBrews);
 		}
 	}
 
 	req.brews = _.map(brews, (brew)=>{
-		return sanitizeBrew(brew, !ownAccount);
+		return sanitizeBrew(brew, ownAccount ? 'edit' : 'share');
 	});
 
 	return next();
 });
 
 //Edit Page
-app.get('/edit/:id', asyncHandler(async (req, res, next)=>{
+app.get('/edit/:id', asyncHandler(getBrew('edit')), (req, res, next)=>{
+	req.brew = req.brew.toObject ? req.brew.toObject() : req.brew;
+	sanitizeBrew(req.brew, 'edit');
+	splitTextStyleAndMetadata(req.brew);
 	res.header('Cache-Control', 'no-cache, no-store');	//reload the latest saved brew when pressing back button, not the cached version before save.
-	const brew = await getBrewFromId(req.params.id, 'edit');
-	req.brew = brew;
 	return next();
-}));
+});
 
 //New Page
-app.get('/new/:id', asyncHandler(async (req, res, next)=>{
-	const brew = await getBrewFromId(req.params.id, 'share');
-	brew.title = `CLONE - ${brew.title}`;
-	req.brew = brew;
+app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
+	sanitizeBrew(req.brew, 'share');
+	splitTextStyleAndMetadata(req.brew);
+	req.brew.title = `CLONE - ${req.brew.title}`;
 	return next();
-}));
+});
 
 //Share Page
-app.get('/share/:id', asyncHandler(async (req, res, next)=>{
-	const brew = await getBrewFromId(req.params.id, 'share');
+app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
+	const { brew } = req;
 
-	if(req.params.id.length > 12) {
+	if(req.params.id.length > 12 && !brew._id) {
 		const googleId = req.params.id.slice(0, -12);
 		const shareId = req.params.id.slice(-12);
 		await GoogleActions.increaseView(googleId, shareId, 'share', brew)
-					.catch((err)=>{next(err);});
+			.catch((err)=>{next(err);});
 	} else {
 		await HomebrewModel.increaseView({ shareId: brew.shareId });
 	}
-
-	req.brew = brew;
+	sanitizeBrew(req.brew, 'share');
+	splitTextStyleAndMetadata(req.brew);
 	return next();
 }));
 
 //Print Page
-app.get('/print/:id', asyncHandler(async (req, res, next)=>{
-	const brew = await getBrewFromId(req.params.id, 'share');
-	req.brew = brew;
-	return next();
-}));
+app.get('/print/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
+	sanitizeBrew(req.brew, 'share');
+	splitTextStyleAndMetadata(req.brew);
+	next();
+});
 
 //Account Page
 app.get('/ui/account', asyncHandler(async (req, res, next)=>{
@@ -335,8 +325,7 @@ if(isLocalEnvironment){
 
 //Render the page
 const templateFn = require('./../client/template.js');
-
-app.use((req, res)=>{
+app.use(asyncHandler(async (req, res, next)=>{
 	// Create configuration object
 	const configuration = {
 		local       : isLocalEnvironment,
@@ -344,23 +333,25 @@ app.use((req, res)=>{
 		environment : nodeEnv
 	};
 	const props = {
-		version     : require('./../package.json').version,
-		url         : req.originalUrl,
-		brew        : req.brew,
-		brews       : req.brews,
-		googleBrews : req.googleBrews,
-		account     : req.account,
-		enable_v3   : config.get('enable_v3'),
-		config      : configuration
+		version       : require('./../package.json').version,
+		url           : req.originalUrl,
+		brew          : req.brew,
+		brews         : req.brews,
+		googleBrews   : req.googleBrews,
+		account       : req.account,
+		enable_v3     : config.get('enable_v3'),
+		enable_themes : config.get('enable_themes'),
+		config        : configuration
 	};
 	const title = req.brew ? req.brew.title : '';
-	templateFn('homebrew', title, props)
-        .then((page)=>{ res.send(page); })
-        .catch((err)=>{
-        	console.log(err);
-        	return res.sendStatus(500);
-        });
-});
+	const page = await templateFn('homebrew', title, props)
+		.catch((err)=>{
+			console.log(err);
+			return res.sendStatus(500);
+		});
+	if(!page) return;
+	res.send(page);
+}));
 
 //v=====----- Error-Handling Middleware -----=====v//
 //Format Errors so all fields will be sent
@@ -384,6 +375,13 @@ app.use((err, req, res, next)=>{
 	console.error(err);
 	res.status(status).send(getPureError(err));
 });
+
+app.use((req, res)=>{
+	if(!res.headersSent) {
+		console.error('Headers have not been sent, responding with a server error.', req.url);
+		res.status(500).send('An error occurred and the server did not send a response. The error has been logged, please note the time this occurred and report this issue.');
+	}
+});
 //^=====--------------------------------------=====^//
 
 module.exports = {

server/db.js

@@ -10,7 +10,7 @@ const Mongoose = require('mongoose');
 const getMongoDBURL = (config)=>{
 	return config.get('mongodb_uri') ||
            config.get('mongolab_uri') ||
-           'mongodb://localhost/homebrewery';
+		   'mongodb://127.0.0.1/homebrewery';  // changed from mongodb://localhost/homebrewery to accommodate versions 16+ of node.
 };
 
 const handleConnectionError = (error)=>{

server/googleActions.js

@@ -124,7 +124,6 @@ const GoogleActions = {
 				title       : file.properties.title,
 				description : file.description,
 				views       : parseInt(file.properties.views),
-				tags        : '',
 				published   : file.properties.published ? file.properties.published == 'true' : false,
 				systems     : [],
 				thumbnail   : file.properties.thumbnail
@@ -143,12 +142,11 @@ const GoogleActions = {
 				description : `${brew.description}`,
 				properties  : {
 					title     : brew.title,
-					published : brew.published,
-					version   : brew.version,
-					renderer  : brew.renderer,
-					tags      : brew.tags,
+					shareId   : brew.shareId || nanoid(12),
+					editId    : brew.editId || nanoid(12),
 					pageCount : brew.pageCount,
-					systems   : brew.systems.join(),
+					renderer  : brew.renderer || 'legacy',
+					isStubbed : true,
 					thumbnail : brew.thumbnail
 				}
 			},
@@ -161,10 +159,9 @@ const GoogleActions = {
 			console.log('Error saving to google');
 			console.error(err);
 			throw (err);
-			//return res.status(500).send('Error while saving');
 		});
 
-		return (brew);
+		return true;
 	},
 
 	newGoogleBrew : async (auth, brew)=>{
@@ -178,17 +175,18 @@ const GoogleActions = {
 		const folderId = await GoogleActions.getGoogleFolder(auth);
 
 		const fileMetadata = {
-			'name'        : `${brew.title}.txt`,
-			'description' : `${brew.description}`,
-			'parents'     : [folderId],
-			'properties'  : {								//AppProperties is not accessible
-				'shareId'   : brew.shareId || nanoid(12),
-				'editId'    : brew.editId || nanoid(12),
-				'title'     : brew.title,
-				'views'     : '0',
-				'pageCount' : brew.pageCount,
-				'renderer'  : brew.renderer || 'legacy',
-				'thumbnail' : brew.thumbnail || ''
+			name        : `${brew.title}.txt`,
+			description : `${brew.description}`,
+			parents     : [folderId],
+			properties  : {								//AppProperties is not accessible
+				shareId   : brew.shareId || nanoid(12),
+				editId    : brew.editId || nanoid(12),
+				title     : brew.title,
+				pageCount : brew.pageCount,
+				renderer  : brew.renderer || 'legacy',
+				isStubbed : true,
+				version   : 1,
+				thumbnail : brew.thumbnail || ''
 			}
 		};
 
@@ -215,26 +213,7 @@ const GoogleActions = {
 			console.error(err);
 		});
 
-		const newHomebrew = {
-			text      : brew.text,
-			shareId   : fileMetadata.properties.shareId,
-			editId    : fileMetadata.properties.editId,
-			createdAt : new Date(),
-			updatedAt : new Date(),
-			gDrive    : true,
-			googleId  : obj.data.id,
-			pageCount : fileMetadata.properties.pageCount,
-
-			title       : brew.title,
-			description : brew.description,
-			tags        : '',
-			published   : brew.published,
-			renderer    : brew.renderer,
-			authors     : [],
-			systems     : []
-		};
-
-		return newHomebrew;
+		return obj.data.id;
 	},
 
 	getGoogleBrew : async (id, accessId, accessType)=>{
@@ -247,7 +226,6 @@ const GoogleActions = {
 		.catch((err)=>{
 			console.log('Error loading from Google');
 			throw (err);
-			return;
 		});
 
 		if(obj) {
@@ -257,9 +235,7 @@ const GoogleActions = {
 				throw ('Share ID does not match');
 			}
 
-			const serviceDrive = google.drive({ version: 'v3' });
-
-			const file = await serviceDrive.files.get({
+			const file = await drive.files.get({
 				fileId : id,
 				fields : 'description, properties',
 				alt    : 'media'
@@ -276,7 +252,7 @@ const GoogleActions = {
 				text    : file.data,
 
 				description : obj.data.description,
-				tags        : obj.data.properties.tags    ? obj.data.properties.tags               : '',
+				tags        : obj.data.properties.tags ? obj.data.properties.tags : '',
 				systems     : obj.data.properties.systems ? obj.data.properties.systems.split(',') : [],
 				authors     : [],
 				published   : obj.data.properties.published ? obj.data.properties.published == 'true' : false,
@@ -291,7 +267,6 @@ const GoogleActions = {
 				renderer   : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
 				thumbnail  : obj.data.properties.thumbnail || '',
 
-				gDrive   : true,
 				googleId : id
 			};
 
@@ -299,14 +274,11 @@ const GoogleActions = {
 		}
 	},
 
-	deleteGoogleBrew : async (auth, id)=>{
+	deleteGoogleBrew : async (auth, id, accessId)=>{
 		const drive = google.drive({ version: 'v3', auth });
 
-		const googleId = id.slice(0, -12);
-		const accessId = id.slice(-12);
-
 		const obj = await drive.files.get({
-			fileId : googleId,
+			fileId : id,
 			fields : 'properties'
 		})
 		.catch((err)=>{
@@ -315,11 +287,11 @@ const GoogleActions = {
 		});
 
 		if(obj && obj.data.properties.editId != accessId) {
-			throw ('Not authorized to delete this Google brew');
+			throw { status: 403, message: 'Not authorized to delete this Google brew' };
 		}
 
 		await drive.files.update({
-			fileId   : googleId,
+			fileId   : id,
 			resource : { trashed: true }
 		})
 		.catch((err)=>{

server/homebrew.api.js

@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
 const _ = require('lodash');
 const HomebrewModel = require('./homebrew.model.js').model;
 const router = require('express').Router();
@@ -6,6 +7,7 @@ const GoogleActions = require('./googleActions.js');
 const Markdown = require('../shared/naturalcrit/markdown.js');
 const yaml = require('js-yaml');
 const asyncHandler = require('express-async-handler');
+const { nanoid } = require('nanoid');
 
 // const getTopBrews = (cb) => {
 // 	HomebrewModel.find().sort({ views: -1 }).limit(5).exec(function(err, brews) {
@@ -13,6 +15,63 @@ const asyncHandler = require('express-async-handler');
 // 	});
 // };
 
+const getId = (req)=>{
+	// Set the id and initial potential google id, where the google id is present on the existing brew.
+	let id = req.params.id, googleId = req.body?.googleId;
+
+	// If the id is longer than 12, then it's a google id + the edit id. This splits the longer id up.
+	if(id.length > 12) {
+		googleId = id.slice(0, -12);
+		id = id.slice(-12);
+	}
+	return { id, googleId };
+};
+
+const getBrew = (accessType)=>{
+	// Create middleware with the accessType passed in as part of the scope
+	return async (req, res, next)=>{
+		// Get relevant IDs for the brew
+		const { id, googleId } = getId(req);
+
+		// Try to find the document in the Homebrewery database -- if it doesn't exist, that's fine.
+		let stub = await HomebrewModel.get(accessType === 'edit' ? { editId: id } : { shareId: id })
+			.catch((err)=>{
+				if(googleId) {
+					console.warn(`Unable to find document stub for ${accessType}Id ${id}`);
+				} else {
+					console.warn(err);
+				}
+			});
+		stub = stub?.toObject();
+
+		// If there is a google id, try to find the google brew
+		if(googleId || stub?.googleId) {
+			let googleError;
+			const googleBrew = await GoogleActions.getGoogleBrew(googleId || stub?.googleId, id, accessType)
+				.catch((err)=>{
+					console.warn(err);
+					googleError = err;
+				});
+			// If we can't find the google brew and there is a google id for the brew, throw an error.
+			if(!googleBrew) throw googleError;
+			// Combine the Homebrewery stub with the google brew, or if the stub doesn't exist just use the google brew
+			stub = stub ? _.assign({ ...excludeStubProps(stub), stubbed: true }, excludeGoogleProps(googleBrew)) : googleBrew;
+		}
+
+		// If after all of that we still don't have a brew, throw an exception
+		if(!stub) {
+			throw 'Brew not found in Homebrewery database or Google Drive';
+		}
+
+		if(typeof stub.tags === 'string') {
+			stub.tags = [];
+		}
+		req.brew = stub;
+
+		next();
+	};
+};
+
 const mergeBrewText = (brew)=>{
 	let text = brew.text;
 	if(brew.style !== undefined) {
@@ -21,7 +80,7 @@ const mergeBrewText = (brew)=>{
 			`\`\`\`\n\n` +
 			`${text}`;
 	}
-	const metadata = _.pick(brew, ['title', 'description', 'tags', 'systems', 'renderer']);
+	const metadata = _.pick(brew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme']);
 	text = `\`\`\`metadata\n` +
 		`${yaml.dump(metadata)}\n` +
 		`\`\`\`\n\n` +
@@ -33,15 +92,33 @@ const MAX_TITLE_LENGTH = 100;
 
 const getGoodBrewTitle = (text)=>{
 	const tokens = Markdown.marked.lexer(text);
- 	return (tokens.find((token)=>token.type == 'heading' ||	token.type == 'paragraph')?.text || 'No Title')
+ 	return (tokens.find((token)=>token.type === 'heading' || token.type === 'paragraph')?.text || 'No Title')
 				 .slice(0, MAX_TITLE_LENGTH);
 };
 
 const excludePropsFromUpdate = (brew)=>{
 	// Remove undesired properties
-	const propsToExclude = ['views', 'lastViewed'];
+	const modified = _.clone(brew);
+	const propsToExclude = ['_id', 'views', 'lastViewed', 'editId', 'shareId', 'googleId'];
 	for (const prop of propsToExclude) {
-		delete brew[prop];
+		delete modified[prop];
+	}
+	return modified;
+};
+
+const excludeGoogleProps = (brew)=>{
+	const modified = _.clone(brew);
+	const propsToExclude = ['tags', 'systems', 'published', 'authors', 'owner', 'views'];
+	for (const prop of propsToExclude) {
+		delete modified[prop];
+	}
+	return modified;
+};
+
+const excludeStubProps = (brew)=>{
+	const propsToExclude = ['text', 'textBin', 'renderer', 'pageCount', 'version'];
+	for (const prop of propsToExclude) {
+		brew[prop] = undefined;
 	}
 	return brew;
 };
@@ -55,33 +132,17 @@ const beforeNewSave = (account, brew)=>{
 	brew.text = mergeBrewText(brew);
 };
 
-const newLocalBrew = async (brew)=>{
-	const newHomebrew = new HomebrewModel(brew);
-	// Compress brew text to binary before saving
-	newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
-	// Delete the non-binary text field since it's not needed anymore
-	newHomebrew.text = undefined;
-
-	let saved = await newHomebrew.save()
-		.catch((err)=>{
-			console.error(err, err.toString(), err.stack);
-			throw `Error while creating new brew, ${err.toString()}`;
-		});
-
-	saved = saved.toObject();
-	saved.gDrive = false;
-	return saved;
-};
-
 const newGoogleBrew = async (account, brew, res)=>{
 	const oAuth2Client = GoogleActions.authCheck(account, res);
 
-	return await GoogleActions.newGoogleBrew(oAuth2Client, brew);
+	const newBrew = excludeGoogleProps(brew);
+
+	return await GoogleActions.newGoogleBrew(oAuth2Client, newBrew);
 };
 
 const newBrew = async (req, res)=>{
 	const brew = req.body;
-	const { transferToGoogle } = req.query;
+	const { saveToGoogle } = req.query;
 
 	delete brew.editId;
 	delete brew.shareId;
@@ -89,148 +150,189 @@ const newBrew = async (req, res)=>{
 
 	beforeNewSave(req.account, brew);
 
-	let saved;
-	if(transferToGoogle) {
-		saved = await newGoogleBrew(req.account, brew, res)
+	const newHomebrew = new HomebrewModel(brew);
+	newHomebrew.editId = nanoid(12);
+	newHomebrew.shareId = nanoid(12);
+
+	let googleId, saved;
+	if(saveToGoogle) {
+		googleId = await newGoogleBrew(req.account, newHomebrew, res)
 			.catch((err)=>{
-				res.status(err.status || err.response.status).send(err.message || err);
+				console.error(err);
+				res.status(err?.status || err?.response?.status || 500).send(err?.message || err);
 			});
+		if(!googleId) return;
+		excludeStubProps(newHomebrew);
+		newHomebrew.googleId = googleId;
 	} else {
-		saved = await newLocalBrew(brew)
-			.catch((err)=>{
-				res.status(500).send(err);
-			});
+		// Compress brew text to binary before saving
+		newHomebrew.textBin = zlib.deflateRawSync(newHomebrew.text);
+		// Delete the non-binary text field since it's not needed anymore
+		newHomebrew.text = undefined;
 	}
+
+	saved = await newHomebrew.save()
+		.catch((err)=>{
+			console.error(err, err.toString(), err.stack);
+			throw `Error while creating new brew, ${err.toString()}`;
+		});
 	if(!saved) return;
-	return res.status(200).send(saved);
+	saved = saved.toObject();
+
+	res.status(200).send(saved);
 };
 
 const updateBrew = async (req, res)=>{
-	let brew = excludePropsFromUpdate(req.body);
-	const { transferToGoogle, transferFromGoogle } = req.query;
+	// Initialize brew from request and body, destructure query params, set a constant for the google id, and set the initial value for the after-save method
+	let brew = _.assign(req.brew, excludePropsFromUpdate(req.body));
+	const { saveToGoogle, removeFromGoogle } = req.query;
+	const googleId = brew.googleId;
+	let afterSave = async ()=>true;
 
-	let saved;
-	if(brew.googleId && transferFromGoogle) {
-		beforeNewSave(req.account, brew);
+	brew.text = mergeBrewText(brew);
 
-		saved = await newLocalBrew(brew)
-			.catch((err)=>{
-				console.error(err);
-				res.status(500).send(err);
-			});
-		if(!saved) return;
+	if(brew.googleId && removeFromGoogle) {
+		// If the google id exists and we're removing it from google, set afterSave to delete the google brew and mark the brew's google id as undefined
+		afterSave = async ()=>{
+			return await deleteGoogleBrew(req.account, googleId, brew.editId, res)
+				.catch((err)=>{
+					console.error(err);
+					res.status(err?.status || err?.response?.status || 500).send(err.message || err);
+				});
+		};
 
-		await deleteGoogleBrew(req.account, `${brew.googleId}${brew.editId}`, res)
+		brew.googleId = undefined;
+	} else if(!brew.googleId && saveToGoogle) {
+		// If we don't have a google id and the user wants to save to google, create the google brew and set the google id on the brew
+		brew.googleId = await newGoogleBrew(req.account, excludeGoogleProps(brew), res)
 			.catch((err)=>{
 				console.error(err);
 				res.status(err.status || err.response.status).send(err.message || err);
 			});
-	} else if(!brew.googleId && transferToGoogle) {
-		saved = await newGoogleBrew(req.account, brew, res)
-			.catch((err)=>{
-				console.error(err);
-				res.status(err.status || err.response.status).send(err.message || err);
-			});
-		if(!saved) return;
-
-		await deleteLocalBrew(req.account, brew.editId)
-			.catch((err)=>{
-				console.error(err);
-				res.status(err.status).send(err.message);
-			});
+		if(!brew.googleId) return;
 	} else if(brew.googleId) {
-		brew.text = mergeBrewText(brew);
-
-		saved = await GoogleActions.updateGoogleBrew(brew)
+		// If the google id exists and no other actions are being performed, update the google brew
+		const updated = await GoogleActions.updateGoogleBrew(excludeGoogleProps(brew))
 			.catch((err)=>{
 				console.error(err);
-				res.status(err.response?.status || 500).send(err);
+				res.status(err?.response?.status || 500).send(err);
 			});
+		if(!updated) return;
+	}
+
+	if(brew.googleId) {
+		// If the google id exists after all those actions, exclude the props that are stored in google and aren't needed for rendering the brew items
+		excludeStubProps(brew);
 	} else {
-		const dbBrew = await HomebrewModel.get({ editId: req.params.id })
-			.catch((err)=>{
-				console.error(err);
-				return res.status(500).send('Error while saving');
-			});
-
-		brew = _.merge(dbBrew, brew);
-		brew.text = mergeBrewText(brew);
-
 		// Compress brew text to binary before saving
 		brew.textBin = zlib.deflateRawSync(brew.text);
 		// Delete the non-binary text field since it's not needed anymore
 		brew.text = undefined;
-		brew.updatedAt = new Date();
-
-		if(req.account) {
-			brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
-		}
-
-		brew.markModified('authors');
-		brew.markModified('systems');
-
-		saved = await brew.save();
 	}
+	brew.updatedAt = new Date();
+
+	if(req.account) {
+		brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
+	}
+
+	// Fetch the brew from the database again (if it existed there to begin with), and assign the existing brew to it
+	brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
+
+	if(!brew.markModified) {
+		// If it wasn't in the database, create a new db brew
+		brew = new HomebrewModel(brew);
+	}
+
+	brew.markModified('authors');
+	brew.markModified('systems');
+
+	// Save the database brew
+	const saved = await brew.save()
+		.catch((err)=>{
+			console.error(err);
+			res.status(err.status || 500).send(err.message || 'Unable to save brew to Homebrewery database');
+		});
 	if(!saved) return;
+	// Call and wait for afterSave to complete
+	const after = await afterSave();
+	if(!after) return;
 
-	if(!res.headersSent) return res.status(200).send(saved);
+	res.status(200).send(saved);
 };
 
-const deleteBrew = async (req, res)=>{
-	if(req.params.id.length > 12) {
-		const deleted = await deleteGoogleBrew(req.account, req.params.id, res)
-			.catch((err)=>{
-				res.status(500).send(err);
-			});
-		if(deleted) return res.status(200).send();
-	} else {
-		const deleted = await deleteLocalBrew(req.account, req.params.id)
-			.catch((err)=>{
-				res.status(err.status).send(err.message);
-			});
-		if(deleted) return res.status(200).send(deleted);
-		return res.status(200).send();
-	}
-};
-
-const deleteLocalBrew = async (account, id)=>{
-	const brew = await HomebrewModel.findOne({ editId: id });
-	if(!brew) {
-		throw { status: 404, message: 'Can not find homebrew with that id' };
-	}
-
-	if(account) {
-		// Remove current user as author
-		brew.authors = _.pull(brew.authors, account.username);
-		brew.markModified('authors');
-	}
-
-	if(brew.authors.length === 0) {
-		// Delete brew if there are no authors left
-		await brew.remove()
-			.catch((err)=>{
-				console.error(err);
-				throw { status: 500, message: 'Error while removing' };
-			});
-	} else {
-		// Otherwise, save the brew with updated author list
-		return await brew.save()
-			.catch((err)=>{
-				throw { status: 500, message: err };
-			});
-	}
-};
-
-const deleteGoogleBrew = async (account, id, res)=>{
+const deleteGoogleBrew = async (account, id, editId, res)=>{
 	const auth = await GoogleActions.authCheck(account, res);
-	await GoogleActions.deleteGoogleBrew(auth, id);
+	await GoogleActions.deleteGoogleBrew(auth, id, editId);
 	return true;
 };
 
+const deleteBrew = async (req, res, next)=>{
+	// Delete an orphaned stub if its Google brew doesn't exist
+	try {
+		await getBrew('edit')(req, res, ()=>{});
+	} catch (err) {
+		const { id, googleId } = getId(req);
+		console.warn(`No google brew found for id ${googleId}, the stub with id ${id} will be deleted.`);
+		await HomebrewModel.deleteOne({ editId: id });
+		return next();
+	}
+
+	let brew = req.brew;
+	const { googleId, editId } = brew;
+	const account = req.account;
+	const isOwner = account && (brew.authors.length === 0 || brew.authors[0] === account.username);
+	// If the user is the owner and the file is saved to google, mark the google brew for deletion
+	const shouldDeleteGoogleBrew = googleId && isOwner;
+
+	if(brew._id) {
+		brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
+		if(account) {
+			// Remove current user as author
+			brew.authors = _.pull(brew.authors, account.username);
+			brew.markModified('authors');
+		}
+
+		if(brew.authors.length === 0) {
+			// Delete brew if there are no authors left
+			await brew.remove()
+				.catch((err)=>{
+					console.error(err);
+					throw { status: 500, message: 'Error while removing' };
+				});
+		} else {
+			if(shouldDeleteGoogleBrew) {
+				// When there are still authors remaining, we delete the google brew but store the full brew in the Homebrewery database
+				brew.googleId = undefined;
+				brew.textBin = zlib.deflateRawSync(brew.text);
+				brew.text = undefined;
+			}
+
+			// Otherwise, save the brew with updated author list
+			await brew.save()
+				.catch((err)=>{
+					throw { status: 500, message: err };
+				});
+		}
+	}
+	if(shouldDeleteGoogleBrew) {
+		const deleted = await deleteGoogleBrew(account, googleId, editId, res)
+			.catch((err)=>{
+				console.error(err);
+				res.status(500).send(err);
+			});
+		if(!deleted) return;
+	}
+
+	res.status(204).send();
+};
+
 router.post('/api', asyncHandler(newBrew));
-router.put('/api/:id', asyncHandler(updateBrew));
-router.put('/api/update/:id', asyncHandler(updateBrew));
+router.put('/api/:id', asyncHandler(getBrew('edit')), asyncHandler(updateBrew));
+router.put('/api/update/:id', asyncHandler(getBrew('edit')), asyncHandler(updateBrew));
 router.delete('/api/:id', asyncHandler(deleteBrew));
 router.get('/api/remove/:id', asyncHandler(deleteBrew));
 
-module.exports = router;
+module.exports = {
+	homebrewApi : router,
+	getBrew
+};

server/homebrew.model.js

@@ -6,13 +6,14 @@ const zlib = require('zlib');
 const HomebrewSchema = mongoose.Schema({
 	shareId   : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
 	editId    : { type: String, default: ()=>{return nanoid(12);}, index: { unique: true } },
+	googleId  : { type: String },
 	title     : { type: String, default: '' },
 	text      : { type: String, default: '' },
 	textBin   : { type: Buffer },
 	pageCount : { type: Number, default: 1 },
 
 	description : { type: String, default: '' },
-	tags        : { type: String, default: '' },
+	tags        : [String],
 	systems     : [String],
 	renderer    : { type: String, default: '' },
 	authors     : [String],

shared/naturalcrit/codeEditor/codeEditor.jsx

@@ -30,6 +30,8 @@ if(typeof navigator !== 'undefined'){
 	// require('codemirror/addon/edit/trailingspace.js');
 	//Active line highlighting
 	// require('codemirror/addon/selection/active-line.js');
+	//Scroll past last line
+	require('codemirror/addon/scroll/scrollpastend.js');
 	//Auto-closing
 	//XML code folding is a requirement of the auto-closing tag feature and is not enabled
 	require('codemirror/addon/fold/xml-fold.js');
@@ -98,6 +100,7 @@ const CodeEditor = createClass({
 			indentWithTabs    : true,
 			tabSize           : 2,
 			historyEventDelay : 250,
+			scrollPastEnd     : true,
 			extraKeys         : {
 				'Ctrl-B'           : this.makeBold,
 				'Cmd-B'            : this.makeBold,

shared/naturalcrit/codeEditor/codeEditor.less

@@ -3,6 +3,11 @@
 @import (less) 'codemirror/addon/search/matchesonscrollbar.css';
 @import (less) 'codemirror/addon/dialog/dialog.css';
 
+@keyframes sourceMoveAnimation {
+	50%  {background-color: red;   color: white;}
+	100% {background-color: unset; color: unset;}
+}
+
 .codeEditor{
   .CodeMirror-foldmarker {
     font-family: inherit;
@@ -10,6 +15,11 @@
     font-weight: 600;
   }
 
+  .sourceMoveFlash .CodeMirror-line{
+    animation-name: sourceMoveAnimation;
+    animation-duration: 0.4s;
+  }
+
   //.cm-tab {
   //  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
   //}
@@ -19,4 +29,4 @@
   //    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAQAgMAAABW5NbuAAAACVBMVEVHcEwAAAAAAAAWawmTAAAAA3RSTlMAPBJ6PMxpAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAFUlEQVQI12NgwACcCQysASAEZGAAACMuAX06aCQUAAAAAElFTkSuQmCC) no-repeat right;
   //  }
   //}
-}
+}

shared/naturalcrit/nav/nav.jsx

@@ -73,18 +73,35 @@ const Nav = {
 
 	dropdown : createClass({
 		displayName     : 'Nav.dropdown',
+		getDefaultProps : function() {
+			return {
+				trigger : 'hover'
+			};
+		},
 		getInitialState : function() {
 			return {
 				showDropdown : false
 			};
 		},
-
+		componentDidMount : function() {
+			if(this.props.trigger == 'click')
+				document.addEventListener('click', this.handleClickOutside);
+		},
+		componentWillUnmount : function() {
+			if(this.props.trigger == 'click')
+				document.removeEventListener('click', this.handleClickOutside);
+		},
+		handleClickOutside : function(e){
+			// Close dropdown when clicked outside
+			if(this.refs.dropdown && !this.refs.dropdown.contains(e.target)) {
+				this.handleDropdown(false);
+			}
+		},
 		handleDropdown : function(show){
 			this.setState({
 				showDropdown : show
 			});
 		},
-
 		renderDropdown : function(dropdownChildren){
 			if(!this.state.showDropdown) return null;
 
@@ -94,7 +111,6 @@ const Nav = {
 				</div>
 			);
 		},
-
 		render : function () {
 			const dropdownChildren = React.Children.map(this.props.children, (child, i)=>{
 				// Ignore the first child
@@ -102,10 +118,12 @@ const Nav = {
 				return child;
 			});
 			return (
-				<div className='navDropdownContainer'
-					onMouseEnter={()=>this.handleDropdown(true)}
-					onMouseLeave={()=>this.handleDropdown(false)}>
-					{this.props.children[0]}
+				<div className={`navDropdownContainer ${this.props.className}`}
+					ref='dropdown'
+					onMouseEnter={this.props.trigger == 'hover' ? ()=>{this.handleDropdown(true);} : undefined}
+					onClick=     {this.props.trigger == 'click' ? ()=>{this.handleDropdown(true);} : undefined}
+					onMouseLeave={this.props.trigger == 'hover' ? ()=>{this.handleDropdown(false);} : undefined}>
+					{this.props.children[0] || this.props.children /*children is not an array when only one child*/}
 					{this.renderDropdown(dropdownChildren)}
 				</div>
 			);

shared/naturalcrit/nav/nav.less

@@ -50,7 +50,7 @@ nav{
 		}
 	}
 	.navItem{
-		#backgroundColors;
+		#backgroundColorsHover;
 		.animate(background-color);
 		padding          : 8px 12px;
 		cursor           : pointer;

shared/naturalcrit/splitPane/splitPane.jsx

@@ -17,7 +17,10 @@ const SplitPane = createClass({
 		return {
 			currentDividerPos : null,
 			windowWidth       : 0,
-			isDragging        : false
+			isDragging        : false,
+			moveSource        : false,
+			moveBrew          : false,
+			showMoveArrows    : true
 		};
 	},
 
@@ -29,6 +32,11 @@ const SplitPane = createClass({
 				userSetDividerPos : dividerPos,
 				windowWidth       : window.innerWidth
 			});
+		} else {
+			this.setState({
+				currentDividerPos : window.innerWidth / 2,
+				userSetDividerPos : window.innerWidth / 2
+			});
 		}
 		window.addEventListener('resize', this.handleWindowResize);
 	},
@@ -83,20 +91,58 @@ const SplitPane = createClass({
 			window.getSelection().removeAllRanges();
 		}
 	},
-*/
+	*/
+
+	setMoveArrows : function(newState) {
+		if(this.state.showMoveArrows != newState){
+			this.setState({
+				showMoveArrows : newState
+			});
+		}
+	},
+
+	renderMoveArrows : function(){
+		if(this.state.showMoveArrows) {
+			return <>
+				<div className='arrow left'
+					style={{ left: this.state.currentDividerPos-4 }}
+					onClick={()=>this.setState({ moveSource: !this.state.moveSource })} >
+					<i className='fas fa-arrow-left' />
+				</div>
+				<div className='arrow right'
+					style={{ left: this.state.currentDividerPos-4 }}
+					onClick={()=>this.setState({ moveBrew: !this.state.moveBrew })} >
+					<i className='fas fa-arrow-right' />
+				</div>
+			</>;
+		}
+	},
+
 	renderDivider : function(){
-		return <div className='divider' onMouseDown={this.handleDown} >
-			<div className='dots'>
-				<i className='fas fa-circle' />
-				<i className='fas fa-circle' />
-				<i className='fas fa-circle' />
+		return <>
+			{this.renderMoveArrows()}
+			<div className='divider' onMouseDown={this.handleDown} >
+				<div className='dots'>
+					<i className='fas fa-circle' />
+					<i className='fas fa-circle' />
+					<i className='fas fa-circle' />
+				</div>
 			</div>
-		</div>;
+		</>;
 	},
 
 	render : function(){
 		return <div className='splitPane' onMouseMove={this.handleMove} onMouseUp={this.handleUp}>
-			<Pane ref='pane1' width={this.state.currentDividerPos}>{this.props.children[0]}</Pane>
+			<Pane
+				ref='pane1'
+				width={this.state.currentDividerPos}
+			>
+				{React.cloneElement(this.props.children[0], {
+					moveBrew      : this.state.moveBrew,
+					moveSource    : this.state.moveSource,
+					setMoveArrows : this.setMoveArrows
+				})}
+			</Pane>
 			{this.renderDivider()}
 			<Pane ref='pane2' isDragging={this.state.isDragging}>{this.props.children[1]}</Pane>
 		</div>;

shared/naturalcrit/splitPane/splitPane.less

@@ -13,7 +13,7 @@
 	.divider{
 		display          : table;
 		height           : 100%;
-		width            : 12px;
+		width            : 15px;
 		cursor           : ew-resize;
 		background-color : #bbb;
 		text-align       : center;
@@ -32,4 +32,28 @@
 			background-color: #999;
 		}
 	}
+	.arrow{
+		position         : absolute;
+		width            : 25px;
+		height           : 25px;
+		border           : 2px solid #bbb;
+		border-radius    : 15px;
+		text-align       : center;
+		font-size        : 1.2em;
+		cursor           : pointer;
+		background-color : #ddd;
+		z-index          : 999;
+		box-shadow      : 0 4px 5px #0000007f;
+		&.left{
+			.tooltipLeft('Jump to location in Editor');
+			top : 30px;
+		}
+		&.right{
+			.tooltipRight('Jump to location in Preview');
+			top : 60px;
+		}
+		&:hover{
+			background-color: #666;
+		}
+	}
 }

shared/naturalcrit/styles/colors.less

@@ -23,6 +23,29 @@
 @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 };
+}
+
+#backgroundColorsHover {
   &.tealLight:hover{ background-color : @tealLight };
   &.teal:hover{ background-color : @teal };
   &.greenLight:hover{ background-color : @greenLight };

shared/naturalcrit/styles/reset.less

@@ -1 +1,27 @@
-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,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}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:none}table{border-collapse:collapse;border-spacing: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,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(article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section){
+  display:block
+}
+
+:where(body){
+  line-height:1
+}
+
+:where(ol,ul){
+  list-style:none
+}
+
+:where(blockquote,q){
+  quotes:none
+}
+
+:where(blockquote:before,blockquote:after,q:before,q:after){
+  content:none
+}
+
+:where(table){
+  border-collapse:collapse;border-spacing:0
+}

themes/Legacy/5ePHB/settings.json

@@ -0,0 +1,5 @@
+{
+  "name" : "5e PHB",
+  "renderer" : "legacy",
+  "baseTheme" : false
+}

themes/Legacy/5ePHB/snippets.js

@@ -1,12 +1,12 @@
 /* eslint-disable max-lines */
 
-const MagicGen = require('./magic.gen.js');
-const ClassTableGen = require('./classtable.gen.js');
-const MonsterBlockGen = require('./monsterblock.gen.js');
-const ClassFeatureGen = require('./classfeature.gen.js');
-const CoverPageGen = require('./coverpage.gen.js');
-const TableOfContentsGen = require('./tableOfContents.gen.js');
-const dedent = require('dedent-tabs').default;
+const MagicGen           = require('./snippets/magic.gen.js');
+const ClassTableGen      = require('./snippets/classtable.gen.js');
+const MonsterBlockGen    = require('./snippets/monsterblock.gen.js');
+const ClassFeatureGen    = require('./snippets/classfeature.gen.js');
+const CoverPageGen       = require('./snippets/coverpage.gen.js');
+const TableOfContentsGen = require('./snippets/tableOfContents.gen.js');
+const dedent             = require('dedent-tabs').default;
 
 module.exports = [
 

themes/Legacy/5ePHB/snippets/classfeature.gen.js

@@ -8,6 +8,7 @@ module.exports = function(classname){
 	classname = classname.toLowerCase();
 
 	const hitDie = _.sample([4, 6, 8, 10, 12]);
+	const spellSkill = _.sample(['Wisdom', 'Charisma', 'Intelligence']);
 
 	const abilityList = ['Strength', 'Dexerity', 'Constitution', 'Wisdom', 'Charisma', 'Intelligence'];
 	const skillList = ['Acrobatics ', 'Animal Handling', 'Arcana', 'Athletics', 'Deception', 'History', 'Insight', 'Intimidation', 'Investigation', 'Medicine', 'Nature', 'Perception', 'Performance', 'Persuasion', 'Religion', 'Sleight of Hand', 'Stealth', 'Survival'];
@@ -26,12 +27,21 @@ module.exports = function(classname){
 		'___',
 		`- **Armor:** ${_.sampleSize(['Light armor', 'Medium armor', 'Heavy armor', 'Shields'], _.random(0, 3)).join(', ') || 'None'}`,
 		`- **Weapons:** ${_.sampleSize(['Squeegee', 'Rubber Chicken', 'Simple weapons', 'Martial weapons'], _.random(0, 2)).join(', ') || 'None'}`,
-		`- **Tools:** ${_.sampleSize(['Artian\'s tools', 'one musical instrument', 'Thieve\'s tools'], _.random(0, 2)).join(', ') || 'None'}`,
+		`- **Tools:** ${_.sampleSize(['Artisan\'s tools', 'one musical instrument', 'Thieves\' tools'], _.random(0, 2)).join(', ') || 'None'}`,
 		'',
 		'___',
 		`- **Saving Throws:** ${_.sampleSize(abilityList, 2).join(', ')}`,
 		`- **Skills:** Choose two from ${_.sampleSize(skillList, _.random(4, 6)).join(', ')}`,
 		'',
+		'#### Spellcasting Ability',
+		'',
+		`<div style=text-align:center>`,
+		'___',
+		`- **Spell save DC** = ${_.sample([6, 8, 10])} + your proficiency bonus + your ${spellSkill} modifier`,
+		'',
+		`- **Spell attack modifier** = your proficiency bonus + your ${spellSkill} modifier`,
+		`</div>`,
+		'',
 		'#### Equipment',
 		'You start with the following equipment, in addition to the equipment granted by your background:',
 		'- *(a)* a martial weapon and a shield or *(b)* two martial weapons',

themes/V3/5eDMG/settings.json

@@ -0,0 +1,6 @@
+{
+  "name" : "5e DMG",
+  "renderer" : "V3",
+  "baseTheme" : "5ePHB",
+  "baseSnippets" : "5ePHB"
+}

themes/V3/5eDMG/snippets.js

@@ -0,0 +1,4 @@
+/* eslint-disable max-lines */
+
+module.exports = [
+];

themes/V3/5eDMG/style.less

@@ -0,0 +1,19 @@
+:root {
+	//Colors
+	--HB_Color_Accent                : #EBCEC3; // Salmon
+	--HB_Color_Footnotes             : #5C5C5C; // Dark gray
+}
+
+.page {
+	background-image : url(/assets/DMG_background.png);
+	background-size  : cover;
+
+	&:after {
+		background-image : url(/assets/DMG_footerAccent.png);
+		height: 58px;
+	}
+
+	.footnote {
+		bottom : 40px;
+	}
+}

themes/V3/5ePHB/settings.json

@@ -0,0 +1,6 @@
+{
+  "name" : "5e PHB",
+  "renderer" : "V3",
+  "baseTheme" : false,
+  "baseSnippets" : false
+}

themes/V3/5ePHB/snippets.js

@@ -0,0 +1,264 @@
+/* eslint-disable max-lines */
+
+const MagicGen           = require('./snippets/magic.gen.js');
+const ClassTableGen      = require('./snippets/classtable.gen.js');
+const MonsterBlockGen    = require('./snippets/monsterblock.gen.js');
+const ClassFeatureGen    = require('./snippets/classfeature.gen.js');
+const CoverPageGen       = require('./snippets/coverpage.gen.js');
+const TableOfContentsGen = require('./snippets/tableOfContents.gen.js');
+const dedent             = require('dedent-tabs').default;
+
+
+
+module.exports = [
+
+	{
+		groupName : 'Text Editor',
+		icon      : 'fas fa-pencil-alt',
+		view      : 'text',
+		snippets  : [
+			{
+				name : 'Page Number',
+				icon : 'fas fa-bookmark',
+				gen  : '{{pageNumber 1}}\n{{footnote PART 1 | SECTION NAME}}\n\n'
+			},
+			{
+				name : 'Auto-incrementing Page Number',
+				icon : 'fas fa-sort-numeric-down',
+				gen  : '{{pageNumber,auto}}\n{{footnote PART 1 | SECTION NAME}}\n\n'
+			},
+			{
+				name : 'Table of Contents',
+				icon : 'fas fa-book',
+				gen  : TableOfContentsGen
+			}
+		]
+	},
+	{
+		groupName : 'Style Editor',
+		icon      : 'fas fa-pencil-alt',
+		view      : 'style',
+		snippets  : [
+			{
+				name : 'Remove Drop Cap',
+				icon : 'fas fa-remove-format',
+				gen  : dedent`/* Removes Drop Caps */
+						.page h1+p:first-letter {
+							all: unset;
+						}\n\n
+						/* Removes Small-Caps in first line */
+						.page h1+p:first-line {
+							all: unset;
+						}`
+			},
+			{
+				name : 'Tweak Drop Cap',
+				icon : 'fas fa-sliders-h',
+				gen  : dedent`/* Drop Cap settings */
+						.page h1 + p::first-letter {
+							font-family: SolberaImitationRemake;
+							font-size: 3.5cm;
+							background-image: linear-gradient(-45deg, #322814, #998250, #322814);
+							line-height: 1em;
+						}\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',
+		view      : 'text',
+		snippets  : [
+			{
+				name : 'Spell',
+				icon : 'fas fa-magic',
+				gen  : MagicGen.spell,
+			},
+			{
+				name : 'Spell List',
+				icon : 'fas fa-scroll',
+				gen  : MagicGen.spellList,
+			},
+			{
+				name : 'Class Feature',
+				icon : 'fas fa-mask',
+				gen  : ClassFeatureGen,
+			},
+			{
+				name : 'Note',
+				icon : 'fas fa-sticky-note',
+				gen  : function(){
+					return dedent`
+						{{note
+						##### Time to Drop Knowledge
+						Use notes to point out some interesting information.
+
+						**Tables and lists** both work within a note.
+						}}
+						\n`;
+				},
+			},
+			{
+				name : 'Descriptive Text Box',
+				icon : 'fas fa-comment-alt',
+				gen  : function(){
+					return dedent`
+						{{descriptive
+						##### Time to Drop Knowledge
+						Use descriptive boxes to highlight text that should be read aloud.
+
+						**Tables and lists** both work within a descriptive box.
+						}}
+						\n`;
+				},
+			},
+			{
+				name : 'Monster Stat Block (unframed)',
+				icon : 'fas fa-paw',
+				gen  : MonsterBlockGen.monster('monster', 2),
+			},
+			{
+				name : 'Monster Stat Block',
+				icon : 'fas fa-spider',
+				gen  : MonsterBlockGen.monster('monster,frame', 2),
+			},
+			{
+				name : 'Wide Monster Stat Block',
+				icon : 'fas fa-dragon',
+				gen  : MonsterBlockGen.monster('monster,frame,wide', 4),
+			},
+			{
+				name : 'Cover Page',
+				icon : 'fas fa-file-word',
+				gen  : CoverPageGen,
+			},
+			{
+				name : 'Magic Item',
+				icon : 'fas fa-hat-wizard',
+				gen  : MagicGen.item,
+			},
+			{
+				name : 'Artist Credit',
+				icon : 'fas fa-signature',
+				gen  : function(){
+					return dedent`
+						{{artist,top:90px,right:30px
+						##### Starry Night
+						[Van Gogh](https://www.vangoghmuseum.nl/en)
+						}}
+						\n`;
+				},
+			},
+		]
+	},
+
+
+
+	/*********************  TABLES *********************/
+
+	{
+		groupName : 'Tables',
+		icon      : 'fas fa-table',
+		view      : 'text',
+		snippets  : [
+			{
+				name : 'Class Table',
+				icon : 'fas fa-table',
+				gen  : ClassTableGen.full('classTable,frame,decoration,wide'),
+			},
+			{
+				name : 'Class Table (unframed)',
+				icon : 'fas fa-border-none',
+				gen  : ClassTableGen.full('classTable,wide'),
+			},
+			{
+				name : '1/2 Class Table',
+				icon : 'fas fa-list-alt',
+				gen  : ClassTableGen.half('classTable,decoration,frame'),
+			},
+			{
+				name : '1/2 Class Table (unframed)',
+				icon : 'fas fa-border-none',
+				gen  : ClassTableGen.half('classTable'),
+			},
+			{
+				name : '1/3 Class Table',
+				icon : 'fas fa-border-all',
+				gen  : ClassTableGen.third('classTable,frame'),
+			},
+			{
+				name : '1/3 Class Table (unframed)',
+				icon : 'fas fa-border-none',
+				gen  : ClassTableGen.third('classTable'),
+			}
+		]
+	},
+
+
+
+
+	/**************** PAGE *************/
+
+	{
+		groupName : 'Print',
+		icon      : 'fas fa-print',
+		view      : 'style',
+		snippets  : [
+			{
+				name : 'Ink Friendly',
+				icon : 'fas fa-tint',
+				gen  : dedent`
+					/* Ink Friendly */
+					*:is(.page,.monster,.note,.descriptive) {
+						background : white !important;
+						filter : drop-shadow(0px 0px 3px #888) !important;
+					}
+
+					.page img {
+						visibility : hidden;
+					}\n\n`
+			},
+		]
+	}
+];

themes/V3/5ePHB/snippets/classfeature.gen.js

@@ -9,6 +9,7 @@ module.exports = function(classname){
 	classname = classname.toLowerCase();
 
 	const hitDie = _.sample([4, 6, 8, 10, 12]);
+	const spellSkill = _.sample(['Wisdom', 'Charisma', 'Intelligence']);
 
 	const abilityList = ['Strength', 'Dexerity', 'Constitution', 'Wisdom', 'Charisma', 'Intelligence'];
 	const skillList = ['Acrobatics', 'Animal Handling', 'Arcana', 'Athletics', 'Deception', 'History', 'Insight', 'Intimidation', 'Investigation', 'Medicine', 'Nature', 'Perception', 'Performance', 'Persuasion', 'Religion', 'Sleight of Hand', 'Stealth', 'Survival'];
@@ -16,27 +17,33 @@ module.exports = function(classname){
 
 	return dedent`
 		## Class Features
-		As a ${classname}, you gain the following class features
-		#### Hit Points
 
+		As a ${classname}, you gain the following class features
+
+		#### Hit Points
 		**Hit Dice:**                    :: 1d${hitDie} per ${classname} level
 		**Hit Points at 1st Level:**     :: ${hitDie} + your Constitution modifier
 		**Hit Points at Higher Levels:** :: 1d${hitDie} (or ${hitDie/2 + 1}) + your Constitution modifier per ${classname} level after 1st
 
 		#### Proficiencies
-
 		**Armor:**   :: ${_.sampleSize(['Light armor', 'Medium armor', 'Heavy armor', 'Shields'], _.random(0, 3)).join(', ') || 'None'}
 		**Weapons:** :: ${_.sampleSize(['Squeegee', 'Rubber Chicken', 'Simple weapons', 'Martial weapons'], _.random(0, 2)).join(', ') || 'None'}
-		**Tools:**   :: ${_.sampleSize(['Artian\'s tools', 'one musical instrument', 'Thieve\'s tools'], _.random(0, 2)).join(', ') || 'None'}
+		**Tools:**   :: ${_.sampleSize(['Artisan\'s tools', 'one musical instrument', 'Thieves\' tools'], _.random(0, 2)).join(', ') || 'None'}
 
 		**Saving Throws:** :: ${_.sampleSize(abilityList, 2).join(', ')}
 		**Skills:**        :: Choose two from ${_.sampleSize(skillList, _.random(4, 6)).join(', ')}
 
+		#### Spellcasting Ability
+		{{text-align:center
+		**Spell save DC**:: = ${_.sample([6, 8, 10])} + your proficiency bonus + your ${spellSkill} modifier
+
+		**Spell attack modifier**:: = your proficiency bonus + your ${spellSkill} modifier
+		}}
+
 		#### Equipment
 		You start with the following equipment, in addition to the equipment granted by your background:
 		- *(a)* a martial weapon and a shield or *(b)* two martial weapons
 		- *(a)* five javelins or *(b)* any simple melee weapon
 		- ${_.sample(['10 lint fluffs', '1 button', 'a cherished lost sock'])}
-
 		`;
 };

themes/V3/5ePHB/style.less

@@ -1,15 +1,19 @@
 @import (less) './themes/fonts/5e/fonts.less';
 @import (less) './themes/assets/assets.less';
 
-//Colors
-@background            : #EEE5CE; // Light parchment
-@noteGreen             : #e0e5c1; // Pastel green
-@headerUnderline       : #c9ad6a; // Gold
-@horizontalRule        : #9c2b1b; // Maroon
-@headerText            : #58180D; // Dark maroon
-@monsterStatBackground : #EEDBAB; // Light orange parchment
-@captionText           : #766649; // Brown
-@watercolorStain       : #BBAD82; // Light brown
+:root {
+	//Colors
+	--HB_Color_Background            : #EEE5CE; // Light parchment
+	--HB_Color_Accent                : #E0E5C1; // Pastel green
+	--HB_Color_HeaderUnderline       : #C0AD6A; // Gold
+	--HB_Color_HorizontalRule        : #9C2B1B; // Maroon
+	--HB_Color_HeaderText            : #58180D; // Dark Maroon
+	--HB_Color_MonsterStatBackground : #EEDBAB; // Light orange parchment
+	--HB_Color_CaptionText           : #766649; // Brown
+	--HB_Color_WatercolorStain       : #BBAD82; // Light brown
+	--HB_Color_Footnotes             : #C9AD6A; // Gold
+}
+
 @page { margin: 0; }
 body {
 	counter-reset : phb-page-numbers;
@@ -65,7 +69,7 @@ body {
 	overflow          : hidden;
 	height            : 279.4mm;
 	width             : 215.9mm;
-	background-color  : @background;
+	background-color  : var(--HB_Color_Background);
 	background-image  : @backgroundImage;
 	padding           : 1.4cm 1.9cm 1.7cm;
 	font-family       : BookInsanityRemake;
@@ -131,12 +135,13 @@ body {
 	h1,h2,h3,h4{
 		font-family   : MrEavesRemake;
 		font-weight   : 800;
-		color         : @headerText;
+		color         : var(--HB_Color_HeaderText);
 	}
 	h1{
 		margin-bottom       : 0.18cm; //Margin-bottom only because this is WIDE
 		column-span         : all;
 		font-size           : 0.89cm;
+		line-height         : 1em;
 		-webkit-column-span : all;
 		-moz-column-span    : all;
 		&+p::first-letter{
@@ -168,7 +173,7 @@ body {
 		//margin-top    : -0.1cm; //Font is misaligned. Shift up slightly
 		//margin-bottom : 0.1cm;
 		font-size     : 0.575cm;
-		border-bottom : 2px solid @headerUnderline;
+		border-bottom : 2px solid var(--HB_Color_HeaderUnderline);;
 		line-height   : 0.995em; //Font is misaligned. Shift up slightly
 	}
 	h4{
@@ -211,7 +216,7 @@ body {
 					padding : 0.14em 0.4em;
 				}
 				&:nth-child(odd){
-					background-color : @noteGreen;
+					background-color : var(--HB_Color_Accent);
 				}
 			}
 		}
@@ -221,7 +226,7 @@ body {
 	// *****************************/
 	.note{
 		.useSansSerif();
-		background-color    : @noteGreen;
+		background-color    : var(--HB_Color_Accent);
 		border-style        : solid;
 		border-width        : 1px;
 		border-image        : @noteBorderImage 12 stretch;
@@ -287,7 +292,7 @@ body {
 		text-align  : center;
 		font-family : WalterTurncoat;
 		font-size   : 0.27cm;
-		color       : @captionText;
+		color       : var(--HB_Color_CaptionText);
 		p, p + p {
 			margin      : unset;
 			text-indent : unset;
@@ -340,7 +345,7 @@ body {
 		mask-size           : contain;
 		mask-repeat         : no-repeat;
 		background-size     : cover;
-		background-color    : @watercolorStain;			/*default color*/
+		background-color    : var(--HB_Color_WatercolorStain);			/*default color*/
 		--wc                : @watercolor1;         /*default image*/
 		z-index             : -2;
 	}
@@ -366,7 +371,7 @@ body {
 		&.frame {
 			border-style          : solid;
 			border-width          : 7px 6px;
-			background-color      : @monsterStatBackground;
+			background-color      : var(--HB_Color_MonsterStatBackground);
 			background-image      : @monsterBlockBackground;
 			border-image          : @monsterBorderImage 14 round;
 			border-image-outset   : 0px 2px;
@@ -397,7 +402,7 @@ body {
 			font-family    : ScalySansRemake;
 			font-weight    : 800;
 			font-variant   : small-caps;
-			border-bottom  : 2px solid @headerText;
+			border-bottom  : 2px solid var(--HB_Color_HeaderText);
 			// margin-top     : 0.05cm;  //Font is misaligned. Shift up slightly
   		padding-bottom : 0.05cm;
 		}
@@ -414,7 +419,7 @@ body {
 
 		//Attribute Lists - All text between HRs is red
 		hr ~ :is(dl,p) {
-			color : @headerText;
+			color : var(--HB_Color_HeaderText);
 		}
 		hr:last-of-type {
 			& ~ :is(dl,p) {
@@ -429,7 +434,7 @@ body {
 		hr + table:first-of-type{
 			margin              : 0;
 			column-span         : none;
-			color               : @headerText;
+			color               : var(--HB_Color_HeaderText);
 			background-color    : transparent;
 			border-style        : none;
 			border-image        : none;
@@ -484,7 +489,7 @@ body {
 		bottom      : 22px;
 		width       : 50px;
 		font-size   : 0.9em;
-		color       : #c9ad6a;
+		color       : var(--HB_Color_Footnotes);
 		text-align  : center;
 		text-indent : 0;
 		&.auto::after {
@@ -498,7 +503,7 @@ body {
 		z-index    : 150;
 		width      : 200px;
 		font-size  : 0.8em;
-		color      : #c9ad6a;
+		color      : var(--HB_Color_Footnotes);
 		text-align : right;
 	}
 	//************************************
@@ -545,7 +550,6 @@ body {
 		-webkit-column-break-after : always;
 		break-after                : always;
 		-moz-column-break-after    : always;
-		break-before               : column;
 	}
 	//Avoid breaking up
 	blockquote,table{
@@ -604,8 +608,8 @@ body {
 		white-space : nowrap;
 	}
 	&.frame {
-		margin-top          : 0.66cm;
-		margin-bottom       : 1.05cm;
+		margin-top          : 0.7cm;
+		margin-bottom       : 0.9cm;
 		margin-left         : -0.1cm;
 		margin-right        : -0.1cm;
 		width               : calc(100% + 0.2cm);
@@ -613,34 +617,38 @@ body {
 		background-color    : white;
 		border              : initial;
 		border-style        : solid;
-		border-image-outset : 0.55cm 0.3cm;
+		border-image-outset : 0.4cm 0.3cm;
 		border-image-repeat : stretch;
 		border-image-slice  : 200;
 		border-image-source : @frameBorderImage;
 		border-image-width  : 47px;
+		&.wide:first-child {
+			margin-top: 0.12cm;
+		}
 	}
 	&.decoration {
-		transform-style : preserve-3d;
-		z-index: -1;
 		position:relative;
 	}
 	&.decoration::before {
-		content           :'';
-		position          : absolute;
-		background-image  : @classTableDecoration;
-		background-size   : contain;
-		background-repeat : space;
-		width             : 7.75cm;
-		height            : calc(100% + 3.3cm);
-		top               : 50%;
-		left              : 50%;
-		transform         : translateY(-50%) translateX(-50%) translateZ(-1px);
-		filter            : drop-shadow(0px 0px 1px #C8C5C080)
+		content             :'';
+		position            : absolute;
+		background-image    : @classTableDecoration,
+		                      @classTableDecoration;
+		background-size     : contain, contain;
+		background-repeat   : no-repeat, no-repeat;
+		background-position : top, bottom;
+		width               : 7.75cm;
+		height              : calc(100% + 3.3cm);
+		top                 : 50%;
+		left                : 50%;
+		transform           : translateY(-50%) translateX(-50%);
+		filter              : drop-shadow(0px 0px 1px #C8C5C080);
+		z-index             : -1;
 	}
 	&.decoration.wide::before {
-		width             : calc(100% + 3.3cm);
-		height            : 7.75cm;
-		top               : calc(50% + 0.4cm);
+		width               : calc(100% + 3.3cm);
+		height              : 7.75cm;
+		background-position : left, right;
 	}
 	h5 + table{
 		margin-top : 0.2cm;

themes/V3/Blank/settings.json

@@ -0,0 +1,6 @@
+{
+  "name" : "Blank",
+  "renderer" : "V3",
+  "baseTheme" : false,
+  "baseSnippets" : false
+}

themes/V3/Blank/snippets.js

@@ -1,13 +1,8 @@
 /* eslint-disable max-lines */
 
-const MagicGen = require('./magic.gen.js');
-const ClassTableGen = require('./classtable.gen.js');
-const MonsterBlockGen = require('./monsterblock.gen.js');
-const ClassFeatureGen = require('./classfeature.gen.js');
-const CoverPageGen = require('./coverpage.gen.js');
-const TableOfContentsGen = require('./tableOfContents.gen.js');
-const dedent = require('dedent-tabs').default;
-const watercolorGen = require('./watercolor.gen.js');
+const WatercolorGen      = require('./snippets/watercolor.gen.js');
+const dedent             = require('dedent-tabs').default;
+
 
 
 module.exports = [
@@ -59,26 +54,11 @@ module.exports = [
 							`&size=100x100) {width:100px;mix-blend-mode:multiply}`;
 				}
 			},
-			{
-				name : 'Page Number',
-				icon : 'fas fa-bookmark',
-				gen  : '{{pageNumber 1}}\n{{footnote PART 1 | SECTION NAME}}\n\n'
-			},
-			{
-				name : 'Auto-incrementing Page Number',
-				icon : 'fas fa-sort-numeric-down',
-				gen  : '{{pageNumber,auto}}\n{{footnote PART 1 | SECTION NAME}}\n\n'
-			},
 			{
 				name : 'Link to page',
 				icon : 'fas fa-link',
 				gen  : '[Click here](#p3) to go to page 3\n'
 			},
-			{
-				name : 'Table of Contents',
-				icon : 'fas fa-book',
-				gen  : TableOfContentsGen
-			},
 			{
 				name : 'Add Comment',
 				icon : 'fas fa-code',
@@ -91,29 +71,6 @@ module.exports = [
 		icon      : 'fas fa-pencil-alt',
 		view      : 'style',
 		snippets  : [
-			{
-				name : 'Remove Drop Cap',
-				icon : 'fas fa-remove-format',
-				gen  : dedent`/* Removes Drop Caps */
-						.page h1+p:first-letter {
-							all: unset;
-						}\n\n
-						/* Removes Small-Caps in first line */
-						.page h1+p:first-line {
-							all: unset;
-						}`
-			},
-			{
-				name : 'Tweak Drop Cap',
-				icon : 'fas fa-sliders-h',
-				gen  : dedent`/* Drop Cap settings */
-						.page h1 + p::first-letter {
-							font-family: SolberaImitationRemake;
-							font-size: 3.5cm;
-							background-image: linear-gradient(-45deg, #322814, #998250, #322814);
-							line-height: 1em;
-						}\n\n`
-			},
 			{
 				name : 'Add Comment',
 				icon : 'fas fa-code',
@@ -132,28 +89,18 @@ module.exports = [
 				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)
-					}}`
+					![cat warrior](https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg) {width:325px,mix-blend-mode:multiply}`
 			},
 			{
 				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)
-					}}`
+					![homebrew mug](http://i.imgur.com/hMna6G0.png) {position:absolute,top:50px,right:30px,width:280px}`
 			},
 			{
 				name : 'Watercolor Splatter',
 				icon : 'fas fa-fill-drip',
-				gen  : watercolorGen,
+				gen  : WatercolorGen,
 			},
 			{
 				name : 'Watermark',
@@ -164,99 +111,6 @@ module.exports = [
 		]
 	},
 
-
-	/************************* PHB ********************/
-
-	{
-		groupName : 'PHB',
-		icon      : 'fas fa-book',
-		view      : 'text',
-		snippets  : [
-			{
-				name : 'Spell',
-				icon : 'fas fa-magic',
-				gen  : MagicGen.spell,
-			},
-			{
-				name : 'Spell List',
-				icon : 'fas fa-scroll',
-				gen  : MagicGen.spellList,
-			},
-			{
-				name : 'Class Feature',
-				icon : 'fas fa-mask',
-				gen  : ClassFeatureGen,
-			},
-			{
-				name : 'Note',
-				icon : 'fas fa-sticky-note',
-				gen  : function(){
-					return dedent`
-						{{note
-						##### Time to Drop Knowledge
-						Use notes to point out some interesting information.
-
-						**Tables and lists** both work within a note.
-						}}
-						\n`;
-				},
-			},
-			{
-				name : 'Descriptive Text Box',
-				icon : 'fas fa-comment-alt',
-				gen  : function(){
-					return dedent`
-						{{descriptive
-						##### Time to Drop Knowledge
-						Use descriptive boxes to highlight text that should be read aloud.
-
-						**Tables and lists** both work within a descriptive box.
-						}}
-						\n`;
-				},
-			},
-			{
-				name : 'Monster Stat Block (unframed)',
-				icon : 'fas fa-paw',
-				gen  : MonsterBlockGen.monster('monster', 2),
-			},
-			{
-				name : 'Monster Stat Block',
-				icon : 'fas fa-spider',
-				gen  : MonsterBlockGen.monster('monster,frame', 2),
-			},
-			{
-				name : 'Wide Monster Stat Block',
-				icon : 'fas fa-dragon',
-				gen  : MonsterBlockGen.monster('monster,frame,wide', 4),
-			},
-			{
-				name : 'Cover Page',
-				icon : 'fas fa-file-word',
-				gen  : CoverPageGen,
-			},
-			{
-				name : 'Magic Item',
-				icon : 'fas fa-hat-wizard',
-				gen  : MagicGen.item,
-			},
-			{
-				name : 'Artist Credit',
-				icon : 'fas fa-signature',
-				gen  : function(){
-					return dedent`
-						{{artist,top:90px,right:30px
-						##### Starry Night
-						[Van Gogh](https://www.vangoghmuseum.nl/en)
-						}}
-						\n`;
-				},
-			},
-		]
-	},
-
-
-
 	/*********************  TABLES *********************/
 
 	{
@@ -323,43 +177,10 @@ module.exports = [
 						}}
 						\n`;
 				}
-			},
-			{
-				name : 'Class Table',
-				icon : 'fas fa-table',
-				gen  : ClassTableGen.full('classTable,frame,decoration,wide'),
-			},
-			{
-				name : 'Class Table (unframed)',
-				icon : 'fas fa-border-none',
-				gen  : ClassTableGen.full('classTable,wide'),
-			},
-			{
-				name : '1/2 Class Table',
-				icon : 'fas fa-list-alt',
-				gen  : ClassTableGen.half('classTable,decoration,frame'),
-			},
-			{
-				name : '1/2 Class Table (unframed)',
-				icon : 'fas fa-border-none',
-				gen  : ClassTableGen.half('classTable'),
-			},
-			{
-				name : '1/3 Class Table',
-				icon : 'fas fa-border-all',
-				gen  : ClassTableGen.third('classTable,frame'),
-			},
-			{
-				name : '1/3 Class Table (unframed)',
-				icon : 'fas fa-border-none',
-				gen  : ClassTableGen.third('classTable'),
 			}
 		]
 	},
 
-
-
-
 	/**************** PAGE *************/
 
 	{
@@ -392,7 +213,7 @@ module.exports = [
 				icon : 'fas fa-tint',
 				gen  : dedent`
 					/* Ink Friendly */
-					*:is(.page,.monster,.note,.descriptive) {
+					*:is(.page) {
 						background : white !important;
 						filter : drop-shadow(0px 0px 3px #888) !important;
 					}
@@ -402,6 +223,5 @@ module.exports = [
 					}\n\n`
 			},
 		]
-	},
-
+	}
 ];

themes/V3/Blank/snippets/watercolor.gen.js

@@ -0,0 +1,5 @@
+const _ = require('lodash');
+
+module.exports = ()=>{
+	return `{{watercolor${_.random(1, 12)},top:20px,left:30px,width:300px,background-color:#BBAD82,opacity:80%}}\n\n`;
+};

themes/V3/Blank/style.less

@@ -0,0 +1,273 @@
+@import (less) './themes/fonts/5e/fonts.less';
+@import (less) './themes/assets/assets.less';
+
+:root {
+	//Colors
+	--HB_Color_Background            : #FFFFFF; // White
+	--HB_Color_WatercolorStain       : #000000; // Black
+}
+
+@page { margin: 0; }
+body {
+	counter-reset : phb-page-numbers;
+}
+*{
+	-webkit-print-color-adjust : exact;
+}
+
+.useColumns(@multiplier : 1, @fillMode: balance){
+	column-fill          : @fillMode;
+	column-count         : 2;
+}
+.columnWrapper{
+	max-height        : 100%;
+	column-span       : all;
+	columns           : inherit;
+	column-gap        : inherit;
+}
+.page{
+	.useColumns();
+	height            : 279.4mm;
+	width             : 215.9mm;
+	padding           : 1.4cm 1.9cm 1.7cm;
+	counter-increment : phb-page-numbers;
+	background-color  : var(--HB_Color_Background);
+	position          : relative;
+	z-index           : 15;
+	box-sizing        : border-box;
+	overflow          : hidden;
+	text-rendering    : optimizeLegibility;
+	page-break-before : always;
+	page-break-after  : always;
+}
+	//*****************************
+	// *            BASE
+	// *****************************/
+:where(.page){
+	p{
+		overflow-wrap : break-word;
+		display       : block;
+	}
+	strong{
+		font-weight : bold;
+	}
+	em{
+		font-style : italic;
+	}
+	sup{
+		vertical-align : super;
+		font-size      : smaller;
+		line-height    : 0;
+	}
+	sub{
+		vertical-align : sub;
+		font-size      : smaller;
+		line-height    : 0;
+	}
+	ul {
+		list-style-position : outside; //Needed for multiline list items
+		list-style-type     : disc;
+		padding-left        : 1.4em;
+	}
+	ol {
+		list-style-position : outside;
+		list-style-type     : decimal;
+		padding-left        : 1.4em;
+	}
+	img{
+		z-index : -1;
+	}
+	:not(:where(.wide,.columnSplit,.blank,hr)) + :where(h1,h2,h3,h4,h5,h6,table,dl,.block) {
+		margin-top : 1em;  		//NOTE: MAKE ALL MARGINS TOP-ONLY FOR BEST RESULTS WITH COLUMN BREAKS. USE * + * STYLE SELECTORS
+	}
+
+	:where(h1,h3,h3,h4,h5,h6) + * {
+		margin-top : 0;
+	}
+	//*****************************
+	// *           HEADERS
+	// *****************************/
+	h1,h2,h3,h4,h5,h6{
+		font-weight  : bold;
+		line-height  : 1.2em;
+	}
+	h1{
+		font-size : 2em;
+	}
+	h2{
+		font-size : 1.5em;
+	}
+	h3{
+		font-size : 1.17em;
+	}
+	h4{
+		font-size : 1em;
+	}
+	h5{
+		font-size : 0.83em;
+	}
+	//*****************************
+	// *          TABLE
+	// *****************************/
+	table{
+		width : 100%;
+		thead{
+			display     : table-row-group;
+			font-weight : bold;
+		}
+	}
+
+	/* Watermark */
+	.watermark {
+		display         : grid !important;
+		place-items     : center;
+		justify-content	: center;
+		position        : absolute;
+		margin          : 0;
+		top             : 0;
+		left            : 0;
+		width           : 100%;
+		height          : 100%;
+		font-size       : 120px;
+		text-transform	: uppercase;
+		color           : black;
+		mix-blend-mode  : overlay;
+		opacity         : 30%;
+		transform       : rotate(-45deg);
+		z-index         : 500;
+		p {
+			margin-bottom : none;
+		}
+	}
+
+	/* Watercolor */
+	[class*="watercolor"] {
+		position            : absolute;
+		width               : 2000px;    /* dimensions need to be real big so the user can set */
+		height              : 2000px;    /* height or width and the image will maintain aspect ratio */
+		-webkit-mask-image  : var(--wc);
+		-webkit-mask-size   : contain;
+		-webkit-mask-repeat : no-repeat;
+		mask-image          : var(--wc);
+		mask-size           : contain;
+		mask-repeat         : no-repeat;
+		background-size     : cover;
+		background-color    : var(--HB_Color_WatercolorStain);			/*default color*/
+		--wc                : @watercolor1;         /*default image*/
+		z-index             : -2;
+	}
+
+	.watercolor1  { --wc : @watercolor1; }
+	.watercolor2  { --wc : @watercolor2; }
+	.watercolor3  { --wc : @watercolor3; }
+	.watercolor4  { --wc : @watercolor4; }
+	.watercolor5  { --wc : @watercolor5; }
+	.watercolor6  { --wc : @watercolor6; }
+	.watercolor7  { --wc : @watercolor7; }
+	.watercolor8  { --wc : @watercolor8; }
+	.watercolor9  { --wc : @watercolor9; }
+	.watercolor10 { --wc : @watercolor10; }
+	.watercolor11 { --wc : @watercolor11; }
+	.watercolor12 { --wc : @watercolor12; }
+
+	//************************************
+	// *           CODE BLOCKS
+	// ************************************/
+	code{
+    font-family      : "Courier New", Courier, monospace;
+		white-space      : pre-wrap;
+		overflow-wrap    : break-word;
+	}
+
+	pre code{
+		width               : 100%;
+		display             : inline-block;
+	}
+	//*****************************
+	// *          EXTRAS
+	// *****************************/
+	.columnSplit {
+		visibility                 : hidden;
+		-webkit-column-break-after : always;
+		break-after                : always;
+		-moz-column-break-after    : always;
+	}
+	//Avoid breaking up
+	blockquote,table{
+		z-index                     : 15;
+		-webkit-column-break-inside : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
+	}
+	// Nested lists
+	ul ul,ol ol,ul ol,ol ul{
+		margin-bottom : 0px;
+		margin-left   : 1.5em;
+	}
+	li{
+		-webkit-column-break-inside : avoid;
+		page-break-inside           : avoid;
+		break-inside                : avoid;
+	}
+}
+
+//*****************************
+// *    MUSTACHE DIVS/SPANS
+// *****************************/
+:where(.page) {
+	.block {
+		break-inside      : avoid;
+		display           : inline-block;
+		.page :where(&) {
+			width             : 100%;
+		}
+	}
+	.inline-block {
+		display     : inline-block;
+		text-indent : initial;
+	}
+}
+
+//*****************************
+// *    DEFINITION LISTS
+// *****************************/
+:where(.page) {
+	dl {
+		padding-left : 1em;
+		white-space  : pre-line;
+	}
+  dt {
+    display      : inline;
+    margin-right : 0.5ch;
+		margin-left  : -1em;
+  }
+  dd {
+		display     : inline;
+		margin-left : 0;
+		text-indent : 0;
+  }
+}
+
+//*****************************
+// *    BLANK LINE
+// *****************************/
+:where(.page) {
+	.blank {
+		height     : 1em;
+		margin-top : 0;
+	}
+}
+
+//*****************************
+// *         WIDE
+// *****************************/
+:where(.page) {
+	.wide{
+		column-span         : all;
+		display             : block;
+		margin-bottom       : 1em;
+		&+* {
+			margin-top : 0;
+		}
+	}
+}

themes/V3/Journal/settings.json

@@ -0,0 +1,6 @@
+{
+  "name" : "Journal",
+  "renderer" : "V3",
+  "baseTheme" : false,
+  "baseSnippets" : "5ePHB"
+}

themes/V3/Journal/snippets.js

@@ -0,0 +1,4 @@
+/* eslint-disable max-lines */
+
+module.exports = [
+];

themes/V3/Journal/style.less

@@ -0,0 +1,559 @@
+@import (less) './themes/fonts/Journal/fonts.less';
+@import (less) './themes/assets/assets.less';
+
+:root {
+	//Colors
+	--HB_Color_Background            : unset; // Light parchment
+	--HB_Color_Text                  : #412121; // Dark Maroon Brown
+	--HB_Color_Text2                 : #261C13CC; //Dark Brown
+	--HB_Color_HeaderText            : #58180D; // Dark Maroon
+	--HB_Color_CaptionText           : #766649; // Brown
+	--HB_Color_WatercolorStain       : #BBAD82; // Light brown
+}
+
+.useSansSerif(){
+	font-family : PermanentMarker;
+	font-size   : 0.3cm;
+	line-height : 1.2em;
+	color       : var(--HB_Color_Text2);
+	p,dl,ul,ol {
+		line-height : 1.2em;
+	}
+	ul, ol {
+		padding-left : 1em;
+	}
+	em{
+		font-style  : italic;
+	}
+	strong{
+		font-weight : 800;
+		font-size   : 1.1em;
+	}
+	h5 + * {
+		margin-top : 0.1cm;
+	}
+}
+.useColumns(@multiplier : 1, @fillMode: balance){
+	column-gap           : 0.5cm;
+}
+
+.page{
+	background-size     : 200% 100%;
+	background-repeat   : no-repeat;
+	filter              : drop-shadow(1px 4px 14px black);
+	background-image    : url(/assets/Journal/Background1.webp);
+	padding             : 2.1cm 1.9cm 1.7cm 3.8cm;
+	&:nth-of-type(2n + 1) {
+		background-position : left;
+	}
+	&:nth-of-type(2n) {
+		background-position : right;
+		padding             : 2.1cm 3.9cm 1.7cm 1.8cm;
+	}
+	&:nth-of-type(2) {
+		background-image    : url(/assets/Journal/Background2.webp); //Only first page should show ribbon
+	}
+
+	& .columnWrapper {
+		//transform: rotate(-0.5deg);  // Breaks absolute positioning of images/footers. Wait for Chrome fix
+	}
+}
+
+	//*****************************
+	// *            BASE
+	// *****************************/
+:where(.page){
+	color       : var(--HB_Color_Text);
+	font-family : ReenieBeanie;
+	font-size   : 0.53cm;
+	line-height : 0.8em;
+	p + * {
+		margin-top : 0.325cm;
+	}
+	p + p{
+		margin-top : 0;
+	}
+	ul{
+		margin-bottom       : 0.8em;
+	}
+	ol{
+		margin-bottom       : 0.8em;
+	}
+	em{
+		text-decoration : underline;
+  	font-style      : unset;
+	}
+	del{
+		text-decoration-style: double;
+	}
+
+	//Indents after p or lists
+	p+p, ul+p, ol+p{
+		text-indent : 1em;
+	}
+	//*****************************
+	// *           HEADERS
+	// *****************************/
+	h1,h2,h3,h4,h5{
+		font-family   : FrederickaTheGreat;
+		font-weight   : unset;
+		color         : var(--HB_Color_HeaderText);
+	}
+	h1{
+		margin-bottom       : 0.18cm; //Margin-bottom only because this is WIDE
+		font-size           : 0.89cm;
+		line-height         : 1em;
+		font-variant        : small-caps;
+		&+p::first-letter{
+			float                   : left;
+			font-family             : FrederickaTheGreat;
+			line-height             : 1em;
+			font-size               : 1.9em;
+			padding-left            : 40px; //Allow background color to extend into margins
+			margin-top              : -0.3cm;
+			margin-bottom           : -20px;
+			margin-left             : -40px;
+			margin-right            : 0.1em;
+			padding-top             : 0.3em;
+			padding-bottom          : 2px;
+		}
+		&+p::first-line{
+			font-variant : small-caps;
+		}
+	}
+	h2{
+		font-size     : 0.62cm;
+		line-height   : 0.988em; //Font is misaligned. Shift up slightly
+	}
+	h3{
+		font-size     : 0.575cm;
+		line-height   : 0.995em; //Font is misaligned. Shift up slightly
+		margin-left   : -0.9em;
+	}
+	h4{
+		font-size      : 0.55cm;
+		line-height    : 0.971em; //Font is misaligned. Shift up slightly
+		color          : var(--HB_Color_Text);
+		padding-bottom : 5px;
+		transform:rotate(0deg);
+		&:nth-of-type(2n) {
+			transform:rotate(1deg);
+		}
+		&:nth-of-type(3n) {
+			transform:rotate(-1.5deg);
+		}
+	}
+	h5{
+		font-family   : PermanentMarker;
+		font-size     : 0.4cm;
+		color         : var(--HB_Color_Text2);
+		font-weight   : bold;
+		line-height   : 0.951em; //Font is misaligned. Shift up slightly
+		& + * {
+			margin-top : 0.2cm;
+		}
+	}
+	//*****************************
+	// *          TABLE
+	// *****************************/
+	table{
+		.useSansSerif();
+		& + * {
+			margin-top : 0.325cm;
+		}
+		thead{
+			th{
+				vertical-align : bottom;
+				padding        : 0.14em 0;
+			}
+		}
+		tbody{
+			tr{
+				td{
+					padding : 0.14em 0;
+				}
+				&:nth-child(odd){
+					background-image : linear-gradient(to left, #41212100, #41212122, #41212100);
+				}
+			}
+		}
+	}
+	//*****************************
+	// *            NOTE
+	// *****************************/
+	.note{
+		.useSansSerif();
+		border-style        : solid;
+		border-width        : 1px;
+		border-image-source : url(/assets/Journal/Border1.png);
+		border-image-slice  : 18 18 18 18;
+		border-image-width  : 6px 6px 6px 6px;
+		border-image-outset : 5px 5px 5px 5px;
+		border-image-repeat : stretch stretch;
+		background-image    : url(/assets/Journal/HashMarks.png),
+													linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
+		background-size     : 120% 120%;
+		background-repeat   : no-repeat;
+		background-position : center;
+		padding             : 0.2cm;
+		:where(&) {
+			margin-top        : 9px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.45cm;
+		}
+		h5 {
+			font-size : 0.375cm;
+		}
+		p{
+			padding-bottom : 0px;
+		}
+		:last-child {
+			margin-bottom : 0;
+		}
+	}
+	//************************************
+	// *       DESCRIPTIVE TEXT BOX
+	// ************************************/
+	* + .descriptive {
+		margin-top : 0.6cm;
+	}
+	.descriptive{
+		.useSansSerif();
+		border-style        : solid;
+		border-width        : 1px;
+		border-image-source : url('/assets/Journal/Border2.png');
+		border-image-slice  : 48 48 48 48;
+		border-image-width  : 20px;
+		border-image-outset : 16px 20px 16px 20px;
+		border-image-repeat : stretch stretch;
+		background-image    : url(/assets/Journal/HashMarks.png),
+													linear-gradient(to bottom right, #ff000000, #41212114, #41212100);
+		background-size     : 120% 120%;
+		background-repeat   : no-repeat;
+		background-position : center;
+		padding             : 0.2cm;
+		:where(&) {
+			margin-top        : 4px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.45cm;
+		}
+		h5 {
+			font-size : 0.375cm;
+		}
+		p{
+			padding-bottom : 0px;
+		}
+		:last-child {
+			margin-bottom : 0;
+		}
+	}
+	//*****************************
+	// *    Images Snippets
+	// *****************************/
+
+	/* Arist Credit */
+	.artist {
+		position    : absolute;
+		width       : auto;
+		text-align  : center;
+		font-family : WalterTurncoat;
+		font-size   : 0.27cm;
+		color       : var(--HB_Color_CaptionText);
+		p, p + p {
+			margin      : unset;
+			text-indent : unset;
+			line-height : 1em;
+		}
+	 	h5 {
+			font-size   : 1.3em;
+			font-family : WalterTurncoat;
+		}
+		a{
+			color           : inherit;
+			text-decoration : unset;
+			&:hover {
+				text-decoration : underline;
+			}
+		}
+	}
+
+	//*****************************
+	// *    MONSTER STAT BLOCK
+	// *****************************/
+	.monster {
+		.useSansSerif();
+		&.frame {
+			border-style          : solid;
+			border-width          : 7px 6px;
+			border-image-source   : url('/assets/Journal/Border3.png');
+			border-image-slice    : 63 74 63 74;
+			border-image-width    : 15px 20px 15px 20px;
+			border-image-outset   : 12px 12px 12px 12px;
+			border-image-repeat   : stretch round;
+			background-image      : url('/assets/Journal/HashMarks.png'),
+				                      linear-gradient(to bottom right, #ff000000, #a36a4e14, #41212100);
+			background-blend-mode : screen multiply;
+			background-size       : 100%;
+			padding               : 0.2cm;
+		}
+
+		color: var(--HB_Color_Text);
+		position          : relative;
+		padding           : 0px;
+		margin-bottom     : 0.325cm;
+
+		//Headers
+		h2{
+			font-size     : 0.62cm;
+			line-height   : 1em;
+			margin        : 0;
+			&+p {
+				margin-bottom : 0; //Monster size and type subtext
+			}
+		}
+		h3{
+			margin-left    : 0;
+			font-variant   : small-caps;
+  		padding-bottom : 0.05cm;
+		}
+		hr{
+			visibility       : visible;
+			height           : 6px;
+			margin           : 0.12cm 0cm;
+			background-image : url('/assets/Journal/HorizontalRule.png');
+			background-size  : 100% 100%;
+		}
+		hr:last-of-type + * {
+			margin-top : 0.325cm; // Space after last HR
+		}
+
+		// Monster Ability table
+		hr + table:first-of-type{
+			margin              : 0;
+			column-span         : none;
+		  background-image    : none;
+			border-style        : none;
+			border-image        : none;
+			color               : inherit;
+			tr {
+				background-image  : none;
+			}
+			td,th {
+				padding: 0px;
+			}
+		}
+
+		:last-child {
+			margin-bottom : 0;
+		}
+
+		strong, em {
+			font-style      : normal;
+			text-decoration : none;
+		}
+	}
+
+	//Full Width
+	.monster.wide{
+		.useColumns(0.96, @fillMode: balance);
+	}
+
+	//*****************************
+	// *           FOOTER
+	// *****************************/
+	&:nth-child(odd){
+		.pageNumber{
+			left : 3cm;
+		}
+		.footnote{
+			left       : 4.5cm;
+			text-align : left;
+		}
+	}
+	.pageNumber{
+		font-family : FrederickaTheGreat;
+		position    : absolute;
+		right       : 3cm;
+		bottom      : 1.25cm;
+		width       : 50px;
+		font-size   : 0.9em;
+		color       : var(--HB_Color_HeaderText);
+		text-align  : center;
+		text-indent : 0;
+		&.auto::after {
+			content : counter(phb-page-numbers);
+		}
+	}
+	.footnote{
+		position   : absolute;
+		right      : 4.5cm;
+		bottom     : 1.25cm;
+		z-index    : 150;
+		width      : 200px;
+		font-size  : 0.8em;
+		color      : var(--HB_Color_HeaderText);
+		text-align : right;
+	}
+	//************************************
+	// *           CODE BLOCKS
+	// ************************************/
+	code{
+		font-size        : 0.3cm;
+		padding          : 0px 4px;
+		color            : var(--HB_Color_Text);
+		vertical-align   : middle;
+		background-color : #faf7ea;
+		border-radius    : 4px;
+	}
+
+	pre code{
+		border-style        : solid;
+		border-width        : 1px;
+		border-image        : @codeBorderImage 26 stretch;
+		border-image-width  : 10px;
+		border-image-outset : 2px;
+		border-radius       : 12px;
+		margin-bottom       : 2px;
+		padding             : 0.15cm;
+		.page :where(&) {
+			margin-top        : 2px; //Prevent top border getting cut off on colbreak
+		}
+		& + * {
+			margin-top : 0.325cm;
+		}
+	}
+	//*****************************
+	// *          EXTRAS
+	// *****************************/
+	hr{
+		visibility : hidden;
+		border     : none;
+		margin     : 0px;
+	}
+	//Text indent right after table
+	table+p{
+		text-indent : 1em;
+	}
+	a, a:visited, a:hover {
+		color: var(--HB_Color_Text);
+		transition:all 1s ease;
+	}
+	a:hover {
+		color:red;
+	}
+}
+//*****************************
+// *         SPELL LIST
+// *****************************/
+
+.page .spellList{
+	.useSansSerif();
+	font-family  : PermanentMarker;
+	column-count : 2;
+	ul+h5{
+		margin-top : 15px;
+	}
+	ul{
+		margin-bottom               : 0.5em;
+		padding-left                : 1em;
+		text-indent                 : -1em;
+		list-style-type             : none;
+		-webkit-column-break-inside : auto;
+		page-break-inside           : auto;
+		break-inside                : auto;
+	}
+	&.wide{
+		column-count : 4;
+	}
+}
+
+//*****************************
+// *       CLASS TABLE
+// *****************************/
+.page .classTable{
+	th[colspan]:not([rowspan]) {
+		white-space : nowrap;
+	}
+	h5 + table{
+		margin-top : 0.2cm;
+	}
+}
+//*****************************
+// *      TABLE OF CONTENTS
+// *****************************/
+.page .toc{
+	-webkit-column-break-inside : avoid;
+	page-break-inside           : avoid;
+	break-inside                : avoid;
+	h1 {
+		text-align    : center;
+		margin-bottom : 0.3cm;
+	}
+	a{
+		display         : inline;
+		color           : inherit;
+		text-decoration : none;
+		&:hover{
+			text-decoration : underline;
+		}
+	}
+	h4 {
+		margin-top  : 0.2cm;
+		line-height : 0.4cm;
+		& + ul li {
+			line-height: 1.2em;
+		}
+	}
+	ul{
+		padding-left    : 0;
+		list-style-type : none;
+		li + li h3 {
+			margin-top  : 0.26cm;
+			line-height : 1em
+		}
+		h3 span:first-child::after {
+			border : none;
+		}
+		span {
+			display : table-cell;
+			&:first-child {
+				position   :       relative;
+				overflow   :       hidden;
+				&::after {
+					content       : "";
+					position      : absolute;
+					bottom        : 0.08cm;
+					margin-left   : 0.06cm;        /* Spacing before dot leaders */
+					width         : 100%;
+					border-bottom : 0.05cm dotted #000;
+				}
+			}
+			&:last-child {
+				font-family    : ReenieBeanie;
+				font-size      : 0.34cm;
+				font-weight    : normal;
+				color          : black;
+				text-align     : right;
+				vertical-align : bottom; /* Keep page number bottom-aligned */
+				width          : 1%;
+				padding-left   : 0.06cm; /* Spacing after dot leaders */
+				/*white-space  : nowrap; /* Uncomment if needed */
+			}
+		}
+		ul { /*List indent*/
+			margin-left : 1em;
+		}
+	}
+	&.wide{
+		.useColumns(0.96, @fillMode: balance);
+	}
+}
+
+//*****************************
+// *         WIDE
+// *****************************/
+:where(.page) .wide {
+	margin-bottom       : 0.45cm;
+}

themes/assets/assets.less

@@ -1,26 +1,26 @@
 // PHB
-@footerAccentImage        : data-uri('./themes/assets/footerAccent.png');
-@frameBorderImage         : data-uri('./themes/assets/frameBorder.png');
-@backgroundImage          : data-uri('./themes/assets/parchmentBackground.jpg');
-@redTriangleImage         : data-uri('./themes/assets/redTriangle.png');
-@monsterBorderImageLegacy : data-uri('./themes/assets/monsterBorderLegacy.png');
-@noteBorderImage          : data-uri('./themes/assets/noteBorder.png');
-@descriptiveBoxImage      : data-uri('./themes/assets/descriptiveBorder.png');
-@monsterBlockBackground   : data-uri('./themes/assets/parchmentBackgroundGrayscale.jpg');
-@monsterBorderImage       : data-uri('./themes/assets/monsterBorderFancy.png');
-@codeBorderImage          : data-uri('./themes/assets/codeBorder.png');
-@classTableDecoration     : data-uri('./themes/assets/classTableDecoration.png');
+@footerAccentImage        : url('/assets/PHB_footerAccent.png');
+@frameBorderImage         : url('/assets/frameBorder.png');
+@backgroundImage          : url('/assets/parchmentBackground.jpg');
+@redTriangleImage         : url('/assets/redTriangle.png');
+@monsterBorderImageLegacy : url('/assets/monsterBorderLegacy.png');
+@noteBorderImage          : url('/assets/noteBorder.png');
+@descriptiveBoxImage      : url('/assets/descriptiveBorder.png');
+@monsterBlockBackground   : url('/assets/parchmentBackgroundGrayscale.jpg');
+@monsterBorderImage       : url('/assets/monsterBorderFancy.png');
+@codeBorderImage          : url('/assets/codeBorder.png');
+@classTableDecoration     : url('/assets/classTableDecoration.png');
 
 // Watercolor Images
-@watercolor1  : data-uri('./themes/assets/watercolor/watercolor1.png');
-@watercolor2  : data-uri('./themes/assets/watercolor/watercolor2.png');
-@watercolor3  : data-uri('./themes/assets/watercolor/watercolor3.png');
-@watercolor4  : data-uri('./themes/assets/watercolor/watercolor4.png');
-@watercolor5  : data-uri('./themes/assets/watercolor/watercolor5.png');
-@watercolor6  : data-uri('./themes/assets/watercolor/watercolor6.png');
-@watercolor7  : data-uri('./themes/assets/watercolor/watercolor7.png');
-@watercolor8  : data-uri('./themes/assets/watercolor/watercolor8.png');
-@watercolor9  : data-uri('./themes/assets/watercolor/watercolor9.png');
-@watercolor10 : data-uri('./themes/assets/watercolor/watercolor10.png');
-@watercolor11 : data-uri('./themes/assets/watercolor/watercolor11.png');
-@watercolor12 : data-uri('./themes/assets/watercolor/watercolor12.png');
+@watercolor1  : url('/assets/watercolor/watercolor1.png');
+@watercolor2  : url('/assets/watercolor/watercolor2.png');
+@watercolor3  : url('/assets/watercolor/watercolor3.png');
+@watercolor4  : url('/assets/watercolor/watercolor4.png');
+@watercolor5  : url('/assets/watercolor/watercolor5.png');
+@watercolor6  : url('/assets/watercolor/watercolor6.png');
+@watercolor7  : url('/assets/watercolor/watercolor7.png');
+@watercolor8  : url('/assets/watercolor/watercolor8.png');
+@watercolor9  : url('/assets/watercolor/watercolor9.png');
+@watercolor10 : url('/assets/watercolor/watercolor10.png');
+@watercolor11 : url('/assets/watercolor/watercolor11.png');
+@watercolor12 : url('/assets/watercolor/watercolor12.png');

themes/fonts/5e legacy/fonts.less

@@ -1,25 +1,25 @@
 /* Main Font, serif */
 @font-face {
 	font-family: BookSanity;
-	src: url('../fonts/5e legacy/Bookinsanity.woff2');
+	src: url('../../../fonts/5e legacy/Bookinsanity.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: BookSanity;
-	src: url('../fonts/5e legacy/Bookinsanity Bold.woff2');
+	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');
+	src: url('../../../fonts/5e legacy/Bookinsanity Italic.woff2');
 	font-weight: normal;
 	font-style: italic;
 }
 @font-face {
 	font-family: BookSanity;
-	src: url('../fonts/5e legacy/Bookinsanity Bold Italic.woff2');
+	src: url('../../../fonts/5e legacy/Bookinsanity Bold Italic.woff2');
 	font-weight: bold;
 	font-style: italic;
 }
@@ -27,19 +27,19 @@
 /* Notes and Tables, sans-serif */
 @font-face {
 	font-family: ScalySans;
-	src: url('../fonts/5e legacy/Scaly Sans.woff2');
+	src: url('../../../fonts/5e legacy/Scaly Sans.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: ScalySansSmallCaps;
-	src: url('../fonts/5e legacy/Scaly Sans Caps.woff2');
+	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');
+	src: url('../../../fonts/5e legacy/WalterTurncoat-Regular.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
@@ -47,7 +47,7 @@
 /* Headers */
 @font-face {
 	font-family: MrJeeves;
-	src: url('../fonts/5e legacy/Mr Eaves Small Caps.woff2');
+	src: url('../../../fonts/5e legacy/Mr Eaves Small Caps.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
@@ -55,7 +55,7 @@
 /* Fancy Drop Cap */
 @font-face {
 	font-family: Solberry;
-	src: url('../fonts/5e legacy/Solbera Imitation.woff2');
+	src: url('../../../fonts/5e legacy/Solbera Imitation.woff2');
 	font-weight: normal;
 	font-style: normal;
 }

themes/fonts/5e/fonts.less

@@ -1,25 +1,25 @@
 /* Main Font, serif */
 @font-face {
 	font-family: BookInsanityRemake;
-	src: url('../fonts/5e/Bookinsanity.woff2');
+	src: url('../../../fonts/5e/Bookinsanity.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: BookInsanityRemake;
-	src: url('../fonts/5e/Bookinsanity Bold.woff2');
+	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');
+	src: url('../../../fonts/5e/Bookinsanity Italic.woff2');
 	font-weight: normal;
 	font-style: italic;
 }
 @font-face {
 	font-family: BookInsanityRemake;
-	src: url('../fonts/5e/Bookinsanity Bold Italic.woff2');
+	src: url('../../../fonts/5e/Bookinsanity Bold Italic.woff2');
 	font-weight: bold;
 	font-style: italic;
 }
@@ -27,37 +27,37 @@
 /* Notes and Tables, sans-serif */
 @font-face {
 	font-family: ScalySansRemake;
-	src: url('../fonts/5e/Scaly Sans.woff2');
+	src: url('../../../fonts/5e/Scaly Sans.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
 @font-face {
 	font-family: ScalySansRemake;
-	src: url('../fonts/5e/Scaly Sans Bold.woff2');
+	src: url('../../../fonts/5e/Scaly Sans Bold.woff2');
 	font-weight: bold;
 	font-style: normal;
 }
 @font-face {
 	font-family: ScalySansRemake;
-	src: url('../fonts/5e/Scaly Sans Italic.woff2');
+	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');
+	src: url('../../../fonts/5e/Scaly Sans Bold Italic.woff2');
 	font-weight: bold;
 	font-style: italic;
 }
 @font-face {
 	font-family: ScalySansSmallCapsRemake;
-	src: url('../fonts/5e/Scaly Sans Caps.woff2');
+	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');
+	src: url('../../../fonts/5e/WalterTurncoat-Regular.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
@@ -65,7 +65,7 @@
 /* Headers */
 @font-face {
 	font-family: MrEavesRemake;
-	src: url('../fonts/5e/Mr Eaves Small Caps.woff2');
+	src: url('../../../fonts/5e/Mr Eaves Small Caps.woff2');
 	font-weight: normal;
 	font-style: normal;
 }
@@ -73,7 +73,7 @@
 /* Fancy Drop Cap */
 @font-face {
 	font-family: SolberaImitationRemake; //Tweaked 5e version
-	src: url('../fonts/5e/Solbera Imitation Tweak.woff2');
+	src: url('../../../fonts/5e/Solbera Imitation Tweak.woff2');
 	font-weight: normal;
 	font-style: normal;
 }

themes/fonts/Journal/LICENSE - PermanentMarker.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.