Change fetch to use request-middleware instead

.circleci/config.yml

@@ -64,12 +64,6 @@ jobs:
       - run:
           name: Test - Mustache Spans
           command: npm run test:mustache-syntax
-      - run:
-          name: Test - Definition Lists
-          command: npm run test:definition-lists
-      - run:
-          name: Test - Variables
-          command: npm run test:variables
       - run:
           name: Test - Routes
           command: npm run test:route

.github/actions/limit-pull-requests/action.yml

@@ -1,103 +0,0 @@
-name: Limit pull requests
-description: >
-  Limit the number of open pull requests to the repository created by a user
-author: ZhongRuoyu (from Homebrew repository)
-branding:
-  icon: alert-triangle
-  color: yellow
-
-inputs:
-  token:
-    description: GitHub token
-    required: false
-    default: ${{ github.token }}
-  except-users:
-    description: The users exempted from the limit, one per line
-    required: false
-  # https://docs.github.com/en/graphql/reference/enums#commentauthorassociation
-  except-author-associations:
-    description: The author associations exempted from the limit, one per line
-    required: false
-  comment-limit:
-    description: >
-      Post the comment when the user's number of open pull requests exceeds this
-      number and `comment` is not empty
-    required: true
-    default: "10"
-  comment:
-    description: The comment to post when the limit is reached
-    required: false
-  close-limit:
-    description: >
-      Close the pull request when the user's number of open pull requests
-      exceeds this number and `close` is set to `true`
-    required: true
-    default: "50"
-  close:
-    description: Whether to close the pull request when the limit is reached
-    required: true
-    default: "false"
-
-runs:
-  using: composite
-  steps:
-    - name: Check the number of pull requests
-      id: count-pull-requests
-      run: |
-        # If the user is exempted, assume they have no pull requests.
-        if grep -Fiqx '${{ github.actor }}' <<<"$EXCEPT_USERS"; then
-          echo "::notice::@${{ github.actor }} is exempted from the limit."
-          echo "count=0" >>"$GITHUB_OUTPUT"
-          exit 0
-        fi
-        if grep -Fiqx '${{ github.event.pull_request.author_association }}' <<<"$EXCEPT_AUTHOR_ASSOCIATIONS"; then
-          echo "::notice::@{{ github.actor }} is a ${{ github.event.pull_request.author_association }} exempted from the limit."
-          echo "count=0" >>"$GITHUB_OUTPUT"
-          exit 0
-        fi
-
-        count="$(
-          gh api \
-            --method GET \
-            --header 'Accept: application/vnd.github+json' \
-            --header 'X-GitHub-Api-Version: 2022-11-28' \
-            --field state=open \
-            --paginate \
-            '/repos/{owner}/{repo}/pulls' |
-            jq \
-              --raw-output \
-              --arg USER '${{ github.actor }}' \
-              'map(select(.user.login == $USER)) | length'
-        )"
-        echo "::notice::@${{ github.actor }} has $count open pull request(s)."
-        echo "count=$count" >>"$GITHUB_OUTPUT"
-      env:
-        GH_REPO: ${{ github.repository }}
-        GH_TOKEN: ${{ inputs.token }}
-        EXCEPT_USERS: ${{ inputs.except-users }}
-        EXCEPT_AUTHOR_ASSOCIATIONS: ${{ inputs.except-author-associations }}
-      shell: bash
-
-    - name: Comment on pull request
-      if: >
-        fromJSON(steps.count-pull-requests.outputs.count) > fromJSON(inputs.comment-limit) &&
-        inputs.comment != ''
-      run: |
-        gh pr comment '${{ github.event.pull_request.number }}' \
-          --body="${COMMENT_BODY}"
-      env:
-        GH_REPO: ${{ github.repository }}
-        GH_TOKEN: ${{ inputs.token }}
-        COMMENT_BODY: ${{ inputs.comment }}
-      shell: bash
-
-    - name: Close pull request
-      if: >
-        fromJSON(steps.count-pull-requests.outputs.count) > fromJSON(inputs.close-limit) &&
-        inputs.close == 'true'
-      run: |
-        gh pr close '${{ github.event.pull_request.number }}'
-      env:
-        GH_REPO: ${{ github.repository }}
-        GH_TOKEN: ${{ inputs.token }}
-      shell: bash

.github/workflows/pr-check.yml

@@ -1,29 +0,0 @@
-name: PR Check
-on: pull_request_target
-env:
-  GH_REPO: ${{ github.repository }}
-  GH_NO_UPDATE_NOTIFIER: 1
-  GH_PROMPT_DISABLED: 1
-permissions:
-  contents: read
-  issues: write
-  pull-requests: write
-  statuses: write
-jobs:
-  limit-pull-requests:
-    if: always() && github.repository_owner == 'naturalcrit'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name : Run limit-pull-requests action
-        uses: ./.github/actions/limit-pull-requests
-        with:
-          except-users: |
-            dependabot
-          comment-limit: 3
-          comment: |
-            Hi, thanks for your contribution to the Homebrewery! You already have >=3 open pull requests. Consider completing some of your existing PRs before opening new ones. Thanks!
-          close-limit: 5
-          close: false

changelog.md

@@ -75,302 +75,11 @@ pre {
 .page {
 	padding-bottom: 1.5cm;
 }
-
-.varSyntaxTable th:first-of-type {
-  width:6cm;
-}
 ```
 
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
-### Saturday 6/7/2024 - v3.13.1
-{{taskList
-
-##### calculuschild, G-Ambatte
-
-* [x] Hotfixes for issues with v3.13.0
-
-Fixes issues [#3559](https://github.com/naturalcrit/homebrewery/issues/3559), [#3552](https://github.com/naturalcrit/homebrewery/issues/3552), [#3554](https://github.com/naturalcrit/homebrewery/issues/3554)
-}}
-
-### Friday 28/6/2024 - v3.13.0
-{{taskList
-
-##### calculuschild
-
-* [x] Add `:emoji:` Markdown syntax, with autosuggest; start typing after the first `:` for matching emojis from 
-:fab_font_awesome: FontAwesome, :df_d20: DiceFont, :ei_action: ElderberryInn, and a subset of :gi_broadsword: GameIcons
-
-* [x] Fix `{curly injection}` to append to, rather than erase and replace target CSS
-* [x] {{openSans **GET PDF**}} {{fa,fa-file-pdf}} now opens the print dialog directly, rather than redirecting to a separate page
-
-##### Gazook
-
-* [x] Several small style tweaks to the UI
-* [x] Cleaning and refactoring several large pieces of code
-
-##### 5e-Cleric
-
-* [x] For error pages, add links to user account and `/share` page if available
-
-Fixes issue [#3298](https://github.com/naturalcrit/homebrewery/issues/3298)
-
-* [x] Change FrontCover title to use stroke outline instead of faking it with dozens of shadows
-* [x] Cleaning and refactoring several large pieces of CSS
-
-##### abquintic
-
-* [x] Added additional {{openSans **TABLE OF CONTENTS**}} snippet options. Explicitly include or exclude items from the ToC generation via CSS properties  
-`--TOC:exclude` or `--TOC:include`, or change the included header depth from 3 to 6 (default 3) with `tocDepthH6`
-
-##### MurdoMaclachlan *(new contributor!)*
-
-* [x] Added "proficiency bonus" to Monster Stat Block snippet. 
-
-Fixes issue [#3397](https://github.com/naturalcrit/homebrewery/issues/3397)
-}}
-
-\column
-
-### Monday 18/3/2024 - v3.12.0
-{{taskList
-
-##### 5e-Cleric
-
-* [x] Fix language-specific hyphenation on print page
-
-Fixes issue [#3294](https://github.com/naturalcrit/homebrewery/issues/3294)
-
-* [x] Upgrade Font-Awesome to v6.51
-
-* [x] Allow downloaded files to be uploaded via {{openSans **NEW {{fa,fa-plus-square}} → FROM UPLOAD {{fa,fa-upload}}**}}
-
-##### G-Ambatte
-
-* [x] Fix an edge case crash with empty documents
-
-Fixes issue [#3315](https://github.com/naturalcrit/homebrewery/issues/3315)
-
-* [x] Brews on the user page can be searched by tag; clicking a tag adds it to the filter
-
-Fixes issue [#3164](https://github.com/naturalcrit/homebrewery/issues/3164)
-
-* [x] Add *DiceFont* icons {{df,d20-20}} `{{df,icon-name}}`
-
-##### abquintic
-
-* [x] Fix ^super^ and ^^sub^^ highlighting in the text editor
-
-* [x] Add new syntax for multiline Definition Lists:
-
-
-```
-Term
-::Definition 1
-::Definition 2
-with more text
-```
-
-produces:
-
-Term
-::Definition 1
-::Definition 2
-with more text
-
-Fixes issue [#2340](https://github.com/naturalcrit/homebrewery/issues/2340)
-
-##### RKuerten :
-* [x] Fix monster stat block backgrounds on print page
-
-Fixes issue [#3275](https://github.com/naturalcrit/homebrewery/issues/3275)
-
-* [x] Added new text editor theme: "Darkvision".
-
-##### calculuschild, G-Ambatte, 5e-Cleric
-
-* [x] Codebase and UI cleanup
-}}
-
-\page
-
-
-### Friday 21/2/2024 - v3.11.0
-{{taskList
-
-##### Gazook89
-
-* [x] Brew view count no longer increases when viewed by owner
-
-Fixes issue [#3037](https://github.com/naturalcrit/homebrewery/issues/3037)
-
-* [x] Small tweak to PHB H3 sizing
-
-Fixes issue [#2989](https://github.com/naturalcrit/homebrewery/issues/2989)
-
-* [x] Add **Fold/Unfold All** {{fas,fa-compress-alt}} / {{fas,fa-expand-alt}} buttons to editor bar 
-
-Fixes issue [#2965](https://github.com/naturalcrit/homebrewery/issues/2965)
-
-
-##### G-Ambatte
-
-* [x] Share link added to Editor Access error page
-
-Fixes issue [#3086](https://github.com/naturalcrit/homebrewery/issues/3086)
-
-* [x] Add Darkbrewery theme to Editor theme selector {{fas,fa-palette}}
-
-Fixes issue [#3034](https://github.com/naturalcrit/homebrewery/issues/3034)
-
-* [x] Fix Firefox prints with alternating blank pages
-
-Fixes issue [#3115](https://github.com/naturalcrit/homebrewery/issues/3115)
-
-* [x] Admin page working again
-
-Fixes issue [#2657](https://github.com/naturalcrit/homebrewery/issues/2657)
-
-
-##### 5e-Cleric
-
-* [x] Fix indenting issue with Monster Blocks and italics in Class Feature
-
-Fixes issues [#527](https://github.com/naturalcrit/homebrewery/issues/527),
-[#3247](https://github.com/naturalcrit/homebrewery/issues/3247)
-
-* [x] Allow CSS vars in curly syntax to be formatted as strings using single quotes
-
-`{{--customVar:"'a string'"}}`
-
-Fixes issue [#3066](https://github.com/naturalcrit/homebrewery/issues/3066)
-
-* [x] Add *Elderberry Inn* icons {{ei,action}} `{{ei,icon-name}}`
-
-Fixes issue [#3171](https://github.com/naturalcrit/homebrewery/issues/3171)
-
-* [x] New {{openSans **{{fas,fa-keyboard}} FONTS**  }} snippets!
-
-Fixes issue [#3171](https://github.com/naturalcrit/homebrewery/issues/3171)
-
-* [x] New page now opens in a new tab
-
-
-##### abquintic (new contributor!)
-
-* [x] Add ^super^ `^abc^` and ^^sub^^ `^^abc^^` syntax.
- 
-Fixes issue [#2171](https://github.com/naturalcrit/homebrewery/issues/2171)
-
-* [x] Add HTML tag assignment to curly syntax `{{tag=value}}`
- 
-Fixes issue [1488](https://github.com/naturalcrit/homebrewery/issues/1488)
-
-* [x] {{openSans **Brew → Clone to New**}} now clones tags
- 
-Fixes issue [1488](https://github.com/naturalcrit/homebrewery/issues/1488)
-
-##### calculuschild
-
-* [x] Better error messages for "Out of Google Drive Storage" and "Not logged in to edit"
-
-Fixes issues [2510](https://github.com/naturalcrit/homebrewery/issues/2510),
-[2975](https://github.com/naturalcrit/homebrewery/issues/2975)
-
-* [x] Brew Variables
-}}
-
-\
-
-{{wide
-
-### Brew Variable Syntax
-
-You may already be familiar with `[link](url)` and `![image](url)` synax. We have expanded this to include a third `$[variable](text)` syntax. All three of these syntaxes now share a common set of features:
-
-{{varSyntaxTable
-| syntax | description |
-|:-------|-------------|
-| `[var]:content`  | Assigns a variable (must start on a line by itself, and ends at the next blank line) |
-| `[var](content)` | Assigns a variable and outputs it (can be inline) |
-| `[var]`  | Outputs the variable contents as a link, if formatted as a valid link |
-| `![var]` | Outputs as an image, if formatted as a valid image                    |
-| `$[var]` | Outputs as Markdown                                          |
-| `$[var1 + var2 - 2 * var3]` | Performs math operations and outputs result if all variables are valid numbers                                     |
-}}
-
-}}
-
-{{wide,margin-top:0,margin-bottom:0
-### Examples
-}}
-
-{{wide,columns:2,margin-top:0,margin-bottom:0
-
-```
-[first]: Bob
-
-[last]: Jones
-
-My name is $[first] $[last].
-```
-
-\column
-
-[first]: Bob
-
-[last]: Jones
-
-My name is $[first] $[last].
-
-}}
-
-{{wide,columns:2,margin-top:0,margin-bottom:0
-
-```
-[myTable]:
-| h1 | h2 |
-|----|----|
-| c1 | c2 |
-
-Here is my table:
-$[myTable]
-```
-
-\column
-
-[myTable]:
-| h1 | h2 |
-|----|----|
-| c1 | c2 |
-
-Here is my table:
-$[myTable]
-}}
-
-{{wide,columns:2,margin-top:0,margin-bottom:0
-
-```
-There are $[TableNum] tables total.
-
-#### Table $[TableNum](1): Horses
-
-#### Table $[TableNum]($[TableNum + 1]): Cows
-```
-
-\column
-
-There are $[TableNum] tables in this document. *(note: final value of `$[TableNum]` gets hoisted up if available)*
-
-
-#### Table $[TableNum](1): Horses
-
-#### Table $[TableNum]($[TableNum + 1]): Cows
-}}
-
-\page
-
 ### Friday 13/10/2023 - v3.10.0
 {{taskList
 
@@ -1626,7 +1335,7 @@ myStyle {color: black}
 ### Sunday, 29/05/2016 - v2.1.0
 - Finally added a syntax for doing spell lists. A bit in-depth about why this took so long. Essentially I'm running out of syntax to use in stardard Markdown. There are too many unique elements in the PHB-style to be mapped. I solved this earlier by stacking certain elements together (eg. an `<hr>` before a `blockquote` turns it into moster state block), but those are getting unweildly. I would like to simply wrap these in `div`s with classes, but unfortunately Markdown stops processing when within HTML blocks. To get around this I wrote my own override to the Markdown parser and lexer to process Markdown within a simple div class wrapper. This should open the door for more unique syntaxes in the future. Big step!
 - Override Ctrl+P (and cmd+P) to launch to the print page. Many people try to just print either the editing or share page to get a PDF. While this dones;t make much sense, I do get a ton of issues about it. So now if you try to do this, it'll just bring you imediately to the print page. Everybody wins!
-- The onboarding flow has also been confusing a few users (Homepage → new → save → edit page). If you edit the Homepage text now, a Call to Action to save your work will pop-up.
+- The onboarding flow has also been confusing a few users (Homepage -> new -> save -> edit page). If you edit the Homepage text now, a Call to Action to save your work will pop-up.
 - Added a 'Recently Edited' and 'Recently Viewed' nav item to the edit and share page respectively. Each will remember the last 8 items you edited or viewed and when you viewed it. Makes use of the new title attribute of brews to easy navigatation.
 - Paragraphs now indent properly after lists (thanks u/slitjen!)
 

client/admin/brewCleanup/brewCleanup.jsx

@@ -1,6 +1,7 @@
 require('./brewCleanup.less');
 const React       = require('react');
 const createClass = require('create-react-class');
+const cx          = require('classnames');
 
 const request = require('superagent');
 

client/admin/brewCompress/brewCompress.jsx

@@ -1,6 +1,7 @@
 require('./brewCompress.less');
 const React       = require('react');
 const createClass = require('create-react-class');
+const cx          = require('classnames');
 
 const request = require('superagent');
 

client/admin/stats/stats.jsx

@@ -34,6 +34,8 @@ const Stats = createClass({
 			<dl>
 				<dt>Total Brew Count</dt>
 				<dd>{this.state.stats.totalBrews}</dd>
+				<dt>Total Brews Published Count</dt>
+				<dd>{this.state.stats.totalPublishedBrews || 'no published brews'}</dd>
 			</dl>
 
 			{this.state.fetching

client/components/combobox.jsx

@@ -1,6 +1,7 @@
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
+const cx = require('classnames');
 require('./combobox.less');
 
 const Combobox = createClass({

client/components/dialog.jsx

@@ -1,29 +0,0 @@
-// Dialog box, for popups and modal blocking messages
-const React = require('react');
-const { useRef, useEffect } = React;
-
-function Dialog({ dismissKey, closeText = 'Close', blocking = false, ...rest }) {
-	const dialogRef = useRef(null);
-
-	useEffect(()=>{
-		if(!dismissKey || !localStorage.getItem(dismissKey)) {
-			blocking ? dialogRef.current?.showModal() : dialogRef.current?.show();
-		}
-	}, []);
-
-	const dismiss = ()=>{
-		dismissKey && localStorage.setItem(dismissKey, true);
-		dialogRef.current?.close();
-	};
-
-	return	(
-		<dialog ref={dialogRef} onCancel={dismiss} {...rest}>
-			{rest.children}
-			<button className='dismiss' onClick={dismiss}>
-				{closeText}
-			</button>
-		</dialog>
-	);
-};
-
-export default Dialog;

client/homebrew/brewRenderer/brewRenderer.jsx

@@ -13,10 +13,6 @@ const RenderWarnings = require('homebrewery/renderWarnings/renderWarnings.jsx');
 const NotificationPopup = require('./notificationPopup/notificationPopup.jsx');
 const Frame = require('react-frame-component').default;
 const dedent = require('dedent-tabs').default;
-const { printCurrentBrew } = require('../../../shared/helpers.js');
-
-const DOMPurify = require('dompurify');
-const purifyConfig = { FORCE_BODY: true, SANITIZE_DOM: false };
 
 const Themes = require('themes/themes.json');
 
@@ -24,9 +20,9 @@ const PAGE_HEIGHT = 1056;
 
 const INITIAL_CONTENT = dedent`
 	<!DOCTYPE html><html><head>
-	<link href="//use.fontawesome.com/releases/v6.5.1/css/all.css" rel="stylesheet" type="text/css" />
+	<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='/homebrew/bundle.css' type="text/css" rel='stylesheet' />
+	<link href='/homebrew/bundle.css' rel='stylesheet' />
 	<base target=_blank>
 	</head><body style='overflow: hidden'><div></div></body></html>`;
 
@@ -37,9 +33,8 @@ const BrewPage = (props)=>{
 		index    : 0,
 		...props
 	};
-	const cleanText = props.contents; //DOMPurify.sanitize(props.contents, purifyConfig);
 	return <div className={props.className} id={`p${props.index + 1}`} >
-	         <div className='columnWrapper' dangerouslySetInnerHTML={{ __html: cleanText }} />
+	         <div className='columnWrapper' dangerouslySetInnerHTML={{ __html: props.contents }} />
 	       </div>;
 };
 
@@ -94,19 +89,24 @@ const BrewRenderer = (props)=>{
 		}));
 	};
 
-	const isInView = (index)=>{
-		if(!state.isMounted)
-			return false;
-
-		if(index == props.currentEditorPage)	//Already rendered before this step
-			return false;
+	const shouldRender = (index)=>{
+		if(!state.isMounted) return false;
 
 		if(Math.abs(index - state.viewablePageNumber) <= 3)
 			return true;
 
+		if(index + 1 == props.currentEditorPage)
+			return true;
+
 		return false;
 	};
 
+	const sanitizeScriptTags = (content)=>{
+		return content
+			.replace(/<script/ig, '&lt;script')
+			.replace(/<\/script>/ig, '&lt;/script&gt;');
+	};
+
 	const renderPageInfo = ()=>{
 		return <div className='pageInfo' ref={mainRef}>
 			<div>
@@ -126,18 +126,19 @@ const BrewRenderer = (props)=>{
 
 	const renderStyle = ()=>{
 		if(!props.style) return;
-		const cleanStyle = props.style; //DOMPurify.sanitize(props.style, purifyConfig);
+		const cleanStyle = sanitizeScriptTags(props.style);
 		//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${sanitizeScriptTags(props.style)}\n} </style>` }} />;
 		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style> ${cleanStyle} </style>` }} />;
 	};
 
 	const renderPage = (pageText, index)=>{
+		let cleanPageText = sanitizeScriptTags(pageText);
 		if(props.renderer == 'legacy') {
-			const html = MarkdownLegacy.render(pageText);
+			const html = MarkdownLegacy.render(cleanPageText);
 			return <BrewPage className='page phb' index={index} key={index} contents={html} />;
 		} else {
-			pageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear)
-			const html = Markdown.render(pageText, index);
+			cleanPageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear)
+			const html = Markdown.render(cleanPageText);
 			return <BrewPage className='page' index={index} key={index} contents={html} />;
 		}
 	};
@@ -149,27 +150,14 @@ const BrewRenderer = (props)=>{
 		if(rawPages.length != renderedPages.length) // Re-render all pages when page count changes
 			renderedPages.length = 0;
 
-		// Render currently-edited page first so cross-page effects (variables, links) can propagate out first
-		renderedPages[props.currentEditorPage] = renderPage(rawPages[props.currentEditorPage], props.currentEditorPage);
-
 		_.forEach(rawPages, (page, index)=>{
-			if((isInView(index) || !renderedPages[index]) && typeof window !== 'undefined'){
+			if((shouldRender(index) || !renderedPages[index]) && typeof window !== 'undefined'){
 				renderedPages[index] = renderPage(page, index); // Render any page not yet rendered, but only re-render those in PPR range
 			}
 		});
 		return renderedPages;
 	};
 
-	const handleControlKeys = (e)=>{
-		if(!(e.ctrlKey || e.metaKey)) return;
-		const P_KEY = 80;
-		if(e.keyCode == P_KEY && props.allowPrint) printCurrentBrew();
-		if(e.keyCode == P_KEY) {
-			e.stopPropagation();
-			e.preventDefault();
-		}
-	};
-
 	const frameDidMount = ()=>{	//This triggers when iFrame finishes internal "componentDidMount"
 		setTimeout(()=>{	//We still see a flicker where the style isn't applied yet, so wait 100ms before showing iFrame
 			updateSize();
@@ -203,12 +191,6 @@ const BrewRenderer = (props)=>{
 				</div>
 				: null}
 
-			<ErrorBar errors={props.errors} />
-			<div className='popups'>
-				<RenderWarnings />
-				<NotificationPopup />
-			</div>
-
 			{/*render in iFrame so broken code doesn't crash the site.*/}
 			<Frame id='BrewRenderer' initialContent={INITIAL_CONTENT}
 				style={{ width: '100%', height: '100%', visibility: state.visibility }}
@@ -217,15 +199,18 @@ const BrewRenderer = (props)=>{
 			>
 				<div className={'brewRenderer'}
 					onScroll={handleScroll}
-					onKeyDown={handleControlKeys}
-					tabIndex={-1}
 					style={{ height: state.height }}>
 
-					<link href={`/themes/${rendererPath}/Blank/style.css`} type='text/css' rel='stylesheet'/>
+					<ErrorBar errors={props.errors} />
+					<div className='popups'>
+						<RenderWarnings />
+						<NotificationPopup />
+					</div>
+					<link href={`/themes/${rendererPath}/Blank/style.css`} rel='stylesheet'/>
 					{baseThemePath &&
-						<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} type='text/css' rel='stylesheet'/>
+						<link href={`/themes/${rendererPath}/${baseThemePath}/style.css`} rel='stylesheet'/>
 					}
-					<link href={`/themes/${rendererPath}/${themePath}/style.css`} type='text/css' rel='stylesheet'/>
+					<link href={`/themes/${rendererPath}/${themePath}/style.css`} rel='stylesheet'/>
 
 					{/* Apply CSS from Style tab and render pages from Markdown tab */}
 					{state.isMounted

client/homebrew/brewRenderer/brewRenderer.less

@@ -14,28 +14,6 @@
 			box-shadow    : 1px 4px 14px #000000;
 		}
 	}
-
-	&::-webkit-scrollbar {
-		width: 20px;
-		&:horizontal{
-			height: 20px;
-			width:auto;
-		}
-		&-thumb {
-			background: linear-gradient(90deg, #d3c1af 15px, #00000000 15px);
-			&:horizontal{
-				background: linear-gradient(0deg, #d3c1af 15px, #00000000 15px);
-			}
-		}
-		&-corner {
-			visibility: hidden;
-		}
-	}
-	
-
-
-
-
 }
 .pane { position : relative; }
 .pageInfo {
@@ -64,16 +42,3 @@
 	color            : white;
 	background-color : #333333;
 }
-
-@media print {
-	.brewRenderer {
-		height: 100%;
-		overflow-y: unset;
-		.pages {
-			margin: 0px;
-			&>.page {
-				box-shadow: unset;
-			}
-		}
-	}
-}

client/homebrew/brewRenderer/errorBar/errorBar.jsx

@@ -2,6 +2,7 @@ require('./errorBar.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
+const cx    = require('classnames');
 
 const ErrorBar = createClass({
 	displayName     : 'ErrorBar',

client/homebrew/brewRenderer/notificationPopup/notificationPopup.jsx

@@ -1,45 +1,84 @@
 require('./notificationPopup.less');
 const React = require('react');
+const createClass = require('create-react-class');
 const _     = require('lodash');
-
-import Dialog from '../../../components/dialog.jsx';
+const cx    = require('classnames');	//Unused variable
 
 const DISMISS_KEY = 'dismiss_notification12-04-23';
-const DISMISS_BUTTON = <i className='fas fa-times dismiss' />;
 
-const NotificationPopup = ()=>{
-	return <Dialog className='notificationPopup' dismissKey={DISMISS_KEY} closeText={DISMISS_BUTTON} >
-		<div className='header'>
-			<i className='fas fa-info-circle info'></i>
-			<h3>Notice</h3>
-			<small>This website is always improving and we are still adding new features and squashing bugs. Keep the following in mind:</small>
-		</div>
-		<ul>
-			<li key='psa'>
-				<em>Don't store IMAGES in Google Drive</em><br />
-				Google Drive is not an image service, and will block images from being used
-				in brews if they get more views than expected. Google has confirmed they won't fix
-				this, so we recommend you look for another image hosting service such as imgur, ImgBB or Google Photos.
-			</li>
+const NotificationPopup = createClass({
+	displayName     : 'NotificationPopup',
+	getInitialState : function() {
+		return {
+			notifications : {}
+		};
+	},
+	componentDidMount : function() {
+		this.checkNotifications();
+		window.addEventListener('resize', this.checkNotifications);
+	},
+	componentWillUnmount : function() {
+		window.removeEventListener('resize', this.checkNotifications);
+	},
+	notifications : {
+		psa : function(){
+			return (
+				<>
+					<li key='psa'>
+						<em>Broken default logo on <b>CoverPage</b> </em> <br />
+						If you have used the Cover Page snippet and notice the Naturalcrit
+						logo is showing as a broken image, this is due to some small tweaks
+						of this BETA feature. To fix the logo in your cover page, rename
+						the image link <b>"/assets/naturalCritLogoRed.svg"</b>. Remember
+						that any snippet marked "BETA" may have a similar change in the
+						future as we encounter any bugs or reworks.
+					</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='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>
-		</ul>
-	</Dialog>;
-};
+					<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);
+		if(hideDismiss) return this.setState({ notifications: {} });
+
+		this.setState({
+			notifications : _.mapValues(this.notifications, (fn)=>{ return fn(); })	//Convert notification functions into their return text value
+		});
+	},
+	dismiss : function(){
+		localStorage.setItem(DISMISS_KEY, true);
+		this.checkNotifications();
+	},
+	render : function(){
+		if(_.isEmpty(this.state.notifications)) return null;
+
+		return <div className='notificationPopup'>
+			<i className='fas fa-times dismiss' onClick={this.dismiss}/>
+			<i className='fas fa-info-circle info' />
+			<div className='header'>
+				<h3>Notice</h3>
+				<small>This website is always improving and we are still adding new features and squashing bugs. Keep the following in mind:</small>
+			</div>
+			<ul>{_.values(this.state.notifications)}</ul>
+		</div>;
+	}
+});
 
 module.exports = NotificationPopup;

client/homebrew/brewRenderer/notificationPopup/notificationPopup.less

@@ -1,60 +1,64 @@
-.popups {
+.popups{
 	position         : fixed;
 	top              : @navbarHeight;
-	right            : 24px;
+	right            : 15px;
 	z-index          : 10001;
 	width            : 450px;
 }
 
-.notificationPopup {
+.notificationPopup{
 	position         : relative;
+	display          : inline-block;
 	width            : 100%;
 	padding          : 15px;
 	padding-bottom   : 10px;
 	padding-left     : 25px;
-	color            : white;
 	background-color : @blue;
-	border           : none;
-	&[open] { display : inline-block; }
-	a {
+	color            : white;
+	a{
+		color       : #e0e5c1;
 		font-weight : 800;
-		color       : #E0E5C1;
 	}
-	i.info {
+	i.info{
 		position  : absolute;
 		top       : 12px;
 		left      : 12px;
-		font-size : 2.5em;
 		opacity   : 0.8;
+		font-size : 2.5em;
 	}
-	button.dismiss {
-		position         : absolute;
-		top              : 10px;
-		right            : 10px;
-		cursor           : pointer;
-		background-color : transparent;
-		opacity          : 0.6;
-		&:hover { opacity : 1; }
+	i.dismiss{
+		position : absolute;
+		top      : 10px;
+		right    : 10px;
+		cursor   : pointer;
+		opacity  : 0.6;
+		&:hover{
+			opacity : 1;
+		}
 	}
-	.header { padding-left : 50px; }
-	small {
-		font-size : 0.6em;
+	.header {
+		padding-left : 50px;
+	}
+	small{
 		opacity   : 0.7;
+		font-size : 0.6em;
 	}
-	h3 {
+	h3{
 		font-size   : 1.1em;
 		font-weight : 800;
 	}
-	ul {
+	ul{
 		margin-top          : 15px;
 		font-size           : 0.8em;
 		list-style-position : outside;
 		list-style-type     : disc;
-		li {
-			margin-top  : 1.4em;
+		li{
 			font-size   : 0.8em;
 			line-height : 1.4em;
-			em { font-weight : 800; }
+			margin-top  : 1.4em;
+			em{
+				font-weight : 800;
+			}
 		}
 	}
 }

client/homebrew/editor/editor.jsx

@@ -5,7 +5,6 @@ const createClass = require('create-react-class');
 const _ = require('lodash');
 const cx = require('classnames');
 const dedent = require('dedent-tabs').default;
-const Markdown = require('../../../shared/naturalcrit/markdown.js');
 
 const CodeEditor = require('naturalcrit/codeEditor/codeEditor.jsx');
 const SnippetBar = require('./snippetbar/snippetbar.jsx');
@@ -48,9 +47,6 @@ const Editor = createClass({
 		};
 	},
 
-	editor     : React.createRef(null),
-	codeEditor : React.createRef(null),
-
 	isText  : function() {return this.state.view == 'text';},
 	isStyle : function() {return this.state.view == 'style';},
 	isMeta  : function() {return this.state.view == 'meta';},
@@ -83,15 +79,15 @@ const Editor = createClass({
 	},
 
 	updateEditorSize : function() {
-		if(this.codeEditor.current) {
-			let paneHeight = this.editor.current.parentNode.clientHeight;
-			paneHeight -= SNIPPETBAR_HEIGHT;
-			this.codeEditor.current.codeMirror.setSize(null, paneHeight);
+		if(this.refs.codeEditor) {
+			let paneHeight = this.refs.main.parentNode.clientHeight;
+			paneHeight -= SNIPPETBAR_HEIGHT + 1;
+			this.refs.codeEditor.codeMirror.setSize(null, paneHeight);
 		}
 	},
 
 	handleInject : function(injectText){
-		this.codeEditor.current?.injectText(injectText, false);
+		this.refs.codeEditor?.injectText(injectText, false);
 	},
 
 	handleViewChange : function(newView){
@@ -102,7 +98,7 @@ const Editor = createClass({
 	},
 
 	getCurrentPage : function(){
-		const lines = this.props.brew.text.split('\n').slice(0, this.codeEditor.current.getCursorPosition().line + 1);
+		const lines = this.props.brew.text.split('\n').slice(0, this.refs.codeEditor.getCursorPosition().line + 1);
 		return _.reduce(lines, (r, line)=>{
 			if(
 				(this.props.renderer == 'legacy' && line.indexOf('\\page') !== -1)
@@ -114,9 +110,9 @@ const Editor = createClass({
 	},
 
 	highlightCustomMarkdown : function(){
-		if(!this.codeEditor.current) return;
+		if(!this.refs.codeEditor) return;
 		if(this.state.view === 'text')  {
-			const codeMirror = this.codeEditor.current.codeMirror;
+			const codeMirror = this.refs.codeEditor.codeMirror;
 
 			codeMirror.operation(()=>{ // Batch CodeMirror styling
 				//reset custom text styles
@@ -155,37 +151,30 @@ const Editor = createClass({
 
 						// definition lists
 						if(line.includes('::')){
-							if(/^:*$/.test(line) == true){ return };
-							const regex = /^([^\n]*?:?\s?)(::[^\n]*)(?:\n|$)/ymd;  // the `d` flag, for match indices, throws an ESLint error.
+							const regex = /^([^\n]*?)::([^\n]*)(?:\n|$)/ym;
 							let match;
 							while ((match = regex.exec(line)) != null){
-								codeMirror.markText({ line: lineNumber, ch: match.indices[0][0] }, { line: lineNumber, ch: match.indices[0][1] }, { className: 'dl-highlight' });
-								codeMirror.markText({ line: lineNumber, ch: match.indices[1][0] }, { line: lineNumber, ch: match.indices[1][1] }, { className: 'dt-highlight' });
-								codeMirror.markText({ line: lineNumber, ch: match.indices[2][0] }, { line: lineNumber, ch: match.indices[2][1] }, { className: 'dd-highlight' });
-								const ddIndex = match.indices[2][0];
-								let colons = /::/g;
-								let colonMatches = colons.exec(match[2]);
-								if(colonMatches !== null){
-									codeMirror.markText({ line: lineNumber, ch: colonMatches.index + ddIndex }, { line: lineNumber, ch: colonMatches.index + colonMatches[0].length + ddIndex }, { className: 'dl-colon-highlight'} )
-								}
+								codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[0]) }, { line: lineNumber, ch: line.indexOf(match[0]) + match[0].length }, { className: 'define' });
+								codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length }, { className: 'term' });
+								codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[2]) }, { line: lineNumber, ch: line.indexOf(match[2]) + match[2].length }, { className: 'definition' });
 							}
 						}
 
-						// Subscript & Superscript
-						if(line.includes('^')) {
-							let startIndex = line.indexOf('^');
-							const superRegex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/gy;
-							const subRegex   = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/gy;
-							
-							while (startIndex >= 0) {
-								superRegex.lastIndex = subRegex.lastIndex = startIndex;
-								let isSuper = false;
-								let match = subRegex.exec(line) || superRegex.exec(line);
-								if (match) {
-									isSuper = !subRegex.lastIndex;
-									codeMirror.markText({ line: lineNumber, ch: match.index }, { line: lineNumber, ch: match.index + match[0].length }, { className: isSuper ? 'superscript' : 'subscript' });
-								}
-								startIndex = line.indexOf('^', Math.max(startIndex + 1, subRegex.lastIndex, superRegex.lastIndex));
+						// Superscript
+						if(line.includes('\^')) {
+							const regex = /\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^/g;
+							let match;
+							while ((match = regex.exec(line)) != null) {
+								codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) - 1 }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length + 1 }, { className: 'superscript' });
+							}
+						}
+
+						// Subscript
+						if(line.includes('^^')) {
+							const regex = /\^\^(?!\s)(?=([^\n\^]*[^\s\^]))\1\^\^/g;
+							let match;
+							while ((match = regex.exec(line)) != null) {
+								codeMirror.markText({ line: lineNumber, ch: line.indexOf(match[1]) - 2 }, { line: lineNumber, ch: line.indexOf(match[1]) + match[1].length + 2 }, { className: 'subscript' });
 							}
 						}
 
@@ -223,34 +212,6 @@ const Editor = createClass({
 								endCh = match.index+match[0].length;
 							codeMirror.markText({ line: lineNumber, ch: 0 }, { line: lineNumber, ch: endCh }, { className: 'block' });
 						}
-
-						// Emojis
-						if(line.match(/:[^\s:]+:/g)) {
-							let startIndex = line.indexOf(':');
-							const emojiRegex = /:[^\s:]+:/gy;
-
-							while (startIndex >= 0) {
-								emojiRegex.lastIndex = startIndex;
-								let match = emojiRegex.exec(line);
-								if (match) {
-									let tokens = Markdown.marked.lexer(match[0]);
-									tokens = tokens[0].tokens.filter(t => t.type == 'emoji')
-									if (!tokens.length)
-										return;
-
-									let startPos = { line: lineNumber, ch: match.index };
-									let endPos   = { line: lineNumber, ch: match.index + match[0].length };
-
-									// Iterate over conflicting marks and clear them
-									var marks = codeMirror.findMarks(startPos, endPos);
-									marks.forEach(function(marker) {
-										marker.clear();
-									});
-									codeMirror.markText(startPos, endPos, { className: 'emoji' });
-								}
-								startIndex = line.indexOf(':', Math.max(startIndex + 1, emojiRegex.lastIndex));
-							}
-						}
 					}
 				});
 			});
@@ -305,23 +266,23 @@ const Editor = createClass({
 
 				targetLine = lineCount - 1; //Scroll to `\page`, which is one line back.
 
-				let currentY = this.codeEditor.current.codeMirror.getScrollInfo().top;
-				let targetY  = this.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
+				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.codeEditor.current.codeMirror.scrollTo(null, currentY);
+					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.codeEditor.current.codeMirror.heightAtLine(targetLine, 'local', true);
+						targetY = this.refs.codeEditor.codeMirror.heightAtLine(targetLine, 'local', true);
 
 					// End when close enough
 					if(Math.abs(targetY - currentY) < 1) {
-						this.codeEditor.current.codeMirror.scrollTo(null, targetY);  // Scroll any remaining difference
-						this.codeEditor.current.setCursorPosition({ line: targetLine + 1, ch: 0 });
-						this.codeEditor.current.codeMirror.addLineClass(targetLine + 1, 'wrap', 'sourceMoveFlash');
+						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);
@@ -331,7 +292,7 @@ const Editor = createClass({
 
 	//Called when there are changes to the editor's dimensions
 	update : function(){
-		this.codeEditor.current?.updateSize();
+		this.refs.codeEditor?.updateSize();
 	},
 
 	updateEditorTheme : function(newTheme){
@@ -350,7 +311,7 @@ const Editor = createClass({
 		if(this.isText()){
 			return <>
 				<CodeEditor key='codeEditor'
-					ref={this.codeEditor}
+					ref='codeEditor'
 					language='gfm'
 					view={this.state.view}
 					value={this.props.brew.text}
@@ -362,7 +323,7 @@ const Editor = createClass({
 		if(this.isStyle()){
 			return <>
 				<CodeEditor key='codeEditor'
-					ref={this.codeEditor}
+					ref='codeEditor'
 					language='css'
 					view={this.state.view}
 					value={this.props.brew.style ?? DEFAULT_STYLE_TEXT}
@@ -387,28 +348,28 @@ const Editor = createClass({
 	},
 
 	redo : function(){
-		return this.codeEditor.current?.redo();
+		return this.refs.codeEditor?.redo();
 	},
 
 	historySize : function(){
-		return this.codeEditor.current?.historySize();
+		return this.refs.codeEditor?.historySize();
 	},
 
 	undo : function(){
-		return this.codeEditor.current?.undo();
+		return this.refs.codeEditor?.undo();
 	},
 
 	foldCode : function(){
-		return this.codeEditor.current?.foldAllCode();
+		return this.refs.codeEditor?.foldAllCode();
 	},
 
 	unfoldCode : function(){
-		return this.codeEditor.current?.unfoldAllCode();
+		return this.refs.codeEditor?.unfoldAllCode();
 	},
 
 	render : function(){
 		return (
-			<div className='editor' ref={this.editor}>
+			<div className='editor' ref='main'>
 				<SnippetBar
 					brew={this.props.brew}
 					view={this.state.view}
@@ -424,7 +385,7 @@ const Editor = createClass({
 					historySize={this.historySize()}
 					currentEditorTheme={this.state.editorTheme}
 					updateEditorTheme={this.updateEditorTheme}
-					cursorPos={this.codeEditor.current?.getCursorPosition() || {}} />
+					cursorPos={this.refs.codeEditor?.getCursorPosition() || {}} />
 
 				{this.renderEditor()}
 			</div>

client/homebrew/editor/editor.less

@@ -43,16 +43,6 @@
 			font-weight : bold;
 			color       : green;
 		}
-		.emoji:not(.cm-comment) {
-			margin-left    : 2px;
-			color          : #360034;
-			background     : #ffc8ff;
-			border-radius  : 6px;
-			font-weight    : bold;
-			padding-bottom : 1px;
-			outline-offset : -2px;
-			outline        : solid 2px #ff96fc;
-		}
 		.superscript:not(.cm-comment) {
 			font-weight    : bold;
 			color          : goldenrod;
@@ -65,16 +55,6 @@
 			vertical-align : sub;
 			font-size      : 0.9em;
 		}
-		.dl-highlight {
-			&.dl-colon-highlight {
-				font-weight   : bold;
-				color         : #949494;
-				background    : #E5E5E5;
-				border-radius : 3px;
-			}
-			&.dt-highlight { color : rgb(96, 117, 143); }
-			&.dd-highlight { color : rgb(97, 57, 178); }
-		}		
 	}
 
 	.brewJump {

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -3,6 +3,7 @@ require('./metadataEditor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
+const cx    = require('classnames');
 const request = require('../../utils/request-middleware.js');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Combobox = require('client/components/combobox.jsx');

client/homebrew/editor/snippetbar/snippetbar.jsx

@@ -161,7 +161,7 @@ const Snippetbar = createClass({
 						onClick={this.props.unfoldCode} >
 						<i className='fas fa-expand-alt' />
 					</div>
-				</>;
+				</>
 
 		}
 
@@ -181,7 +181,7 @@ const Snippetbar = createClass({
 				<i className='fas fa-palette' />
 				{this.state.themeSelector && this.renderThemeSelector()}
 			</div>
-
+			
 			<div className='divider'></div>
 			<div className={cx('text', { selected: this.props.view === 'text' })}
 				 onClick={()=>this.props.onViewChange('text')}>

client/homebrew/editor/snippetbar/snippetbar.less

@@ -130,8 +130,6 @@
 					height       : 1.2em;
 					margin-right : 8px;
 					font-size    : 1.2em;
-					min-width: 25px;
-					text-align: center;
 					& ~ i {
 						margin-right : 0;
 						margin-left  : 5px;
@@ -140,7 +138,7 @@
 					&.font {
 						height : auto;
 						&::before {
-							font-size : 1em;
+							font-size : 1.4em;
 							content   : 'ABC';
 						}
 

client/homebrew/homebrew.jsx

@@ -10,6 +10,8 @@ const UserPage = require('./pages/userPage/userPage.jsx');
 const SharePage = require('./pages/sharePage/sharePage.jsx');
 const NewPage = require('./pages/newPage/newPage.jsx');
 const ErrorPage = require('./pages/errorPage/errorPage.jsx');
+const PrintPage = require('./pages/printPage/printPage.jsx');
+const ArchivePage = require('./pages/archivePage/archivePage.jsx');
 const AccountPage = require('./pages/accountPage/accountPage.jsx');
 
 const WithRoute = (props)=>{
@@ -71,13 +73,16 @@ const Homebrew = createClass({
 						<Route path='/new/:id' element={<WithRoute el={NewPage} brew={this.props.brew} />} />
 						<Route path='/new' element={<WithRoute el={NewPage}/>} />
 						<Route path='/user/:username' element={<WithRoute el={UserPage} brews={this.props.brews} />} />
+						<Route path='/print/:id' element={<WithRoute el={PrintPage} brew={this.props.brew} />} />
+						<Route path='/print' element={<WithRoute el={PrintPage} />} />
+						<Route path='/archive' element={<WithRoute el={ArchivePage}/>}/>
 						<Route path='/changelog' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
 						<Route path='/faq' element={<WithRoute el={SharePage} brew={this.props.brew} />} />
-						<Route path='/account' element={<WithRoute el={AccountPage} brew={this.props.brew} accountDetails={this.props.brew.accountDetails} />} />
+						<Route path='/account' element={<WithRoute el={AccountPage} brew={this.props.brew} uiItems={this.props.brew.uiItems} />} />
 						<Route path='/legacy' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
 						<Route path='/error' element={<WithRoute el={ErrorPage} brew={this.props.brew} />} />
-						<Route path='/' 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} />} />
+					  	<Route path='/*' element={<WithRoute el={HomePage} brew={this.props.brew} />} />
 					</Routes>
 				</div>
 			</Router>
@@ -85,4 +90,15 @@ const Homebrew = createClass({
 	}
 });
 
-module.exports = Homebrew;
+module.exports = Homebrew;
+
+//TODO: Nicer Error page instead of just "cant get that"
+// 	'/share/:id' : (args)=>{
+// 		if(!this.props.brew.shareId){
+// 			return <ErrorPage errorId={args.id}/>;
+// 		}
+//
+// 		return <SharePage
+// 			id={args.id}
+// 			brew={this.props.brew} />;
+// 	},

client/homebrew/homebrew.less

@@ -15,23 +15,6 @@
 		}
 		&.listPage .content {
 			overflow-y : scroll;
-
-			&::-webkit-scrollbar {
-				width: 20px;
-				&:horizontal{
-					height: 20px;
-					width:auto;
-				}
-				&-thumb {
-					background: linear-gradient(90deg, #d3c1af 15px, #00000000 15px);
-					&:horizontal{
-						background: linear-gradient(0deg, #d3c1af 15px, #00000000 15px);
-					}
-				}
-				&-corner {
-					visibility: hidden;
-				}
-			}
 		}
 	}
 }

client/homebrew/navbar/error-navitem.jsx

@@ -42,7 +42,7 @@ const ErrorNavItem = createClass({
 				</div>
 			</Nav.item>;
 		}
-
+		
 		if(status === 412) {
 			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 				Oops!
@@ -51,7 +51,7 @@ const ErrorNavItem = createClass({
 				</div>
 			</Nav.item>;
 		}
-
+		
 		if(HBErrorCode === '04') {
 			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 				Oops!
@@ -76,10 +76,10 @@ const ErrorNavItem = createClass({
 		if(response.body?.errors?.[0].reason == 'storageQuotaExceeded') {
 			return <Nav.item className='save error' icon='fas fa-exclamation-triangle'>
 			Oops!
-				<div className='errorContainer' onClick={clearError}>
+			<div className='errorContainer' onClick={clearError}>
 				Can't save because your Google Drive seems to be full!
-				</div>
-			</Nav.item>;
+			</div>
+		</Nav.item>;
 		}
 
 		if(response.req.url.match(/^\/api.*Google.*$/m)){

client/homebrew/navbar/help.navitem.jsx

@@ -1,4 +1,6 @@
 const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
 const dedent = require('dedent-tabs').default;
 
 const Nav = require('naturalcrit/nav/nav.jsx');

client/homebrew/navbar/metadata.navitem.jsx

@@ -1,5 +1,6 @@
 const React = require('react');
 const createClass = require('create-react-class');
+const _ = require('lodash');
 const Moment = require('moment');
 
 const Nav = require('naturalcrit/nav/nav.jsx');

client/homebrew/navbar/navbar.less

@@ -1,351 +1,272 @@
-@import 'naturalcrit/styles/colors.less';
-
+@import "naturalcrit/styles/colors.less";
 @navbarHeight : 28px;
-
 @keyframes pinkColoring {
-	0% { color : pink; }
-	50% { color : pink; }
-	75% { color : red; }
-	100% { color : pink; }
+  0%   {color : pink;}
+  50%  {color : pink;}
+  75%  {color : red;}
+  100% {color : pink;}
 }
-
-@keyframes glideDropDown {
-	0% {
-		background-color : #333333;
-		opacity          : 0;
-		transform        : translate(0px, -100%);
-	}
-	100% {
-		background-color : #333333;
-		opacity          : 1;
-		transform        : translate(0px, 0px);
-	}
-}
-
 .homebrew nav {
-	background-color : #333333;
-	.navContent {
-		position        : relative;
-		z-index         : 2;
-		display         : flex;
-		justify-content : space-between;
-	}
-	.navSection {
-		display     : flex;
-		align-items : center;
-		&:last-child .navItem { border-left : 1px solid #666666; }
-	}
-	// "NaturalCrit" logo
-	.navLogo {
-		display         : block;
-		margin-top      : 0px;
-		margin-right    : 8px;
-		margin-left     : 8px;
-		color           : white;
-		text-decoration : none;
+	.homebrewLogo {
+		.animate(color);
+		font-family : CodeBold;
+		font-size   : 12px;
+		color       : white;
+		div {
+			margin-top    : 2px;
+			margin-bottom : -2px;
+		}
 		&:hover {
-			.name { color : @orange; }
-			svg { fill : @orange; }
-		}
-		svg {
-			height       : 13px;
-			margin-right : 0.2em;
-			cursor       : pointer;
-			fill         : white;
-		}
-		span.name {
-			font-family : 'CodeLight';
-			font-size   : 15px;
-			span.crit { font-family : 'CodeBold'; }
-			small {
-				font-family    : 'Open Sans';
-				font-size      : 0.3em;
-				font-weight    : 800;
-				text-transform : uppercase;
-			}
+			color : @blue;
 		}
 	}
-	.navItem {
-		#backgroundColorsHover;
-		.animate(background-color);
-		padding          : 8px 12px;
-		font-size        : 10px;
-		font-weight      : 800;
-		line-height      : 13px;
-		color            : white;
-		text-decoration  : none;
-		text-transform   : uppercase;
-		cursor           : pointer;
-		background-color : #333333;
-		i {
-			float       : right;
-			margin-left : 5px;
-			font-size   : 13px;
-		}
-		&.patreon {
-			border-right : 1px solid #666666;
-			border-left  : 1px solid #666666;
-			&:hover i { color : red; }
-			i {
-				color              : pink;
-				.animate(color);
-				animation-name     : pinkColoring;
-				animation-duration : 2s;
-			}
-		}
-		&.editTitle {  // this is not needed at all currently - you used to be able to edit the title via the navbar.
-			padding : 2px 12px;
-			input {
-				width            : 250px;
-				padding          : 2px;
-				margin           : 0;
-				font-family      : 'Open Sans', sans-serif;
-				font-size        : 12px;
-				font-weight      : 800;
-				color            : white;
-				text-align       : center;
-				background-color : transparent;
-				border           : 1px solid @blue;
-				outline          : none;
-			}
-			.charCount {
-				display        : inline-block;
-				margin-left    : 8px;
-				color          : #666666;
-				text-align     : right;
-				vertical-align : bottom;
-				&.max { color : @red; }
-			}
-		}
-		&.brewTitle {
-			flex-grow        : 1;
+	.editTitle.navItem {
+		padding : 2px 12px;
+		input {
+			font-family      : "Open Sans", sans-serif;
 			font-size        : 12px;
 			font-weight      : 800;
-			color            : white;
+			width            : 250px;
+			margin           : 0;
+			padding          : 2px;
 			text-align       : center;
-			text-transform   : initial;
+			color            : white;
+			border           : 1px solid @blue;
+			outline          : none;
 			background-color : transparent;
 		}
-		// "The Homebrewery" logo
-		&.homebrewLogo {
+		.charCount {
+			display        : inline-block;
+			margin-left    : 8px;
+			text-align     : right;
+			vertical-align : bottom;
+			color          : #666;
+			&.max {
+				color : @red;
+			}
+		}
+	}
+	.brewTitle.navItem {
+		font-size        : 12px;
+		font-weight      : 800;
+		height           : 100%;
+		text-align       : center;
+		text-transform   : initial;
+		color            : white;
+		background-color : transparent;
+		flex-grow        : 1;
+	}
+	.save-menu {
+		.dropdown {
+			z-index : 1000;
+		}
+		.navItem i.fa-power-off {
+			color : red;
+			&.active {
+				color  : rgb(0, 182, 52);
+				filter : drop-shadow(0 0 2px rgba(0, 182, 52, 0.765));
+			}
+		}
+	}
+	.patreon.navItem {
+		border-right : 1px solid #666;
+		border-left  : 1px solid #666;
+		&:hover i {
+			color : red;
+		}
+		i {
 			.animate(color);
-			font-family : 'CodeBold';
-			font-size   : 12px;
-			color       : white;
-			div {
-				margin-top    : 2px;
-				margin-bottom : -2px;
-			}
-			&:hover { color : @blue; }
-		}
-		&.metadata {
-			position    : relative;
-			display     : flex;
-			flex-grow   : 1;
-			align-items : center;
-			height      : 100%;
-			padding     : 0;
-			i { margin-right : 10px;}
-			.window {
-				position         : absolute;
-				bottom           : 0;
-				left             : 50%;
-				z-index          : -1;
-				display          : flex;
-				flex-flow        : row wrap;
-				align-content    : baseline;
-				justify-content  : flex-start;
-				width            : 440px;
-				max-height       : ~'calc(100vh - 28px)';
-				padding          : 0 10px 5px;
-				margin           : 0 auto;
-				background-color : #333333;
-				border           : 3px solid #444444;
-				border-top       : unset;
-				border-radius    : 0 0 5px 5px;
-				box-shadow       : inset 0 7px 9px -7px #111111;
-				transition       : transform 0.4s, opacity 0.4s;
-				&.active {
-					opacity   : 1;
-					transform : translateX(-50%) translateY(100%);
-				}
-				&.inactive {
-					opacity   : 0;
-					transform : translateX(-50%) translateY(0%);
-				}
-				.row {
-					display   : flex;
-					flex-flow : row wrap;
-					width     : 100%;
-					h4 {
-						box-sizing : border-box;
-						display    : block;
-						flex-basis : 20%;
-						flex-grow  : 1;
-						min-width  : 76px;
-						padding    : 5px 0;
-						color      : #BBBBBB;
-						text-align : center;
-					}
-					p {
-						flex-basis     : 80%;
-						flex-grow      : 1;
-						padding        : 5px 0;
-						font-family    : 'Open Sans', sans-serif;
-						font-size      : 10px;
-						font-weight    : normal;
-						text-transform : initial;
-						.tag {
-							display          : inline-block;
-							padding          : 2px;
-							margin           : 2px 2px;
-							background-color : #444444;
-							border           : 2px solid grey;
-							border-radius    : 5px;
-						}
-						a.userPageLink {
-							color           : white;
-							text-decoration : none;
-							&:hover { text-decoration : underline; }
-						}
-					}
-					&:nth-of-type(even) { background-color : #555555; }
-				}
-			}
-		}
-		&.warning {
-			position         : relative;
-			color            : white;
-			background-color : @orange;
-			&:hover > .dropdown { visibility : visible; }
-			.dropdown {
-				position         : absolute;
-				top              : 28px;
-				left             : 0;
-				z-index          : 10000;
-				box-sizing       : border-box;
-				display          : block;
-				width            : 100%;
-				padding          : 13px 5px;
-				text-align       : center;
-				visibility       : hidden;
-				background-color : #333333;
-			}
-		}
-		&.account {
-			min-width : 100px;
-			&.username { text-transform : none;}
+			animation-name     : pinkColoring;
+			animation-duration : 2s;
+			color              : pink;
 		}
 	}
-	.navDropdownContainer {
+	.recent.navDropdownContainer {
 		position : relative;
-		.navDropdown {
-			position: absolute;
-			top: 28px;
-			right: 0px;
-			z-index: 10000;
-			width: max-content;
-			min-width:100%;
-			max-height: calc(100vh - 28px);
-			overflow: hidden auto;
-			display: flex;
-			flex-direction: column;
-			align-items: flex-end;
-			.navItem {
-				position           : relative;
-				display            : flex;
-				justify-content    : space-between;
-				align-items        : center;
-				width              : 100%;
-				border             : 1px solid #888888;
-				border-bottom      : 0;
-				animation-name     : glideDropDown;
-				animation-duration : 0.4s;
-			}
-		}
-		&.recent {
-			position : relative;
-			.navDropdown .navItem {
-				#backgroundColorsHover;
-				.animate(background-color);
-				position         : relative;
-				box-sizing       : border-box;
-				display          : block;
-				max-width        : 15em;
-				max-height       : ~'calc(100vh - 28px)';			
-				padding          : 8px 5px 13px;
-				overflow         : hidden auto;
-				color            : white;
-				text-decoration  : none;
-				background-color : #333333;
-				border-top       : 1px solid #888888;
-				scrollbar-color  : #666666 #333333;
-				scrollbar-width  : thin;
-				.clear {
-					position         : absolute;
-					top              : 50%;
-					right            : 0;
-					display          : none;
-					width            : 20px;
-					height           : 100%;
-					background-color : #333333;
-					border-radius    : 3px;
-					opacity          : 70%;
-					transform        : translateY(-50%);
-					&:hover { opacity : 100%; }
-					i {
-						width      : 100%;
-						height     : 100%;
-						margin     : 0;
-						font-size  : 10px;
-						text-align : center;
-					}
-				}
-				&:hover {
-					background-color : @blue;
-					.clear {
-						display       : grid;
-						place-content : center;
-					}
-				}
-				.title {
-					display       : inline-block;
-					width         : 100%;
-					overflow      : hidden auto;
-					text-overflow : ellipsis;
-					white-space   : nowrap;
-				}
-				.time {
-					position  : absolute;
-					right     : 2px;
-					bottom    : 2px;
-					font-size : 0.7em;
-					color     : #888888;
-				}
-				&.header {
-					box-sizing       : border-box;
-					display          : block;
-					padding          : 5px 0;
-					color            : #BBBBBB;
-					text-align       : center;
-					background-color : #333333;
-					border-top       : 1px solid #888888;
-					&:nth-of-type(1) { background-color : darken(@teal, 20%); }
-					&:nth-of-type(2) { background-color : darken(@purple, 30%); }
-				}
-			}
-		}
-	}
-}
+		.navDropdown .navItem {
+			overflow        : hidden auto;
+			max-height      : ~"calc(100vh - 28px)";
+			scrollbar-color : #666 #333;
+			scrollbar-width : thin;
+			
 
-// this should likely be refactored into .navDropdownContainer
-.save-menu {
-	.dropdown { z-index : 1000; }
-	.navItem i.fa-power-off {
-		color : red;
-		&.active {
-			color  : rgb(0, 182, 52);
-			filter : drop-shadow(0 0 2px rgba(0, 182, 52, 0.765));
+			#backgroundColorsHover;
+			.animate(background-color);
+			position         : relative;
+			display          : block;
+			overflow         : clip;
+			box-sizing       : border-box;
+			padding          : 8px 5px 13px;
+			text-decoration  : none;
+			color            : white;
+			border-top       : 1px solid #888;
+			background-color : #333;
+			.clear {
+				position         : absolute;
+				top              : 50%;
+				right            : 0;
+				display          : none;
+				width            : 20px;
+				height           : 100%;
+				transform        : translateY(-50%);
+				opacity          : 70%;
+				border-radius    : 3px;
+				background-color : #333;
+				&:hover {
+					opacity : 100%;
+				}
+				i {
+					font-size  : 10px;
+					width      : 100%;
+					height     : 100%;
+					margin     : 0;
+					text-align : center;
+				}
+			}
+			&:hover {
+				background-color : @blue;
+				.clear {
+					display       : grid;
+					place-content : center;
+				}
+			}
+			.title {
+				display       : inline-block;
+				overflow      : hidden;
+				width         : 100%;
+				white-space   : nowrap;
+				text-overflow : ellipsis;
+			}
+			.time {
+				font-size : 0.7em;
+				position  : absolute;
+				right     : 2px;
+				bottom    : 2px;
+				color     : #888;
+			}
+			&.header {
+				display          : block;
+				box-sizing       : border-box;
+				padding          : 5px 0;
+				text-align       : center;
+				color            : #BBB;
+				border-top       : 1px solid #888;
+				background-color : #333;
+				&:nth-of-type(1) {
+					background-color : darken(@teal, 20%);
+				}
+				&:nth-of-type(2) {
+					background-color : darken(@purple, 30%);
+				}
+			}
 		}
 	}
+	.metadata.navItem {
+		position    : relative;
+		display     : flex;
+		align-items : center;
+		height      : 100%;
+		padding     : 0;
+		flex-grow   : 1;
+		i {
+			margin-right : 10px;
+		}
+		.window {
+			position         : absolute;
+			z-index          : -1;
+			bottom           : 0;
+			left             : 50%;
+			display          : flex;
+			justify-content  : flex-start;
+			width            : 440px;
+			max-height       : ~"calc(100vh - 28px)";
+			margin           : 0 auto;
+			padding          : 0 10px 5px;
+			transition       : transform 0.4s, opacity 0.4s;
+			border           : 3px solid #444;
+			border-top       : unset;
+			border-radius    : 0 0 5px 5px;
+			background-color : #333;
+			box-shadow       : inset 0 7px 9px -7px #111;
+			flex-flow        : row wrap;
+			align-content    : baseline;
+			&.active {
+				transform : translateX(-50%) translateY(100%);
+				opacity   : 1;
+			}
+			&.inactive {
+				transform : translateX(-50%) translateY(0%);
+				opacity   : 0;
+			}
+			.row {
+				display   : flex;
+				width     : 100%;
+				flex-flow : row wrap;
+				h4 {
+					display    : block;
+					box-sizing : border-box;
+					min-width  : 76px;
+					padding    : 5px 0;
+					text-align : center;
+					color      : #BBB;
+					flex-basis : 20%;
+					flex-grow  : 1;
+				}
+				p {
+					font-family    : "Open Sans", sans-serif;
+					font-size      : 10px;
+					font-weight    : normal;
+					padding        : 5px 0;
+					text-transform : initial;
+					flex-basis     : 80%;
+					flex-grow      : 1;
+					.tag {
+						display          : inline-block;
+						margin           : 2px 2px;
+						padding          : 2px;
+						border           : 2px solid grey;
+						border-radius    : 5px;
+						background-color : #444;
+					}
+					a.userPageLink {
+						text-decoration : none;
+						color           : white;
+						&:hover {
+							text-decoration : underline;
+						}
+					}
+				}
+				&:nth-of-type(even) {
+					background-color : #555;
+				}
+			}
+		}
+	}
+	.warning.navItem {
+		position         : relative;
+		color            : white;
+		background-color : @orange;
+		&:hover > .dropdown {
+			visibility : visible;
+		}
+		.dropdown {
+			position         : absolute;
+			z-index          : 10000;
+			top              : 28px;
+			left             : 0;
+			display          : block;
+			visibility       : hidden;
+			box-sizing       : border-box;
+			width            : 100%;
+			padding          : 13px 5px;
+			text-align       : center;
+			background-color : #333;
+		}
+	}
+	.account.navItem {
+		min-width : 100px;
+	}
+	.account.username.navItem {
+		text-transform : none;
+	}
 }

client/homebrew/navbar/newbrew.navitem.jsx

@@ -1,64 +1,12 @@
 const React = require('react');
-const _ = require('lodash');
 const Nav = require('naturalcrit/nav/nav.jsx');
-const { splitTextStyleAndMetadata } = require('../../../shared/helpers.js'); // Importing the function from helpers.js
 
-const BREWKEY  = 'homebrewery-new';
-const STYLEKEY = 'homebrewery-new-style';
-const METAKEY  = 'homebrewery-new-meta';
-
-const NewBrew = ()=>{
-	const handleFileChange = (e)=>{
-		const file = e.target.files[0];
-		if(file) {
-			const reader = new FileReader();
-			reader.onload = (e)=>{
-				const fileContent = e.target.result;
-				const newBrew = {
-					text  : fileContent,
-					style : ''
-				};
-				if(fileContent.startsWith('```metadata')) {
-					splitTextStyleAndMetadata(newBrew); // Modify newBrew directly
-					localStorage.setItem(BREWKEY, newBrew.text);
-					localStorage.setItem(STYLEKEY, newBrew.style);
-					localStorage.setItem(METAKEY, JSON.stringify(_.pick(newBrew, ['title', 'description', 'tags', 'systems', 'renderer', 'theme', 'lang'])));
-					window.location.href = '/new';
-				} else {
-					alert('This file is invalid, please, enter a valid file');
-				}
-			};
-			reader.readAsText(file);
-		}
-	};
-
-	return (
-		<Nav.dropdown>
-			<Nav.item
-				className='new'
-				color='purple'
-				icon='fa-solid fa-plus-square'>
-                new
-			</Nav.item>
-			<Nav.item
-				className='fromBlank'
-				href='/new'
-				newTab={true}
-				color='purple'
-				icon='fa-solid fa-file'>
-                from blank
-			</Nav.item>
-
-			<Nav.item
-				className='fromFile'
-				color='purple'
-				icon='fa-solid fa-upload'
-				onClick={()=>{ document.getElementById('uploadTxt').click(); }}>
-				<input id='uploadTxt' className='newFromLocal' type='file' onChange={handleFileChange} style={{ display: 'none' }} />
-                from file
-			</Nav.item>
-		</Nav.dropdown>
-	);
+module.exports = function(props){
+	return <Nav.item
+		href='/new'
+		newTab={true}
+		color='purple'
+		icon='fas fa-plus-square'>
+		new
+	</Nav.item>;
 };
-
-module.exports = NewBrew;

client/homebrew/navbar/print.navitem.jsx

@@ -1,9 +1,9 @@
 const React = require('react');
+const createClass = require('create-react-class');
 const Nav = require('naturalcrit/nav/nav.jsx');
-const { printCurrentBrew } = require('../../../shared/helpers.js');
 
-module.exports = function(){
-	return <Nav.item onClick={printCurrentBrew} color='purple' icon='far fa-file-pdf'>
+module.exports = function(props){
+	return <Nav.item newTab={true} href={`/print/${props.shareId}?dialog=true`} color='purple' icon='far fa-file-pdf'>
 		get PDF
 	</Nav.item>;
 };

client/homebrew/navbar/reddit.navitem.jsx

@@ -1,7 +1,9 @@
 const React = require('react');
 const createClass = require('create-react-class');
+const cx = require('classnames');
 const Nav = require('naturalcrit/nav/nav.jsx');
 
+const MAX_URL_SIZE = 2083;
 const MAIN_URL = 'https://www.reddit.com/r/UnearthedArcana/submit?selftext=true';
 
 

client/homebrew/pages/accountPage/accountPage.jsx

@@ -1,82 +1,102 @@
-const React  = require('react');
+const React = require('react');
+const createClass = require('create-react-class');
+const _     = require('lodash');
+const cx    = require('classnames');
 const moment = require('moment');
+
 const UIPage = require('../basePages/uiPage/uiPage.jsx');
+
+const Nav = require('naturalcrit/nav/nav.jsx');
+const Navbar = require('../../navbar/navbar.jsx');
+
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+const Account = require('../../navbar/account.navitem.jsx');
+const NewBrew = require('../../navbar/newbrew.navitem.jsx');
+const HelpNavItem = require('../../navbar/help.navitem.jsx');
+
 const NaturalCritIcon = require('naturalcrit/svg/naturalcrit.svg.jsx');
 
 let SAVEKEY = '';
 
-const AccountPage = (props)=>{
-	// destructure props and set state for save location
-	const { accountDetails, brew } = props;
-	const [saveLocation, setSaveLocation] = React.useState('');
-
-	// initialize save location from local storage based on user id
-	React.useEffect(()=>{
-		if(!saveLocation && accountDetails.username) {
-			SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${accountDetails.username}`;
-			// if no SAVEKEY in local storage, default save location to Google Drive if user has Google account.
-			let saveLocation = window.localStorage.getItem(SAVEKEY);
-			saveLocation = saveLocation ?? (accountDetails.googleId ? 'GOOGLE-DRIVE' : 'HOMEBREWERY');
-			setActiveSaveLocation(saveLocation);
+const AccountPage = createClass({
+	displayName     : 'AccountPage',
+	getDefaultProps : function() {
+		return {
+			brew    : {},
+			uiItems : {}
+		};
+	},
+	getInitialState : function() {
+		return {
+			uiItems : this.props.uiItems
+		};
+	},
+	componentDidMount : function(){
+		if(!this.state.saveLocation && this.props.uiItems.username) {
+			SAVEKEY = `HOMEBREWERY-DEFAULT-SAVE-LOCATION-${this.props.uiItems.username}`;
+			let saveLocation =  window.localStorage.getItem(SAVEKEY);
+			saveLocation = saveLocation ?? (this.state.uiItems.googleId ? 'GOOGLE-DRIVE' : 'HOMEBREWERY');
+			this.makeActive(saveLocation);
 		}
-	}, []);
+	},
 
-	const setActiveSaveLocation = (newSelection)=>{
-		if(saveLocation === newSelection) return;
+	makeActive : function(newSelection){
+		if(this.state.saveLocation == newSelection) return;
 		window.localStorage.setItem(SAVEKEY, newSelection);
-		setSaveLocation(newSelection);
-	};
+		this.setState({
+			saveLocation : newSelection
+		});
+	},
 
-	// todo: should this be a set of radio buttons (well styled) since it's either/or choice?
-	const renderSaveLocationButton = (name, key, shouldRender = true)=>{
-		if(!shouldRender) return null;
-		return (
-			<button className={saveLocation === key ? 'active' : ''} onClick={()=>{setActiveSaveLocation(key);}}>
-				{name}
-			</button>
-		);
-	};
+	renderButton : function(name, key, shouldRender=true){
+		if(!shouldRender) return;
+		return <button className={this.state.saveLocation==key ? 'active' :	''}	onClick={()=>{this.makeActive(key);}}>{name}</button>;
+	},
 
-	// render the entirety of the account page content
-	const renderAccountPage = ()=>{
-		return (
-			<>
-				<div className='dataGroup'>
-					<h1>Account Information <i className='fas fa-user'></i></h1>
-					<p><strong>Username: </strong>{accountDetails.username || 'No user currently logged in'}</p>
-					<p><strong>Last Login: </strong>{moment(accountDetails.issued).format('dddd, MMMM Do YYYY, h:mm:ss a ZZ') || '-'}</p>
-				</div>
-				<div className='dataGroup'>
-					<h3>Homebrewery Information <NaturalCritIcon /></h3>
-					<p><strong>Brews on Homebrewery: </strong>{accountDetails.mongoCount}</p>
-				</div>
-				<div className='dataGroup'>
-					<h3>Google Information <i className='fab fa-google-drive'></i></h3>
-					<p><strong>Linked to Google: </strong>{accountDetails.googleId ? 'YES' : 'NO'}</p>
-					{accountDetails.googleId && (
-						<p>
-							<strong>Brews on Google Drive: </strong>{accountDetails.googleCount ?? (
-								<>
-									Unable to retrieve files - <a href='https://github.com/naturalcrit/homebrewery/discussions/1580'>follow these steps to renew your Google credentials.</a>
-								</>
-							)}
-						</p>
-					)}
-				</div>
-				<div className='dataGroup'>
-					<h4>Default Save Location</h4>
-					{renderSaveLocationButton('Homebrewery', 'HOMEBREWERY')}
-					{renderSaveLocationButton('Google Drive', 'GOOGLE-DRIVE', accountDetails.googleId)}
-				</div>
-			</>
-		);
-	};
+	renderNavItems : function() {
+		return <Navbar>
+			<Nav.section>
+				<NewBrew />
+				<HelpNavItem />
+				<RecentNavItem />
+				<Account />
+			</Nav.section>
+		</Navbar>;
+	},
 
-	// return the account page inside the base layout wrapper (with navbar etc).
-	return (
-		<UIPage brew={brew}>
-			{renderAccountPage()}
-		</UIPage>);
-};
+	renderUiItems : function() {
+		return 	<>
+			<div className='dataGroup'>
+				<h1>Account Information  <i className='fas fa-user'></i></h1>
+				<p><strong>Username: </strong> {this.props.uiItems.username || 'No user currently logged in'}</p>
+				<p><strong>Last Login: </strong> {moment(this.props.uiItems.issued).format('dddd, MMMM Do YYYY, h:mm:ss a ZZ') || '-'}</p>
+			</div>
+			<div className='dataGroup'>
+				<h3>Homebrewery Information <NaturalCritIcon /></h3>
+				<p><strong>Brews on Homebrewery: </strong> {this.props.uiItems.mongoCount}</p>
+			</div>
+			<div className='dataGroup'>
+				<h3>Google Information <i className='fab fa-google-drive'></i></h3>
+				<p><strong>Linked to Google: </strong> {this.props.uiItems.googleId ? 'YES' : 'NO'}</p>
+				{this.props.uiItems.googleId &&
+					<p>
+						<strong>Brews on Google Drive: </strong> {this.props.uiItems.googleCount ?? <>Unable to retrieve files - <a href='https://github.com/naturalcrit/homebrewery/discussions/1580'>follow these steps to renew your Google credentials.</a></>}
+					</p>
+				}
+			</div>
+			<div className='dataGroup'>
+				<h4>Default Save Location</h4>
+				{this.renderButton('Homebrewery', 'HOMEBREWERY')}
+				{this.renderButton('Google Drive', 'GOOGLE-DRIVE', this.state.uiItems.googleId)}
+			</div>
+		</>;
+	},
+
+	render : function(){
+		return <UIPage brew={this.props.brew}>
+			{this.renderUiItems()}
+		</UIPage>;
+	}
+});
 
 module.exports = AccountPage;

client/homebrew/pages/archivePage/archivePage.jsx

@@ -0,0 +1,201 @@
+require('./archivePage.less');
+
+const React       = require('react');
+const createClass = require('create-react-class');
+const _           = require('lodash');
+const cx          = require('classnames');
+
+const Nav           = require('naturalcrit/nav/nav.jsx');
+const Navbar        = require('../../navbar/navbar.jsx');
+const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
+const Account       = require('../../navbar/account.navitem.jsx');
+const NewBrew       = require('../../navbar/newbrew.navitem.jsx');
+const HelpNavItem   = require('../../navbar/help.navitem.jsx');
+const BrewItem      = require('../basePages/listPage/brewItem/brewItem.jsx');
+
+const request = require('../../utils/request-middleware.js');
+
+const ArchivePage = createClass({
+	displayName     : 'ArchivePage',
+	getDefaultProps : function () {
+		return {};
+	},
+	getInitialState : function () {
+		return {
+			title          : this.props.query.title || '',
+			brewCollection : null,
+			page           : 1,
+			totalPages     : 1,
+			searching      : false,
+			error          : null,
+		};
+	},
+	componentDidMount : function() {
+
+	},
+	handleChange(e) {
+		this.setState({ title: e.target.value });
+	},
+
+	updateStateWithBrews : function (brews, page, totalPages) {
+		this.setState({
+			brewCollection : brews || null,
+			page           : page || 1,
+			totalPages     : totalPages || 1,
+			searching      : false
+		});
+	},
+
+	loadPage : async function(page) {
+		if(this.state.title == '') {} else {
+
+			try {
+				//this.updateUrl();
+				this.setState({ searching: true, error: null });
+				const title = encodeURIComponent(this.state.title);
+				await request.get(`/api/archive?title=${title}&page=${page}`)
+                    .then((response)=>{
+                    	if(response.ok) {
+                    		this.updateStateWithBrews(response.body.brews, page, response.body.totalPages);
+                    	}
+                    });
+			} catch (error) {
+				console.log(`LoadPage error: ${error}`);
+			}
+		}
+	},
+
+	updateUrl : function() {
+		const url = new URL(window.location.href);
+		const urlParams = new URLSearchParams(url.search);
+
+		// Set the title and page parameters
+		urlParams.set('title', this.state.title);
+		urlParams.set('page', this.state.page);
+
+		url.search = urlParams.toString(); // Convert URLSearchParams to string
+		window.history.replaceState(null, null, url);
+	},
+
+	renderFoundBrews() {
+		const { title, brewCollection, page, totalPages, error } = this.state;
+
+		if(title === '') {return (<div className='foundBrews noBrews'><h3>Whenever you want, just start typing...</h3></div>);}
+
+		if(error !== null) {
+			return (
+				<div className='foundBrews noBrews'>
+					<div><h3>I'm sorry, your request didn't work</h3>
+						<br /><p>Your search is not specific enough. Too many brews meet this criteria for us to display them.</p>
+					</div></div>
+			);
+		}
+
+		if(!brewCollection || brewCollection.length === 0) {
+			return (
+				<div className='foundBrews noBrews'>
+					<h3>We haven't found brews meeting your request.</h3>
+				</div>
+			);
+		}
+
+		return (
+			<div className='foundBrews'>
+				<span className='brewCount'>{`Brews Found: ${brewCollection.length}`}</span>
+
+				{brewCollection.map((brew, index)=>(
+					<BrewItem brew={brew} key={index} reportError={this.props.reportError} />
+				))}
+				<div className='paginationControls'>
+					{page > 1 && (
+						<button onClick={()=>this.loadPage(page - 1)}>Previous Page</button>
+					)}
+					<span className='currentPage'>Page {page}</span>
+					{page < totalPages && (
+						<button onClick={()=>this.loadPage(page + 1)}>Next Page</button>
+					)}
+				</div>
+			</div>
+		);
+	},
+
+
+	renderForm : function () {
+		return (
+			<div className='brewLookup'>
+				<h2>Brew Lookup</h2>
+				<label>Title of the brew</label>
+				<input
+					type='text'
+					value={this.state.title}
+					onChange={this.handleChange}
+					onKeyDown={(e)=>{
+						if(e.key === 'Enter') {
+							this.handleChange(e);
+							this.loadPage(1);
+						}
+					}}
+					placeholder='v3 Reference Document'
+				/>
+				{/* In the future, we should be able to filter the results by adding tags.
+            <label>Tags</label><input type='text' value={this.state.query} placeholder='add a tag to filter'/>
+            <input type="checkbox" id="v3" /><label>v3 only</label>
+            */}
+
+				<button onClick={()=>{ this.handleChange({ target: { value: this.state.title } }); this.loadPage(1); }}>
+					<i
+						className={cx('fas', {
+							'fa-search'          : !this.state.searching,
+							'fa-spin fa-spinner' : this.state.searching,
+						})}
+					/>
+				</button>
+			</div>
+		);
+	},
+
+
+
+	renderNavItems : function () {
+		return (
+			<Navbar>
+				<Nav.section>
+					<Nav.item className='brewTitle'>Archive: Search for brews</Nav.item>
+				</Nav.section>
+				<Nav.section>
+					<NewBrew />
+					<HelpNavItem />
+					<RecentNavItem />
+					<Account />
+				</Nav.section>
+			</Navbar>
+		);
+	},
+
+	render : function () {
+		return (
+			<div className='archivePage'>
+				<link href='/themes/V3/Blank/style.css' rel='stylesheet'/>
+			  <link href='/themes/V3/5ePHB/style.css' rel='stylesheet'/>
+				{this.renderNavItems()}
+
+				<div className='content'>
+					<div className='welcome'>
+						<h1>Welcome to the Archive</h1>
+					</div>
+					<div className='flexGroup'>
+						<div className='form dataGroup'>{this.renderForm()}</div>
+						<div className='resultsContainer dataGroup'>
+							<div className='title'>
+								<h2>Your results, my lordship</h2>
+							</div>
+							{this.renderFoundBrews()}
+						</div>
+					</div>
+				</div>
+			</div>
+		);
+	},
+});
+
+module.exports = ArchivePage;

client/homebrew/pages/archivePage/archivePage.less

@@ -0,0 +1,173 @@
+body {
+    height: 100vh;
+
+    .content {
+        height: 100%;
+    }
+}
+
+.archivePage {
+    overflow-y: hidden;
+    height: 100%;
+    background-color: #2C3E50;
+
+    h1,h2,h3 {
+        font-family: 'Open Sans';
+        color: white;
+        font-weight: 900;
+    }
+
+    .content {
+        display: grid;
+        grid-template-rows: 20vh 1fr;
+
+        .welcome {
+            display: grid;
+            place-items: center;
+            background: url('https://i.imgur.com/MJ4YHu7.jpg');
+            background-size: 100%;
+            background-position: center;
+            height: 20vh;
+            border-bottom: 5px solid #333;
+
+            h1 {
+                font-size: 40px;
+                filter:drop-shadow(0 0 5px black);
+            }
+        }
+
+        .flexGroup {
+            height: 100%;
+            display: grid;
+            grid-template-columns: 500px 2fr;
+            background: #2C3E50;
+
+            .dataGroup {
+                width: 100%;
+                height: 100%;
+                background: white;
+
+                &.form .brewLookup {
+                    padding: 50px;
+
+                    h2 {
+                        font-size: 30px;
+                        border-bottom: 2px solid;
+                        margin-block: 20px;
+                    }
+
+                    label {
+                        margin-right: 10px;
+                    }
+
+                    input+button {
+                        margin-left: 20px;
+                    }
+                }
+
+                &.resultsContainer {
+                    display: flex;
+                    flex-direction: column;
+                    border-left: 2px solid;
+                    height: 100%;
+                    font-family: "BookInsanityRemake";
+                    font-size: .34cm;
+
+                    .title {
+                        height: 10vh;
+                        background-color: #333;
+                        display: grid;
+                        place-items: center;
+
+                        h2 {
+                            font-size: 30px;
+                        }
+                    }
+                    .foundBrews {
+                        position: relative;
+                        background-color: #2C3E50;
+                        width: 100%;
+                        max-height: 100%;
+                        height: 66.7vh;
+                        padding: 50px;
+                        overflow-y:scroll;
+
+                        h3 {
+                            font-size: 25px;
+                        }
+
+                        &.noBrews {
+                            display:grid;
+                            place-items:center;
+                        }
+
+                        .brewCount {
+                            position: fixed;
+                            bottom: 0;
+                            right: 17px;
+                            font-size: 11px;
+                            font-weight: 800;
+                            color: white;
+                            background-color: #333;
+                            padding: 8px 10px;
+                            z-index: 1000;
+                            font-family: 'Open Sans';
+                            
+                            &:empty {
+                                display: none;
+                            }
+                        }
+
+                        .limit {
+                            position: fixed;
+                            bottom: 0;
+                            left: 502px;
+                            font-size: 11px;
+                            font-weight: 800;
+                            color: white;
+                            background-color: #333;
+                            padding: 8px 10px;
+                            z-index: 1000;
+                            font-family: 'Open Sans';
+                            
+                            &:empty {
+                                display: none;
+                            }
+                        }
+                        .brewItem {
+                            background-image: url('/assets/parchmentBackground.jpg');
+                            width: 48%;
+                            margin-right: 40px;
+                            color: black;
+
+                            &:nth-child(even) {
+                                margin-right: 0;
+                            }
+                            h2 {
+                                font-size: 0.75cm;
+                                line-height: 0.988em;
+                                font-family: "MrEavesRemake";
+                                font-weight: 800;
+                                color: var(--HB_Color_HeaderText);
+                            }
+
+                            .info {
+                                font-family: ScalySansRemake;
+                                font-size: 1.2em;
+
+                                >span {
+                                    margin-right: 12px;
+                                    line-height: 1.5em;
+                                }
+                            }
+                        }
+
+                        hr {
+                            visibility: hidden;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -1,6 +1,8 @@
 require('./brewItem.less');
 const React = require('react');
 const createClass = require('create-react-class');
+const _     = require('lodash');
+const cx    = require('classnames');
 const moment = require('moment');
 const request = require('../../../../utils/request-middleware.js');
 
@@ -18,8 +20,7 @@ const BrewItem = createClass({
 				authors     : [],
 				stubbed     : true
 			},
-			updateListFilter : ()=>{},
-			reportError      : ()=>{}
+			reportError : ()=>{}
 		};
 	},
 
@@ -43,10 +44,6 @@ const BrewItem = createClass({
 			});
 	},
 
-	updateFilter : function(type, term){
-		this.props.updateListFilter(type, term);
-	},
-
 	renderDeleteBrewLink : function(){
 		if(!this.props.brew.editId) return;
 
@@ -112,11 +109,10 @@ const BrewItem = createClass({
 		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
-			brew.tags.sort((a, b)=>{
-				return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase());
-			});
 		}
 		const dateFormatString = 'YYYY-MM-DD HH:mm:ss';
+		const authors = brew.authors.length > 0 ? brew.authors : 'No authors';
+
 
 		return <div className='brewItem'>
 			{brew.thumbnail &&
@@ -135,17 +131,24 @@ const BrewItem = createClass({
 						<i className='fas fa-tags'/>
 						{brew.tags.map((tag, idx)=>{
 							const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
-							return <span key={idx} className={matches[1]} onClick={()=>{this.updateFilter(tag);}}>{matches[2]}</span>;
+							return <span key={idx} className={matches[1]}>{matches[2]}</span>;
 						})}
 					</div>
 				</> : <></>
 				}
 				<span title={`Authors:\n${brew.authors?.join('\n')}`}>
-					<i className='fas fa-user'/> {brew.authors?.map((author, index)=>(
-  					<>
-    					<a key={index} href={`/user/${author}`}>{author}</a>
-    					{index < brew.authors.length - 1 && ', '}
-  					</>))}
+				<i className='fas fa-user'/> {Array.isArray(authors) ? (
+  					<span>
+    					{authors.map((author, index) => (
+      					<span key={index}>
+        					<a href={`/share/${author}`}>{author}</a>
+        					{index < authors.length - 1 && ', '}
+      					</span>
+    					))}
+  					</span>
+					) : (
+  					<span>{authors}</span>
+					)}
 				</span>
 				<br />
 				<span title={`Last viewed: ${moment(brew.lastViewed).local().format(dateFormatString)}`}>

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

@@ -63,41 +63,6 @@
 		white-space: nowrap;
 		display: inline-block;
 		font-weight: bold;
-		border-color: currentColor;
-		cursor : pointer;
-		&:before {
-			font-family: 'Font Awesome 5 Free';
-			font-size: 12px;
-			margin-right: 3px;
-		}
-		&.type {
-			background-color: #0080003b;
-			color: #008000;
-			&:before{
-				content: '\f0ad';
-			}
-		}
-		&.group {
-			background-color: #5050503b;
-			color: #000000;
-			&:before{
-				content: '\f500';
-			}
-		}
-		&.meta {
-			background-color: #0000803b;
-			color: #000080;
-			&:before{
-				content: '\f05a';
-			}
-		}
-		&.system {
-			background-color: #8000003b;
-			color: #800000;
-			&:before{
-				content: '\f518';
-			}
-		}
 	}
 	&:hover{
 		.links{
@@ -119,12 +84,11 @@
 		text-align       : center;
 		a{
 			.animate(opacity);
-			display         : block;
-			margin          : 8px 0px;
-			opacity         : 0.6;
-			font-size       : 1.3em;
-			color           : white;
-			text-decoration : unset;
+			display   : block;
+			margin    : 8px 0px;
+			opacity   : 0.6;
+			font-size : 1.3em;
+			color     : white;
 			&:hover{
 				opacity : 1;
 			}

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

@@ -36,7 +36,6 @@ const ListPage = createClass({
 
 		return {
 			filterString   : this.props.query?.filter || '',
-			filterTags     : [],
 			sortType       : this.props.query?.sort || null,
 			sortDir        : this.props.query?.dir || null,
 			query          : this.props.query,
@@ -83,7 +82,7 @@ const ListPage = createClass({
 		if(!brews || !brews.length) return <div className='noBrews'>No Brews.</div>;
 
 		return _.map(brews, (brew, idx)=>{
-			return <BrewItem brew={brew} key={idx} reportError={this.props.reportError} updateListFilter={ (tag)=>{ this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, tag); }}/>;
+			return <BrewItem brew={brew} key={idx} reportError={this.props.reportError}/>;
 		});
 	},
 
@@ -137,33 +136,13 @@ const ListPage = createClass({
 		return;
 	},
 
-	updateUrl : function(filterTerm, sortType, sortDir, filterTag=''){
+	updateUrl : function(filterTerm, sortType, sortDir){
 		const url = new URL(window.location.href);
 		const urlParams = new URLSearchParams(url.search);
 
 		urlParams.set('sort', sortType);
 		urlParams.set('dir', sortDir);
 
-		let filterTags = urlParams.getAll('tag');
-		if(filterTag != '') {
-			if(filterTags.findIndex((tag)=>{return tag.toLowerCase()==filterTag.toLowerCase();}) == -1){
-				filterTags.push(filterTag);
-			} else {
-				filterTags = filterTags.filter((tag)=>{ return tag.toLowerCase() != filterTag.toLowerCase(); });
-			}
-		}
-		urlParams.delete('tag');
-		// Add tags to URL in the order they were clicked
-		filterTags.forEach((tag)=>{ urlParams.append('tag', tag); });
-		// Sort tags before updating state
-		filterTags.sort((a, b)=>{
-			return a.indexOf(':') - b.indexOf(':') != 0 ? a.indexOf(':') - b.indexOf(':') : a.toLowerCase().localeCompare(b.toLowerCase());
-		});
-
-		this.setState({
-			filterTags
-		});
-
 		if(!filterTerm)
 			urlParams.delete('filter');
 		else
@@ -187,16 +166,6 @@ const ListPage = createClass({
 		</div>;
 	},
 
-	renderTagsOptions : function(){
-		if(this.state.filterTags?.length == 0) return;
-		return <div className='tags-container'>
-			{_.map(this.state.filterTags, (tag, idx)=>{
-				const matches = tag.match(/^(?:([^:]+):)?([^:]+)$/);
-				return <span key={idx} className={matches[1]} onClick={()=>{ this.updateUrl(this.state.filterString, this.state.sortType, this.state.sortDir, tag); }}>{matches[2]}</span>;
-			})}
-		</div>;
-	},
-
 	renderSortOptions : function(){
 		return <div className='sort-container'>
 			<h6>Sort by :</h6>
@@ -207,6 +176,9 @@ const ListPage = createClass({
 			{/* {this.renderSortOption('Latest', 'latest')} */}
 
 			{this.renderFilterOption()}
+
+
+
 		</div>;
 	},
 
@@ -214,28 +186,14 @@ const ListPage = createClass({
 		const testString = _.deburr(this.state.filterString).toLowerCase();
 
 		brews = _.filter(brews, (brew)=>{
-			// Filter by user entered text
 			const brewStrings = _.deburr([
 				brew.title,
 				brew.description,
 				brew.tags].join('\n')
 				.toLowerCase());
 
-			const filterTextTest = brewStrings.includes(testString);
-
-			// Filter by user selected tags
-			let filterTagTest = true;
-			if(this.state.filterTags.length > 0){
-				filterTagTest = Array.isArray(brew.tags) && this.state.filterTags?.every((tag)=>{
-					return brew.tags.findIndex((brewTag)=>{
-						return brewTag.toLowerCase() == tag.toLowerCase();
-					}) >= 0;
-				});
-			}
-
-			return filterTextTest && filterTagTest;
+			return brewStrings.includes(testString);
 		});
-
 		return _.orderBy(brews, (brew)=>{ return this.sortBrewOrder(brew); }, this.state.sortDir);
 	},
 
@@ -262,11 +220,10 @@ const ListPage = createClass({
 	render : function(){
 		return <div className='listPage sitePage'>
 			{/*<style>@layer V3_5ePHB, bundle;</style>*/}
-			<link href='/themes/V3/Blank/style.css' type='text/css' rel='stylesheet'/>
-			<link href='/themes/V3/5ePHB/style.css' type='text/css' rel='stylesheet'/>
+			<link href='/themes/V3/Blank/style.css' rel='stylesheet'/>
+			<link href='/themes/V3/5ePHB/style.css' rel='stylesheet'/>
 			{this.props.navItems}
 			{this.renderSortOptions()}
-			{this.renderTagsOptions()}
 
 			<div className='content V3'>
 				<div className='page'>

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

@@ -53,7 +53,7 @@
 			}
 		}
 	}
-	.sort-container {
+	.sort-container{
 		font-family        : 'Open Sans', sans-serif;
 		position           : sticky;
 		top                : 0;
@@ -125,66 +125,4 @@
 
 
 	}
-	.tags-container {
-		height             : 30px;
-		background-color   : #555;
-		border-top         : 1px solid #666;
-		border-bottom      : 1px solid #666;
-		color              : white;
-		display            : flex;
-		justify-content    : center;
-		align-items        : center;
-		column-gap         : 15px;
-		row-gap            : 5px;
-		flex-wrap          : wrap;
-		span {
-			font-family    : 'Open Sans', sans-serif;
-			font-size      : 11px;
-			font-weight    : bold;
-			border         : 1px solid;
-			border-radius  : 3px;
-			padding        : 3px;
-			cursor         : pointer;
-			color: #dfdfdf;
-			&:before {
-				font-family: 'Font Awesome 5 Free';
-				font-size: 12px;
-				margin-right: 3px;
-			}
-			&:after {
-				content: '\f00d';
-				font-family: 'Font Awesome 5 Free';
-				font-size: 12px;
-				margin-left: 3px;
-			}
-			&.type {
-				background-color: #008000;
-				border-color: #00a000;
-				&:before{
-					content: '\f0ad';
-				}
-			}
-			&.group {
-				background-color: #505050;
-				border-color: #000000;
-				&:before{
-					content: '\f500';
-				}
-			}
-			&.meta {
-				background-color: #000080;
-				border-color: #0000a0;
-				&:before{
-					content: '\f05a';
-				}
-			}
-			&.system {
-				background-color: #800000;
-				border-color: #a00000;
-				&:before{
-					content: '\f518';
-				}
-			}
-		}
-	}
 }

client/homebrew/pages/editPage/editPage.jsx

@@ -11,7 +11,7 @@ const Navbar = require('../../navbar/navbar.jsx');
 
 const NewBrew = require('../../navbar/newbrew.navitem.jsx');
 const HelpNavItem = require('../../navbar/help.navitem.jsx');
-const PrintNavItem = require('../../navbar/print.navitem.jsx');
+const PrintLink = require('../../navbar/print.navitem.jsx');
 const ErrorNavItem = require('../../navbar/error-navitem.jsx');
 const Account = require('../../navbar/account.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
@@ -20,12 +20,9 @@ const SplitPane = require('naturalcrit/splitPane/splitPane.jsx');
 const Editor = require('../../editor/editor.jsx');
 const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
-const LockNotification = require('./lockNotification/lockNotification.jsx');
-
 const Markdown = require('naturalcrit/markdown.js');
 
 const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
-const { printCurrentBrew } = require('../../../../shared/helpers.js');
 
 const googleDriveIcon = require('../../googleDrive.svg');
 
@@ -54,12 +51,9 @@ const EditPage = createClass({
 			autoSave               : true,
 			autoSaveWarning        : false,
 			unsavedTime            : new Date(),
-			currentEditorPage      : 0,
-			displayLockMessage     : this.props.brew.lock || false
+			currentEditorPage      : 0
 		};
 	},
-
-	editor    : React.createRef(null),
 	savedBrew : null,
 
 	componentDidMount : function(){
@@ -99,7 +93,7 @@ const EditPage = createClass({
 		const S_KEY = 83;
 		const P_KEY = 80;
 		if(e.keyCode == S_KEY) this.trySave(true);
-		if(e.keyCode == P_KEY) printCurrentBrew();
+		if(e.keyCode == P_KEY) window.open(`/print/${this.processShareId()}?dialog=true`, '_blank').focus();
 		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
 			e.stopPropagation();
 			e.preventDefault();
@@ -107,7 +101,7 @@ const EditPage = createClass({
 	},
 
 	handleSplitMove : function(){
-		this.editor.current.update();
+		this.refs.editor.update();
 	},
 
 	handleTextChange : function(text){
@@ -119,7 +113,7 @@ const EditPage = createClass({
 			brew              : { ...prevState.brew, text: text },
 			isPending         : true,
 			htmlErrors        : htmlErrors,
-			currentEditorPage : this.editor.current.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
+			currentEditorPage : this.refs.editor.getCurrentPage()
 		}), ()=>{if(this.state.autoSave) this.trySave();});
 	},
 
@@ -382,7 +376,7 @@ const EditPage = createClass({
 						post to reddit
 					</Nav.item>
 				</Nav.dropdown>
-				<PrintNavItem />
+				<PrintLink shareId={this.processShareId()} />
 				<RecentNavItem brew={this.state.brew} storageKey='edit' />
 				<Account />
 			</Nav.section>
@@ -396,10 +390,9 @@ const EditPage = createClass({
 			{this.renderNavbar()}
 
 			<div className='content'>
-				{this.props.brew.lock && <LockNotification shareId={this.props.brew.shareId} message={this.props.brew.lock.editMessage} />}
-				<SplitPane onDragFinish={this.handleSplitMove}>
+				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
 					<Editor
-						ref={this.editor}
+						ref='editor'
 						brew={this.state.brew}
 						onTextChange={this.handleTextChange}
 						onStyleChange={this.handleStyleChange}
@@ -415,7 +408,6 @@ const EditPage = createClass({
 						errors={this.state.htmlErrors}
 						lang={this.state.brew.lang}
 						currentEditorPage={this.state.currentEditorPage}
-						allowPrint={true}
 					/>
 				</SplitPane>
 			</div>

client/homebrew/pages/editPage/lockNotification/lockNotification.jsx

@@ -1,30 +0,0 @@
-require('./lockNotification.less');
-const React = require('react');
-import Dialog from '../../../../components/dialog.jsx';
-
-function LockNotification(props) {
-	props = {
-		shareId     : 0,
-		disableLock : ()=>{},
-		message     : '',
-		...props
-	};
-
-	const removeLock = ()=>{
-		alert(`Not yet implemented - ID ${props.shareId}`);
-	};
-
-	return <Dialog className='lockNotification' blocking closeText='CONTINUE TO EDITOR' >
-		<h1>BREW LOCKED</h1>
-		<p>This brew been locked by the Administrators. It will not be accessible by any method other than the Editor until the lock is removed.</p>
-		<hr />
-		<h3>LOCK REASON</h3>
-		<p>{props.message || 'Unable to retrieve Lock Message'}</p>
-		<hr />
-		<p>Once you have resolved this issue, click REQUEST LOCK REMOVAL to notify the Administrators for review.</p>
-		<p>Click CONTINUE TO EDITOR to temporarily hide this notification; it will reappear the next time the page is reloaded.</p>
-		<button onClick={removeLock}>REQUEST LOCK REMOVAL</button>
-	</Dialog>;
-};
-
-module.exports = LockNotification;

client/homebrew/pages/editPage/lockNotification/lockNotification.less

@@ -1,27 +0,0 @@
-.lockNotification {
-	z-index          : 1;
-	width            : 80%;
-	padding          : 10px;
-	margin           : 5% 10%;
-	line-height      : 1.5em;
-	color            : black;
-	text-align       : center;
-	background-color : #CCCCCC;
-
-	&::backdrop { background-color : #000000AA; }
-
-	button {
-		margin           : 10px;
-		color            : white;
-		background-color : #333333;
-
-		&:hover { background-color : #777777; }
-	}
-
-	h1, h3 {
-		font-family : 'Open Sans', sans-serif;
-		font-weight : 800;
-	}
-	h1 { font-size : 24px; }
-	h3 { font-size : 18px; }
-}

client/homebrew/pages/errorPage/errorPage.jsx

@@ -1,25 +1,41 @@
 require('./errorPage.less');
-const React      = require('react');
-const UIPage     = require('../basePages/uiPage/uiPage.jsx');
-const Markdown   = require('../../../../shared/naturalcrit/markdown.js');
+const React = require('react');
+const createClass = require('create-react-class');
+const _ = require('lodash');
+const cx = require('classnames');
+
+const UIPage = require('../basePages/uiPage/uiPage.jsx');
+
+const Markdown = require('../../../../shared/naturalcrit/markdown.js');
+
 const ErrorIndex = require('./errors/errorIndex.js');
 
-const ErrorPage = ({ brew })=>{
-	// Retrieving the error text based on the brew's error code from ErrorIndex
-	const errorText = ErrorIndex({ brew })[brew.HBErrorCode.toString()] || '';
+const ErrorPage = createClass({
+	displayName : 'ErrorPage',
 
-	return (
-		<UIPage brew={{ title: 'Crit Fail!' }}>
+	getDefaultProps : function() {
+		return {
+			ver     : '0.0.0',
+			errorId : '',
+			text    : '# Oops \n We could not find a brew with that id. **Sorry!**',
+			error   : {}
+		};
+	},
+
+	render : function(){
+		const errorText = ErrorIndex(this.props)[this.props.brew.HBErrorCode.toString()] || '';
+
+		return <UIPage brew={{ title: 'Crit Fail!' }}>
 			<div className='dataGroup'>
 				<div className='errorTitle'>
-					<h1>{`Error ${brew?.status || '000'}`}</h1>
-					<h4>{brew?.text || 'No error text'}</h4>
+					<h1>{`Error ${this.props.brew.status || '000'}`}</h1>
+					<h4>{this.props.brew.text || 'No error text'}</h4>
 				</div>
 				<hr />
 				<div dangerouslySetInnerHTML={{ __html: Markdown.render(errorText) }} />
 			</div>
-		</UIPage>
-	);
-};
+		</UIPage>;
+	}
+});
 
 module.exports = ErrorPage;

client/homebrew/pages/errorPage/errors/errorIndex.js

@@ -73,11 +73,9 @@ const errorIndex = (props)=>{
 		**Properties** tab, and adding your username to the "invited authors" list. You can
 		then try to access this document again.
 		
-		:
-
 		**Brew Title:** ${props.brew.brewTitle || 'Unable to show title'}
 
-		**Current Authors:** ${props.brew.authors?.map((author)=>{return `[${author}](/user/${author})`;}).join(', ') || 'Unable to list authors'}
+		**Current Authors:** ${props.brew.authors?.map((author)=>{return `${author}`;}).join(', ') || 'Unable to list authors'}
 		
 		[Click here to be redirected to the brew's share page.](/share/${props.brew.shareId})`,
 
@@ -88,14 +86,9 @@ const errorIndex = (props)=>{
 		You must be logged in to one of the accounts listed as an author of this brew.
 		User is not logged in. Please log in [here](${loginUrl}).
 		
-		:
-
 		**Brew Title:** ${props.brew.brewTitle || 'Unable to show title'}
 
-		**Current Authors:** ${props.brew.authors?.map((author)=>{return `[${author}](/user/${author})`;}).join(', ') || 'Unable to list authors'}
-
-		[Click here to be redirected to the brew's share page.](/share/${props.brew.shareId})`,
-
+		**Current Authors:** ${props.brew.authors?.map((author)=>{return `${author}`;}).join(', ') || 'Unable to list authors'}`,
 
 		// Brew load error
 		'05' : dedent`
@@ -104,8 +97,6 @@ const errorIndex = (props)=>{
 		The server could not locate the Homebrewery document. It was likely deleted by
 		its owner.
 		
-		:
-
 		**Requested access:** ${props.brew.accessType}
 
 		**Brew ID:**  ${props.brew.brewId}`,
@@ -122,8 +113,6 @@ const errorIndex = (props)=>{
 		
 		An error occurred while attempting to remove the Homebrewery document.
 		
-		:
-
 		**Brew ID:**  ${props.brew.brewId}`,
 
 		// Author delete error
@@ -132,21 +121,7 @@ const errorIndex = (props)=>{
 		
 		An error occurred while attempting to remove the user from the Homebrewery document author list!
 		
-		:
-
 		**Brew ID:**  ${props.brew.brewId}`,
-
-		// Brew locked by Administrators error
-		'100' : dedent`
-		## This brew has been locked.
-		
-		Only an author may request that this lock is removed.
-		
-		:
-
-		**Brew ID:**  ${props.brew.brewId}
-		
-		**Brew Title:** ${props.brew.brewTitle}`,
 	};
 };
 

client/homebrew/pages/hijackPrint.js

@@ -0,0 +1,12 @@
+//TODO: Depricate
+
+module.exports = function(shareId){
+	return function(event){
+		event = event || window.event;
+		if((event.ctrlKey || event.metaKey) && event.keyCode == 80){
+			const win = window.open(`/homebrew/print/${shareId}?dialog=true`, '_blank');
+			win.focus();
+			event.preventDefault();
+		}
+	};
+};

client/homebrew/pages/homePage/homePage.jsx

@@ -31,15 +31,11 @@ const HomePage = createClass({
 	},
 	getInitialState : function() {
 		return {
-			brew              : this.props.brew,
-			welcomeText       : this.props.brew.text,
-			error             : undefined,
-			currentEditorPage : 0
+			brew        : this.props.brew,
+			welcomeText : this.props.brew.text,
+			error       : undefined
 		};
 	},
-
-	editor : React.createRef(null),
-
 	handleSave : function(){
 		request.post('/api')
 			.send(this.state.brew)
@@ -53,12 +49,11 @@ const HomePage = createClass({
 			});
 	},
 	handleSplitMove : function(){
-		this.editor.current.update();
+		this.refs.editor.update();
 	},
 	handleTextChange : function(text){
 		this.setState((prevState)=>({
-			brew              : { ...prevState.brew, text: text },
-			currentEditorPage : this.editor.current.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
+			brew : { ...prevState.brew, text: text }
 		}));
 	},
 	renderNavbar : function(){
@@ -82,20 +77,15 @@ const HomePage = createClass({
 			{this.renderNavbar()}
 
 			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove}>
+				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
 					<Editor
-						ref={this.editor}
+						ref='editor'
 						brew={this.state.brew}
 						onTextChange={this.handleTextChange}
 						renderer={this.state.brew.renderer}
 						showEditButtons={false}
 					/>
-					<BrewRenderer
-						text={this.state.brew.text}
-						style={this.state.brew.style}
-						renderer={this.state.brew.renderer}
-						currentEditorPage={this.state.currentEditorPage}
-					/>
+					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer}/>
 				</SplitPane>
 			</div>
 

client/homebrew/pages/homePage/welcome_msg.md

@@ -143,7 +143,6 @@ Much nicer than `<br><br><br><br><br>`
 ### 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.
 

client/homebrew/pages/newPage/newPage.jsx

@@ -2,12 +2,12 @@
 require('./newPage.less');
 const React = require('react');
 const createClass = require('create-react-class');
+const _ = require('lodash');
 const request = require('../../utils/request-middleware.js');
 
 const Markdown = require('naturalcrit/markdown.js');
 
 const Nav = require('naturalcrit/nav/nav.jsx');
-const PrintNavItem = require('../../navbar/print.navitem.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 const AccountNavItem = require('../../navbar/account.navitem.jsx');
 const ErrorNavItem = require('../../navbar/error-navitem.jsx');
@@ -19,7 +19,6 @@ const Editor = require('../../editor/editor.jsx');
 const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
 const { DEFAULT_BREW } = require('../../../../server/brewDefaults.js');
-const { printCurrentBrew } = require('../../../../shared/helpers.js');
 
 const BREWKEY  = 'homebrewery-new';
 const STYLEKEY = 'homebrewery-new-style';
@@ -39,17 +38,14 @@ const NewPage = createClass({
 		const brew = this.props.brew;
 
 		return {
-			brew              : brew,
-			isSaving          : false,
-			saveGoogle        : (global.account && global.account.googleId ? true : false),
-			error             : null,
-			htmlErrors        : Markdown.validate(brew.text),
-			currentEditorPage : 0
+			brew       : brew,
+			isSaving   : false,
+			saveGoogle : (global.account && global.account.googleId ? true : false),
+			error      : null,
+			htmlErrors : Markdown.validate(brew.text)
 		};
 	},
 
-	editor : React.createRef(null),
-
 	componentDidMount : function() {
 		document.addEventListener('keydown', this.handleControlKeys);
 
@@ -91,7 +87,7 @@ const NewPage = createClass({
 		const S_KEY = 83;
 		const P_KEY = 80;
 		if(e.keyCode == S_KEY) this.save();
-		if(e.keyCode == P_KEY) printCurrentBrew();
+		if(e.keyCode == P_KEY) this.print();
 		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
 			e.stopPropagation();
 			e.preventDefault();
@@ -99,7 +95,7 @@ const NewPage = createClass({
 	},
 
 	handleSplitMove : function(){
-		this.editor.current.update();
+		this.refs.editor.update();
 	},
 
 	handleTextChange : function(text){
@@ -108,9 +104,8 @@ const NewPage = createClass({
 		if(htmlErrors.length) htmlErrors = Markdown.validate(text);
 
 		this.setState((prevState)=>({
-			brew              : { ...prevState.brew, text: text },
-			htmlErrors        : htmlErrors,
-			currentEditorPage : this.editor.current.getCurrentPage() - 1 //Offset index since Marked starts pages at 0
+			brew       : { ...prevState.brew, text: text },
+			htmlErrors : htmlErrors
 		}));
 		localStorage.setItem(BREWKEY, text);
 	},
@@ -182,6 +177,16 @@ const NewPage = createClass({
 		}
 	},
 
+	print : function(){
+		window.open('/print?dialog=true&local=print', '_blank');
+	},
+
+	renderLocalPrintButton : function(){
+		return <Nav.item color='purple' icon='far fa-file-pdf' onClick={this.print}>
+			get PDF
+		</Nav.item>;
+	},
+
 	renderNavbar : function(){
 		return <Navbar>
 
@@ -194,7 +199,7 @@ const NewPage = createClass({
 					<ErrorNavItem error={this.state.error} parent={this}></ErrorNavItem> :
 					this.renderSaveButton()
 				}
-				<PrintNavItem />
+				{this.renderLocalPrintButton()}
 				<HelpNavItem />
 				<RecentNavItem />
 				<AccountNavItem />
@@ -206,25 +211,16 @@ const NewPage = createClass({
 		return <div className='newPage sitePage'>
 			{this.renderNavbar()}
 			<div className='content'>
-				<SplitPane onDragFinish={this.handleSplitMove}>
+				<SplitPane onDragFinish={this.handleSplitMove} ref='pane'>
 					<Editor
-						ref={this.editor}
+						ref='editor'
 						brew={this.state.brew}
 						onTextChange={this.handleTextChange}
 						onStyleChange={this.handleStyleChange}
 						onMetaChange={this.handleMetaChange}
 						renderer={this.state.brew.renderer}
 					/>
-					<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}
-						lang={this.state.brew.lang}
-						currentEditorPage={this.state.currentEditorPage}
-						allowPrint={true}
-					/>
+					<BrewRenderer text={this.state.brew.text} style={this.state.brew.style} renderer={this.state.brew.renderer} theme={this.state.brew.theme} lang={this.state.brew.lang} errors={this.state.htmlErrors}/>
 				</SplitPane>
 			</div>
 		</div>;

client/homebrew/pages/printPage/printPage.jsx

@@ -0,0 +1,110 @@
+require('./printPage.less');
+const React = require('react');
+const createClass = require('create-react-class');
+const _     = require('lodash');
+const cx    = require('classnames');
+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';
+
+const PrintPage = createClass({
+	displayName     : 'PrintPage',
+	getDefaultProps : function() {
+		return {
+			query : {},
+			brew  : {
+				text     : '',
+				style    : '',
+				renderer : 'legacy'
+			}
+		};
+	},
+
+	getInitialState : function() {
+		return {
+			brew : {
+				text     : this.props.brew.text     || '',
+				style    : this.props.brew.style    || undefined,
+				renderer : this.props.brew.renderer || 'legacy',
+				theme    : this.props.brew.theme    || '5ePHB'
+			}
+		};
+	},
+
+	componentDidMount : function() {
+		if(this.props.query.local == 'print'){
+			const brewStorage  = localStorage.getItem(BREWKEY);
+			const styleStorage = localStorage.getItem(STYLEKEY);
+			const metaStorage = JSON.parse(localStorage.getItem(METAKEY));
+
+			this.setState((prevState, prevProps)=>{
+				return {
+					brew : {
+						text     : brewStorage,
+						style    : styleStorage,
+						renderer : metaStorage?.renderer || 'legacy',
+						theme    : metaStorage?.theme    || '5ePHB'
+					}
+				};
+			});
+		}
+
+		if(this.props.query.dialog) window.print();
+	},
+
+	renderStyle : function() {
+		if(!this.state.brew.style) return;
+		//return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />;
+		return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.state.brew.style}\n</style>` }} />;
+	},
+
+	renderPages : function(){
+		if(this.state.brew.renderer == 'legacy') {
+			return _.map(this.state.brew.text.split('\\page'), (pageText, index)=>{
+				return <div
+					className='phb page'
+					id={`p${index + 1}`}
+					dangerouslySetInnerHTML={{ __html: MarkdownLegacy.render(pageText) }}
+					key={index} />;
+			});
+		} else {
+			return _.map(this.state.brew.text.split(/^\\page$/gm), (pageText, index)=>{
+				pageText += `\n\n&nbsp;\n\\column\n&nbsp;`; //Artificial column break at page end to emulate column-fill:auto (until `wide` is used, when column-fill:balance will reappear)
+				return (
+					<div className='page' id={`p${index + 1}`} key={index} >
+						<div className='columnWrapper' dangerouslySetInnerHTML={{ __html: Markdown.render(pageText) }} />
+					</div>
+				);
+			});
+		}
+
+	},
+
+	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={`/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 */}
+			{this.renderStyle()}
+			<div className='pages' ref='pages'>
+				{this.renderPages()}
+			</div>
+		</div>;
+	}
+});
+
+module.exports = PrintPage;

client/homebrew/pages/printPage/printPage.less

@@ -0,0 +1,3 @@
+.printPage{
+
+}

client/homebrew/pages/sharePage/sharePage.jsx

@@ -6,13 +6,14 @@ const { Meta } = require('vitreum/headtags');
 const Nav = require('naturalcrit/nav/nav.jsx');
 const Navbar = require('../../navbar/navbar.jsx');
 const MetadataNav = require('../../navbar/metadata.navitem.jsx');
-const PrintNavItem = require('../../navbar/print.navitem.jsx');
+const PrintLink = require('../../navbar/print.navitem.jsx');
 const RecentNavItem = require('../../navbar/recent.navitem.jsx').both;
 const Account = require('../../navbar/account.navitem.jsx');
+
+
 const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
 
 const { DEFAULT_BREW_LOAD } = require('../../../../server/brewDefaults.js');
-const { printCurrentBrew } = require('../../../../shared/helpers.js');
 
 const SharePage = createClass({
 	displayName     : 'SharePage',
@@ -34,7 +35,7 @@ const SharePage = createClass({
 		if(!(e.ctrlKey || e.metaKey)) return;
 		const P_KEY = 80;
 		if(e.keyCode == P_KEY){
-			if(e.keyCode == P_KEY) printCurrentBrew();
+			window.open(`/print/${this.processShareId()}?dialog=true`, '_blank').focus();
 			e.stopPropagation();
 			e.preventDefault();
 		}
@@ -46,19 +47,6 @@ const SharePage = createClass({
 					 this.props.brew.shareId;
 	},
 
-	renderEditLink : function(){
-		if(!this.props.brew.editId) return;
-
-		let editLink = this.props.brew.editId;
-		if(this.props.brew.googleId && !this.props.brew.stubbed) {
-			editLink = this.props.brew.googleId + editLink;
-		}
-
-		return 	<Nav.item color='orange' icon='fas fa-pencil-alt' href={`/edit/${editLink}`}>
-					edit
-		</Nav.item>;
-	},
-
 	render : function(){
 		return <div className='sharePage sitePage'>
 			<Meta name='robots' content='noindex, nofollow' />
@@ -71,19 +59,18 @@ const SharePage = createClass({
 
 				<Nav.section>
 					{this.props.brew.shareId && <>
-						<PrintNavItem/>
+						<PrintLink shareId={this.processShareId()} />
 						<Nav.dropdown>
 							<Nav.item color='red' icon='fas fa-code'>
 								source
 							</Nav.item>
-							<Nav.item color='blue' icon='fas fa-eye' href={`/source/${this.processShareId()}`}>
+							<Nav.item color='blue' href={`/source/${this.processShareId()}`}>
 								view
 							</Nav.item>
-							{this.renderEditLink()}
-							<Nav.item color='blue' icon='fas fa-download' href={`/download/${this.processShareId()}`}>
+							<Nav.item color='blue' href={`/download/${this.processShareId()}`}>
 								download
 							</Nav.item>
-							<Nav.item color='blue' icon='fas fa-clone' href={`/new/${this.processShareId()}`}>
+							<Nav.item color='blue' href={`/new/${this.processShareId()}`}>
 								clone to new
 							</Nav.item>
 						</Nav.dropdown>
@@ -94,13 +81,7 @@ const SharePage = createClass({
 			</Navbar>
 
 			<div className='content'>
-				<BrewRenderer
-					text={this.props.brew.text}
-					style={this.props.brew.style}
-					renderer={this.props.brew.renderer}
-					theme={this.props.brew.theme}
-					allowPrint={true}
-				/>
+				<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

@@ -1,6 +1,7 @@
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
+const cx    = require('classnames');
 
 const ListPage = require('../basePages/listPage/listPage.jsx');
 

client/template.js

@@ -12,9 +12,9 @@ const template = async function(name, title='', props = {}){
 	<html>
 		<head>
 			<meta name="viewport" content="width=device-width, initial-scale=1, height=device-height, interactive-widget=resizes-visual" />
-			<link href="//use.fontawesome.com/releases/v6.5.1/css/all.css" rel="stylesheet" type="text/css" />
+			<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`} type="text/css" rel='stylesheet' />
+			<link href=${`/${name}/bundle.css`} rel='stylesheet' />
 			<link rel="icon" href="/assets/favicon.ico" type="image/x-icon" />
 			${ogMetaTags}
 			<meta name="twitter:card" content="summary">

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.13.1",
+  "version": "3.10.0",
   "engines": {
     "npm": "^10.2.x",
     "node": "^20.8.x"
@@ -26,13 +26,10 @@
     "test:coverage": "jest --coverage --silent --runInBand",
     "test:dev": "jest --verbose --watch",
     "test:basic": "jest tests/markdown/basic.test.js --verbose",
-    "test:variables": "jest tests/markdown/variables.test.js --verbose",
-    "test:mustache-syntax": "jest \".*(mustache-syntax).*\" --verbose --noStackTrace",
-    "test:mustache-syntax:inline": "jest \".*(mustache-syntax).*\" -t '^Inline:.*' --verbose --noStackTrace",
-    "test:mustache-syntax:block": "jest \".*(mustache-syntax).*\" -t '^Block:.*' --verbose --noStackTrace",
-    "test:mustache-syntax:injection": "jest \".*(mustache-syntax).*\" -t '^Injection:.*' --verbose --noStackTrace",
-    "test:definition-lists": "jest tests/markdown/definition-lists.test.js --verbose --noStackTrace",
-    "test:emojis": "jest tests/markdown/emojis.test.js --verbose --noStackTrace",
+    "test:mustache-syntax": "jest '.*(mustache-syntax).*' --verbose --noStackTrace",
+    "test:mustache-syntax:inline": "jest '.*(mustache-syntax).*' -t '^Inline:.*' --verbose --noStackTrace",
+    "test:mustache-syntax:block": "jest '.*(mustache-syntax).*' -t '^Block:.*' --verbose --noStackTrace",
+    "test:mustache-syntax:injection": "jest '.*(mustache-syntax).*' -t '^Injection:.*' --verbose --noStackTrace",
     "test:route": "jest tests/routes/static-pages.test.js --verbose",
     "phb": "node scripts/phb.js",
     "prod": "set NODE_ENV=production && npm run build",
@@ -82,20 +79,18 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/plugin-transform-runtime": "^7.24.7",
-    "@babel/preset-env": "^7.24.7",
-    "@babel/preset-react": "^7.24.7",
-    "@googleapis/drive": "^8.11.0",
+    "@babel/core": "^7.23.9",
+    "@babel/plugin-transform-runtime": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
+    "@babel/preset-react": "^7.23.3",
+    "@googleapis/drive": "^8.6.0",
     "body-parser": "^1.20.2",
-    "classnames": "^2.5.1",
+    "classnames": "^2.3.2",
     "codemirror": "^5.65.6",
     "cookie-parser": "^1.4.6",
     "create-react-class": "^15.7.0",
     "dedent-tabs": "^0.10.3",
-    "dompurify": "^3.1.5",
-    "expr-eval": "^2.0.2",
-    "express": "^4.19.2",
+    "express": "^4.18.2",
     "express-async-handler": "^1.2.0",
     "express-static-gzip": "2.1.7",
     "fs-extra": "11.2.0",
@@ -103,35 +98,34 @@
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "11.2.0",
-    "marked-emoji": "^1.4.1",
+    "marked": "11.1.1",
     "marked-extended-tables": "^1.0.8",
-    "marked-gfm-heading-id": "^3.2.0",
+    "marked-gfm-heading-id": "^3.1.2",
     "marked-smartypants-lite": "^1.0.2",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.30.1",
-    "mongoose": "^8.4.5",
+    "mongoose": "^8.1.1",
     "nanoid": "3.3.4",
     "nconf": "^0.12.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-frame-component": "^4.1.3",
-    "react-router-dom": "6.24.1",
+    "react-router-dom": "6.21.3",
     "sanitize-filename": "1.6.3",
-    "superagent": "^9.0.2",
+    "superagent": "^8.1.2",
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
   },
   "devDependencies": {
-    "eslint": "^8.57.0",
-    "eslint-plugin-jest": "^28.6.0",
-    "eslint-plugin-react": "^7.34.3",
+    "eslint": "^8.56.0",
+    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-react": "^7.33.2",
     "jest": "^29.7.0",
     "jest-expect-message": "^1.1.3",
     "postcss-less": "^6.0.0",
     "stylelint": "^15.11.0",
-    "stylelint-config-recess-order": "^4.6.0",
+    "stylelint-config-recess-order": "^4.4.0",
     "stylelint-config-recommended": "^13.0.0",
     "stylelint-stylistic": "^0.4.3",
-    "supertest": "^7.0.0"
+    "supertest": "^6.3.4"
   }
 }

scripts/project.json

@@ -25,7 +25,6 @@
 		"codemirror/addon/edit/closetag.js",
 		"codemirror/addon/edit/trailingspace.js",
 		"codemirror/addon/selection/active-line.js",
-		"codemirror/addon/hint/show-hint.js",
 		"moment",
 		"superagent"
 	]

server.js

@@ -7,14 +7,6 @@ DB.connect(config).then(()=>{
 	// before launching server
 	const PORT = process.env.PORT || config.get('web_port') || 8000;
 	server.app.listen(PORT, ()=>{
-		const reset = '\x1b[0m'; // Reset to default style
-		const bright = '\x1b[1m'; // Bright (bold) style
-		const cyan = '\x1b[36m'; // Cyan color
-		const underline = '\x1b[4m'; // Underlined style
-
-		console.log(`\n\tserver started at: ${new Date().toLocaleString()}`);
-		console.log(`\tserver on port: ${PORT}`);
-		console.log(`\t${bright + cyan}Open in browser: ${reset}${underline + bright + cyan}http://localhost:${PORT}${reset}\n\n`);
-
+		console.log(`server on port: ${PORT}`);
 	});
 });

server/admin.api.js

@@ -30,7 +30,7 @@ const junkBrewPipeline = [
 	{	$match : {
 		updatedAt  : { $lt: Moment().subtract(30, 'days').toDate() },
 		lastViewed : { $lt: Moment().subtract(30, 'days').toDate() }
-	} },
+	}},
 	{ $project: { textBinSize: { $binarySize: '$textBin' } } },
 	{ $match: { textBinSize: { $lt: 140 } } },
 	{ $limit: 100 }
@@ -84,7 +84,7 @@ router.get('/admin/lookup/:id', mw.adminOnly, async (req, res, next)=>{
 		return res.status(500).json({ error: 'Internal Server Error' });
 	});
 });
-
+  
 /* Find 50 brews that aren't compressed yet */
 router.get('/admin/finduncompressed', mw.adminOnly, (req, res)=>{
 	const query = uncompressedBrewQuery.clone();

server/app.js

@@ -17,13 +17,26 @@ const asyncHandler = require('express-async-handler');
 
 const { DEFAULT_BREW } = require('./brewDefaults.js');
 
-const { splitTextStyleAndMetadata } = require('../shared/helpers.js');
-
+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', 'theme', 'lang']));
+		brew.text = brew.text.slice(index + 5);
+	}
+	if(brew.text.startsWith('```css')) {
+		const index = brew.text.indexOf('```\n\n');
+		brew.style = brew.text.slice(7, index - 1);
+		brew.text = brew.text.slice(index + 5);
+	}
+};
 
 const sanitizeBrew = (brew, accessType)=>{
 	brew._id = undefined;
 	brew.__v = undefined;
-	if(accessType !== 'edit' && accessType !== 'shareAuthor') {
+	if(accessType !== 'edit'){
 		brew.editId = undefined;
 	}
 	return brew;
@@ -54,6 +67,7 @@ app.use((req, res, next)=>{
 
 app.use(homebrewApi);
 app.use(require('./admin.api.js'));
+app.use(require('./archive.api.js'));
 
 const HomebrewModel     = require('./homebrew.model.js').model;
 const welcomeText       = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
@@ -307,6 +321,7 @@ app.get('/new/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
 //Share Page
 app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, res, next)=>{
 	const { brew } = req;
+
 	req.ogMeta = { ...defaultMetaTags,
 		title       : req.brew.title || 'Untitled Brew',
 		description : req.brew.description || 'No description.',
@@ -325,12 +340,18 @@ app.get('/share/:id', asyncHandler(getBrew('share')), asyncHandler(async (req, r
 			await HomebrewModel.increaseView({ shareId: brew.shareId });
 		}
 	};
-
-	brew.authors.includes(req.account?.username) ? sanitizeBrew(req.brew, 'shareAuthor') : sanitizeBrew(req.brew, 'share');
+	sanitizeBrew(req.brew, 'share');
 	splitTextStyleAndMetadata(req.brew);
 	return next();
 }));
 
+//Print Page
+app.get('/print/:id', asyncHandler(getBrew('share')), (req, res, next)=>{
+	sanitizeBrew(req.brew, 'share');
+	splitTextStyleAndMetadata(req.brew);
+	next();
+});
+
 //Account Page
 app.get('/account', asyncHandler(async (req, res, next)=>{
 	const data = {};
@@ -365,7 +386,7 @@ app.get('/account', asyncHandler(async (req, res, next)=>{
 				console.log(err);
 			});
 
-		data.accountDetails = {
+		data.uiItems = {
 			username    : req.account.username,
 			issued      : req.account.issued,
 			googleId    : Boolean(req.account.googleId),
@@ -461,6 +482,11 @@ app.use(async (err, req, res, next)=>{
 		res.status(err.status || err.response?.status || 500).send(err);
 		return;
 	}
+	if(err.originalUrl?.startsWith('/archive/')) {
+		// console.log('archive error');
+		res.status(err.status || err.response?.status || 500).send(err);
+		return;
+	}
 
 	// console.log('non-API error');
 	const status = err.status || err.code || 500;
@@ -484,6 +510,8 @@ app.use(async (err, req, res, next)=>{
 	res.send(page);
 });
 
+
+
 app.use((req, res)=>{
 	if(!res.headersSent) {
 		console.error('Headers have not been sent, responding with a server error.', req.url);

server/archive.api.js

@@ -0,0 +1,53 @@
+const HomebrewModel = require('./homebrew.model.js').model;
+const router = require('express').Router();
+const asyncHandler = require('express-async-handler');
+
+const archive = {
+	archiveApi : router,
+	/* Searches for matching title, also attempts to partial match */
+	findBrews  : async (req, res, next)=>{
+		try {
+			const title = req.query.title || '';
+			const page = parseInt(req.query.page) || 1;
+			console.log('try:', page);
+			const pageSize = 10; // Set a default page size
+			const skip = (page - 1) * pageSize;
+
+			const titleQuery = {
+				title     : { $regex: decodeURIComponent(title), $options: 'i' },
+				published : true
+			};
+
+			const projection = {
+				editId   : 0,
+				googleId : 0,
+				text     : 0,
+				textBin  : 0,
+			};
+
+			const brews = await HomebrewModel.find(titleQuery, projection)
+                .skip(skip)
+                .limit(pageSize)
+                .maxTimeMS(5000)
+                .exec();
+
+			if(!brews || brews.length === 0) {
+				// No published documents found with the given title
+				return res.status(404).json({ error: 'Published documents not found' });
+			}
+
+			const totalDocuments = await HomebrewModel.countDocuments(title);
+
+			const totalPages = Math.ceil(totalDocuments / pageSize);
+
+			return res.json({ brews, page, totalPages });
+		} catch (error) {
+			console.error(error);
+			return res.status(500).json({ error: 'Internal Server Error' });
+		}
+	}
+};
+
+router.get('/api/archive', asyncHandler(archive.findBrews));
+
+module.exports = router;

server/googleActions.js

@@ -1,4 +1,5 @@
 /* eslint-disable max-lines */
+const _ = require('lodash');
 const googleDrive = require('@googleapis/drive');
 const { nanoid } = require('nanoid');
 const token = require('./token.js');
@@ -6,9 +7,7 @@ const config = require('./config.js');
 
 let serviceAuth;
 if(!config.get('service_account')){
-	const reset = '\x1b[0m'; // Reset to default style
-	const yellow = '\x1b[33m'; // yellow color
-	console.warn(`\n${yellow}No Google Service Account in config files - Google Drive integration will not be available.${reset}`);
+	console.log('No Google Service Account in config files - Google Drive integration will not be available.');
 } else  {
 	const keys = typeof(config.get('service_account')) == 'string' ?
 		JSON.parse(config.get('service_account')) :
@@ -19,7 +18,7 @@ if(!config.get('service_account')){
 		serviceAuth.scopes = ['https://www.googleapis.com/auth/drive'];
 	} catch (err) {
 		console.warn(err);
-		console.warn('Please make sure the Google Service Account is set up properly in your config files.');
+		console.log('Please make sure the Google Service Account is set up properly in your config files.');
 	}
 }
 

server/homebrew.api.js

@@ -54,10 +54,6 @@ const api = {
 				});
 			stub = stub?.toObject();
 
-			if(stub?.lock?.locked && accessType != 'edit') {
-				throw { HBErrorCode: '100', code: stub.lock.code, message: stub.lock.shareMessage, brewId: stub.shareId, brewTitle: stub.title };
-			}
-
 			// If there is a google id, try to find the google brew
 			if(!stubOnly && (googleId || stub?.googleId)) {
 				let googleError;
@@ -85,7 +81,7 @@ const api = {
 				if(req.account){
 					throw { ...accessError, message: 'User is not an Author', HBErrorCode: '03', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId };
 				}
-				throw { ...accessError, message: 'User is not logged in', HBErrorCode: '04', authors: stub.authors, brewTitle: stub.title, shareId: stub.shareId };
+				throw { ...accessError, message: 'User is not logged in', HBErrorCode: '04', authors: stub.authors, brewTitle: stub.title };
 			}
 
 			// If after all of that we still don't have a brew, throw an exception

server/homebrew.api.spec.js

@@ -117,7 +117,7 @@ describe('Tests for api', ()=>{
 					id : '123456789012345678901234567890123abcdefghijkl'
 				}
 			});
-
+			
 			expect(googleId).toEqual('123456789012345678901234567890123');
 			expect(id).toEqual('abcdefghijkl');
 		});
@@ -128,7 +128,7 @@ describe('Tests for api', ()=>{
 					id : '123456789012345678901234567890123abcdefghij'
 				}
 			});
-
+			
 			expect(googleId).toEqual('123456789012345678901234567890123');
 			expect(id).toEqual('abcdefghij');
 		});
@@ -298,18 +298,6 @@ describe('Tests for api', ()=>{
 			expect(model.get).toHaveBeenCalledWith({ shareId: '1' });
 			expect(google.getGoogleBrew).toHaveBeenCalledWith('2', '1', 'share');
 		});
-
-		it('access is denied to a locked brew', async()=>{
-			const lockBrew = { title: 'test brew', shareId: '1', lock: { locked: true, code: 404, shareMessage: 'brew locked' } };
-			model.get = jest.fn(()=>toBrewPromise(lockBrew));
-			api.getId = jest.fn(()=>({ id: '1', googleId: undefined }));
-
-			const fn = api.getBrew('share', false);
-			const req = { brew: {} };
-			const next = jest.fn();
-
-			await expect(fn(req, null, next)).rejects.toEqual({ 'HBErrorCode': '100', 'brewId': '1', 'brewTitle': 'test brew', 'code': 404, 'message': 'brew locked' });
-		});
 	});
 
 	describe('mergeBrewText', ()=>{

shared/helpers.js

@@ -1,34 +0,0 @@
-const _ = require('lodash');
-const yaml = require('js-yaml');
-
-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', 'theme', 'lang']));
-		brew.text = brew.text.slice(index + 5);
-	}
-	if(brew.text.startsWith('```css')) {
-		const index = brew.text.indexOf('```\n\n');
-		brew.style = brew.text.slice(7, index - 1);
-		brew.text = brew.text.slice(index + 5);
-	}
-};
-
-const printCurrentBrew = ()=>{
-	if(window.typeof !== 'undefined') {
-		window.frames['BrewRenderer'].contentWindow.print();
-		//Force DOM reflow; Print dialog causes a repaint, and @media print CSS somehow makes out-of-view pages disappear
-		const node = window.frames['BrewRenderer'].contentDocument.getElementsByClassName('brewRenderer').item(0);
-		node.style.display='none';
-		node.offsetHeight; // accessing this is enough to trigger a reflow
-		node.style.display='';
-	}
-};
-
-module.exports = {
-	splitTextStyleAndMetadata,
-	printCurrentBrew
-};

shared/homebrewery/renderWarnings/renderWarnings.jsx

@@ -2,8 +2,9 @@ require('./renderWarnings.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _     = require('lodash');
+const cx    = require('classnames');
 
-import Dialog from '../../../client/components/dialog.jsx';
+const DISMISS_KEY = 'dismiss_render_warning';
 
 const RenderWarnings = createClass({
 	displayName     : 'RenderWarnings',
@@ -34,6 +35,9 @@ const RenderWarnings = createClass({
 		},
 	},
 	checkWarnings : function(){
+		const hideDismiss = localStorage.getItem(DISMISS_KEY);
+		if(hideDismiss) return this.setState({ warnings: {} });
+
 		this.setState({
 			warnings : _.reduce(this.warnings, (r, fn, type)=>{
 				const element = fn();
@@ -42,18 +46,20 @@ const RenderWarnings = createClass({
 			}, {})
 		});
 	},
+	dismiss : function(){
+		localStorage.setItem(DISMISS_KEY, true);
+		this.checkWarnings();
+	},
 	render : function(){
 		if(_.isEmpty(this.state.warnings)) return null;
 
-		const DISMISS_KEY = 'dismiss_render_warning';
-		const DISMISS_TEXT = <i className='fas fa-times dismiss' />;
-
-		return <Dialog className='renderWarnings' dismissKey={DISMISS_KEY} closeText={DISMISS_TEXT}>
+		return <div className='renderWarnings'>
+			<i className='fas fa-times dismiss' onClick={this.dismiss}/>
 			<i className='fas fa-exclamation-triangle ohno' />
 			<h3>Render Warnings</h3>
 			<small>If this homebrew is rendering badly if might be because of the following:</small>
 			<ul>{_.values(this.state.warnings)}</ul>
-		</Dialog>;
+		</div>;
 	}
 });
 

shared/homebrewery/renderWarnings/renderWarnings.less

@@ -1,48 +1,53 @@
-.renderWarnings {
-	position         : relative;
-	float            : right;
+.renderWarnings{
+	position		 : relative;
+	float			 : right;
+	display          : inline-block;
 	width            : 350px;
 	padding          : 20px;
 	padding-bottom   : 10px;
 	padding-left     : 85px;
 	margin-bottom    : 10px;
-	color            : white;
 	background-color : @yellow;
-	border           : none;
-	a { font-weight : 800; }
-	i.ohno {
+	color            : white;
+	a{
+		font-weight : 800;
+	}
+	i.ohno{
 		position  : absolute;
 		top       : 24px;
 		left      : 24px;
-		font-size : 2.5em;
 		opacity   : 0.8;
+		font-size : 2.5em;
 	}
-	button.dismiss {
-		position         : absolute;
-		top              : 10px;
-		right            : 10px;
-		cursor           : pointer;
-		background-color : transparent;
-		opacity          : 0.6;
-		&:hover { opacity : 1; }
+	i.dismiss{
+		position : absolute;
+		top      : 10px;
+		right    : 10px;
+		cursor   : pointer;
+		opacity  : 0.6;
+		&:hover{
+			opacity : 1;
+		}
 	}
-	small {
-		font-size : 0.6em;
+	small{
 		opacity   : 0.7;
+		font-size : 0.6em;
 	}
-	h3 {
+	h3{
 		font-size   : 1.1em;
 		font-weight : 800;
 	}
-	ul {
+	ul{
 		margin-top          : 15px;
 		font-size           : 0.8em;
 		list-style-position : outside;
 		list-style-type     : disc;
-		li {
+		li{
 			font-size   : 0.8em;
 			line-height : 1.6em;
-			em { font-weight : 800; }
+			em{
+				font-weight : 800;
+			}
 		}
 	}
 }

shared/naturalcrit/codeEditor/autocompleteEmoji.js

@@ -1,84 +0,0 @@
-const diceFont      = require('../../../themes/fonts/iconFonts/diceFont.js');
-const elderberryInn = require('../../../themes/fonts/iconFonts/elderberryInn.js');
-const fontAwesome   = require('../../../themes/fonts/iconFonts/fontAwesome.js');
-const gameIcons     = require('../../../themes/fonts/iconFonts/gameIcons.js');
-
-const emojis = {
-	...diceFont,
-	...elderberryInn,
-	...fontAwesome,
-	...gameIcons
-};
-
-const showAutocompleteEmoji = function(CodeMirror, editor) {
-	CodeMirror.commands.autocomplete = function(editor) {
-		editor.showHint({
-			completeSingle : false,
-			hint           : function(editor) {
-				const cursor = editor.getCursor();
-				const line = cursor.line;
-				const lineContent = editor.getLine(line);
-				const start = lineContent.lastIndexOf(':', cursor.ch - 1) + 1;
-				const end = cursor.ch;
-				const currentWord = lineContent.slice(start, end);
-
-
-				const list = Object.keys(emojis).filter(function(emoji) {
-					return emoji.toLowerCase().indexOf(currentWord.toLowerCase()) >= 0;
-				}).sort((a, b)=>{
-					const lowerA = a.replace(/\d+/g, function(match) {	// Temporarily convert any numbers in emoji string
-						return match.padStart(4, '0');										// to 4-digits, left-padded with 0's, to aid in
-					}).toLowerCase();																		// sorting numbers, i.e., "d6, d10, d20", not "d10, d20, d6"
-					const lowerB = b.replace(/\d+/g, function(match) {	// Also make lowercase for case-insensitive alpha sorting
-						return match.padStart(4, '0');
-					}).toLowerCase();
-
-					if(lowerA < lowerB)
-						return -1;
-					return 1;
-				}).map(function(emoji) {
-					return {
-						text   : `${emoji}:`,														// Text to output to editor when option is selected
-						render : function(element, self, data) {				// How to display the option in the dropdown
-							const div = document.createElement('div');
-							div.innerHTML = `<i class="emojiPreview ${emojis[emoji]}"></i> ${emoji}`;
-							element.appendChild(div);
-						}
-					};
-				});
-
-				return {
-					list : list.length ? list : [],
-					from : CodeMirror.Pos(line, start),
-					to   : CodeMirror.Pos(line, end)
-				};
-			}
-		});
-	};
-
-	editor.on('inputRead', function(instance, change) {
-		const cursor = editor.getCursor();
-		const line = editor.getLine(cursor.line);
-
-		// Get the text from the start of the line to the cursor
-		const textToCursor = line.slice(0, cursor.ch);
-
-		// Do not autosuggest emojis in curly span/div/injector properties
-		if(line.includes('{')) {
-			const curlyToCursor = textToCursor.slice(textToCursor.indexOf(`{`));
-			const curlySpanRegex = /{(?=((?:[:=](?:"[\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"':={}\s]*)*))\1$/g;
-
-			if(curlySpanRegex.test(curlyToCursor))
-				return;
-		}
-
-		// Check if the text ends with ':xyz'
-		if(/:[^\s:]+$/.test(textToCursor)) {
-			CodeMirror.commands.autocomplete(editor);
-		}
-	});
-};
-
-module.exports = {
-	showAutocompleteEmoji
-};

shared/naturalcrit/codeEditor/codeEditor.jsx

@@ -3,8 +3,8 @@ require('./codeEditor.less');
 const React = require('react');
 const createClass = require('create-react-class');
 const _ = require('lodash');
+const cx = require('classnames');
 const closeTag = require('./close-tag');
-const autoCompleteEmoji = require('./autocompleteEmoji');
 
 let CodeMirror;
 if(typeof window !== 'undefined'){
@@ -36,8 +36,6 @@ if(typeof window !== 'undefined'){
 	//XML code folding is a requirement of the auto-closing tag feature and is not enabled
 	require('codemirror/addon/fold/xml-fold.js');
 	require('codemirror/addon/edit/closetag.js');
-	//Autocompletion
-	require('codemirror/addon/hint/show-hint.js');
 
 	const foldCode = require('./fold-code');
 	foldCode.registerHomebreweryHelper(CodeMirror);
@@ -62,8 +60,6 @@ const CodeEditor = createClass({
 		};
 	},
 
-	editor : React.createRef(null),
-
 	componentDidMount : function() {
 		this.buildEditor();
 		const newDoc = CodeMirror.Doc(this.props.value, this.props.language);
@@ -103,7 +99,7 @@ const CodeEditor = createClass({
 	},
 
 	buildEditor : function() {
-		this.codeMirror = CodeMirror(this.editor.current, {
+		this.codeMirror = CodeMirror(this.refs.editor, {
 			lineNumbers       : true,
 			lineWrapping      : this.props.wrap,
 			indentWithTabs    : false,
@@ -181,10 +177,7 @@ const CodeEditor = createClass({
 			// 	return el;
 			// }
 		});
-
-		// Add custom behaviors (auto-close curlies and auto-complete emojis)
 		closeTag.autoCloseCurlyBraces(CodeMirror, this.codeMirror);
-		autoCompleteEmoji.showAutocompleteEmoji(CodeMirror, this.codeMirror);
 
 		// Note: codeMirror passes a copy of itself in this callback. cm === this.codeMirror. Either one works.
 		this.codeMirror.on('change', (cm)=>{this.props.onChange(cm.getValue());});
@@ -443,8 +436,8 @@ const CodeEditor = createClass({
 
 	render : function(){
 		return <>
-			<link href={`../homebrew/cm-themes/${this.props.editorTheme}.css`} type='text/css' rel='stylesheet' />
-			<div className='codeEditor' ref={this.editor} style={this.props.style}/>
+			<link href={`../homebrew/cm-themes/${this.props.editorTheme}.css`} rel='stylesheet' />
+			<div className='codeEditor' ref='editor' style={this.props.style}/>
 		</>;
 	}
 });

shared/naturalcrit/codeEditor/codeEditor.less

@@ -2,13 +2,6 @@
 @import (less) 'codemirror/addon/fold/foldgutter.css';
 @import (less) 'codemirror/addon/search/matchesonscrollbar.css';
 @import (less) 'codemirror/addon/dialog/dialog.css';
-@import (less) 'codemirror/addon/hint/show-hint.css';
-
-//Icon fonts included so they can appear in emoji autosuggest dropdown
-@import (less) './themes/fonts/iconFonts/diceFont.less';
-@import (less) './themes/fonts/iconFonts/elderberryInn.less';
-@import (less) './themes/fonts/iconFonts/gameIcons.less';
-@import (less) './themes/fonts/iconFonts/fontAwesome.less';
 
 @keyframes sourceMoveAnimation {
 	50%  {background-color: red;   color: white;}
@@ -24,24 +17,13 @@
     text-shadow: none;
     font-weight: 600;
     color: grey;
-  }
+}
 
   .sourceMoveFlash .CodeMirror-line{
     animation-name: sourceMoveAnimation;
     animation-duration: 0.4s;
   }
 
-  .CodeMirror-vscrollbar {
-    &::-webkit-scrollbar {
-      width: 20px;
-    }
-    &::-webkit-scrollbar-thumb {
-      width: 20px;
-      background: linear-gradient(90deg, #858585 15px, #808080 15px);
-    }
-  }
-
-
   //.cm-tab {
   //  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right;
   //}
@@ -52,8 +34,3 @@
   //  }
   //}
 }
-
-.emojiPreview {
-	font-size: 1.5em;
-	line-height: 1.2em;
-}

shared/naturalcrit/markdown.js

@@ -4,48 +4,7 @@ const Marked = require('marked');
 const MarkedExtendedTables = require('marked-extended-tables');
 const { markedSmartypantsLite: MarkedSmartypantsLite } = require('marked-smartypants-lite');
 const { gfmHeadingId: MarkedGFMHeadingId } = require('marked-gfm-heading-id');
-const { markedEmoji: MarkedEmojis } = require('marked-emoji');
-
-//Icon fonts included so they can appear in emoji autosuggest dropdown
-const diceFont      = require('../../themes/fonts/iconFonts/diceFont.js');
-const elderberryInn = require('../../themes/fonts/iconFonts/elderberryInn.js');
-const fontAwesome   = require('../../themes/fonts/iconFonts/fontAwesome.js');
-const gameIcons     = require('../../themes/fonts/iconFonts/gameIcons.js');
-
-const MathParser = require('expr-eval').Parser;
 const renderer = new Marked.Renderer();
-const tokenizer = new Marked.Tokenizer();
-
-//Limit math features to simple items
-const mathParser = new MathParser({
-	operators : {
-		// These default to true, but are included to be explicit
-		add      : true,
-		subtract : true,
-		multiply : true,
-		divide   : true,
-		power    : true,
-		round    : true,
-		floor    : true,
-		ceil     : true,
-
-		sin     : false, cos     : false, tan     : false, asin    : false, acos    : false,
-		atan    : false, sinh    : false, cosh    : false, tanh    : false, asinh   : false,
-		acosh   : false, atanh   : false, sqrt    : false, cbrt    : false, log     : false,
-		log2    : false, ln      : false, lg      : false, log10   : false, expm1   : false,
-		log1p   : false, abs     : false, trunc   : false, join    : false, sum     : false,
-		'-'     : false, '+'     : false, exp     : false, not     : false, length  : false,
-		'!'     : false, sign    : false, random  : false, fac     : false, min     : false,
-		max     : false, hypot   : false, pyt     : false, pow     : false, atan2   : false,
-		'if'    : false, gamma   : false, roundTo : false, map     : false, fold    : false,
-		filter  : false, indexOf : false,
-
-		remainder   : false, factorial   : false,
-		comparison  : false, concatenate : false,
-		logical     : false, assignment  : false,
-		array       : false, fndef       : false
-	}
-});
 
 //Processes the markdown within an HTML block if it's just a class-wrapper
 renderer.html = function (html) {
@@ -58,7 +17,7 @@ renderer.html = function (html) {
 	return html;
 };
 
-// Don't wrap {{ Spans alone on a line, or {{ Divs in <p> tags
+// Don't wrap {{ Divs or {{ empty Spans in <p> tags
 renderer.paragraph = function(text){
 	let match;
 	if(text.startsWith('<div') || text.startsWith('</div'))
@@ -91,29 +50,24 @@ renderer.link = function (href, title, text) {
 	return out;
 };
 
-// Disable default reflink behavior, as it steps on our variables extension
-tokenizer.def = function () {
-	return undefined;
-};
-
 const mustacheSpans = {
 	name  : 'mustacheSpans',
 	level : 'inline',                                   // Is this a block-level or inline-level tokenizer?
 	start(src) { return src.match(/{{[^{]/)?.index; },  // Hint to Marked.js to stop and check for a match
 	tokenizer(src, tokens) {
 		const completeSpan = /^{{[^\n]*}}/;               // Regex for the complete token
-		const inlineRegex = /{{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1 *|}}/g;
+		const inlineRegex = /{{(?=((?:[:=](?:"['\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1 *|}}/g;
 		const match = completeSpan.exec(src);
 		if(match) {
 			//Find closing delimiter
 			let blockCount = 0;
-			let tags = {};
+			let tags = '';
 			let endTags = 0;
 			let endToken = 0;
 			let delim;
 			while (delim = inlineRegex.exec(match[0])) {
-				if(_.isEmpty(tags)) {
-					tags = processStyleTags(delim[0].substring(2));
+				if(!tags) {
+					tags = `${processStyleTags(delim[0].substring(2))}`;
 					endTags = delim[0].length;
 				}
 				if(delim[0].startsWith('{{')) {
@@ -142,14 +96,7 @@ const mustacheSpans = {
 		}
 	},
 	renderer(token) {
-		const tags = token.tags;
-		tags.classes = ['inline-block', tags.classes].join(' ').trim();
-		return `<span` +
-			`${tags.classes    ? ` class="${tags.classes}"` : ''}` +
-			`${tags.id         ? ` id="${tags.id}"`         : ''}` +
-			`${tags.styles     ? ` style="${tags.styles}"`  : ''}` +
-			`${tags.attributes ? ` ${Object.entries(tags.attributes).map(([key, value])=>`${key}="${value}"`).join(' ')}` : ''}` +
-			`>${this.parser.parseInline(token.tokens)}</span>`; // parseInline to turn child tokens into HTML
+		return `<span class="inline-block${token.tags}>${this.parser.parseInline(token.tokens)}</span>`; // parseInline to turn child tokens into HTML
 	}
 };
 
@@ -159,18 +106,18 @@ const mustacheDivs = {
 	start(src) { return src.match(/\n *{{[^{]/m)?.index; },  // Hint to Marked.js to stop and check for a match
 	tokenizer(src, tokens) {
 		const completeBlock = /^ *{{[^\n}]* *\n.*\n *}}/s;                // Regex for the complete token
-		const blockRegex = /^ *{{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1 *$|^ *}}$/gm;
+		const blockRegex = /^ *{{(?=((?:[:=](?:"['\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1 *$|^ *}}$/gm;
 		const match = completeBlock.exec(src);
 		if(match) {
 			//Find closing delimiter
 			let blockCount = 0;
-			let tags = {};
+			let tags = '';
 			let endTags = 0;
 			let endToken = 0;
 			let delim;
 			while (delim = blockRegex.exec(match[0])?.[0].trim()) {
-				if(_.isEmpty(tags)) {
-					tags = processStyleTags(delim.substring(2));
+				if(!tags) {
+					tags = `${processStyleTags(delim.substring(2))}`;
 					endTags = delim.length + src.indexOf(delim);
 				}
 				if(delim.startsWith('{{')) {
@@ -198,14 +145,7 @@ const mustacheDivs = {
 		}
 	},
 	renderer(token) {
-		const tags = token.tags;
-		tags.classes = ['block', tags.classes].join(' ').trim();
-		return `<div` +
-			`${tags.classes    ? ` class="${tags.classes}"` : ''}` +
-			`${tags.id         ? ` id="${tags.id}"`         : ''}` +
-			`${tags.styles     ? ` style="${tags.styles}"`  : ''}` +
-			`${tags.attributes ? ` ${Object.entries(tags.attributes).map(([key, value])=>`${key}="${value}"`).join(' ')}` : ''}` +
-			`>${this.parser.parse(token.tokens)}</div>`; // parse to turn child tokens into HTML
+		return `<div class="block${token.tags}>${this.parser.parse(token.tokens)}</div>`; // parseInline to turn child tokens into HTML
 	}
 };
 
@@ -214,46 +154,30 @@ const mustacheInjectInline = {
 	level : 'inline',
 	start(src) { return src.match(/ *{[^{\n]/)?.index; },  // Hint to Marked.js to stop and check for a match
 	tokenizer(src, tokens) {
-		const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1}/g;
+		const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1}/g;
 		const match = inlineRegex.exec(src);
 		if(match) {
 			const lastToken = tokens[tokens.length - 1];
 			if(!lastToken || lastToken.type == 'mustacheInjectInline')
 				return false;
 
-			const tags = processStyleTags(match[1]);
+			const tags = `${processStyleTags(match[1])}`;
 			lastToken.originalType = lastToken.type;
 			lastToken.type         = 'mustacheInjectInline';
-			lastToken.injectedTags = tags;
+			lastToken.tags         = tags;
 			return {
-				type : 'mustacheInjectInline',            // Should match "name" above
+				type : 'text',            // Should match "name" above
 				raw  : match[0],          // Text to consume from the source
 				text : ''
 			};
 		}
 	},
 	renderer(token) {
-		if(!token.originalType){
-			return;
-		}
 		token.type = token.originalType;
 		const text = this.parser.parseInline([token]);
-		const originalTags = extractHTMLStyleTags(text);
-		const injectedTags = token.injectedTags;
-		const tags = {
-			id         : injectedTags.id || originalTags.id || null,
-			classes    : [originalTags.classes,    injectedTags.classes].join(' ').trim() || null,
-			styles     : [originalTags.styles,     injectedTags.styles].join(' ').trim()  || null,
-			attributes : Object.assign(originalTags.attributes ?? {}, injectedTags.attributes ?? {})
-		};
-		const openingTag = /(<[^\s<>]+)[^\n<>]*(>.*)/s.exec(text);
+		const openingTag = /(<[^\s<>]+)([^\n<>]*>.*)/s.exec(text);
 		if(openingTag) {
-			return `${openingTag[1]}` +
-				`${tags.classes    ? ` class="${tags.classes}"` : ''}` +
-				`${tags.id         ? ` id="${tags.id}"`         : ''}` +
-				`${tags.styles     ? ` style="${tags.styles}"`  : ''}` +
-				`${!_.isEmpty(tags.attributes) ? ` ${Object.entries(tags.attributes).map(([key, value])=>`${key}="${value}"`).join(' ')}` : ''}` +
-				`${openingTag[2]}`; // parse to turn child tokens into HTML
+			return `${openingTag[1]} class="${token.tags}${openingTag[2]}`;
 		}
 		return text;
 	}
@@ -265,7 +189,7 @@ const mustacheInjectBlock = {
 		level : 'block',
 		start(src) { return src.match(/\n *{[^{\n]/m)?.index; },  // Hint to Marked.js to stop and check for a match
 		tokenizer(src, tokens) {
-			const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-()#%=?. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1}/ym;
+			const inlineRegex = /^ *{(?=((?:[:=](?:"['\w,\-()#%. ]*"|[\w\-()#%.]*)|[^"=':{}\s]*)*))\1}/ym;
 			const match = inlineRegex.exec(src);
 			if(match) {
 				const lastToken = tokens[tokens.length - 1];
@@ -273,7 +197,7 @@ const mustacheInjectBlock = {
 					return false;
 
 				lastToken.originalType = 'mustacheInjectBlock';
-				lastToken.injectedTags = processStyleTags(match[1]);
+				lastToken.tags         = `${processStyleTags(match[1])}`;
 				return {
 					type : 'mustacheInjectBlock', // Should match "name" above
 					raw  : match[0],              // Text to consume from the source
@@ -287,22 +211,9 @@ const mustacheInjectBlock = {
 			}
 			token.type = token.originalType;
 			const text = this.parser.parse([token]);
-			const originalTags = extractHTMLStyleTags(text);
-			const injectedTags = token.injectedTags;
-			const tags = {
-				id         : injectedTags.id || originalTags.id || null,
-				classes    : [originalTags.classes,    injectedTags.classes].join(' ').trim() || null,
-				styles     : [originalTags.styles,     injectedTags.styles].join(' ').trim()  || null,
-				attributes : Object.assign(originalTags.attributes ?? {}, injectedTags.attributes ?? {})
-			};
-			const openingTag = /(<[^\s<>]+)[^\n<>]*(>.*)/s.exec(text);
+			const openingTag = /(<[^\s<>]+)([^\n<>]*>.*)/s.exec(text);
 			if(openingTag) {
-				return `${openingTag[1]}` +
-					`${tags.classes    ? ` class="${tags.classes}"` : ''}` +
-					`${tags.id         ? ` id="${tags.id}"`         : ''}` +
-					`${tags.styles     ? ` style="${tags.styles}"`  : ''}` +
-					`${!_.isEmpty(tags.attributes) ? ` ${Object.entries(tags.attributes).map(([key, value])=>`${key}="${value}"`).join(' ')}` : ''}` +
-					`${openingTag[2]}`; // parse to turn child tokens into HTML
+				return `${openingTag[1]} class="${token.tags}${openingTag[2]}`;
 			}
 			return text;
 		}
@@ -345,34 +256,25 @@ const superSubScripts = {
 	}
 };
 
-const definitionListsSingleLine = {
-	name  : 'definitionListsSingleLine',
+const definitionLists = {
+	name  : 'definitionLists',
 	level : 'block',
-	start(src) { return src.match(/\n[^\n]*?::[^\n]*/m)?.index; },  // Hint to Marked.js to stop and check for a match
+	start(src) { return src.match(/^.*?::.*/m)?.index; },  // Hint to Marked.js to stop and check for a match
 	tokenizer(src, tokens) {
 		const regex = /^([^\n]*?)::([^\n]*)(?:\n|$)/ym;
 		let match;
 		let endIndex = 0;
 		const definitions = [];
 		while (match = regex.exec(src)) {
-			const originalLine = match[0];											// This line and below to handle conflict with emojis
-			let firstLine = originalLine;											// Remove in V4 when definitionListsInline updated to
-			this.lexer.inlineTokens(firstLine.trim())					// require spaces around `::`
-				.filter((t)=>t.type == 'emoji')
-				.map((emoji)=>firstLine = firstLine.replace(emoji.raw, 'x'.repeat(emoji.raw.length)));
-
-			const newMatch = /^([^\n]*?)::([^\n]*)(?:\n|$)/ym.exec(firstLine);
-			if(newMatch) {
-				definitions.push({
-					dt : this.lexer.inlineTokens(originalLine.slice(0, newMatch[1].length).trim()),
-					dd : this.lexer.inlineTokens(originalLine.slice(newMatch[1].length + 2).trim())
-				});
-			}																									// End of emoji hack.
+			definitions.push({
+				dt : this.lexer.inlineTokens(match[1].trim()),
+				dd : this.lexer.inlineTokens(match[2].trim())
+			});
 			endIndex = regex.lastIndex;
 		}
 		if(definitions.length) {
 			return {
-				type : 'definitionListsSingleLine',
+				type : 'definitionLists',
 				raw  : src.slice(0, endIndex),
 				definitions
 			};
@@ -386,320 +288,10 @@ const definitionListsSingleLine = {
 	}
 };
 
-const definitionListsMultiLine = {
-	name  : 'definitionListsMultiLine',
-	level : 'block',
-	start(src) { return src.match(/\n[^\n]*\n::/m)?.index; },  // Hint to Marked.js to stop and check for a match
-	tokenizer(src, tokens) {
-		const regex = /(\n?\n?(?!::)[^\n]+?(?=\n::))|\n::(.(?:.|\n)*?(?=(?:\n::)|(?:\n\n)|$))/y;
-		let match;
-		let endIndex = 0;
-		const definitions = [];
-		while (match = regex.exec(src)) {
-			if(match[1]) {
-				if(this.lexer.blockTokens(match[1].trim())[0]?.type !== 'paragraph') // DT must not be another block-level token besides <p>
-					break;
-				definitions.push({
-					dt  : this.lexer.inlineTokens(match[1].trim()),
-					dds : []
-				});
-			}
-			if(match[2] && definitions.length) {
-				definitions[definitions.length - 1].dds.push(
-					this.lexer.inlineTokens(match[2].trim().replace(/\s/g, ' '))
-				);
-			}
-			endIndex = regex.lastIndex;
-		}
-		if(definitions.length) {
-			return {
-				type : 'definitionListsMultiLine',
-				raw  : src.slice(0, endIndex),
-				definitions
-			};
-		}
-	},
-	renderer(token) {
-		let returnVal = `<dl>`;
-		token.definitions.forEach((def)=>{
-			const dds = def.dds.map((s)=>{
-				return `\n<dd>${this.parser.parseInline(s).trim()}</dd>`;
-			}).join('');
-			returnVal += `<dt>${this.parser.parseInline(def.dt)}</dt>${dds}\n`;
-		});
-		returnVal = returnVal.trim();
-		return `${returnVal}</dl>`;
-	}
-};
-
-//v=====--------------------< Variable Handling >-------------------=====v// 242 lines
-const replaceVar = function(input, hoist=false, allowUnresolved=false) {
-	const regex = /([!$]?)\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]/g;
-	const match = regex.exec(input);
-
-	const prefix = match[1];
-	const label  = match[2];
-
-	//v=====--------------------< HANDLE MATH >-------------------=====v//
-	const mathRegex = /[a-z]+\(|[+\-*/^()]/g;
-	const matches = label.split(mathRegex);
-	const mathVars = matches.filter((match)=>isNaN(match))?.map((s)=>s.trim()); // Capture any variable names
-
-	let replacedLabel = label;
-
-	if(prefix[0] == '$' && mathVars?.[0] !== label.trim())  {// If there was mathy stuff not captured, let's do math!
-		mathVars?.forEach((variable)=>{
-			const foundVar = lookupVar(variable, globalPageNumber, hoist);
-			if(foundVar && foundVar.resolved && foundVar.content && !isNaN(foundVar.content)) // Only subsitute math values if fully resolved, not empty strings, and numbers
-				replacedLabel = replacedLabel.replaceAll(variable, foundVar.content);
-		});
-
-		try {
-			return mathParser.evaluate(replacedLabel);
-		} catch (error) {
-			return undefined;		// Return undefined if invalid math result
-		}
-	}
-	//^=====--------------------< HANDLE MATH >-------------------=====^//
-
-	const foundVar = lookupVar(label, globalPageNumber, hoist);
-
-	if(!foundVar || (!foundVar.resolved && !allowUnresolved))
-		return undefined;			// Return undefined if not found, or parially-resolved vars are not allowed
-
-	//                    url or <url>            "title"    or   'title'     or  (title)
-	const linkRegex =  /^([^<\s][^\s]*|<.*?>)(?: ("(?:\\"|[^"])*"|'(?:\\'|[^'])*'|\((?:\\\(|\\\)|[^()])*\)))?$/m;
-	const linkMatch = linkRegex.exec(foundVar.content);
-
-	const href  = linkMatch ? linkMatch[1]               : null; //TODO: TRIM OFF < > IF PRESENT
-	const title = linkMatch ? linkMatch[2]?.slice(1, -1) : null;
-
-	if(!prefix[0] && href)        // Link
-		return `[${label}](${href}${title ? ` "${title}"` : ''})`;
-
-	if(prefix[0] == '!' && href)  // Image
-		return `![${label}](${href} ${title ? ` "${title}"` : ''})`;
-
-	if(prefix[0] == '$')          // Variable
-		return foundVar.content;
-};
-
-const lookupVar = function(label, index, hoist=false) {
-	while (index >= 0) {
-		if(globalVarsList[index]?.[label] !== undefined)
-			return globalVarsList[index][label];
-		index--;
-	}
-
-	if(hoist) {	//If normal lookup failed, attempt hoisting
-		index = Object.keys(globalVarsList).length; // Move index to start from last page
-		while (index >= 0) {
-			if(globalVarsList[index]?.[label] !== undefined)
-				return globalVarsList[index][label];
-			index--;
-		}
-	}
-
-	return undefined;
-};
-
-const processVariableQueue = function() {
-	let resolvedOne = true;
-	let finalLoop   = false;
-	while (resolvedOne || finalLoop) { // Loop through queue until no more variable calls can be resolved
-		resolvedOne = false;
-		for (const item of varsQueue) {
-			if(item.type == 'text')
-				continue;
-
-			if(item.type == 'varDefBlock') {
-				const regex = /[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]/g;
-				let match;
-				let resolved = true;
-				let tempContent = item.content;
-				while (match = regex.exec(item.content)) { // regex to find variable calls
-					const value = replaceVar(match[0], true);
-
-					if(value == undefined)
-						resolved = false;
-					else
-						tempContent = tempContent.replaceAll(match[0], value);
-				}
-
-				if(resolved == true || item.content != tempContent) {
-					resolvedOne = true;
-					item.content = tempContent;
-				}
-
-				globalVarsList[globalPageNumber][item.varName] = {
-					content  : item.content,
-					resolved : resolved
-				};
-
-				if(resolved)
-					item.type = 'resolved';
-			}
-
-			if(item.type == 'varCallBlock' || item.type == 'varCallInline') {
-				const value = replaceVar(item.content, true, finalLoop); // final loop will just use the best value so far
-
-				if(value == undefined)
-					continue;
-
-				resolvedOne  = true;
-				item.content = value;
-				item.type    = 'text';
-			}
-		}
-		varsQueue = varsQueue.filter((item)=>item.type !== 'resolved'); // Remove any fully-resolved variable definitions
-
-		if(finalLoop)
-			break;
-		if(!resolvedOne)
-			finalLoop   = true;
-	}
-	varsQueue = varsQueue.filter((item)=>item.type !== 'varDefBlock');
-};
-
-function MarkedVariables() {
-	return {
-		hooks : {
-			preprocess(src) {
-				const codeBlockSkip   = /^(?: {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+|^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})(?:[^\n]*)(?:\n|$)(?:|(?:[\s\S]*?)(?:\n|$))(?: {0,3}\2[~`]* *(?=\n|$))|`[^`]*?`/;
-				const blockDefRegex   = /^[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\]:(?!\() *((?:\n? *[^\s].*)+)(?=\n+|$)/; //Matches 3, [4]:5
-				const blockCallRegex  = /^[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\](?=\n|$)/;                              //Matches 6, [7]
-				const inlineDefRegex  = /([!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\])\(([^\n]+)\)/;                         //Matches 8, 9[10](11)
-				const inlineCallRegex =  /[!$]?\[((?!\s*\])(?:\\.|[^\[\]\\])+)\](?!\()/;                                //Matches 12, [13]
-
-				// Combine regexes and wrap in parens like so: (regex1)|(regex2)|(regex3)|(regex4)
-				const combinedRegex = new RegExp([codeBlockSkip, blockDefRegex, blockCallRegex, inlineDefRegex, inlineCallRegex].map((s)=>`(${s.source})`).join('|'), 'gm');
-
-				let lastIndex = 0;
-				let match;
-				while ((match = combinedRegex.exec(src)) !== null) {
-					// Format any matches into tokens and store
-					if(match.index > lastIndex) { // Any non-variable stuff
-						varsQueue.push(
-							{ type    : 'text',
-								varName : null,
-								content : src.slice(lastIndex, match.index)
-							});
-					}
-					if(match[1]) {
-						varsQueue.push(
-							{ type    : 'text',
-								varName : null,
-								content : match[0]
-							});
-					}
-					if(match[3]) { // Block Definition
-						const label   = match[4] ? match[4].trim().replace(/\s+/g, ' ')    : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-						const content = match[5] ? match[5].trim().replace(/[ \t]+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						varsQueue.push(
-							{ type    : 'varDefBlock',
-								varName : label,
-								content : content
-							});
-					}
-					if(match[6]) { // Block Call
-						const label = match[7] ? match[7].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						varsQueue.push(
-							{ type    : 'varCallBlock',
-								varName : label,
-								content : match[0]
-							});
-					}
-					if(match[8]) { // Inline Definition
-						const label = match[10] ? match[10].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-						let content = match[11] ? match[11].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						// In case of nested (), find the correct matching end )
-						let level = 0;
-						let i;
-						for (i = 0; i < content.length; i++) {
-							if(content[i] === '\\') {
-								i++;
-							} else if(content[i] === '(') {
-								level++;
-							} else if(content[i] === ')') {
-								level--;
-								if(level < 0)
-									break;
-							}
-						}
-						if(i > -1) {
-							combinedRegex.lastIndex = combinedRegex.lastIndex - (content.length - i);
-							content = content.slice(0, i).trim().replace(/\s+/g, ' ');
-						}
-
-						varsQueue.push(
-							{ type    : 'varDefBlock',
-								varName : label,
-								content : content
-							});
-						varsQueue.push(
-							{ type    : 'varCallInline',
-								varName : label,
-								content : match[9]
-							});
-					}
-					if(match[12]) { // Inline Call
-						const label = match[13] ? match[13].trim().replace(/\s+/g, ' ') : null; // Trim edge spaces and shorten blocks of whitespace to 1 space
-
-						varsQueue.push(
-							{ type    : 'varCallInline',
-								varName : label,
-								content : match[0]
-							});
-					}
-					lastIndex = combinedRegex.lastIndex;
-				}
-
-				if(lastIndex < src.length) {
-					varsQueue.push(
-						{ type    : 'text',
-							varName : null,
-							content : src.slice(lastIndex)
-						});
-				}
-
-				processVariableQueue();
-
-				const output = varsQueue.map((item)=>item.content).join('');
-				varsQueue = []; // Must clear varsQueue because custom HTML renderer uses Marked.parse which will preprocess again without clearing the array
-				return output;
-			}
-		}
-	};
-};
-//^=====--------------------< Variable Handling >-------------------=====^//
-
-// Emoji options
-// To add more icon fonts, need to do these things
-// 1) Add the font file as .woff2 to themes/fonts/iconFonts folder
-// 2) Create a .less file mapping CSS class names to the font character
-// 3) Create a .js file mapping Autosuggest names to CSS class names
-// 4) Import the .less file into shared/naturalcrit/codeEditor/codeEditor.less
-// 5) Import the .less file into themes/V3/blank.style.less
-// 6) Import the .js file to shared/naturalcrit/codeEditor/autocompleteEmoji.js and add to `emojis` object
-// 7) Import the .js file here to markdown.js, and add to `emojis` object below
-const MarkedEmojiOptions = {
-	emojis : {
-		...diceFont,
-		...elderberryInn,
-		...fontAwesome,
-		...gameIcons,
-	},
-	renderer : (token)=>`<i class="${token.emoji}"></i>`
-};
-
-Marked.use(MarkedVariables());
-Marked.use({ extensions: [definitionListsMultiLine, definitionListsSingleLine, superSubScripts, mustacheSpans, mustacheDivs, mustacheInjectInline] });
+Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists, superSubScripts] });
 Marked.use(mustacheInjectBlock);
-Marked.use({ renderer: renderer, tokenizer: tokenizer, mangle: false });
-Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite(), MarkedEmojis(MarkedEmojiOptions));
+Marked.use({ renderer: renderer, mangle: false });
+Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite());
 
 const nonWordAndColonTest = /[^\w:]/g;
 const cleanUrl = function (sanitize, base, href) {
@@ -766,73 +358,23 @@ const processStyleTags = (string)=>{
 	//TODO: can we simplify to just split on commas?
 	const tags = string.match(/(?:[^, ":=]+|[:=](?:"[^"]*"|))+/g);
 
-	const id         = _.remove(tags, (tag)=>tag.startsWith('#')).map((tag)=>tag.slice(1))[0]        || null;
-	const classes    = _.remove(tags, (tag)=>(!tag.includes(':')) && (!tag.includes('='))).join(' ') || null;
-	const attributes = _.remove(tags, (tag)=>(tag.includes('='))).map((tag)=>tag.replace(/="?([^"]*)"?/g, '="$1"'))
-		?.filter((attr)=>!attr.startsWith('class="') && !attr.startsWith('style="') && !attr.startsWith('id="'))
-		.reduce((obj, attr)=>{
-			const index = attr.indexOf('=');
-			let [key, value] = [attr.substring(0, index), attr.substring(index + 1)];
-			value = value.replace(/"/g, '');
-			obj[key] = value;
-			return obj;
-		}, {}) || null;
-	const styles     = tags?.length ? tags.map((tag)=>tag.replace(/:"?([^"]*)"?/g, ':$1;').trim()).join(' ') : null;
+	const id         = _.remove(tags, (tag)=>tag.startsWith('#')).map((tag)=>tag.slice(1))[0];
+	const classes    = _.remove(tags, (tag)=>(!tag.includes(':')) && (!tag.includes('=')));
+	const attributes = _.remove(tags, (tag)=>(tag.includes('='))).map((tag)=>tag.replace(/="?([^"]*)"?/g, '="$1"'));
+	const styles     = tags?.length ? tags.map((tag)=>tag.replace(/:"?([^"]*)"?/g, ':$1;').trim()) : [];
 
-	return {
-		id         : id,
-		classes    : classes,
-		styles     : styles,
-		attributes : _.isEmpty(attributes) ? null : attributes
-	};
+	return `${classes?.length ? ` ${classes.join(' ')}`        : ''}"` +
+		`${id                   ? ` id="${id}"`                  : ''}` +
+		`${styles?.length       ? ` style="${styles.join(' ')}"` : ''}` +
+		`${attributes?.length   ? ` ${attributes.join(' ')}`     : ''}`;
 };
 
-//Given a string representing an HTML element, extract all of its properties (id, class, style, and other attributes)
-const extractHTMLStyleTags = (htmlString)=>{
-	const firstElementOnly = htmlString.split('>')[0];
-	const id         = firstElementOnly.match(/id="([^"]*)"/)?.[1]    || null;
-	const classes    = firstElementOnly.match(/class="([^"]*)"/)?.[1] || null;
-	const styles     = firstElementOnly.match(/style="([^"]*)"/)?.[1] || null;
-	const attributes = firstElementOnly.match(/[a-zA-Z]+="[^"]*"/g)
-		?.filter((attr)=>!attr.startsWith('class="') && !attr.startsWith('style="') && !attr.startsWith('id="'))
-		.reduce((obj, attr)=>{
-			const index = attr.indexOf('=');
-			let [key, value] = [attr.substring(0, index), attr.substring(index + 1)];
-			value = value.replace(/"/g, '');
-			obj[key] = value;
-			return obj;
-		}, {}) || null;
-
-	return {
-		id         : id,
-		classes    : classes,
-		styles     : styles,
-		attributes : _.isEmpty(attributes) ? null : attributes
-	};
-};
-
-const globalVarsList    = {};
-let varsQueue       = [];
-let globalPageNumber = 0;
-
 module.exports = {
 	marked : Marked,
-	render : (rawBrewText, pageNumber=1)=>{
-		globalVarsList[pageNumber] = {};						//Reset global links for current page, to ensure values are parsed in order
-		varsQueue              = [];						//Could move into MarkedVariables()
-		globalPageNumber        = pageNumber;
-
+	render : (rawBrewText)=>{
 		rawBrewText = rawBrewText.replace(/^\\column$/gm, `\n<div class='columnSplit'></div>\n`)
 														 .replace(/^(:+)$/gm, (match)=>`${`<div class='blank'></div>`.repeat(match.length)}\n`);
-		const opts = Marked.defaults;
-
-		rawBrewText = opts.hooks.preprocess(rawBrewText);
-		const tokens = Marked.lexer(rawBrewText, opts);
-
-		Marked.walkTokens(tokens, opts.walkTokens);
-
-		const html = Marked.parser(tokens, opts);
-		return opts.hooks.postprocess(html);
+		return Marked.parse(rawBrewText);
 	},
 
 	validate : (rawBrewText)=>{

shared/naturalcrit/nav/nav.jsx

@@ -1,4 +1,4 @@
-require('client/homebrew/navbar/navbar.less');
+require('./nav.less');
 const React = require('react');
 const { useState, useRef, useEffect } = React;
 const createClass = require('create-react-class');
@@ -47,8 +47,8 @@ const Nav = {
 				color   : null
 			};
 		},
-		handleClick : function(e){
-			this.props.onClick(e);
+		handleClick : function(){
+			this.props.onClick();
 		},
 		render : function(){
 			const classes = cx('navItem', this.props.color, this.props.className);
@@ -104,7 +104,7 @@ const Nav = {
 		});
 
 		return (
-			<div className={`navDropdownContainer ${props.className ?? ''}`}
+			<div className={`navDropdownContainer ${props.className}`}
 				ref={myRef}
 				onMouseEnter = { props.trigger.includes('hover') ? ()=>handleDropdown(true)  : undefined }
 				onMouseLeave = { props.trigger.includes('hover') ? ()=>handleDropdown(false) : undefined }

shared/naturalcrit/nav/nav.less

@@ -0,0 +1,97 @@
+@import '../styles/colors';
+@keyframes glideDropDown {
+	0%   {transform : translate(0px, -100%);
+				opacity   : 0;
+			  background-color: #333;}
+	100% {transform : translate(0px, 0px);
+				opacity   : 1;
+			  background-color: #333;}
+}
+nav{
+	background-color : #333;
+	.navContent{
+		position			  : relative;
+		display         : flex;
+		justify-content : space-between;
+		z-index         : 2;
+	}
+	.navSection{
+		display     : flex;
+		align-items : center;
+	}
+	.navLogo{
+		display         : block;
+		margin-top      : 0px;
+		margin-right    : 8px;
+		margin-left     : 8px;
+		color           : white;
+		text-decoration : none;
+		&:hover{
+			.name{ color : @orange; }
+			svg{ fill : @orange }
+		}
+		svg{
+			height       : 13px;
+			margin-right : 0.2em;
+			cursor       : pointer;
+			fill         : white;
+		}
+		span.name{
+			font-family : 'CodeLight';
+			font-size   : 15px;
+			span.crit{
+				font-family : 'CodeBold';
+			}
+			small{
+				font-family    : 'Open Sans';
+				font-size      : 0.3em;
+				font-weight    : 800;
+				text-transform : uppercase;
+			}
+		}
+	}
+	.navItem{
+		#backgroundColorsHover;
+		.animate(background-color);
+		padding          : 8px 12px;
+		cursor           : pointer;
+		background-color : #333;
+		font-size        : 10px;
+		font-weight      : 800;
+		color            : white;
+		text-decoration  : none;
+		text-transform   : uppercase;
+		line-height      : 13px;
+		i{
+			margin-left : 5px;
+			font-size   : 13px;
+			float       : right;
+		}
+	}
+	.navSection:last-child .navItem{
+		border-left : 1px solid #666;
+	}
+	.navDropdownContainer{
+		position: relative;
+		.navDropdown {
+			position : absolute;
+			top      : 28px;
+			left     : 0px;
+			z-index  : 10000;
+			width    : 100%;
+			overflow : hidden auto;
+			max-height : calc(100vh - 28px);
+			.navItem{
+				animation-name: glideDropDown;
+				animation-duration: 0.4s;
+				position         : relative;
+				display          : block;
+				width            : 100%;
+				vertical-align   : middle;
+				padding          : 8px 5px;
+				border           : 1px solid #888;
+				border-bottom    : 0;
+			}
+		}
+	}
+}

shared/naturalcrit/splitPane/splitPane.jsx

@@ -1,6 +1,7 @@
 require('./splitPane.less');
 const React = require('react');
 const createClass = require('create-react-class');
+const _ = require('lodash');
 const cx = require('classnames');
 
 const SplitPane = createClass({
@@ -23,9 +24,6 @@ const SplitPane = createClass({
 		};
 	},
 
-	pane1 : React.createRef(null),
-	pane2 : React.createRef(null),
-
 	componentDidMount : function() {
 		const dividerPos = window.localStorage.getItem(this.props.storageKey);
 		if(dividerPos){
@@ -139,6 +137,7 @@ const SplitPane = createClass({
 	render : function(){
 		return <div className='splitPane' onPointerMove={this.handleMove} onPointerUp={this.handleUp}>
 			<Pane
+				ref='pane1'
 				width={this.state.currentDividerPos}
 			>
 				{React.cloneElement(this.props.children[0], {
@@ -148,7 +147,7 @@ const SplitPane = createClass({
 				})}
 			</Pane>
 			{this.renderDivider()}
-			<Pane isDragging={this.state.isDragging}>{this.props.children[1]}</Pane>
+			<Pane ref='pane2' isDragging={this.state.isDragging}>{this.props.children[1]}</Pane>
 		</div>;
 	}
 });

tests/markdown/definition-lists.test.js

@@ -1,91 +0,0 @@
-/* eslint-disable max-lines */
-
-const Markdown = require('naturalcrit/markdown.js');
-
-describe('Inline Definition Lists', ()=>{
-	test('No Term 1 Definition', function() {
-		const source = ':: My First Definition\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt></dt><dd>My First Definition</dd>\n</dl>');
-	});
-
-	test('Single Definition Term', function() {
-		const source = 'My term :: My First Definition\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>My term</dt><dd>My First Definition</dd>\n</dl>');
-	});
-
-	test('Multiple Definition Terms', function() {
-		const source = 'Term 1::Definition of Term 1\nTerm 2::Definition of Term 2\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt><dd>Definition of Term 1</dd>\n<dt>Term 2</dt><dd>Definition of Term 2</dd>\n</dl>');
-	});
-});
-
-describe('Multiline Definition Lists', ()=>{
-	test('Single Term, Single Definition', function() {
-		const source = 'Term 1\n::Definition 1\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1</dd></dl>');
-	});
-
-	test('Single Term, Plural Definitions', function() {
-		const source = 'Term 1\n::Definition 1\n::Definition 2\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1</dd>\n<dd>Definition 2</dd></dl>');
-	});
-
-	test('Multiple Term, Single Definitions', function() {
-		const source = 'Term 1\n::Definition 1\n\nTerm 2\n::Definition 1\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1</dd>\n<dt>Term 2</dt>\n<dd>Definition 1</dd></dl>');
-	});
-
-	test('Multiple Term, Plural Definitions', function() {
-		const source = 'Term 1\n::Definition 1\n::Definition 2\n\nTerm 2\n::Definition 1\n::Definition 2\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1</dd>\n<dd>Definition 2</dd>\n<dt>Term 2</dt>\n<dd>Definition 1</dd>\n<dd>Definition 2</dd></dl>');
-	});
-
-	test('Single Term, Single multi-line definition', function() {
-		const source = 'Term 1\n::Definition 1\nand more and\nmore and more\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1 and more and more and more</dd></dl>');
-	});
-
-	test('Single Term, Plural multi-line definitions', function() {
-		const source = 'Term 1\n::Definition 1\nand more and more\n::Definition 2\nand more\nand more\n::Definition 3\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1 and more and more</dd>\n<dd>Definition 2 and more and more</dd>\n<dd>Definition 3</dd></dl>');
-	});
-
-	test('Multiple Term, Single multi-line definition', function() {
-		const source = 'Term 1\n::Definition 1\nand more and more\n\nTerm 2\n::Definition 1\n::Definition 2\n\n';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1 and more and more</dd>\n<dt>Term 2</dt>\n<dd>Definition 1</dd>\n<dd>Definition 2</dd></dl>');
-	});
-
-	test('Multiple Term, Single multi-line definition, followed by an inline dl', function() {
-		const source = 'Term 1\n::Definition 1\nand more and more\n\nTerm 2\n::Definition 1\n::Definition 2\n\n::Inline Definition (no term)';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1 and more and more</dd>\n<dt>Term 2</dt>\n<dd>Definition 1</dd>\n<dd>Definition 2</dd></dl><dl><dt></dt><dd>Inline Definition (no term)</dd>\n</dl>');
-	});
-
-	test('Multiple Term, Single multi-line definition, followed by paragraph', function() {
-		const source = 'Term 1\n::Definition 1\nand more and more\n\nTerm 2\n::Definition 1\n::Definition 2\n\nParagraph';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt>\n<dd>Definition 1 and more and more</dd>\n<dt>Term 2</dt>\n<dd>Definition 1</dd>\n<dd>Definition 2</dd></dl><p>Paragraph</p>');
-	});
-
-	test('Block Token cannot be the Term of a multi-line definition', function() {
-		const source = '## Header\n::Definition 1 of a single-line DL\n::Definition 1 of another single-line DL';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<h2 id="header">Header</h2>\n<dl><dt></dt><dd>Definition 1 of a single-line DL</dd>\n<dt></dt><dd>Definition 1 of another single-line DL</dd>\n</dl>');
-	});
-
-	test('Inline DL has priority over Multiline', function() {
-		const source = 'Term 1 :: Inline definition 1\n:: Inline definition 2 (no DT)';
-		const rendered = Markdown.render(source).trim();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<dl><dt>Term 1</dt><dd>Inline definition 1</dd>\n<dt></dt><dd>Inline definition 2 (no DT)</dd>\n</dl>');
-	});
-});

tests/markdown/emojis.test.js

@@ -1,58 +0,0 @@
-const Markdown = require('naturalcrit/markdown.js');
-const dedent = require('dedent-tabs').default;
-
-// Marked.js adds line returns after closing tags on some default tokens.
-// This removes those line returns for comparison sake.
-String.prototype.trimReturns = function(){
-	return this.replace(/\r?\n|\r/g, '');
-};
-
-const emoji = 'df_d12_2';
-
-describe(`When emojis/icons are active`, ()=>{
-	it('when a word is between two colons (:word:), and a matching emoji exists, it is rendered as an emoji', function() {
-		const source = `:${emoji}:`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><i class="df d12-2"></i></p>`);
-	});
-
-	it('when a word is between two colons (:word:), and no matching emoji exists, it is not parsed', function() {
-		const source = `:invalid:`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>:invalid:</p>`);
-	});
-
-	it('two valid emojis with no whitespace are prioritized over definition lists', function() {
-		const source = `:${emoji}::${emoji}:`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><i class="df d12-2"></i><i class="df d12-2"></i></p>`);
-	});
-
-	it('definition lists that are not also part of an emoji can coexist with normal emojis', function() {
-		const source = `definition :: term ${emoji}::${emoji}:`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<dl><dt>definition</dt><dd>term df_d12_2:<i class="df d12-2"></i></dd></dl>`);
-	});
-
-	it('A valid emoji is compatible with curly injectors', function() {
-		const source = `:${emoji}:{color:blue,myClass}`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><i class="df d12-2 myClass" style="color:blue;"></i></p>`);
-	});
-
-	it('Emojis are not parsed inside of curly span CSS blocks', function() {
-		const source = `{{color:${emoji} text}}`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<span class="inline-block" style="color:df_d12_2;">text</span>`);
-	});
-
-	it('Emojis are not parsed inside of curly div CSS blocks', function() {
-		const source = dedent`{{color:${emoji}
-													text
-													}}`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="color:df_d12_2;"><p>text</p></div>`);
-	});
-
-	// another test of the editor to confirm an autocomplete menu opens
-});

tests/markdown/mustache-syntax.test.js

@@ -130,8 +130,8 @@ describe('Inline: When using the Inline syntax {{ }}', ()=>{
 describe(`Block: When using the Block syntax {{tags\\ntext\\n}}`, ()=>{
 	it('Renders a div with text only', function() {
 		const source = dedent`{{
-													text
-													}}`;
+		text
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block"><p>text</p></div>`);
 	});
@@ -139,14 +139,14 @@ describe(`Block: When using the Block syntax {{tags\\ntext\\n}}`, ()=>{
 	it('Renders an empty div', function() {
 		const source = dedent`{{
 
-													}}`;
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block"></div>`);
 	});
 
 	it('Renders a single paragraph with opening and closing brackets', function() {
 		const source = dedent`{{
-													}}`;
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>{{}}</p>`);
 	});
@@ -154,79 +154,79 @@ describe(`Block: When using the Block syntax {{tags\\ntext\\n}}`, ()=>{
 	it('Renders a div with a single class', function() {
 		const source = dedent`{{cat
 
-													}}`;
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block cat"></div>`);
 	});
 
 	it('Renders a div with a single class and text', function() {
 		const source = dedent`{{cat
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block cat"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with two classes and text', function() {
 		const source = dedent`{{cat,dog
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block cat dog"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with a style and text', function() {
 		const source = dedent`{{color:red
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="color:red;"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with a style that has a string variable, and text', function() {
 		const source = dedent`{{--stringVariable:"'string'"
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="--stringVariable:'string';"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with a style that has a string variable, and text', function() {
 		const source = dedent`{{--stringVariable:"'string'"
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="--stringVariable:'string';"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with a class, style and text', function() {
 		const source = dedent`{{cat,color:red
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block cat" style="color:red;"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with an ID, class, style and text (different order)', function() {
 		const source = dedent`{{color:red,cat,#dog
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block cat" id="dog" style="color:red;"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with a single ID', function() {
 		const source = dedent`{{#cat,#dog
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" id="cat"><p>Sample text.</p></div>`);
 	});
 
 	it('Renders a div with an ID, class, style and text, and a variable assignment', function() {
 		const source = dedent`{{color:red,cat,#dog,a="b and c",d="e"
-													Sample text.
-													}}`;
+		Sample text.
+		}}`;
 		const rendered = Markdown.render(source).trimReturns();
 		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class=\"block cat\" id=\"dog\" style=\"color:red;\" a=\"b and c\" d=\"e\"><p>Sample text.</p></div>`);
 	});
@@ -243,218 +243,124 @@ describe(`Block: When using the Block syntax {{tags\\ntext\\n}}`, ()=>{
 describe('Injection: When an injection tag follows an element', ()=>{
 	// FIXME: Most of these fail because injections currently replace attributes, rather than append to.  Or just minor extra whitespace issues.
 	describe('and that element is an inline-block', ()=>{
-		it('Renders a span "text" with no injection', function() {
+		it.failing('Renders a span "text" with no injection', function() {
 			const source = '{{ text}}{}';
 			const rendered = Markdown.render(source);
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block">text</span>');
 		});
 
-		it('Renders a span "text" with injected Class name', function() {
+		it.failing('Renders a span "text" with injected Class name', function() {
 			const source = '{{ text}}{ClassName}';
 			const rendered = Markdown.render(source);
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block ClassName">text</span>');
 		});
 
-		it('Renders a span "text" with injected attribute', function() {
+		it.failing('Renders a span "text" with injected attribute', function() {
 			const source = '{{ text}}{a="b and c"}';
 			const rendered = Markdown.render(source);
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block" a="b and c">text</span>');
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span a="b and c" class="inline-block ">text</span>');
 		});
 
-		it('Renders a span "text" with injected style', function() {
+		it.failing('Renders a span "text" with injected style', function() {
 			const source = '{{ text}}{color:red}';
 			const rendered = Markdown.render(source);
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block" style="color:red;">text</span>');
 		});
 
-		it('Renders a span "text" with injected style using a string variable', function() {
+		it.failing('Renders a span "text" with injected style using a string variable', function() {
 			const source = `{{ text}}{--stringVariable:"'string'"}`;
 			const rendered = Markdown.render(source);
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<span class="inline-block" style="--stringVariable:'string';">text</span>`);
 		});
 
-		it('Renders a span "text" with two injected styles', function() {
+		it.failing('Renders a span "text" with two injected styles', function() {
 			const source = '{{ text}}{color:red,background:blue}';
 			const rendered = Markdown.render(source);
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block" style="color:red; background:blue;">text</span>');
 		});
 
-		it('Renders a span "text" with its own ID, overwritten with an injected ID', function() {
-			const source = '{{#oldId text}}{#newId}';
-			const rendered = Markdown.render(source);
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block" id="newId">text</span>');
-		});
-
-		it('Renders a span "text" with its own attributes, overwritten with an injected attribute, plus a new one', function() {
-			const source = '{{attrA="old",attrB="old" text}}{attrA="new",attrC="new"}';
-			const rendered = Markdown.render(source);
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block" attrA="new" attrB="old" attrC="new">text</span>');
-		});
-
-		it('Renders a span "text" with its own attributes, overwritten with an injected attribute, ignoring "class", "style", and "id"', function() {
-			const source = '{{attrA="old",attrB="old" text}}{attrA="new",attrC="new",class="new",style="new",id="new"}';
-			const rendered = Markdown.render(source);
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block" attrA="new" attrB="old" attrC="new">text</span>');
-		});
-
-		it('Renders a span "text" with its own styles, appended with injected styles', function() {
-			const source = '{{color:blue,height:10px text}}{width:10px,color:red}';
-			const rendered = Markdown.render(source);
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block" style="color:blue; height:10px; width:10px; color:red;">text</span>');
-		});
-
-		it('Renders a span "text" with its own classes, appended with injected classes', function() {
-			const source = '{{classA,classB text}}{classA,classC}';
-			const rendered = Markdown.render(source);
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<span class="inline-block classA classB classA classC">text</span>');
-		});
-
-		it('Renders an emphasis element with injected Class name', function() {
+		it.failing('Renders an emphasis element with injected Class name', function() {
 			const source = '*emphasis*{big}';
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p><em class="big">emphasis</em></p>');
 		});
 
-		it('Renders a code element with injected style', function() {
+		it.failing('Renders a code element with injected style', function() {
 			const source = '`code`{background:gray}';
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p><code style="background:gray;">code</code></p>');
 		});
 
-		it('Renders an image element with injected style', function() {
+		it.failing('Renders an image element with injected style', function() {
 			const source = '![alt text](http://i.imgur.com/hMna6G0.png){position:absolute}';
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p><img style="position:absolute;" src="http://i.imgur.com/hMna6G0.png" alt="alt text"></p>');
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p><img src="http://i.imgur.com/hMna6G0.png" alt="homebrew mug" style="position:absolute;"></p>');
 		});
 
-		it('Renders an element modified by only the first of two consecutive injections', function() {
+		it.failing('Renders an element modified by only the first of two consecutive injections', function() {
 			const source = '{{ text}}{color:red}{background:blue}';
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p><span class="inline-block" style="color:red;">text</span>{background:blue}</p>');
 		});
 
-		it('Renders an parent and child element, each modified by an injector', function() {
-			const source = dedent`**bolded text**{color:red}
-														{color:blue}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p style="color:blue;"><strong style="color:red;">bolded text</strong></p>');
-		});
-
 		it('Renders an image with added attributes', function() {
 			const source = `![homebrew mug](https://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px,a="b and c",d=e}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="position:absolute; bottom:20px; left:130px; width:220px;" src="https://i.imgur.com/hMna6G0.png" alt="homebrew mug" a="b and c" d="e"></p>`);
-		});
-
-		it('Renders an image with "=" in the url, and added attributes', function() {
-			const source = `![homebrew mug](https://i.imgur.com/hMna6G0.png?auth=12345&height=1024) {position:absolute,bottom:20px,left:130px,width:220px,a="b and c",d=e}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="position:absolute; bottom:20px; left:130px; width:220px;" src="https://i.imgur.com/hMna6G0.png?auth=12345&height=1024" alt="homebrew mug" a="b and c" d="e"></p>`);
-		});
-
-		it('Renders an image and added attributes with "=" in the value, ', function() {
-			const source = `![homebrew mug](https://i.imgur.com/hMna6G0.png) {position:absolute,bottom:20px,left:130px,width:220px,a="b and c",d=e,otherUrl="url?auth=12345"}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img style="position:absolute; bottom:20px; left:130px; width:220px;" src="https://i.imgur.com/hMna6G0.png" alt="homebrew mug" a="b and c" d="e" otherUrl="url?auth=12345"></p>`);
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p><img class="" style="position:absolute; bottom:20px; left:130px; width:220px;" a="b and c" d="e" src="https://i.imgur.com/hMna6G0.png" alt="homebrew mug"></p>`);
 		});
 	});
 
 	describe('and that element is a block', ()=>{
-		it('renders a div "text" with no injection', function() {
+		it.failing('renders a div "text" with no injection', function() {
 			const source = '{{\ntext\n}}\n{}';
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block"><p>text</p></div>');
 		});
 
-		it('renders a div "text" with injected Class name', function() {
+		it.failing('renders a div "text" with injected Class name', function() {
 			const source = '{{\ntext\n}}\n{ClassName}';
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block ClassName"><p>text</p></div>');
 		});
 
-		it('renders a div "text" with injected style', function() {
+		it.failing('renders a div "text" with injected style', function() {
 			const source = '{{\ntext\n}}\n{color:red}';
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block" style="color:red;"><p>text</p></div>');
 		});
 
-		it('renders a div "text" with two injected styles', function() {
+		it.failing('renders a div "text" with two injected styles', function() {
 			const source = dedent`{{
-														text
-														}}
-														{color:red,background:blue}`;
+			text
+			}}
+			{color:red,background:blue}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="color:red; background:blue;"><p>text</p></div>`);
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="color:red; background:blue"><p>text</p></div>`);
 		});
 
-		it('renders a div "text" with injected variable string', function() {
+		it.failing('renders a div "text" with injected variable string', function() {
 			const source = dedent`{{
-														text
-														}}
-														{--stringVariable:"'string'"}`;
+			text
+			}}
+			{--stringVariable:"'string'"}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="--stringVariable:'string';"><p>text</p></div>`);
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<div class="block" style="--stringVariable:'string'"><p>text</p></div>`);
 		});
 
-		it('Renders a span "text" with its own ID, overwritten with an injected ID', function() {
-			const source = dedent`{{#oldId
-														text
-														}}
-														{#newId}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block" id="newId"><p>text</p></div>');
-		});
-
-		it('Renders a span "text" with its own attributes, overwritten with an injected attribute, plus a new one', function() {
-			const source = dedent`{{attrA="old",attrB="old"
-														text
-														}}
-														{attrA="new",attrC="new"}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block" attrA="new" attrB="old" attrC="new"><p>text</p></div>');
-		});
-
-		it('Renders a span "text" with its own attributes, overwritten with an injected attribute, ignoring "class", "style", and "id"', function() {
-			const source = dedent`{{attrA="old",attrB="old"
-														text
-														}}
-														{attrA="new",attrC="new",class="new",style="new",id="new"}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block" attrA="new" attrB="old" attrC="new"><p>text</p></div>');
-		});
-
-		it('Renders a span "text" with its own styles, appended with injected styles', function() {
-			const source = dedent`{{color:blue,height:10px
-														text
-														}}
-														{width:10px,color:red}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block" style="color:blue; height:10px; width:10px; color:red;"><p>text</p></div>');
-		});
-
-		it('Renders a span "text" with its own classes, appended with injected classes', function() {
-			const source = dedent`{{classA,classB
-														text
-														}}
-														{classA,classC}`;
-			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block classA classB classA classC"><p>text</p></div>');
-		});
-
-		it('renders an h2 header "text" with injected class name', function() {
+		it.failing('renders an h2 header "text" with injected class name', function() {
 			const source = dedent`## text
-														{ClassName}`;
+			{ClassName}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<h2 class="ClassName" id="text">text</h2>');
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<h2 class="ClassName">text</h2>');
 		});
 
-		it('renders a table with injected class name', function() {
+		it.failing('renders a table with injected class name', function() {
 			const source = dedent`| Experience Points | Level |
-														|:------------------|:-----:|
-														| 0                 | 1     |
-														| 300               | 2     |
+			|:------------------|:-----:|
+			| 0                 | 1     |
+			| 300               | 2     |
 
-														{ClassName}`;
+			{ClassName}`;
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<table class="ClassName"><thead><tr><th align=left>Experience Points</th><th align=center>Level</th></tr></thead><tbody><tr><td align=left>0</td><td align=center>1</td></tr><tr><td align=left>300</td><td align=center>2</td></tr></tbody></table>`);
 		});
@@ -470,23 +376,23 @@ describe('Injection: When an injection tag follows an element', ()=>{
 		// 	expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`...`);   // FIXME: expect this to be injected into <ul>?  Currently injects into last <li>
 		// });
 
-		it('renders an h2 header "text" with injected class name, and "secondInjection" as regular text on the next line.', function() {
+		it.failing('renders an h2 header "text" with injected class name, and "secondInjection" as regular text on the next line.', function() {
 			const source = dedent`## text
 			{ClassName}
 			{secondInjection}`;
 			const rendered = Markdown.render(source).trimReturns();
-			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<h2 class="ClassName" id="text">text</h2><p>{secondInjection}</p>');
+			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<h2 class="ClassName">text</h2><p>{secondInjection}</p>');
 		});
 
-		it('renders a div nested into another div, the inner with class=innerDiv and the other class=outerDiv', function() {
+		it.failing('renders a div nested into another div, the inner with class=innerDiv and the other class=outerDiv', function() {
 			const source = dedent`{{
-														outer text
-														{{
-														inner text
-														}}
-														{innerDiv}
-														}}
-														{outerDiv}`;
+			outer text
+			{{
+			inner text
+			}}
+			{innerDiv}
+			}}
+			{outerDiv}`;
 			const rendered = Markdown.render(source).trimReturns();
 			expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<div class="block outerDiv"><p>outer text</p><div class="block innerDiv"><p>inner text</p></div></div>');
 		});

tests/markdown/variables.test.js

@@ -1,373 +0,0 @@
-/* eslint-disable max-lines */
-
-const dedent = require('dedent-tabs').default;
-const Markdown = require('naturalcrit/markdown.js');
-
-// Marked.js adds line returns after closing tags on some default tokens.
-// This removes those line returns for comparison sake.
-String.prototype.trimReturns = function(){
-	return this.replace(/\r?\n|\r/g, '').trim();
-};
-
-renderAllPages = function(pages){
-	const outputs = [];
-	pages.forEach((page, index)=>{
-		const output = Markdown.render(page, index);
-		outputs.push(output);
-	});
-
-	return outputs;
-};
-
-// Adding `.failing()` method to `describe` or `it` will make failing tests "pass" as long as they continue to fail.
-// Remove the `.failing()` method once you have fixed the issue.
-
-describe('Block-level variables', ()=>{
-	it('Handles variable assignment and recall with simple text', function() {
-		const source = dedent`
-			[var]: string
-
-			$[var]
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string</p>');
-	});
-
-	it('Handles variable assignment and recall with multiline string', function() {
-		const source = dedent`
-			[var]: string
-			across multiple
-			lines
-
-			$[var]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string across multiple lines</p>');
-	});
-
-	it('Handles variable assignment and recall with tables', function() {
-		const source = dedent`
-			[var]:
-			##### Title
-			| H1 | H2 | 
-			|:---|:--:|
-			| A  | B  |
-			| C  | D  |
-			
-			$[var]`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<h5 id="title">Title</h5>
-			<table><thead><tr><th align=left>H1</th>
-			<th align=center>H2</th>
-			</tr></thead><tbody><tr><td align=left>A</td>
-			<td align=center>B</td>
-			</tr><tr><td align=left>C</td>
-			<td align=center>D</td>
-			</tr></tbody></table>`.trimReturns());
-	});
-
-	it('Hoists undefined variables', function() {
-		const source = dedent`
-			$[var]
-
-			[var]: string`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string</p>');
-	});
-
-	it('Hoists last instance of variable', function() {
-		const source = dedent`
-			$[var]
-
-			[var]: string
-
-			[var]: new string`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>new string</p>');
-	});
-
-	it('Handles complex hoisting', function() {
-		const source = dedent`
-			$[titleAndName]: $[title] $[fullName]
-
-			$[title]: Mr.
-
-			$[fullName]: $[firstName] $[lastName]
-
-			[firstName]: Bob
-
-			Welcome, $[titleAndName]!
-
-			[lastName]: Jacob
-
-			[lastName]: $[lastName]son
-			`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>Welcome, Mr. Bob Jacobson!</p>');
-	});
-
-	it('Handles variable reassignment', function() {
-		const source = dedent`
-			[var]: one
-
-			$[var]
-
-			[var]: two
-
-			$[var]
-			`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>one</p><p>two</p>'.trimReturns());
-	});
-
-	it('Handles variable reassignment with hoisting', function() {
-		const source = dedent`
-			$[var]
-		
-			[var]: one
-
-			$[var]
-
-			[var]: two
-
-			$[var]
-			`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>two</p><p>one</p><p>two</p>'.trimReturns());
-	});
-
-	it('Ignores undefined variables that can\'t be hoisted', function() {
-		const source = dedent`
-			$[var](My name is $[first] $[last])
-
-			$[last]: Jones
-			`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>My name is $[first] Jones</p>`.trimReturns());
-	});
-});
-
-describe('Inline-level variables', ()=>{
-	it('Handles variable assignment and recall with simple text', function() {
-		const source = dedent`
-			$[var](string)
-
-			$[var]
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>string</p><p>string</p>');
-	});
-
-	it('Hoists undefined variables when possible', function() {
-		const source = dedent`
-			$[var](My name is $[name] Jones)
-
-			[name]: Bob`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>My name is Bob Jones</p>');
-	});
-
-	it('Hoists last instance of variable', function() {
-		const source = dedent`
-			$[var](My name is $[name] Jones)
-
-			$[name](Bob)
-
-			[name]: Bill`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(`<p>My name is Bill Jones</p> <p>Bob</p>`.trimReturns());
-	});
-
-	it('Only captures nested parens if balanced', function() {
-		const source = dedent`
-			$[var1](A variable (with nested parens) inside)
-
-			$[var1]
-
-			$[var2](A variable ) with unbalanced parens)
-
-			$[var2]`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		<p>A variable (with nested parens) inside</p>
-		<p>A variable (with nested parens) inside</p>
-		<p>A variable with unbalanced parens)</p>
-		<p>A variable</p>
-		`.trimReturns());
-	});
-});
-
-describe('Math', ()=>{
-	it('Handles simple math using numbers only', function() {
-		const source = dedent`
-			$[1 + 3 * 5 - (1 / 4)]
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>15.75</p>');
-	});
-
-	it('Handles round function', function() {
-		const source = dedent`
-			$[round(1/4)]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>0</p>');
-	});
-
-	it('Handles floor function', function() {
-		const source = dedent`
-			$[floor(0.6)]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>0</p>');
-	});
-
-	it('Handles ceil function', function() {
-		const source = dedent`
-			$[ceil(0.2)]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>1</p>');
-	});
-
-	it('Handles nested functions', function() {
-		const source = dedent`
-			$[ceil(floor(round(0.6)))]`;
-		const rendered = Markdown.render(source).replace(/\s/g, ' ').trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>1</p>');
-	});
-
-	it('Handles simple math with variables', function() {
-		const source = dedent`
-			$[num1]: 5
-
-			$[num2]: 4
-
-			Answer is $[answer]($[1 + 3 * num1 - (1 / num2)]).
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>Answer is 15.75.</p>');
-	});
-
-	it('Handles variable incrementing', function() {
-		const source = dedent`
-			$[num1]: 5
-
-			Increment num1 to get $[num1]($[num1 + 1]) and again to $[num1]($[num1 + 1]).
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('<p>Increment num1 to get 6 and again to 7.</p>');
-	});
-});
-
-describe('Code blocks', ()=>{
-	it('Ignores all variables in fenced code blocks', function() {
-		const source = dedent`
-		  \`\`\`
-			[var]: string
-
-			$[var]
-
-			$[var](new string)
-			\`\`\`
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		 <pre><code>
-		 [var]: string
-		 
-		 $[var]
-		 
-		 $[var](new string)
-		 </code></pre>`.trimReturns());
-	});
-
-	it('Ignores all variables in indented code blocks', function() {
-		const source = dedent`
-			test
-
-			    [var]: string
-
-			    $[var]
-
-			    $[var](new string)
-		`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		 <p>test</p>
-
-		 <pre><code>
-		 [var]: string
-		 
-		 $[var]
-		 
-		 $[var](new string)
-		 </code></pre>`.trimReturns());
-	});
-
-	it('Ignores all variables in inline code blocks', function() {
-		const source = '[var](Hello) `[link](url)`. This `[var] does not work`';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><a href="Hello">var</a> <code>[link](url)</code>. This <code>[var] does not work</code></p>`.trimReturns());
-	});
-});
-
-describe('Normal Links and Images', ()=>{
-	it('Renders normal images', function() {
-		const source = `![alt text](url)`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><img src="url" alt="alt text"></p>`.trimReturns());
-	});
-
-	it('Renders normal images with a title', function() {
-		const source = 'An image ![alt text](url "and title")!';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p>An image <img src="url" alt="alt text" title="and title">!</p>`.trimReturns());
-	});
-
-	it('Applies curly injectors to images', function() {
-		const source = `![alt text](url){width:100px}`;
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-			<p><img style="width:100px;" src="url" alt="alt text"></p>`.trimReturns());
-	});
-
-	it('Renders normal links', function() {
-		const source = 'A Link to my [website](url)!';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		<p>A Link to my <a href="url">website</a>!</p>`.trimReturns());
-	});
-
-	it('Renders normal links with a title', function() {
-		const source = 'A Link to my [website](url "and title")!';
-		const rendered = Markdown.render(source).trimReturns();
-		expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe(dedent`
-		<p>A Link to my <a href="url" title="and title">website</a>!</p>`.trimReturns());
-	});
-});
-
-describe('Cross-page variables', ()=>{
-	it('Handles variable assignment and recall across pages', function() {
-		const source0 = `[var]: string`;
-		const source1 = `$[var]`;
-		const rendered = renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();
-		expect(rendered, `Input:\n${[source0, source1].join('\n\\page\n')}`, { showPrefix: false }).toBe('\\page<p>string</p>');
-	});
-
-	it('Handles hoisting across pages', function() {
-		const source0 = `$[var]`;
-		const source1 = `[var]: string`;
-		renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();	//Requires one full render of document before hoisting is picked up
-		const rendered = renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();
-		expect(rendered, `Input:\n${[source0, source1].join('\n\\page\n')}`, { showPrefix: false }).toBe('<p>string</p>\\page');
-	});
-
-	it('Handles reassignment and hoisting across pages', function() {
-		const source0 = `$[var]\n\n[var]: one\n\n$[var]`;
-		const source1 = `[var]: two\n\n$[var]`;
-		renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();	//Requires one full render of document before hoisting is picked up
-		const rendered = renderAllPages([source0, source1]).join('\n\\page\n').trimReturns();
-		expect(rendered, `Input:\n${[source0, source1].join('\n\\page\n')}`, { showPrefix: false }).toBe('<p>two</p><p>one</p>\\page<p>two</p>');
-	});
-});

themes/V3/5ePHB/snippets.js

@@ -21,43 +21,9 @@ module.exports = [
 		view      : 'text',
 		snippets  : [
 			{
-				name         : 'Table of Contents',
-				icon         : 'fas fa-book',
-				gen          : TableOfContentsGen,
-				experimental : true,
-				subsnippets  : [
-					{
-						name         : 'Table of Contents',
-						icon         : 'fas fa-book',
-						gen          : TableOfContentsGen,
-						experimental : true
-					},
-					{
-						name : 'Include in ToC up to H3',
-						icon : 'fas fa-dice-three',
-						gen  : dedent `\n{{tocDepthH3
-							}}\n`,
-
-					},
-					{
-						name : 'Include in ToC up to H4',
-						icon : 'fas fa-dice-four',
-						gen  : dedent `\n{{tocDepthH4
-							}}\n`,
-					},
-					{
-						name : 'Include in ToC up to H5',
-						icon : 'fas fa-dice-five',
-						gen  : dedent `\n{{tocDepthH5
-							}}\n`,
-					},
-					{
-						name : 'Include in ToC up to H6',
-						icon : 'fas fa-dice-six',
-						gen  : dedent `\n{{tocDepthH6
-							}}\n`,
-					}
-				]
+				name : 'Table of Contents',
+				icon : 'fas fa-book',
+				gen  : TableOfContentsGen
 			},
 			{
 				name         : 'Index',

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

@@ -149,6 +149,8 @@ module.exports = {
 			![](/assets/naturalCritLogoWhite.svg)
 
 			Homebrewery.Naturalcrit.com
-			}}`;
+			}}
+
+			\page`;
 	}
 };

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

@@ -171,7 +171,7 @@ module.exports = {
 			**Condition Immunities** :: ${genList(['groggy', 'swagged', 'weak-kneed', 'buzzed', 'groovy', 'melancholy', 'drunk'], 3)}
 			**Senses**               :: darkvision 60 ft., passive Perception ${_.random(3, 20)}
 			**Languages**            :: ${genList(['Common', 'Pottymouth', 'Gibberish', 'Latin', 'Jive'], 2)}
-			**Challenge**            :: ${_.random(0, 15)} (${_.random(10, 10000)} XP) {{bonus **Proficiency Bonus** +${_.random(2, 6)}}}
+			**Challenge**            :: ${_.random(0, 15)} (${_.random(10, 10000)} XP)
 			___
 			${_.times(_.random(genLines, genLines + 2), function(){return genAbilities();}).join('\n:\n')}
 			:

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

@@ -1,47 +1,47 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 const quotes = [
-	'The sword glinted in the dim light, its edges keen and deadly. As the adventurer reached for it, he couldn\'t help but feel a surge of excitement mixed with fear. This was no ordinary blade.',
-	'The dragon\'s roar shook the ground beneath their feet, and the brave knight stood tall, his sword at the ready. He knew that this would be the battle of his life, but he was determined to emerge victorious.',
-	'The wizard\'s laboratory was a sight to behold, filled with bubbling cauldrons, ancient tomes, and strange artifacts from distant lands. As the apprentice gazed around in wonder, she knew that she was about to embark on a journey unlike any other.',
-	'The tavern was packed with rowdy patrons, their voices raised in song and laughter. The bard took center stage, strumming his lute and launching into a tale of adventure and heroism that had the crowd hanging on his every word.',
-	'The thief crept through the shadows, his eyes scanning the room for any sign of danger. He knew that one false move could mean the difference between success and failure, and he was determined to come out on top.',
-	'The elf queen stood atop her castle walls, surveying the kingdom below with a mix of pride and sadness. She knew that the coming war would be brutal, but she was determined to protect her people at all costs.',
-	'The necromancer\'s tower loomed in the distance, its dark spires piercing the sky. As the adventurers approached, they could feel the chill of death emanating from within',
-	'The ranger moved through the forest like a shadow, his senses attuned to every sound and movement around him. He knew that danger lurked behind every tree, but he was ready for whatever came his way.',
-	'The paladin knelt before the altar, his hands clasped in prayer. He knew that his faith would be tested in the days ahead, but he was ready to face whatever trials lay in store for him.',
-	'The druid communed with the spirits of nature, his mind merging with the trees, the animals, and the very earth itself. He knew that his power came with a great responsibility, and he was determined to use it for the greater good.',
+  "The sword glinted in the dim light, its edges keen and deadly. As the adventurer reached for it, he couldn't help but feel a surge of excitement mixed with fear. This was no ordinary blade.",
+  "The dragon's roar shook the ground beneath their feet, and the brave knight stood tall, his sword at the ready. He knew that this would be the battle of his life, but he was determined to emerge victorious.",
+  "The wizard's laboratory was a sight to behold, filled with bubbling cauldrons, ancient tomes, and strange artifacts from distant lands. As the apprentice gazed around in wonder, she knew that she was about to embark on a journey unlike any other.",
+  "The tavern was packed with rowdy patrons, their voices raised in song and laughter. The bard took center stage, strumming his lute and launching into a tale of adventure and heroism that had the crowd hanging on his every word.",
+  "The thief crept through the shadows, his eyes scanning the room for any sign of danger. He knew that one false move could mean the difference between success and failure, and he was determined to come out on top.",
+  "The elf queen stood atop her castle walls, surveying the kingdom below with a mix of pride and sadness. She knew that the coming war would be brutal, but she was determined to protect her people at all costs.",
+  "The necromancer's tower loomed in the distance, its dark spires piercing the sky. As the adventurers approached, they could feel the chill of death emanating from within",
+  "The ranger moved through the forest like a shadow, his senses attuned to every sound and movement around him. He knew that danger lurked behind every tree, but he was ready for whatever came his way.",
+  "The paladin knelt before the altar, his hands clasped in prayer. He knew that his faith would be tested in the days ahead, but he was ready to face whatever trials lay in store for him.",
+  "The druid communed with the spirits of nature, his mind merging with the trees, the animals, and the very earth itself. He knew that his power came with a great responsibility, and he was determined to use it for the greater good.",
 ];
 
 const authors = [
-	'Unknown',
-	'James Wyatt',
-	'Eolande Blackwood',
-	'Ragnar Ironheart',
-	'Lyra Nightshade',
-	'Valtorius Darkstar',
-	'Isadora Fireheart',
-	'Theron Shadowbane',
-	'Lirien Starweaver',
-	'Drogathar Bonecrusher',
-	'Kaelen Frostblade',
+    "Unknown",
+    "James Wyatt",
+    "Eolande Blackwood",
+    "Ragnar Ironheart",
+    "Lyra Nightshade",
+    "Valtorius Darkstar",
+    "Isadora Fireheart",
+    "Theron Shadowbane",
+    "Lirien Starweaver",
+    "Drogathar Bonecrusher",
+    "Kaelen Frostblade",
 ];
 
 const books = [
-	'The Blade of Destiny',
-	'Dragonfire and Steel',
-	'The Bard\'s Tale',
-	'Darkness Rising',
-	'The Sacred Quest',
-	'Shadows in the Forest',
-	'The Starweaver Chronicles',
-	'Beneath the Bones',
-	'Moonlit Magic',
-	'Frost and Fury',
+    "The Blade of Destiny",
+    "Dragonfire and Steel",
+    "The Bard's Tale",
+    "Darkness Rising",
+    "The Sacred Quest",
+    "Shadows in the Forest",
+    "The Starweaver Chronicles",
+    "Beneath the Bones",
+    "Moonlit Magic",
+    "Frost and Fury",
 
 ];
-module.exports = ()=>{
-	return `
+module.exports = () => {
+  return `
 {{quote
 ${_.sample(quotes)}
 

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

@@ -2,74 +2,83 @@ const _ = require('lodash');
 const dedent = require('dedent-tabs').default;
 
 const getTOC = (pages)=>{
-
-	const recursiveAdd = (title, page, targetDepth, child, curDepth=0)=>{
-		if(curDepth > 5) return; // Something went wrong.
-		if(curDepth == targetDepth) {
-			child.push({
-				title    : title,
-				page     : page,
-				children : []
-			});
-		} else {
-			if(child.length == 0) {
-				child.push({
-					title    : null,
-					page     : page,
-					children : []
-				});
-			}
-			recursiveAdd(title, page, targetDepth, _.last(child).children, curDepth+1,);
-		}
+	const add1 = (title, page)=>{
+		res.push({
+			title    : title,
+			page     : page + 1,
+			children : []
+		});
+	};
+	const add2 = (title, page)=>{
+		if(!_.last(res)) add1(null, page);
+		_.last(res).children.push({
+			title    : title,
+			page     : page + 1,
+			children : []
+		});
+	};
+	const add3 = (title, page)=>{
+		if(!_.last(res)) add1(null, page);
+		if(!_.last(_.last(res).children)) add2(null, page);
+		_.last(_.last(res).children).children.push({
+			title    : title,
+			page     : page + 1,
+			children : []
+		});
 	};
 
 	const res = [];
-
-	const iframe = document.getElementById('BrewRenderer');
-	const iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
-	const headings = iframeDocument.querySelectorAll('h1, h2, h3, h4, h5, h6');
-	const headerDepth = ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'];
-
-	_.each(headings, (heading)=>{
-		const onPage = parseInt(heading.closest('.page').id?.replace(/^p/, ''));
-		const ToCExclude = getComputedStyle(heading).getPropertyValue('--TOC');
-
-		if(ToCExclude != 'exclude') {
-			recursiveAdd(heading.innerText.trim(), onPage, headerDepth.indexOf(heading.tagName), res);
+	_.each(pages, (page, pageNum)=>{
+		if(!page.includes("{{frontCover}}") && !page.includes("{{insideCover}}") && !page.includes("{{partCover}}") && !page.includes("{{backCover}}")) {
+			const lines = page.split('\n');
+			_.each(lines, (line)=>{
+				if(_.startsWith(line, '# ')){
+					const title = line.replace('# ', '');
+					add1(title, pageNum);
+				}
+				if(_.startsWith(line, '## ')){
+					const title = line.replace('## ', '');
+					add2(title, pageNum);
+				}
+				if(_.startsWith(line, '### ')){
+					const title = line.replace('### ', '');
+					add3(title, pageNum);
+				}
+			});
 		}
 	});
 	return res;
 };
 
-
-const ToCIterate = (entries, curDepth=0)=>{
-	const levelPad = ['- ###', '  - ####', '    - ', '      - ', '        - ', '          - '];
-	const toc = [];
-	if(entries.title !== null){
-		toc.push(`${levelPad[curDepth]} [{{ ${entries.title}}}{{ ${entries.page}}}](#p${entries.page})`);
-	}
-	if(entries.children.length) {
-		_.each(entries.children, (entry, idx)=>{
-			const children = ToCIterate(entry, entry.title == null ? curDepth : curDepth+1);
-			if(children.length) {
-				toc.push(...children);
-			}
-		});
-	}
-	return toc;
-};
-
 module.exports = function(props){
 	const pages = props.brew.text.split('\\page');
 	const TOC = getTOC(pages);
 	const markdown = _.reduce(TOC, (r, g1, idx1)=>{
-		r.push(ToCIterate(g1).join('\n'));
+		if(g1.title !== null) {
+			r.push(`- ### [{{ ${g1.title}}}{{ ${g1.page}}}](#p${g1.page})`);
+		}
+		if(g1.children.length){
+			_.each(g1.children, (g2, idx2)=>{
+				if(g2.title !== null) {
+					r.push(`  - #### [{{ ${g2.title}}}{{ ${g2.page}}}](#p${g2.page})`);
+				}
+				if(g2.children.length){
+					_.each(g2.children, (g3, idx3)=>{
+						if(g2.title !== null) {
+							r.push(`    - [{{ ${g3.title}}}{{ ${g3.page}}}](#p${g3.page})`);
+						} else { // Don't over-indent if no level-2 parent entry
+							r.push(`  - [{{ ${g3.title}}}{{ ${g3.page}}}](#p${g3.page})`);
+						}
+					});
+				}
+			});
+		}
 		return r;
 	}, []).join('\n');
 
 	return dedent`
 		{{toc,wide
-		# Contents
+		# Table Of Contents
 
 		${markdown}
 		}}

themes/V3/5ePHB/style.less

@@ -1,4 +1,6 @@
+@import (less) './themes/fonts/5e/fonts.less';
 @import (less) './themes/assets/assets.less';
+@import (less) './themes/fonts/icon fonts/font-icons.less';
 
 :root {
 	//Colors
@@ -305,6 +307,7 @@
 			margin-left           : -0.16cm;
 			background-color      : var(--HB_Color_MonsterStatBackground);
 			background-image      : @monsterBlockBackground;
+			background-attachment : fixed;
 			background-blend-mode : overlay;
 			border-style          : solid;
 			border-width          : 7px 6px;
@@ -354,11 +357,6 @@
 			}
 		}
 
-		.bonus {
-			float: right;
-			padding-right: 0.5em;
-		}
-
 		// Monster Ability table
 		hr + table:first-of-type {
 			margin              : 0;
@@ -405,9 +403,15 @@
 		}
 	}
 	.pageNumber {
+		position    : absolute;
 		right       : 2px;
 		bottom      : 22px;
+		width       : 50px;
+		font-size   : 0.9em;
 		color       : var(--HB_Color_Footnotes);
+		text-align  : center;
+		text-indent : 0;
+		&.auto::after { content : counter(phb-page-numbers); }
 	}
 	.footnote {
 		position   : absolute;
@@ -535,19 +539,21 @@
 .page:has(.frontCover) {
 	columns    : 1;
 	text-align : center;
-	&::after { display : none; }
+	&::after { all : unset; }
 	h1 {
 		margin-top     : 1.2cm;
 		margin-bottom  : 0;
 		font-family    : 'NodestoCapsCondensed';
 		font-size      : 2.245cm;
 		font-weight    : normal;
-		line-height    : 1.9cm;
+		line-height    : 0.85em;
 		color          : white;
 		text-shadow    : unset;
 		text-transform : uppercase;
-		-webkit-text-stroke: 0.2cm black;
-  		paint-order:stroke;
+		filter         : drop-shadow(0 0 1.5px black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black);
 	}
 	h2 {
 		font-family    : 'NodestoCapsCondensed';
@@ -555,8 +561,10 @@
 		font-weight    : normal;
 		color          : white;
 		letter-spacing : 0.1cm;
-		-webkit-text-stroke: 0.14cm black;
-  		paint-order:stroke;
+		filter         : drop-shadow(0 0 1px black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black);
 	}
 	hr {
 		position         : relative;
@@ -602,8 +610,10 @@
 		font-size    : 0.496cm;
 		color        : white;
 		text-align   : center;
-		-webkit-text-stroke: 0.1cm black;
-  		paint-order:stroke;
+		filter       : drop-shadow(0 0 0.7px black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black)
+			drop-shadow(0 0 0 black) drop-shadow(0 0 0 black);
 	}
 	.logo {
 		position   : absolute;
@@ -623,14 +633,14 @@
 .page:has(.insideCover) {
 	columns    : 1;
 	text-align : center;
-	&::after { display	: none; }
+	&::after { all	: unset; }
 	h1 {
 		margin-top     : 1.2cm;
 		margin-bottom  : 0;
 		font-family    : 'NodestoCapsCondensed';
 		font-size      : 2.1cm;
 		font-weight    : normal;
-		line-height    : 1.785cm;
+		line-height    : 0.85em;
 		text-transform : uppercase;
 	}
 	h2 {
@@ -669,7 +679,7 @@
 	padding : 2.25cm 1.3cm 2cm 1.3cm;
 	color   : #FFFFFF;
 	columns : 1;
-	&::after { display : none; }
+	&::after { all : unset; }
 	.columnWrapper { width : 7.6cm; }
 	.backCover {
 		position          : absolute;
@@ -685,7 +695,7 @@
 		margin-bottom : 0.3cm;
 		font-family   : 'NodestoCapsCondensed';
 		font-size     : 1.35cm;
-		line-height   : 1.28cm;
+		line-height   : 0.95em;
 		color         : #ED1C24;
 		text-align    : center;
 	}
@@ -711,7 +721,7 @@
 	p {
 		font-family : 'Overpass';
 		font-size   : 0.332cm;
-		line-height : 0.35cm;
+		line-height : 1.5em;
 	}
 	hr + p {
 		margin-top : 0.6cm;
@@ -736,10 +746,10 @@
 			font-family    : 'NodestoCapsWide';
 			font-size      : 0.4cm;
 			line-height    : 1em;
-			line-height    : 1.28cm;
 			color          : #FFFFFF;
 			text-align     : center;
 			text-indent    : 0;
+			letter-spacing : 0.08em;
 		}
 	}
 }
@@ -779,46 +789,13 @@
 		margin-left  : auto;
 		font-family  : 'Overpass';
 		font-size    : 0.45cm;
-		line-height  : 0.495cm;
+		line-height  : 1.1em;
 	}
 }
 
 // *****************************
 // *      TABLE OF CONTENTS
 // *****************************/
-
-// Default Exclusions
-// Anything not exlcuded is included, default Headers are H1, H2, and H3.
-h4,
-h5,
-h6,
-.page:has(.frontCover), 
-.page:has(.backCover), 
-.page:has(.insideCover), 
-.monster,
-.noToC,
-.toc { --TOC: exclude; }
-
-.tocDepthH2 :is(h1, h2) {--TOC: include; }
-.tocDepthH3 :is(h1, h2, h3) {--TOC: include; }
-.tocDepthH4 :is(h1, h2, h3, h4) {--TOC: include; }
-.tocDepthH5 :is(h1, h2, h3, h4, h5) {--TOC: include; }
-.tocDepthH6 :is(h1, h2, h3, h4, h5, h6) {--TOC: include; }
-
-.tocIncludeH1 h1 {--TOC: include; }
-.tocIncludeH2 h2 {--TOC: include; }
-.tocIncludeH3 h3 {--TOC: include; }
-.tocIncludeH4 h4 {--TOC: include; }
-.tocIncludeH5 h5 {--TOC: include; }
-.tocIncludeH6 h6 {--TOC: include; }
-
-.page:has(.partCover) {
-	--TOC: exclude;
-	& h1 {
-	  --TOC: include;
-	}
-  }
-
 .page {
 	&:has(.toc)::after { display : none; }
 	.toc {

themes/V3/Blank/snippets.js

@@ -307,8 +307,8 @@ module.exports = [
 	/**************** FONTS *************/
 	{
 		groupName : 'Fonts',
-		icon   	  : 'fas fa-keyboard',
-		view   	  : 'text',
+		icon	  : 'fas fa-keyboard',
+		view	  : 'text',
 		snippets  : [
 			{
 				name : 'Open Sans',
@@ -326,74 +326,74 @@ module.exports = [
 				gen	 : dedent`{{font-family:CodeLight Dummy Text}}`
 			},
 			{
-				name : 'Scaly Sans',
+				name : 'Scaly Sans Remake',
 				icon : 'font ScalySansRemake',
 				gen	 : dedent`{{font-family:ScalySansRemake Dummy Text}}`
 			},
 			{
-				name : 'Book Insanity',
+				name : 'Book Insanity Remake',
 				icon : 'font BookInsanityRemake',
 				gen	 : dedent`{{font-family:BookInsanityRemake Dummy Text}}`
 			},
 			{
-				name : 'Mr Eaves',
+				name : 'Mr Eaves Remake',
 				icon : 'font MrEavesRemake',
 				gen	 : dedent`{{font-family:MrEavesRemake Dummy Text}}`
 			},
 			{
-				name : 'Solbera Imitation',
-				icon : 'font SolberaImitationRemake',
-				gen  : dedent`{{font-family:SolberaImitationRemake Dummy Text}}`
+				name: 'Solbera Imitation Remake',
+				icon: 'font SolberaImitationRemake',
+				gen: dedent`{{font-family:SolberaImitationRemake Dummy Text}}`
 			  },
 			  {
-				name : 'Scaly Sans Small Caps',
-				icon : 'font ScalySansSmallCapsRemake',
-				gen  : dedent`{{font-family:ScalySansSmallCapsRemake Dummy Text}}`
+				name: 'Scaly Sans Small Caps Remake',
+				icon: 'font ScalySansSmallCapsRemake',
+				gen: dedent`{{font-family:ScalySansSmallCapsRemake Dummy Text}}`
 			  },
 			  {
-				name : 'Walter Turncoat',
-				icon : 'font WalterTurncoat',
-				gen  : dedent`{{font-family:WalterTurncoat Dummy Text}}`
+				name: 'Walter Turncoat',
+				icon: 'font WalterTurncoat',
+				gen: dedent`{{font-family:WalterTurncoat Dummy Text}}`
 			  },
 			  {
-				name : 'Lato',
-				icon : 'font Lato',
-				gen  : dedent`{{font-family:Lato Dummy Text}}`
+				name: 'Lato',
+				icon: 'font Lato',
+				gen: dedent`{{font-family:Lato Dummy Text}}`
 			  },
 			  {
-				name : 'Courier',
-				icon : 'font Courier',
-				gen  : dedent`{{font-family:Courier Dummy Text}}`
+				name: 'Courier',
+				icon: 'font Courier',
+				gen: dedent`{{font-family:Courier Dummy Text}}`
 			  },
 			  {
-				name : 'Nodesto Caps Condensed',
-				icon : 'font NodestoCapsCondensed',
-				gen  : dedent`{{font-family:NodestoCapsCondensed Dummy Text}}`
+				name: 'Nodesto Caps Condensed',
+				icon: 'font NodestoCapsCondensed',
+				gen: dedent`{{font-family:NodestoCapsCondensed Dummy Text}}`
 			  },
 			  {
-				name : 'Overpass',
-				icon : 'font Overpass',
-				gen  : dedent`{{font-family:Overpass Dummy Text}}`
+				name: 'Overpass',
+				icon: 'font Overpass',
+				gen: dedent`{{font-family:Overpass Dummy Text}}`
 			  },
 			  {
-				name : 'Davek',
-				icon : 'font Davek',
-				gen  : dedent`{{font-family:Davek Dummy Text}}`
+				name: 'Davek',
+				icon: 'font Davek',
+				gen: dedent`{{font-family:Davek Dummy Text}}`
 			  },
 			  {
-				name : 'Iokharic',
-				icon : 'font Iokharic',
-				gen  : dedent`{{font-family:Iokharic Dummy Text}}`
+				name: 'Iokharic',
+				icon: 'font Iokharic',
+				gen: dedent`{{font-family:Iokharic Dummy Text}}`
 			  },
 			  {
-				name : 'Rellanic',
-				icon : 'font Rellanic',
-				gen  : dedent`{{font-family:Rellanic Dummy Text}}`
+				name: 'Rellanic',
+				icon: 'font Rellanic',
+				gen: dedent`{{font-family:Rellanic Dummy Text}}`
 			  },
 			  {
-				name : 'Times New Roman',
-				icon : 'font TimesNewRoman',
-				gen  : dedent`{{font-family:"Times New Roman" Dummy Text}}`
+				name: 'Times New Roman',
+				icon: 'font TimesNewRoman',
+				gen: dedent`{{font-family:"Times New Roman" Dummy Text}}`
 			  }
 		]
 	},

themes/V3/Blank/style.less

@@ -1,9 +1,5 @@
 @import (less) './themes/fonts/5e/fonts.less';
 @import (less) './themes/assets/assets.less';
-@import (less) './themes/fonts/iconFonts/elderberryInn.less';
-@import (less) './themes/fonts/iconFonts/diceFont.less';
-@import (less) './themes/fonts/iconFonts/gameIcons.less';
-@import (less) './themes/fonts/iconFonts/fontAwesome.less';
 
 :root {
 	//Colors
@@ -12,7 +8,7 @@
 }
 
 @page { margin : 0; }
-body { counter-reset : page-numbers; }
+body { counter-reset : phb-page-numbers; }
 * { -webkit-print-color-adjust : exact; }
 
 //*****************************
@@ -51,7 +47,7 @@ body { counter-reset : page-numbers; }
 	height            : 279.4mm;
 	padding           : 1.4cm 1.9cm 1.7cm;
 	overflow          : hidden;
-	counter-increment : page-numbers;
+	counter-increment : phb-page-numbers;
 	background-color  : var(--HB_Color_Background);
 	text-rendering    : optimizeLegibility;
 	contain           : size;
@@ -170,6 +166,7 @@ body { counter-reset : page-numbers; }
 		margin          : 0;
 		font-size       : 120px;
 		text-transform  : uppercase;
+		mix-blend-mode  : overlay;
 		opacity         : 30%;
 		transform       : rotate(-45deg);
 		p { margin-bottom : none; }
@@ -463,22 +460,3 @@ body { counter-reset : page-numbers; }
 	.homebreweryIcon.red { background-color : red; }
 	.homebreweryIcon.gold { background-image : linear-gradient(to top left, brown 22.5%, gold 40%, white 60%, gold 67.5%, brown 82.5%); }
 }
-
-//*****************************
-//*        Page Number
-//*****************************/
-.page {
-	.pageNumber {
-		position    : absolute;
-		right       : 30px;
-		bottom      : 30px;
-		width       : 50px;
-		font-size   : 0.9em;
-		text-align  : center;
-		&.auto::after { content : counter(page-numbers); }
-	}
-
-	&:nth-child(even) {
-		.pageNumber { left : 30px; }
-	}
-}

themes/V3/Journal/style.less

@@ -374,9 +374,17 @@
 	}
 	.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;

themes/codeMirror/customEditorStyles.less

@@ -58,7 +58,7 @@
                 background-color: rgba(35,153,153,0.5);
             }
             .pageLine {
-                background-color: rgba(255,255,255,0.5);
+                background-color: rgba(255,255,255,0.75);
                 & ~ pre.CodeMirror-line {
                     color: black;
                 }
@@ -85,4 +85,4 @@
         // Future styling for themes with light backgrounds
         --dummyVar: 'currently unused';
     }
-}
+}

themes/codeMirror/customThemes/darkvision.css

@@ -1,121 +0,0 @@
-.CodeMirror {
-	background: #0C0C0C;
-	color: #B9BDB6;
-}
-
-/* Brew BG */
-.brewRenderer {
-    background-color: #0C0C0C;
-}
-
-.cm-s-darkvision {
-    /* Blinking cursor and selection */
-    .CodeMirror-cursor {
-        border-left: 1px solid #B9BDB6;
-    }
-    .CodeMirror-selected {
-        background: #E0E8FF40;
-    }
-
-    /* Line number stuff */
-    .CodeMirror-gutter-elt {
-        color: #81969A;
-    }
-    .CodeMirror-linenumber {
-        background-color: #0C0C0C;
-    }
-    .CodeMirror-gutter {
-        background-color: #0C0C0C;
-    }
-
-    /* column splits */
-    .editor .codeEditor .columnSplit {
-        font-style: italic;
-        color: inherit;
-        background-color:#1F5763;
-        border-bottom: #299 solid 1px;
-    }
-
-    /* # headings */
-    .cm-header {
-        color: #C51B1B;
-        -webkit-text-stroke-width: 0.1px; 
-    }
-    /* bold points */
-    .cm-strong {
-        font-weight: bold;
-        color: #309DD2;
-    }
-    /* Link headings */
-    .cm-link {
-        color: #DD6300;
-    }
-    /* links */
-    .cm-string {
-        color: #5CE638;
-    }
-    /*@import*/
-    .cm-def {
-        color: #2986CC;
-    }
-    /* Bullets and such */
-    .cm-variable-2 {
-        color: #3CBF30;
-    }
-
-    /* Tags (divs) */
-    .cm-tag {
-        color: #E3FF00;
-    }
-    .cm-attribute {
-        color: #E3FF00;
-    }
-    .cm-atom {
-        color: #CF7EA9;
-    }
-    .cm-qualifier {
-        color: #EE1919;
-    }
-    .cm-comment {
-        color: #BBC700;
-    }
-    .cm-keyword {
-        color: #CC66FF;
-    }
-    .cm-property {
-        color: aqua;
-    }
-    .cm-error {
-        color: #C50202;
-    }
-    .CodeMirror-foldmarker {
-        color: #F0FF00;
-    }
-    /* New page  */
-    .cm-builtin {
-        color: #FFF;
-    }
-}
-
-.editor .codeEditor {
-    /* blocks */
-    .block:not(.cm-comment) {
-        color: magenta;
-    }    
-    /* definition lists */
-    .define.definition {
-        color: #FFAA3E;
-    }
-    .define.term {
-        color: #7290d9;
-    }
-    .define:not(.term):not(.definition) {
-        background: #333;
-    }
-    /* New page  */
-    .pageLine {
-        background: #000;
-        color: #000;
-        border-bottom: 1px solid #FFF;
-    }
-}

themes/codeMirror/editorThemes.json

@@ -16,7 +16,6 @@
 "colorforth",
 "darcula",
 "darkbrewery-v301",
-"darkvision",
 "dracula",
 "duotone-dark",
 "duotone-light",

themes/fonts/5e/fonts.less

@@ -74,9 +74,8 @@
 @font-face {
 	font-family: SolberaImitationRemake; //Tweaked 5e version
 	src: url('../../../fonts/5e/Solbera Imitation Tweak.woff2');
-	font-weight: 100 1000;
+	font-weight: normal;
 	font-style: normal;
-	font-style: italic;
 }
 
 /* Cover Page */

themes/fonts/icon fonts/font-icons.less

@@ -0,0 +1,224 @@
+/* Main Font, serif */
+@font-face {
+	font-family : 'Eldeberry-Inn';
+	font-style : normal;
+	font-weight : normal;
+	src : url('../../../fonts/icon fonts/Elderberry-Inn-Icons.woff2');
+} 
+
+.page { 
+	span.ei {
+		display                 : inline-block;
+		margin-right            : 3px;
+		font-family             : 'Eldeberry-Inn';
+		line-height             : 1;
+		vertical-align          : baseline;
+		-moz-osx-font-smoothing : grayscale;
+		-webkit-font-smoothing  : antialiased;
+		text-rendering          : auto;
+
+		&.book::before { content : '\E900'; } 
+		&.screen::before { content : '\E901'; } 
+
+		/* Spell levels */ 
+		&.spell-0::before { content : '\E902'; } 
+		&.spell-1::before { content : '\E903'; } 
+		&.spell-2::before { content : '\E904'; } 
+		&.spell-3::before { content : '\E905'; } 
+		&.spell-4::before { content : '\E906'; } 
+		&.spell-5::before { content : '\E907'; } 
+		&.spell-6::before { content : '\E908'; } 
+		&.spell-7::before { content : '\E909'; } 
+		&.spell-8::before { content : '\E90A'; } 
+		&.spell-9::before { content : '\E90B'; }
+
+		/* Damage types */ 
+		&.acid::before { content : '\E90C'; } 
+		&.bludgeoning::before { content : '\E90D'; } 
+		&.cold::before { content : '\E90E'; } 
+		&.fire::before { content : '\E90F'; } 
+		&.force::before { content : '\E910'; } 
+		&.lightning::before { content : '\E911'; } 
+		&.necrotic::before { content : '\E912'; } 
+		&.piercing::before { content : '\E914'; } 
+		&.poison::before { content : '\E913'; } 
+		&.psychic::before { content : '\E915'; } 
+		&.radiant::before { content : '\E916'; } 
+		&.slashing::before { content : '\E917'; } 
+		&.thunder::before { content : '\E918'; }
+
+		/* DnD Conditions */ 
+		&.blinded::before { content : '\E919'; } 
+		&.charmed::before { content : '\E91A'; } 
+		&.deafened::before { content : '\E91B'; } 
+		&.exhaust-1::before { content : '\E91C'; } 
+		&.exhaust-2::before { content : '\E91D'; } 
+		&.exhaust-3::before { content : '\E91E'; } 
+		&.exhaust-4::before { content : '\E91F'; } 
+		&.exhaust-5::before { content : '\E920'; } 
+		&.exhaust-6::before { content : '\E921'; } 
+		&.frightened::before { content : '\E922'; } 
+		&.grappled::before { content : '\E923'; } 
+		&.incapacitated::before { content : '\E924'; } 
+		&.invisible::before { content : '\E926'; } 
+		&.paralyzed::before { content : '\E927'; } 
+		&.petrified::before { content : '\E928'; } 
+		&.poisoned::before { content : '\E929'; } 
+		&.prone::before { content : '\E92A'; } 
+		&.restrained::before { content : '\E92B'; } 
+		&.stunned::before { content : '\E92C'; } 
+		&.unconscious::before { content : '\E925'; }
+
+		/* Character Classes and Features */ 
+		&.barbarian-rage::before { content : '\E92D'; } 
+		&.barbarian-reckless-attack::before { content : '\E92E'; } 
+		&.bardic-inspiration::before { content : '\E92F'; } 
+		&.cleric-channel-divinity::before { content : '\E930'; } 
+		&.druid-wild-shape::before { content : '\E931'; } 
+		&.fighter-action-surge::before { content : '\E932'; } 
+		&.fighter-second-wind::before { content : '\E933'; } 
+		&.monk-flurry-blows::before { content : '\E934'; }
+		&.monk-patient-defense::before { content : '\E935'; } 
+		&.monk-step-of-the-wind::before { content : '\E936'; } 
+		&.monk-step-of-the-wind-2::before { content : '\E937'; } 
+		&.monk-step-of-the-wind-3::before { content : '\E938'; }
+		&.monk-stunning-strike::before { content : '\E939'; }
+		&.monk-stunning-strike-2::before { content : '\E939'; } 
+		&.paladin-divine-smite::before { content : '\E93B'; } 
+		&.paladin-lay-on-hands::before { content : '\E93C'; } 
+		&.barbarian-abilities::before { content : '\E93D'; } 
+		&.barbarian::before { content : '\E93E'; } 
+		&.bard-abilities::before { content : '\E93F'; } 
+		&.bard::before { content : '\E940'; } 
+		&.cleric-abilities::before { content : '\E941'; } 
+		&.cleric::before { content : '\E942'; } 
+		&.druid-abilities::before { content : '\E943'; } 
+		&.druid::before { content : '\E944'; } 
+		&.fighter-abilities::before { content : '\E945'; } 
+		&.fighter::before { content : '\E946'; } 
+		&.monk-abilities::before { content : '\E947'; } 
+		&.monk::before { content : '\E948'; } 
+		&.paladin-abilities::before { content : '\E949'; } 
+		&.paladin::before { content : '\E94A'; } 
+		&.ranger-abilities::before { content : '\E94B'; } 
+		&.ranger::before { content : '\E94C'; } 
+		&.rogue-abilities::before { content : '\E94D'; } 
+		&.rogue::before { content : '\E94E'; } 
+		&.sorcerer-abilities::before { content : '\E94F'; } 
+		&.sorcerer::before { content : '\E950'; } 
+		&.warlock-abilities::before { content : '\E951'; } 
+		&.warlock::before { content : '\E952'; } 
+		&.wizard-abilities::before { content : '\E953'; } 
+		&.wizard::before { content : '\E954'; }
+
+		/* Types of actions */ 
+		&.movement::before { content : '\E955'; } 
+		&.action::before { content : '\E956'; } 
+		&.bonus-action::before { content : '\E957'; } 
+		&.reaction::before { content : '\E958'; } 
+
+		/* SRD Spells */ 
+		&.acid-arrow::before { content : '\E959'; } 
+		&.action-1::before { content : '\E95A'; } 
+		&.alter-self::before { content : '\E95B'; } 
+		&.alter-self-2::before { content : '\E95C'; } 
+		&.animal-friendship::before { content : '\E95E'; } 
+		&.animate-dead::before { content : '\E95F'; } 
+		&.animate-objects::before { content : '\E960'; } 
+		&.animate-objects-2::before { content : '\E961'; } 
+		&.bane::before { content : '\E962'; } 
+		&.bless::before { content : '\E963'; }
+		&.blur::before { content : '\E964'; }
+		&.bonus::before { content : '\E965'; }
+		&.branding-smite::before { content : '\E966'; }
+		&.burning-hands::before { content : '\E967'; }
+		&.charm-person::before { content : '\E968'; }
+		&.chill-touch::before { content : '\E969'; }
+		&.cloudkill::before { content : '\E96A'; }
+		&.comprehend-languages::before { content : '\E96B'; }
+		&.cone-of-cold::before { content : '\E96C'; }
+		&.conjure-elemental::before { content : '\E96D'; }
+		&.conjure-minor-elemental::before { content : '\E96E'; }
+		&.control-water::before { content : '\E96F'; }
+		&.counterspell::before { content : '\E970'; }
+		&.cure-wounds::before { content : '\E971'; }
+		&.dancing-lights::before { content : '\E972'; }
+		&.darkness::before { content : '\E973'; }
+		&.detect-magic::before { content : '\E974'; }
+		&.disguise-self::before { content : '\E975'; }
+		&.disintegrate::before { content : '\E976'; }
+		&.dispel-evil-and-good::before { content : '\E977'; }
+		&.dispel-magic::before { content : '\E978'; }
+		&.dominate-monster::before { content : '\E979'; }
+		&.dominate-person::before { content : '\E97A'; }
+		&.eldritch-blast::before { content : '\E97B'; }
+		&.enlarge-reduce::before { content : '\E97C'; }
+		&.entangle::before { content : '\E97D'; }
+		&.faerie-fire::before { content : '\E97E'; }
+		&.faerie-fire2::before { content : '\E97F'; }
+		&.feather-fall::before { content : '\E980'; }
+		&.find-familiar::before { content : '\E981'; }
+		&.finger-of-death::before { content : '\E982'; } 
+		&.fireball::before { content : '\E983'; } 
+		&.floating-disk::before { content : '\E984'; } 
+		&.fly::before { content : '\E985'; } 
+		&.fog-cloud::before { content : '\E986'; } 
+		&.gaseous-form::before { content : '\E987'; } 
+		&.gaseous-form2::before { content : '\E988'; } 
+		&.gentle-repose::before { content : '\E989'; } 
+		&.gentle-repose2::before { content : '\E98A'; } 
+		&.globe-of-invulnerability::before { content : '\E98B'; } 
+		&.guiding-bolt::before { content : '\E98C'; } 
+		&.healing-word::before { content : '\E98D'; } 
+		&.heat-metal::before { content : '\E98E'; } 
+		&.hellish-rebuke::before { content : '\E98F'; } 
+		&.heroes-feast::before { content : '\E990'; } 
+		&.heroism::before { content : '\E991'; } 
+		&.hideous-laughter::before { content : '\E992'; } 
+		&.identify::before { content : '\E993'; } 
+		&.illusory-script::before { content : '\E994'; } 
+		&.inflict-wounds::before { content : '\E995'; } 
+		&.light::before { content : '\E996'; } 
+		&.longstrider::before { content : '\E997'; } 
+		&.mage-armor::before { content : '\E998'; } 
+		&.mage-hand::before { content : '\E999'; } 
+		&.magic-missile::before { content : '\E99A'; } 
+		&.mass-cure-wounds::before { content : '\E99B'; } 
+		&.mass-healing-word::before { content : '\E99C'; } 
+		&.Mending::before { content : '\E99D'; } 
+		&.message::before { content : '\E99E'; } 
+		&.Minor-illusion::before { content : '\E99F'; } 
+		&.movement1::before { content : '\E9A0'; } 
+		&.polymorph::before { content : '\E9A1'; } 
+		&.power-word-kill::before { content : '\E9A2'; } 
+		&.power-word-stun::before { content : '\E9A3'; } 
+		&.prayer-of-healing::before { content : '\E9A4'; } 
+		&.prestidigitation::before { content : '\E9A5'; } 
+		&.protection-from-evil-and-good::before { content : '\E9A6'; } 
+		&.raise-read::before { content : '\E9A7'; } 
+		&.raise-read2::before { content : '\E9A8'; } 
+		&.reaction1::before { content : '\E9A9'; } 
+		&.resurrection::before { content : '\E9AA'; } 
+		&.resurrection2::before { content : '\E9AB'; } 
+		&.revivify::before { content : '\E9AC'; } 
+		&.revivify2::before { content : '\E9AD'; } 
+		&.sacred-flame::before { content : '\E9AE'; } 
+		&.sanctuary::before { content : '\E9AF'; } 
+		&.scorching-ray::before { content : '\E9B0'; } 
+		&.sending::before { content : '\E9B1'; } 
+		&.shatter::before { content : '\E9B2'; } 
+		&.shield::before { content : '\E9B3'; } 
+		&.silent-image::before { content : '\E9B4'; } 
+		&.sleep::before { content : '\E9B5'; } 
+		&.speak-with-animals::before { content : '\E9B6'; } 
+		&.telekinesis::before { content : '\E9B7'; } 
+		&.true-strike::before { content : '\E9B8'; } 
+		&.vicious-mockery::before { content : '\E9B9'; } 
+		&.wall-of-fire::before { content : '\E9BA'; } 
+		&.wall-of-force::before { content : '\E9BB'; } 
+		&.wall-of-ice::before { content : '\E9BC'; } 
+		&.wall-of-stone::before { content : '\E9BD'; } 
+		&.wall-of-thorns::before { content : '\E9BE'; } 
+		&.wish::before { content : '\E9BF'; } 
+	}
+}

themes/fonts/iconFonts/diceFont.js

@@ -1,96 +0,0 @@
-const diceFont = {
-	'df_f'                    : 'df F',
-	'df_f_minus'              : 'df F-minus',
-	'df_f_plus'               : 'df F-plus',
-	'df_f_zero'               : 'df F-zero',
-	'df_d10'                  : 'df d10',
-	'df_d10_1'                : 'df d10-1',
-	'df_d10_10'               : 'df d10-10',
-	'df_d10_2'                : 'df d10-2',
-	'df_d10_3'                : 'df d10-3',
-	'df_d10_4'                : 'df d10-4',
-	'df_d10_5'                : 'df d10-5',
-	'df_d10_6'                : 'df d10-6',
-	'df_d10_7'                : 'df d10-7',
-	'df_d10_8'                : 'df d10-8',
-	'df_d10_9'                : 'df d10-9',
-	'df_d12'                  : 'df d12',
-	'df_d12_1'                : 'df d12-1',
-	'df_d12_10'               : 'df d12-10',
-	'df_d12_11'               : 'df d12-11',
-	'df_d12_12'               : 'df d12-12',
-	'df_d12_2'                : 'df d12-2',
-	'df_d12_3'                : 'df d12-3',
-	'df_d12_4'                : 'df d12-4',
-	'df_d12_5'                : 'df d12-5',
-	'df_d12_6'                : 'df d12-6',
-	'df_d12_7'                : 'df d12-7',
-	'df_d12_8'                : 'df d12-8',
-	'df_d12_9'                : 'df d12-9',
-	'df_d2'                   : 'df d2',
-	'df_d2_1'                 : 'df d2-1',
-	'df_d2_2'                 : 'df d2-2',
-	'df_d20'                  : 'df d20',
-	'df_d20_1'                : 'df d20-1',
-	'df_d20_10'               : 'df d20-10',
-	'df_d20_11'               : 'df d20-11',
-	'df_d20_12'               : 'df d20-12',
-	'df_d20_13'               : 'df d20-13',
-	'df_d20_14'               : 'df d20-14',
-	'df_d20_15'               : 'df d20-15',
-	'df_d20_16'               : 'df d20-16',
-	'df_d20_17'               : 'df d20-17',
-	'df_d20_18'               : 'df d20-18',
-	'df_d20_19'               : 'df d20-19',
-	'df_d20_2'                : 'df d20-2',
-	'df_d20_20'               : 'df d20-20',
-	'df_d20_3'                : 'df d20-3',
-	'df_d20_4'                : 'df d20-4',
-	'df_d20_5'                : 'df d20-5',
-	'df_d20_6'                : 'df d20-6',
-	'df_d20_7'                : 'df d20-7',
-	'df_d20_8'                : 'df d20-8',
-	'df_d20_9'                : 'df d20-9',
-	'df_d4'                   : 'df d4',
-	'df_d4_1'                 : 'df d4-1',
-	'df_d4_2'                 : 'df d4-2',
-	'df_d4_3'                 : 'df d4-3',
-	'df_d4_4'                 : 'df d4-4',
-	'df_d6'                   : 'df d6',
-	'df_d6_1'                 : 'df d6-1',
-	'df_d6_2'                 : 'df d6-2',
-	'df_d6_3'                 : 'df d6-3',
-	'df_d6_4'                 : 'df d6-4',
-	'df_d6_5'                 : 'df d6-5',
-	'df_d6_6'                 : 'df d6-6',
-	'df_d8'                   : 'df d8',
-	'df_d8_1'                 : 'df d8-1',
-	'df_d8_2'                 : 'df d8-2',
-	'df_d8_3'                 : 'df d8-3',
-	'df_d8_4'                 : 'df d8-4',
-	'df_d8_5'                 : 'df d8-5',
-	'df_d8_6'                 : 'df d8-6',
-	'df_d8_7'                 : 'df d8-7',
-	'df_d8_8'                 : 'df d8-8',
-	'df_dot_d6'               : 'df dot-d6',
-	'df_dot_d6_1'             : 'df dot-d6-1',
-	'df_dot_d6_2'             : 'df dot-d6-2',
-	'df_dot_d6_3'             : 'df dot-d6-3',
-	'df_dot_d6_4'             : 'df dot-d6-4',
-	'df_dot_d6_5'             : 'df dot-d6-5',
-	'df_dot_d6_6'             : 'df dot-d6-6',
-	'df_small_dot_d6_1'       : 'df small-dot-d6-1',
-	'df_small_dot_d6_2'       : 'df small-dot-d6-2',
-	'df_small_dot_d6_3'       : 'df small-dot-d6-3',
-	'df_small_dot_d6_4'       : 'df small-dot-d6-4',
-	'df_small_dot_d6_5'       : 'df small-dot-d6-5',
-	'df_small_dot_d6_6'       : 'df small-dot-d6-6',
-	'df_solid_small_dot_d6_1' : 'df solid-small-dot-d6-1',
-	'df_solid_small_dot_d6_2' : 'df solid-small-dot-d6-2',
-	'df_solid_small_dot_d6_3' : 'df solid-small-dot-d6-3',
-	'df_solid_small_dot_d6_4' : 'df solid-small-dot-d6-4',
-	'df_solid_small_dot_d6_5' : 'df solid-small-dot-d6-5',
-	'df_solid_small_dot_d6_6' : 'df solid-small-dot-d6-6'
-};
-
-module.exports = diceFont;

themes/fonts/iconFonts/diceFont.less

@@ -1,117 +0,0 @@
-/* Icon Font: diceFont */
-@font-face {
-	font-family : 'DiceFont';
-	font-style : normal;
-	font-weight : normal;
-	src : url('../../../fonts/iconFonts/diceFont.woff2');
-} 
-
-.df {
-	display                 : inline;
-	font-family             : 'DiceFont';
-	font-style              : normal;
-	font-weight             : normal;
-	font-variant            : normal;
-	line-height             : 1;
-	text-decoration         : inherit;
-	text-transform          : none;
-	text-rendering          : optimizeLegibility;
-	
-	/* Better Font Rendering =========== */
-	-webkit-font-smoothing  : antialiased;
-	-moz-osx-font-smoothing : grayscale;
-
-	&.F::before { content : '\f190'; }
-	&.F-minus::before { content : '\f191'; }
-	&.F-plus::before { content : '\f192'; }
-	&.F-zero::before { content : '\f193'; }
-	&.d10::before { content : '\f194'; }
-	&.d10-0::before { content : '\f100'; }
-	&.d10-1::before { content : '\f101'; }
-	&.d10-10::before { content : '\f102'; }
-	&.d10-2::before { content : '\f103'; }
-	&.d10-3::before { content : '\f104'; }
-	&.d10-4::before { content : '\f105'; }
-	&.d10-5::before { content : '\f106'; }
-	&.d10-6::before { content : '\f107'; }
-	&.d10-7::before { content : '\f108'; }
-	&.d10-8::before { content : '\f109'; }
-	&.d10-9::before { content : '\f10a'; }
-	&.d12::before { content : '\f195'; }
-	&.d12-1::before { content : '\f10b'; }
-	&.d12-10::before { content : '\f10c'; }
-	&.d12-11::before { content : '\f10d'; }
-	&.d12-12::before { content : '\f10e'; }
-	&.d12-2::before { content : '\f10f'; }
-	&.d12-3::before { content : '\f110'; }
-	&.d12-4::before { content : '\f111'; }
-	&.d12-5::before { content : '\f112'; }
-	&.d12-6::before { content : '\f113'; }
-	&.d12-7::before { content : '\f114'; }
-	&.d12-8::before { content : '\f115'; }
-	&.d12-9::before { content : '\f116'; }
-	&.d2::before { content : '\f196'; }
-	&.d2-1::before { content : '\f117'; }
-	&.d2-2::before { content : '\f118'; }
-	&.d20::before { content : '\f197'; }
-	&.d20-1::before { content : '\f119'; }
-	&.d20-10::before { content : '\f11a'; }
-	&.d20-11::before { content : '\f11b'; }
-	&.d20-12::before { content : '\f11c'; }
-	&.d20-13::before { content : '\f11d'; }
-	&.d20-14::before { content : '\f11e'; }
-	&.d20-15::before { content : '\f11f'; }
-	&.d20-16::before { content : '\f120'; }
-	&.d20-17::before { content : '\f121'; }
-	&.d20-18::before { content : '\f122'; }
-	&.d20-19::before { content : '\f123'; }
-	&.d20-2::before { content : '\f124'; }
-	&.d20-20::before { content : '\f125'; }
-	&.d20-3::before { content : '\f126'; }
-	&.d20-4::before { content : '\f127'; }
-	&.d20-5::before { content : '\f128'; }
-	&.d20-6::before { content : '\f129'; }
-	&.d20-7::before { content : '\f12a'; }
-	&.d20-8::before { content : '\f12b'; }
-	&.d20-9::before { content : '\f12c'; }
-	&.d4::before { content : '\f198'; }
-	&.d4-1::before { content : '\f12d'; }
-	&.d4-2::before { content : '\f12e'; }
-	&.d4-3::before { content : '\f12f'; }
-	&.d4-4::before { content : '\f130'; }
-	&.d6::before { content : '\f199'; }
-	&.d6-1::before { content : '\f131'; }
-	&.d6-2::before { content : '\f132'; }
-	&.d6-3::before { content : '\f133'; }
-	&.d6-4::before { content : '\f134'; }
-	&.d6-5::before { content : '\f135'; }
-	&.d6-6::before { content : '\f136'; }
-	&.d8::before { content : '\f19a'; }
-	&.d8-1::before { content : '\f137'; }
-	&.d8-2::before { content : '\f138'; }
-	&.d8-3::before { content : '\f139'; }
-	&.d8-4::before { content : '\f13a'; }
-	&.d8-5::before { content : '\f13b'; }
-	&.d8-6::before { content : '\f13c'; }
-	&.d8-7::before { content : '\f13d'; }
-	&.d8-8::before { content : '\f13e'; }
-	&.dot-d6::before { content : '\f19b'; }
-	&.dot-d6-1::before { content : '\f13f'; }
-	&.dot-d6-2::before { content : '\f140'; }
-	&.dot-d6-3::before { content : '\f141'; }
-	&.dot-d6-4::before { content : '\f142'; }
-	&.dot-d6-5::before { content : '\f143'; }
-	&.dot-d6-6::before { content : '\f18f'; }
-	&.small-dot-d6-1::before { content : '\f183'; }
-	&.small-dot-d6-2::before { content : '\f184'; }
-	&.small-dot-d6-3::before { content : '\f185'; }
-	&.small-dot-d6-4::before { content : '\f186'; }
-	&.small-dot-d6-5::before { content : '\f187'; }
-	&.small-dot-d6-6::before { content : '\f188'; }
-	&.solid-small-dot-d6-1::before { content : '\f189'; }
-	&.solid-small-dot-d6-2::before { content : '\f18a'; }
-	&.solid-small-dot-d6-3::before { content : '\f18b'; }
-	&.solid-small-dot-d6-4::before { content : '\f18c'; }
-	&.solid-small-dot-d6-5::before { content : '\f18d'; }
-	&.solid-small-dot-d6-6::before { content : '\f18e'; }
-}

themes/fonts/iconFonts/diceFont_license.md

@@ -1,18 +0,0 @@
-# License
-
-DiceFont is open source. You can use it for commercial projects, personal
-projects or open source projects.
-
-## Font License
-
-Applies to all desktop and webfont files: [License: SIL OFL 1.1](http://scripts.sil.org/OFL)
-
-## Code License
-
-Applies to all CSS and LESS files: [License: MIT License](http://opensource.org/licenses/mit-license.html)
-
-## Documentation License
-
-Applies to all other files [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)
-
-Copyright [Franco Ponticelli](https://github.com/fponticelli).

themes/fonts/iconFonts/elderberryInn.js

@@ -1,209 +0,0 @@
-const elderberryInn = {
-	'ei_book'   : 'ei book',
-	'ei_screen' : 'ei screen',
-
-	/* Spell levels */
-	'ei_spell_0' : 'ei spell-0',
-	'ei_spell_1' : 'ei spell-1',
-	'ei_spell_2' : 'ei spell-2',
-	'ei_spell_3' : 'ei spell-3',
-	'ei_spell_4' : 'ei spell-4',
-	'ei_spell_5' : 'ei spell-5',
-	'ei_spell_6' : 'ei spell-6',
-	'ei_spell_7' : 'ei spell-7',
-	'ei_spell_8' : 'ei spell-8',
-	'ei_spell_9' : 'ei spell-9',
-
-	/* Damage types */
-	'ei_acid'        : 'ei acid',
-	'ei_bludgeoning' : 'ei bludgeoning',
-	'ei_cold'        : 'ei cold',
-	'ei_fire'        : 'ei fire',
-	'ei_force'       : 'ei force',
-	'ei_lightning'   : 'ei lightning',
-	'ei_necrotic'    : 'ei necrotic',
-	'ei_piercing'    : 'ei piercing',
-	'ei_poison'      : 'ei poison',
-	'ei_psychic'     : 'ei psychic',
-	'ei_radiant'     : 'ei radiant',
-	'ei_slashing'    : 'ei slashing',
-	'ei_thunder'     : 'ei thunder',
-
-	/* DnD Conditions */
-	'ei_blinded'       : 'ei blinded',
-	'ei_charmed'       : 'ei charmed',
-	'ei_deafened'      : 'ei deafened',
-	'ei_exhaust1'      : 'ei exhaust-1',
-	'ei_blinded'       : 'ei blinded',
-	'ei_exhaust2'      : 'ei exhaust-2',
-	'ei_exhaust3'      : 'ei exhaust-3',
-	'ei_exhaust4'      : 'ei exhaust-4',
-	'ei_exhaust5'      : 'ei exhaust-5',
-	'ei_exhaust6'      : 'ei exhaust-6',
-	'ei_frightened'    : 'ei frightened',
-	'ei_grappled'      : 'ei grappled',
-	'ei_incapacitated' : 'ei incapacitated',
-	'ei_invisible'     : 'ei invisible',
-	'ei_paralyzed'     : 'ei paralyzed',
-	'ei_petrified'     : 'ei petrified',
-	'ei_poisoned'      : 'ei poisoned',
-	'ei_prone'         : 'ei prone',
-	'ei_restrained'    : 'ei restrained',
-	'ei_stunned'       : 'ei stunned',
-	'ei_unconscious'   : 'ei unconscious',
-
-	/* Character Classes and Features */
-	'ei_barbarian_rage'            : 'ei barbarian-rage',
-	'ei_barbarian_reckless_attack' : 'ei barbarian-reckless-attack',
-	'ei_bardic_inspiration'        : 'ei bardic-inspiration',
-	'ei_cleric_channel_divinity'   : 'ei cleric-channel-divinity',
-	'ei_druid_wild_shape'          : 'ei druid-wild-shape',
-	'ei_fighter_action_surge'      : 'ei fighter-action-surge',
-	'ei_fighter_second_wind'       : 'ei fighter-second-wind',
-	'ei_monk_flurry_blows'         : 'ei monk-flurry-blows',
-	'ei_monk_patient_defense'      : 'ei monk-patient-defense',
-	'ei_monk_step_of_the_wind'     : 'ei monk-step-of-the-wind',
-	'ei_monk_step_of_the_wind2'    : 'ei monk-step-of-the-wind-2',
-	'ei_monk_step_of_the_wind3'    : 'ei monk-step-of-the-wind-3',
-	'ei_monk_stunning_strike'      : 'ei monk-stunning-strike',
-	'ei_monk_stunning_strike2'     : 'ei monk-stunning-strike-2',
-	'ei_paladin_divine_smite'      : 'ei paladin-divine-smite',
-	'ei_paladin_lay_on_hands'      : 'ei paladin-lay-on-hands',
-	'ei_barbarian_abilities'       : 'ei barbarian-abilities',
-	'ei_barbarian'                 : 'ei barbarian',
-	'ei_bard_abilities'            : 'ei bard-abilities',
-	'ei_bard'                      : 'ei bard',
-	'ei_cleric_abilities'          : 'ei cleric-abilities',
-	'ei_cleric'                    : 'ei cleric',
-	'ei_druid_abilities'           : 'ei druid-abilities',
-	'ei_druid'                     : 'ei druid',
-	'ei_fighter_abilities'         : 'ei fighter-abilities',
-	'ei_fighter'                   : 'ei fighter',
-	'ei_monk_abilities'            : 'ei monk-abilities',
-	'ei_monk'                      : 'ei monk',
-	'ei_paladin_abilities'         : 'ei paladin-abilities',
-	'ei_paladin'                   : 'ei paladin',
-	'ei_ranger_abilities'          : 'ei ranger-abilities',
-	'ei_ranger'                    : 'ei ranger',
-	'ei_rogue_abilities'           : 'ei rogue-abilities',
-	'ei_rogue'                     : 'ei rogue',
-	'ei_sorcerer_abilities'        : 'ei sorcerer-abilities',
-	'ei_sorcerer'                  : 'ei sorcerer',
-	'ei_warlock_abilities'         : 'ei warlock-abilities',
-	'ei_warlock'                   : 'ei warlock',
-	'ei_wizard_abilities'          : 'ei wizard-abilities',
-	'ei_wizard'                    : 'ei wizard',
-
-	/* Types of actions */
-	'ei_movement'     : 'ei movement',
-	'ei_action'       : 'ei action',
-	'ei_bonus_action' : 'ei bonus-action',
-	'ei_reaction'     : 'ei reaction',
-
-	/* SRD Spells */
-	'ei_acid_arrow'                    : 'ei acid-arrow',
-	'ei_action1'                       : 'ei action-1',
-	'ei_alter_self'                    : 'ei alter-self',
-	'ei_alter_self2'                   : 'ei alter-self-2',
-	'ei_magic_beans'                   : 'ei magic-beans',
-	'ei_animal_friendship'             : 'ei animal-friendship',
-	'ei_animate_dead'                  : 'ei animate-dead',
-	'ei_animate_objects'               : 'ei animate-objects',
-	'ei_animate_objects2'              : 'ei animate-objects-2',
-	'ei_bane'                          : 'ei bane',
-	'ei_bless'                         : 'ei bless',
-	'ei_blur'                          : 'ei blur',
-	'ei_bonus'                         : 'ei bonus',
-	'ei_branding_smite'                : 'ei branding-smite',
-	'ei_burning_hands'                 : 'ei burning-hands',
-	'ei_charm_person'                  : 'ei charm-person',
-	'ei_chill_touch'                   : 'ei chill-touch',
-	'ei_cloudkill'                     : 'ei cloudkill',
-	'ei_comprehend_languages'          : 'ei comprehend-languages',
-	'ei_cone_of_cold'                  : 'ei cone-of-cold',
-	'ei_conjure_elemental'             : 'ei conjure-elemental',
-	'ei_conjure_minor_elemental'       : 'ei conjure-minor-elemental',
-	'ei_control_water'                 : 'ei control-water',
-	'ei_counterspell'                  : 'ei counterspell',
-	'ei_cure_wounds'                   : 'ei cure-wounds',
-	'ei_dancing_lights'                : 'ei dancing-lights',
-	'ei_darkness'                      : 'ei darkness',
-	'ei_detect_magic'                  : 'ei detect-magic',
-	'ei_disguise_self'                 : 'ei disguise-self',
-	'ei_disintegrate'                  : 'ei disintegrate',
-	'ei_dispel_evil_and_good'          : 'ei dispel-evil-and-good',
-	'ei_dispel_magic'                  : 'ei dispel-magic',
-	'ei_dominate_monster'              : 'ei dominate-monster',
-	'ei_dominate_person'               : 'ei dominate-person',
-	'ei_eldritch_blast'                : 'ei eldritch-blast',
-	'ei_enlarge_reduce'                : 'ei enlarge-reduce',
-	'ei_entangle'                      : 'ei entangle',
-	'ei_faerie_fire'                   : 'ei faerie-fire',
-	'ei_faerie_fire2'                  : 'ei faerie-fire2',
-	'ei_feather_fall'                  : 'ei feather-fall',
-	'ei_find_familiar'                 : 'ei find-familiar',
-	'ei_finger_of_death'               : 'ei finger-of-death',
-	'ei_fireball'                      : 'ei fireball',
-	'ei_floating_disk'                 : 'ei floating-disk',
-	'ei_fly'                           : 'ei fly',
-	'ei_fog_cloud'                     : 'ei fog-cloud',
-	'ei_gaseous_form'                  : 'ei gaseous-form',
-	'ei_gaseous_form2'                 : 'ei gaseous-form2',
-	'ei_gentle_repose'                 : 'ei gentle-repose',
-	'ei_gentle_repose2'                : 'ei gentle-repose2',
-	'ei_globe_of_invulnerability'      : 'ei globe-of-invulnerability',
-	'ei_guiding_bolt'                  : 'ei guiding-bolt',
-	'ei_healing_word'                  : 'ei healing-word',
-	'ei_heat_metal'                    : 'ei heat-metal',
-	'ei_hellish_rebuke'                : 'ei hellish-rebuke',
-	'ei_heroes_feast'                  : 'ei heroes-feast',
-	'ei_heroism'                       : 'ei heroism',
-	'ei_hideous_laughter'              : 'ei hideous-laughter',
-	'ei_identify'                      : 'ei identify',
-	'ei_illusory_script'               : 'ei illusory-script',
-	'ei_inflict_wounds'                : 'ei inflict-wounds',
-	'ei_light'                         : 'ei light',
-	'ei_longstrider'                   : 'ei longstrider',
-	'ei_mage_armor'                    : 'ei mage-armor',
-	'ei_mage_hand'                     : 'ei mage-hand',
-	'ei_magic_missile'                 : 'ei magic-missile',
-	'ei_mass_cure_wounds'              : 'ei mass-cure-wounds',
-	'ei_mass_healing_word'             : 'ei mass-healing-word',
-	'ei_mending'                       : 'ei _mending',
-	'ei_message'                       : 'ei message',
-	'ei_minor_illusion'                : 'ei _minor-illusion',
-	'ei_movement1'                     : 'ei movement1',
-	'ei_polymorph'                     : 'ei polymorph',
-	'ei_power_word_kill'               : 'ei power-word-kill',
-	'ei_power_word_stun'               : 'ei power-word-stun',
-	'ei_prayer_of_healing'             : 'ei prayer-of-healing',
-	'ei_prestidigitation'              : 'ei prestidigitation',
-	'ei_protection_from_evil_and_good' : 'ei protection-from-evil-and-good',
-	'ei_raise_dead'                    : 'ei raise-dead',
-	'ei_raise_dead2'                   : 'ei raise-dead2',
-	'ei_reaction1'                     : 'ei reaction1',
-	'ei_resurrection'                  : 'ei resurrection',
-	'ei_resurrection2'                 : 'ei resurrection2',
-	'ei_revivify'                      : 'ei revivify',
-	'ei_revivify2'                     : 'ei revivify2',
-	'ei_sacred_flame'                  : 'ei sacred-flame',
-	'ei_sanctuary'                     : 'ei sanctuary',
-	'ei_scorching_ray'                 : 'ei scorching-ray',
-	'ei_sending'                       : 'ei sending',
-	'ei_shatter'                       : 'ei shatter',
-	'ei_shield'                        : 'ei shield',
-	'ei_silent_image'                  : 'ei silent-image',
-	'ei_sleep'                         : 'ei sleep',
-	'ei_speak_with_animals'            : 'ei speak-with-animals',
-	'ei_telekinesis'                   : 'ei telekinesis',
-	'ei_true_strike'                   : 'ei true-strike',
-	'ei_vicious_mockery'               : 'ei vicious-mockery',
-	'ei_wall_of_fire'                  : 'ei wall-of-fire',
-	'ei_wall_of_force'                 : 'ei wall-of-force',
-	'ei_wall_of_ice'                   : 'ei wall-of-ice',
-	'ei_wall_of_stone'                 : 'ei wall-of-stone',
-	'ei_wall_of_thorns'                : 'ei wall-of-thorns',
-	'ei_wish'                          : 'ei wish'
-};
-
-module.exports = elderberryInn;

themes/fonts/iconFonts/elderberryInn.less

@@ -1,225 +0,0 @@
-/* Icon Font: Elderberry Inn */
-@font-face {
-	font-family : 'Elderberry-Inn';
-	font-style : normal;
-	font-weight : normal;
-	src : url('../../../fonts/iconFonts/elderberryInn.woff2');
-}
-
-.ei {
-	display                 : inline;
-	font-family             : 'Elderberry-Inn';
-	line-height             : 1;
-	vertical-align          : baseline;
-	text-rendering          : auto;
-
-	/* Better Font Rendering =========== */
-	-webkit-font-smoothing  : antialiased;
-	-moz-osx-font-smoothing : grayscale;
-
-	&.book::before { content : '\E900'; }
-	&.screen::before { content : '\E901'; }
-
-	/* Spell levels */ 
-	&.spell-0::before { content : '\E902'; }
-	&.spell-1::before { content : '\E903'; }
-	&.spell-2::before { content : '\E904'; }
-	&.spell-3::before { content : '\E905'; }
-	&.spell-4::before { content : '\E906'; }
-	&.spell-5::before { content : '\E907'; }
-	&.spell-6::before { content : '\E908'; }
-	&.spell-7::before { content : '\E909'; }
-	&.spell-8::before { content : '\E90A'; }
-	&.spell-9::before { content : '\E90B'; }
-
-	/* Damage types */ 
-	&.acid::before { content : '\E90C'; }
-	&.bludgeoning::before { content : '\E90D'; }
-	&.cold::before { content : '\E90E'; }
-	&.fire::before { content : '\E90F'; }
-	&.force::before { content : '\E910'; }
-	&.lightning::before { content : '\E911'; }
-	&.necrotic::before { content : '\E912'; }
-	&.piercing::before { content : '\E913'; }
-	&.poison::before { content : '\E914'; }
-	&.psychic::before { content : '\E915'; }
-	&.radiant::before { content : '\E916'; }
-	&.slashing::before { content : '\E917'; }
-	&.thunder::before { content : '\E918'; }
-
-	/* DnD Conditions */ 
-	&.blinded::before { content : '\E919'; }
-	&.charmed::before { content : '\E91A'; }
-	&.deafened::before { content : '\E91B'; }
-	&.exhaust-1::before { content : '\E91C'; }
-	&.exhaust-2::before { content : '\E91D'; }
-	&.exhaust-3::before { content : '\E91E'; }
-	&.exhaust-4::before { content : '\E91F'; }
-	&.exhaust-5::before { content : '\E920'; }
-	&.exhaust-6::before { content : '\E921'; }
-	&.frightened::before { content : '\E922'; }
-	&.grappled::before { content : '\E923'; }
-	&.incapacitated::before { content : '\E924'; }
-	&.unconscious::before { content : '\E925'; }
-	&.invisible::before { content : '\E926'; }
-	&.paralyzed::before { content : '\E927'; }
-	&.petrified::before { content : '\E928'; }
-	&.poisoned::before { content : '\E929'; }
-	&.prone::before { content : '\E92A'; }
-	&.restrained::before { content : '\E92B'; }
-	&.stunned::before { content : '\E92C'; }
-	
-
-	/* Character Classes and Features */ 
-	&.barbarian-rage::before { content : '\E92D'; }
-	&.barbarian-reckless-attack::before { content : '\E92E'; }
-	&.bardic-inspiration::before { content : '\E92F'; }
-	&.cleric-channel-divinity::before { content : '\E930'; }
-	&.druid-wild-shape::before { content : '\E931'; }
-	&.fighter-action-surge::before { content : '\E932'; }
-	&.fighter-second-wind::before { content : '\E933'; }
-	&.monk-flurry-blows::before { content : '\E934'; }
-	&.monk-patient-defense::before { content : '\E935'; }
-	&.monk-step-of-the-wind::before { content : '\E936'; }
-	&.monk-step-of-the-wind-2::before { content : '\E937'; }
-	&.monk-step-of-the-wind-3::before { content : '\E938'; }
-	&.monk-stunning-strike::before { content : '\E939'; }
-	&.monk-stunning-strike-2::before { content : '\E93A'; }
-	&.paladin-divine-smite::before { content : '\E93B'; }
-	&.paladin-lay-on-hands::before { content : '\E93C'; }
-	&.barbarian-abilities::before { content : '\E93D'; }
-	&.barbarian::before { content : '\E93E'; }
-	&.bard-abilities::before { content : '\E93F'; }
-	&.bard::before { content : '\E940'; }
-	&.cleric-abilities::before { content : '\E941'; }
-	&.cleric::before { content : '\E942'; }
-	&.druid-abilities::before { content : '\E943'; }
-	&.druid::before { content : '\E944'; }
-	&.fighter-abilities::before { content : '\E945'; }
-	&.fighter::before { content : '\E946'; }
-	&.monk-abilities::before { content : '\E947'; }
-	&.monk::before { content : '\E948'; }
-	&.paladin-abilities::before { content : '\E949'; }
-	&.paladin::before { content : '\E94A'; }
-	&.ranger-abilities::before { content : '\E94B'; }
-	&.ranger::before { content : '\E94C'; }
-	&.rogue-abilities::before { content : '\E94D'; }
-	&.rogue::before { content : '\E94E'; }
-	&.sorcerer-abilities::before { content : '\E94F'; }
-	&.sorcerer::before { content : '\E950'; }
-	&.warlock-abilities::before { content : '\E951'; }
-	&.warlock::before { content : '\E952'; }
-	&.wizard-abilities::before { content : '\E953'; }
-	&.wizard::before { content : '\E954'; }
-
-	/* Types of actions */ 
-	&.movement::before { content : '\E955'; }
-	&.action::before { content : '\E956'; }
-	&.bonus-action::before { content : '\E957'; }
-	&.reaction::before { content : '\E958'; }
-
-	/* SRD Spells */ 
-	&.acid-arrow::before { content : '\E959'; }
-	&.action-1::before { content : '\E95A'; }
-	&.alter-self::before { content : '\E95B'; }
-	&.alter-self-2::before { content : '\E95C'; }
-	&.magic-beans::before { content : '\E95D'; }
-	&.animal-friendship::before { content : '\E95E'; }
-	&.animate-dead::before { content : '\E95F'; }
-	&.animate-objects::before { content : '\E960'; }
-	&.animate-objects-2::before { content : '\E961'; }
-	&.bane::before { content : '\E962'; }
-	&.bless::before { content : '\E963'; }
-	&.blur::before { content : '\E964'; }
-	&.bonus::before { content : '\E965'; }
-	&.branding-smite::before { content : '\E966'; }
-	&.burning-hands::before { content : '\E967'; }
-	&.charm-person::before { content : '\E968'; }
-	&.chill-touch::before { content : '\E969'; }
-	&.cloudkill::before { content : '\E96A'; }
-	&.comprehend-languages::before { content : '\E96B'; }
-	&.cone-of-cold::before { content : '\E96C'; }
-	&.conjure-elemental::before { content : '\E96D'; }
-	&.conjure-minor-elemental::before { content : '\E96E'; }
-	&.control-water::before { content : '\E96F'; }
-	&.counterspell::before { content : '\E970'; }
-	&.cure-wounds::before { content : '\E971'; }
-	&.dancing-lights::before { content : '\E972'; }
-	&.darkness::before { content : '\E973'; }
-	&.detect-magic::before { content : '\E974'; }
-	&.disguise-self::before { content : '\E975'; }
-	&.disintegrate::before { content : '\E976'; }
-	&.dispel-evil-and-good::before { content : '\E977'; }
-	&.dispel-magic::before { content : '\E978'; }
-	&.dominate-monster::before { content : '\E979'; }
-	&.dominate-person::before { content : '\E97A'; }
-	&.eldritch-blast::before { content : '\E97B'; }
-	&.enlarge-reduce::before { content : '\E97C'; }
-	&.entangle::before { content : '\E97D'; }
-	&.faerie-fire::before { content : '\E97E'; }
-	&.faerie-fire2::before { content : '\E97F'; }
-	&.feather-fall::before { content : '\E980'; }
-	&.find-familiar::before { content : '\E981'; }
-	&.finger-of-death::before { content : '\E982'; }
-	&.fireball::before { content : '\E983'; }
-	&.floating-disk::before { content : '\E984'; }
-	&.fly::before { content : '\E985'; }
-	&.fog-cloud::before { content : '\E986'; }
-	&.gaseous-form::before { content : '\E987'; }
-	&.gaseous-form2::before { content : '\E988'; }
-	&.gentle-repose::before { content : '\E989'; }
-	&.gentle-repose2::before { content : '\E98A'; }
-	&.globe-of-invulnerability::before { content : '\E98B'; }
-	&.guiding-bolt::before { content : '\E98C'; }
-	&.healing-word::before { content : '\E98D'; }
-	&.heat-metal::before { content : '\E98E'; }
-	&.hellish-rebuke::before { content : '\E98F'; }
-	&.heroes-feast::before { content : '\E990'; }
-	&.heroism::before { content : '\E991'; }
-	&.hideous-laughter::before { content : '\E992'; }
-	&.identify::before { content : '\E993'; }
-	&.illusory-script::before { content : '\E994'; }
-	&.inflict-wounds::before { content : '\E995'; }
-	&.light::before { content : '\E996'; }
-	&.longstrider::before { content : '\E997'; }
-	&.mage-armor::before { content : '\E998'; }
-	&.mage-hand::before { content : '\E999'; }
-	&.magic-missile::before { content : '\E99A'; }
-	&.mass-cure-wounds::before { content : '\E99B'; }
-	&.mass-healing-word::before { content : '\E99C'; }
-	&.Mending::before { content : '\E99D'; }
-	&.message::before { content : '\E99E'; }
-	&.Minor-illusion::before { content : '\E99F'; }
-	&.movement1::before { content : '\E9A0'; }
-	&.polymorph::before { content : '\E9A1'; }
-	&.power-word-kill::before { content : '\E9A2'; }
-	&.power-word-stun::before { content : '\E9A3'; }
-	&.prayer-of-healing::before { content : '\E9A4'; }
-	&.prestidigitation::before { content : '\E9A5'; }
-	&.protection-from-evil-and-good::before { content : '\E9A6'; }
-	&.raise-dead::before { content : '\E9A7'; }
-	&.raise-dead2::before { content : '\E9A8'; }
-	&.reaction1::before { content : '\E9A9'; }
-	&.resurrection::before { content : '\E9AA'; }
-	&.resurrection2::before { content : '\E9AB'; }
-	&.revivify::before { content : '\E9AC'; }
-	&.revivify2::before { content : '\E9AD'; }
-	&.sacred-flame::before { content : '\E9AE'; }
-	&.sanctuary::before { content : '\E9AF'; }
-	&.scorching-ray::before { content : '\E9B0'; }
-	&.sending::before { content : '\E9B1'; }
-	&.shatter::before { content : '\E9B2'; }
-	&.shield::before { content : '\E9B3'; }
-	&.silent-image::before { content : '\E9B4'; }
-	&.sleep::before { content : '\E9B5'; }
-	&.speak-with-animals::before { content : '\E9B6'; }
-	&.telekinesis::before { content : '\E9B7'; }
-	&.true-strike::before { content : '\E9B8'; }
-	&.vicious-mockery::before { content : '\E9B9'; }
-	&.wall-of-fire::before { content : '\E9BA'; }
-	&.wall-of-force::before { content : '\E9BB'; }
-	&.wall-of-ice::before { content : '\E9BC'; }
-	&.wall-of-stone::before { content : '\E9BD'; }
-	&.wall-of-thorns::before { content : '\E9BE'; }
-	&.wish::before { content : '\E9BF'; }
-}

themes/fonts/iconFonts/fontAwesome.less

@@ -1,2 +0,0 @@
-/* Icon Font: Font Awesome */
-.far,.fas,.fab { display : inline; }

themes/fonts/iconFonts/game-icons_license.md

@@ -1,13 +0,0 @@
-# Game Icons License
-
-The font used in gameIcons.woff / gameIcons.less / gameIcons.js, and usable in the Homebrewery as "gi" icons, are a subset of the Game-Icons.net library of icons.
-
-## The license
-
-Game-Icons has this to say about their license:
-
-> Game-icons.net is an online repository providing heaps of cool game related graphics.
-> 
-> They are provided provided under the terms of the Creative Commons 3.0 BY license.
-> 
-> It means that you can use them freely as long as you credit the original author in your creation(see below). A mention like "Icons made by {author;}. Available on https://game-icons.net" is fine.

themes/fonts/iconFonts/gameIcons.js

@@ -1,509 +0,0 @@
-/* eslint-disable max-lines */
-
-// This is a subset of the library of icons at game-icons.net -- the subset is from RPG-Awesome repo
-
-// The entire font can be downloaded as svg from game-icons.net,
-// and then loaded through icomoon.io to create webfont from svg,
-// and the css font file can be turned into below list using regex
-// regex used: \.([^:-]*)-([^:]*)(.*)
-// substitution: "$1$2" : "$1-$2",
-
-const gameIcons = {
-	'gi_zigzag_leaf'              : 'gi zigzag-leaf',
-	'gi_zebra_shield'             : 'gi zebra-shield',
-	'gi_x_mark'                   : 'gi x-mark',
-	'gi_wyvern'                   : 'gi wyvern',
-	'gi_wrench'                   : 'gi wrench',
-	'gi_wooden_sign'              : 'gi wooden-sign',
-	'gi_wolf_howl'                : 'gi wolf-howl',
-	'gi_wolf_head'                : 'gi wolf-head',
-	'gi_wireless_signal'          : 'gi wireless-signal',
-	'gi_wifi'                     : 'gi wifi',
-	'gi_water_drop'               : 'gi water-drop',
-	'gi_virgo'                    : 'gi virgo',
-	'gi_vine_whip'                : 'gi vine-whip',
-	'gi_vial'                     : 'gi vial',
-	'gi_vest'                     : 'gi vest',
-	'gi_venomous_snake'           : 'gi venomous-snake',
-	'gi_vase'                     : 'gi vase',
-	'gi_unplugged'                : 'gi unplugged',
-	'gi_underhand'                : 'gi underhand',
-	'gi_uncertainty'              : 'gi uncertainty',
-	'gi_two_hearts'               : 'gi two-hearts',
-	'gi_two_dragons'              : 'gi two-dragons',
-	'gi_turd'                     : 'gi turd',
-	'gi_trophy'                   : 'gi trophy',
-	'gi_triforce'                 : 'gi triforce',
-	'gi_trident'                  : 'gi trident',
-	'gi_trefoil_lily'             : 'gi trefoil-lily',
-	'gi_trail'                    : 'gi trail',
-	'gi_tower'                    : 'gi tower',
-	'gi_torch'                    : 'gi torch',
-	'gi_tooth'                    : 'gi tooth',
-	'gi_tombstone'                : 'gi tombstone',
-	'gi_toast'                    : 'gi toast',
-	'gi_tic_tac_toe'              : 'gi tic-tac-toe',
-	'gi_three_keys'               : 'gi three-keys',
-	'gi_thorny_vine'              : 'gi thorny-vine',
-	'gi_thorn_arrow'              : 'gi thorn-arrow',
-	'gi_tesla'                    : 'gi tesla',
-	'gi_tentacle'                 : 'gi tentacle',
-	'gi_telescope'                : 'gi telescope',
-	'gi_taurus'                   : 'gi taurus',
-	'gi_targeted'                 : 'gi targeted',
-	'gi_target_laser'             : 'gi target-laser',
-	'gi_target_arrows'            : 'gi target-arrows',
-	'gi_syringe'                  : 'gi syringe',
-	'gi_surveillance_camera'      : 'gi surveillance-camera',
-	'gi_supersonic_arrow'         : 'gi supersonic-arrow',
-	'gi_super_mushroom'           : 'gi super-mushroom',
-	'gi_sunbeams'                 : 'gi sunbeams',
-	'gi_sun'                      : 'gi sun',
-	'gi_sun_symbol'               : 'gi sun-symbol',
-	'gi_suits'                    : 'gi suits',
-	'gi_suckered_tentacle'        : 'gi suckered-tentacle',
-	'gi_stopwatch'                : 'gi stopwatch',
-	'gi_sprout'                   : 'gi sprout',
-	'gi_sprout_emblem'            : 'gi sprout-emblem',
-	'gi_spray_can'                : 'gi spray-can',
-	'gi_splash'                   : 'gi splash',
-	'gi_spiral_shell'             : 'gi spiral-shell',
-	'gi_spinning_sword'           : 'gi spinning-sword',
-	'gi_spiked_tentacle'          : 'gi spiked-tentacle',
-	'gi_spiked_mace'              : 'gi spiked-mace',
-	'gi_spikeball'                : 'gi spikeball',
-	'gi_spider_face'              : 'gi spider-face',
-	'gi_speech_bubbles'           : 'gi speech-bubbles',
-	'gi_speech_bubble'            : 'gi speech-bubble',
-	'gi_spear_head'               : 'gi spear-head',
-	'gi_spawn_node'               : 'gi spawn-node',
-	'gi_spades'                   : 'gi spades',
-	'gi_spades_card'              : 'gi spades-card',
-	'gi_soccer_ball'              : 'gi soccer-ball',
-	'gi_snowflake'                : 'gi snowflake',
-	'gi_snorkel'                  : 'gi snorkel',
-	'gi_snake'                    : 'gi snake',
-	'gi_snail'                    : 'gi snail',
-	'gi_small_fire'               : 'gi small-fire',
-	'gi_slash_ring'               : 'gi slash-ring',
-	'gi_skull'                    : 'gi skull',
-	'gi_skull_trophy'             : 'gi skull-trophy',
-	'gi_site'                     : 'gi site',
-	'gi_sideswipe'                : 'gi sideswipe',
-	'gi_sickle'                   : 'gi sickle',
-	'gi_shuriken'                 : 'gi shuriken',
-	'gi_shovel'                   : 'gi shovel',
-	'gi_shotgun_shell'            : 'gi shotgun-shell',
-	'gi_shot_through_the_heart'   : 'gi shot-through-the-heart',
-	'gi_shoe_prints'              : 'gi shoe-prints',
-	'gi_ship_emblem'              : 'gi ship-emblem',
-	'gi_shield'                   : 'gi shield',
-	'gi_sheriff'                  : 'gi sheriff',
-	'gi_sheep'                    : 'gi sheep',
-	'gi_shark'                    : 'gi shark',
-	'gi_seagull'                  : 'gi seagull',
-	'gi_sea_serpent'              : 'gi sea-serpent',
-	'gi_scythe'                   : 'gi scythe',
-	'gi_scroll_unfurled'          : 'gi scroll-unfurled',
-	'gi_scorpio'                  : 'gi scorpio',
-	'gi_save'                     : 'gi save',
-	'gi_satellite'                : 'gi satellite',
-	'gi_sapphire'                 : 'gi sapphire',
-	'gi_sagittarius'              : 'gi sagittarius',
-	'gi_rune_stone'               : 'gi rune-stone',
-	'gi_rss'                      : 'gi rss',
-	'gi_round_shield'             : 'gi round-shield',
-	'gi_round_bottom_flask'       : 'gi round-bottom-flask',
-	'gi_robot_arm'                : 'gi robot-arm',
-	'gi_roast_chicken'            : 'gi roast-chicken',
-	'gi_ringing_bell'             : 'gi ringing-bell',
-	'gi_rifle'                    : 'gi rifle',
-	'gi_revolver'                 : 'gi revolver',
-	'gi_reverse'                  : 'gi reverse',
-	'gi_repair'                   : 'gi repair',
-	'gi_relic_blade'              : 'gi relic-blade',
-	'gi_regeneration'             : 'gi regeneration',
-	'gi_recycle'                  : 'gi recycle',
-	'gi_reactor'                  : 'gi reactor',
-	'gi_raven'                    : 'gi raven',
-	'gi_radioactive'              : 'gi radioactive',
-	'gi_radial_balance'           : 'gi radial-balance',
-	'gi_radar_dish'               : 'gi radar-dish',
-	'gi_rabbit'                   : 'gi rabbit',
-	'gi_quill_ink'                : 'gi quill-ink',
-	'gi_queen_crown'              : 'gi queen-crown',
-	'gi_pyramids'                 : 'gi pyramids',
-	'gi_potion'                   : 'gi potion',
-	'gi_poison_cloud'             : 'gi poison-cloud',
-	'gi_podium'                   : 'gi podium',
-	'gi_player'                   : 'gi player',
-	'gi_player_thunder_struck'    : 'gi player-thunder-struck',
-	'gi_player_teleport'          : 'gi player-teleport',
-	'gi_player_shot'              : 'gi player-shot',
-	'gi_player_pyromaniac'        : 'gi player-pyromaniac',
-	'gi_player_pain'              : 'gi player-pain',
-	'gi_player_lift'              : 'gi player-lift',
-	'gi_player_king'              : 'gi player-king',
-	'gi_player_dodge'             : 'gi player-dodge',
-	'gi_player_despair'           : 'gi player-despair',
-	'gi_plain_dagger'             : 'gi plain-dagger',
-	'gi_pisces'                   : 'gi pisces',
-	'gi_ping_pong'                : 'gi ping-pong',
-	'gi_pine_tree'                : 'gi pine-tree',
-	'gi_pills'                    : 'gi pills',
-	'gi_pill'                     : 'gi pill',
-	'gi_perspective_dice_three'   : 'gi perspective-dice-three',
-	'gi_perspective_dice_six'     : 'gi perspective-dice-six',
-	'gi_perspective_dice_six_two' : 'gi perspective-dice-six-two',
-	'gi_perspective_dice_random'  : 'gi perspective-dice-random',
-	'gi_perspective_dice_one'     : 'gi perspective-dice-one',
-	'gi_perspective_dice_four'    : 'gi perspective-dice-four',
-	'gi_perspective_dice_five'    : 'gi perspective-dice-five',
-	'gi_pawprint'                 : 'gi pawprint',
-	'gi_pawn'                     : 'gi pawn',
-	'gi_palm_tree'                : 'gi palm-tree',
-	'gi_overmind'                 : 'gi overmind',
-	'gi_overhead'                 : 'gi overhead',
-	'gi_ophiuchus'                : 'gi ophiuchus',
-	'gi_on_target'                : 'gi on-target',
-	'gi_omega'                    : 'gi omega',
-	'gi_octopus'                  : 'gi octopus',
-	'gi_ocean_emblem'             : 'gi ocean-emblem',
-	'gi_ocarina'                  : 'gi ocarina',
-	'gi_nuclear'                  : 'gi nuclear',
-	'gi_noose'                    : 'gi noose',
-	'gi_nodular'                  : 'gi nodular',
-	'gi_nails'                    : 'gi nails',
-	'gi_musket'                   : 'gi musket',
-	'gi_muscle_up'                : 'gi muscle-up',
-	'gi_muscle_fat'               : 'gi muscle-fat',
-	'gi_mp5'                      : 'gi mp5',
-	'gi_moon_sun'                 : 'gi moon-sun',
-	'gi_montains'                 : 'gi montains',
-	'gi_monster_skull'            : 'gi monster-skull',
-	'gi_mirror'                   : 'gi mirror',
-	'gi_mining_diamonds'          : 'gi mining-diamonds',
-	'gi_mine_wagon'               : 'gi mine-wagon',
-	'gi_microphone'               : 'gi microphone',
-	'gi_metal_gate'               : 'gi metal-gate',
-	'gi_medical_pack'             : 'gi medical-pack',
-	'gi_meat'                     : 'gi meat',
-	'gi_meat_hook'                : 'gi meat-hook',
-	'gi_match'                    : 'gi match',
-	'gi_mass_driver'              : 'gi mass-driver',
-	'gi_magnet'                   : 'gi magnet',
-	'gi_maggot'                   : 'gi maggot',
-	'gi_love_howl'                : 'gi love-howl',
-	'gi_locked_fortress'          : 'gi locked-fortress',
-	'gi_load'                     : 'gi load',
-	'gi_lit_candelabra'           : 'gi lit-candelabra',
-	'gi_lion'                     : 'gi lion',
-	'gi_lightning'                : 'gi lightning',
-	'gi_lightning_trio'           : 'gi lightning-trio',
-	'gi_lightning_sword'          : 'gi lightning-sword',
-	'gi_lightning_storm'          : 'gi lightning-storm',
-	'gi_lightning_bolt'           : 'gi lightning-bolt',
-	'gi_lighthouse'               : 'gi lighthouse',
-	'gi_light_bulb'               : 'gi light-bulb',
-	'gi_libra'                    : 'gi libra',
-	'gi_lever'                    : 'gi lever',
-	'gi_level_two'                : 'gi level-two',
-	'gi_level_two_advanced'       : 'gi level-two-advanced',
-	'gi_level_three'              : 'gi level-three',
-	'gi_level_three_advanced'     : 'gi level-three-advanced',
-	'gi_level_four'               : 'gi level-four',
-	'gi_level_four_advanced'      : 'gi level-four-advanced',
-	'gi_leo'                      : 'gi leo',
-	'gi_leaf'                     : 'gi leaf',
-	'gi_lava'                     : 'gi lava',
-	'gi_laser_site'               : 'gi laser-site',
-	'gi_laser_blast'              : 'gi laser-blast',
-	'gi_large_hammer'             : 'gi large-hammer',
-	'gi_lantern_flame'            : 'gi lantern-flame',
-	'gi_kunai'                    : 'gi kunai',
-	'gi_knight_helmet'            : 'gi knight-helmet',
-	'gi_knife'                    : 'gi knife',
-	'gi_knife_fork'               : 'gi knife-fork',
-	'gi_kitchen_knives'           : 'gi kitchen-knives',
-	'gi_key'                      : 'gi key',
-	'gi_key_basic'                : 'gi key-basic',
-	'gi_kettlebell'               : 'gi kettlebell',
-	'gi_kaleidoscope'             : 'gi kaleidoscope',
-	'gi_jigsaw_piece'             : 'gi jigsaw-piece',
-	'gi_jetpack'                  : 'gi jetpack',
-	'gi_interdiction'             : 'gi interdiction',
-	'gi_insect_jaws'              : 'gi insect-jaws',
-	'gi_incense'                  : 'gi incense',
-	'gi_implosion'                : 'gi implosion',
-	'gi_ice_cube'                 : 'gi ice-cube',
-	'gi_hydra'                    : 'gi hydra',
-	'gi_hydra_shot'               : 'gi hydra-shot',
-	'gi_hourglass'                : 'gi hourglass',
-	'gi_hot_surface'              : 'gi hot-surface',
-	'gi_hospital_cross'           : 'gi hospital-cross',
-	'gi_horseshoe'                : 'gi horseshoe',
-	'gi_horns'                    : 'gi horns',
-	'gi_horn_call'                : 'gi horn-call',
-	'gi_hood'                     : 'gi hood',
-	'gi_honeycomb'                : 'gi honeycomb',
-	'gi_hole_ladder'              : 'gi hole-ladder',
-	'gi_hive_emblem'              : 'gi hive-emblem',
-	'gi_help'                     : 'gi help',
-	'gi_helmet'                   : 'gi helmet',
-	'gi_heavy_shield'             : 'gi heavy-shield',
-	'gi_heavy_fall'               : 'gi heavy-fall',
-	'gi_heat_haze'                : 'gi heat-haze',
-	'gi_hearts'                   : 'gi hearts',
-	'gi_hearts_card'              : 'gi hearts-card',
-	'gi_heartburn'                : 'gi heartburn',
-	'gi_heart_tower'              : 'gi heart-tower',
-	'gi_heart_bottle'             : 'gi heart-bottle',
-	'gi_health'                   : 'gi health',
-	'gi_health_increase'          : 'gi health-increase',
-	'gi_health_decrease'          : 'gi health-decrease',
-	'gi_harpoon_trident'          : 'gi harpoon-trident',
-	'gi_hand'                     : 'gi hand',
-	'gi_hand_saw'                 : 'gi hand-saw',
-	'gi_hand_emblem'              : 'gi hand-emblem',
-	'gi_hammer'                   : 'gi hammer',
-	'gi_hammer_drop'              : 'gi hammer-drop',
-	'gi_halberd'                  : 'gi halberd',
-	'gi_guillotine'               : 'gi guillotine',
-	'gi_guarded_tower'            : 'gi guarded-tower',
-	'gi_groundbreaker'            : 'gi groundbreaker',
-	'gi_grenade'                  : 'gi grenade',
-	'gi_grass'                    : 'gi grass',
-	'gi_grass_patch'              : 'gi grass-patch',
-	'gi_grappling_hook'           : 'gi grappling-hook',
-	'gi_gold_bar'                 : 'gi gold-bar',
-	'gi_gloop'                    : 'gi gloop',
-	'gi_glass_heart'              : 'gi glass-heart',
-	'gi_gemini'                   : 'gi gemini',
-	'gi_gem'                      : 'gi gem',
-	'gi_gem_pendant'              : 'gi gem-pendant',
-	'gi_gecko'                    : 'gi gecko',
-	'gi_gears'                    : 'gi gears',
-	'gi_gear_heart'               : 'gi gear-heart',
-	'gi_gear_hammer'              : 'gi gear-hammer',
-	'gi_gavel'                    : 'gi gavel',
-	'gi_gamepad_cross'            : 'gi gamepad-cross',
-	'gi_frozen_arrow'             : 'gi frozen-arrow',
-	'gi_frostfire'                : 'gi frostfire',
-	'gi_frost_emblem'             : 'gi frost-emblem',
-	'gi_fox'                      : 'gi fox',
-	'gi_forward'                  : 'gi forward',
-	'gi_forging'                  : 'gi forging',
-	'gi_footprint'                : 'gi footprint',
-	'gi_food_chain'               : 'gi food-chain',
-	'gi_focused_lightning'        : 'gi focused-lightning',
-	'gi_fluffy_swirl'             : 'gi fluffy-swirl',
-	'gi_flowers'                  : 'gi flowers',
-	'gi_flower'                   : 'gi flower',
-	'gi_flat_hammer'              : 'gi flat-hammer',
-	'gi_flask'                    : 'gi flask',
-	'gi_flaming_trident'          : 'gi flaming-trident',
-	'gi_flaming_claw'             : 'gi flaming-claw',
-	'gi_flaming_arrow'            : 'gi flaming-arrow',
-	'gi_flame_symbol'             : 'gi flame-symbol',
-	'gi_fizzing_flask'            : 'gi fizzing-flask',
-	'gi_fish'                     : 'gi fish',
-	'gi_fireball_sword'           : 'gi fireball-sword',
-	'gi_fire'                     : 'gi fire',
-	'gi_fire_symbol'              : 'gi fire-symbol',
-	'gi_fire_shield'              : 'gi fire-shield',
-	'gi_fire_ring'                : 'gi fire-ring',
-	'gi_fire_breath'              : 'gi fire-breath',
-	'gi_fire_bomb'                : 'gi fire-bomb',
-	'gi_fedora'                   : 'gi fedora',
-	'gi_feathered_wing'           : 'gi feathered-wing',
-	'gi_feather_wing'             : 'gi feather-wing',
-	'gi_fast_ship'                : 'gi fast-ship',
-	'gi_falling'                  : 'gi falling',
-	'gi_fall_down'                : 'gi fall-down',
-	'gi_fairy'                    : 'gi fairy',
-	'gi_fairy_wand'               : 'gi fairy-wand',
-	'gi_eyeball'                  : 'gi eyeball',
-	'gi_eye_shield'               : 'gi eye-shield',
-	'gi_eye_monster'              : 'gi eye-monster',
-	'gi_explosive_materials'      : 'gi explosive-materials',
-	'gi_explosion'                : 'gi explosion',
-	'gi_energise'                 : 'gi energise',
-	'gi_emerald'                  : 'gi emerald',
-	'gi_eggplant'                 : 'gi eggplant',
-	'gi_egg'                      : 'gi egg',
-	'gi_egg_pod'                  : 'gi egg-pod',
-	'gi_duel'                     : 'gi duel',
-	'gi_droplets'                 : 'gi droplets',
-	'gi_droplet'                  : 'gi droplet',
-	'gi_droplet_splash'           : 'gi droplet-splash',
-	'gi_dripping_sword'           : 'gi dripping-sword',
-	'gi_dripping_knife'           : 'gi dripping-knife',
-	'gi_dripping_blade'           : 'gi dripping-blade',
-	'gi_drill'                    : 'gi drill',
-	'gi_dragonfly'                : 'gi dragonfly',
-	'gi_dragon'                   : 'gi dragon',
-	'gi_dragon_wing'              : 'gi dragon-wing',
-	'gi_dragon_breath'            : 'gi dragon-breath',
-	'gi_doubled'                  : 'gi doubled',
-	'gi_double_team'              : 'gi double-team',
-	'gi_diving_dagger'            : 'gi diving-dagger',
-	'gi_divert'                   : 'gi divert',
-	'gi_dinosaur'                 : 'gi dinosaur',
-	'gi_dice_two'                 : 'gi dice-two',
-	'gi_dice_three'               : 'gi dice-three',
-	'gi_dice_six'                 : 'gi dice-six',
-	'gi_dice_one'                 : 'gi dice-one',
-	'gi_dice_four'                : 'gi dice-four',
-	'gi_dice_five'                : 'gi dice-five',
-	'gi_diamonds'                 : 'gi diamonds',
-	'gi_diamonds_card'            : 'gi diamonds-card',
-	'gi_diamond'                  : 'gi diamond',
-	'gi_desert_skull'             : 'gi desert-skull',
-	'gi_dervish_swords'           : 'gi dervish-swords',
-	'gi_demolish'                 : 'gi demolish',
-	'gi_defibrillate'             : 'gi defibrillate',
-	'gi_decapitation'             : 'gi decapitation',
-	'gi_death_skull'              : 'gi death-skull',
-	'gi_dead_tree'                : 'gi dead-tree',
-	'gi_daisy'                    : 'gi daisy',
-	'gi_daggers'                  : 'gi daggers',
-	'gi_cycle'                    : 'gi cycle',
-	'gi_cut_palm'                 : 'gi cut-palm',
-	'gi_cubes'                    : 'gi cubes',
-	'gi_crystals'                 : 'gi crystals',
-	'gi_crystal_wand'             : 'gi crystal-wand',
-	'gi_crystal_cluster'          : 'gi crystal-cluster',
-	'gi_crystal_ball'             : 'gi crystal-ball',
-	'gi_crush'                    : 'gi crush',
-	'gi_crowned_heart'            : 'gi crowned-heart',
-	'gi_crown'                    : 'gi crown',
-	'gi_crown_of_thorns'          : 'gi crown-of-thorns',
-	'gi_crossed_swords'           : 'gi crossed-swords',
-	'gi_crossed_sabres'           : 'gi crossed-sabres',
-	'gi_crossed_pistols'          : 'gi crossed-pistols',
-	'gi_crossed_bones'            : 'gi crossed-bones',
-	'gi_crossed_axes'             : 'gi crossed-axes',
-	'gi_crossbow'                 : 'gi crossbow',
-	'gi_croc_sword'               : 'gi croc-sword',
-	'gi_cracked_shield'           : 'gi cracked-shield',
-	'gi_cracked_helm'             : 'gi cracked-helm',
-	'gi_crab_claw'                : 'gi crab-claw',
-	'gi_corked_tube'              : 'gi corked-tube',
-	'gi_compass'                  : 'gi compass',
-	'gi_cold_heart'               : 'gi cold-heart',
-	'gi_cog'                      : 'gi cog',
-	'gi_cog_wheel'                : 'gi cog-wheel',
-	'gi_coffee_mug'               : 'gi coffee-mug',
-	'gi_cluster_bomb'             : 'gi cluster-bomb',
-	'gi_clovers'                  : 'gi clovers',
-	'gi_clovers_card'             : 'gi clovers-card',
-	'gi_clover'                   : 'gi clover',
-	'gi_clockwork'                : 'gi clockwork',
-	'gi_cloak_and_dagger'         : 'gi cloak-and-dagger',
-	'gi_circular_shield'          : 'gi circular-shield',
-	'gi_circular_saw'             : 'gi circular-saw',
-	'gi_circle_of_circles'        : 'gi circle-of-circles',
-	'gi_chicken_leg'              : 'gi chicken-leg',
-	'gi_chessboard'               : 'gi chessboard',
-	'gi_chemical_arrow'           : 'gi chemical-arrow',
-	'gi_cheese'                   : 'gi cheese',
-	'gi_chain'                    : 'gi chain',
-	'gi_cat'                      : 'gi cat',
-	'gi_castle_flag'              : 'gi castle-flag',
-	'gi_castle_emblem'            : 'gi castle-emblem',
-	'gi_carrot'                   : 'gi carrot',
-	'gi_capricorn'                : 'gi capricorn',
-	'gi_capitol'                  : 'gi capitol',
-	'gi_cannon_shot'              : 'gi cannon-shot',
-	'gi_candle'                   : 'gi candle',
-	'gi_candle_fire'              : 'gi candle-fire',
-	'gi_cancer'                   : 'gi cancer',
-	'gi_cancel'                   : 'gi cancel',
-	'gi_campfire'                 : 'gi campfire',
-	'gi_butterfly'                : 'gi butterfly',
-	'gi_burst_blob'               : 'gi burst-blob',
-	'gi_burning_meteor'           : 'gi burning-meteor',
-	'gi_burning_eye'              : 'gi burning-eye',
-	'gi_burning_embers'           : 'gi burning-embers',
-	'gi_burning_book'             : 'gi burning-book',
-	'gi_bullets'                  : 'gi bullets',
-	'gi_bubbling_potion'          : 'gi bubbling-potion',
-	'gi_broken_skull'             : 'gi broken-skull',
-	'gi_broken_shield'            : 'gi broken-shield',
-	'gi_broken_heart'             : 'gi broken-heart',
-	'gi_broken_bottle'            : 'gi broken-bottle',
-	'gi_broken_bone'              : 'gi broken-bone',
-	'gi_broadsword'               : 'gi broadsword',
-	'gi_broadhead_arrow'          : 'gi broadhead-arrow',
-	'gi_bridge'                   : 'gi bridge',
-	'gi_brandy_bottle'            : 'gi brandy-bottle',
-	'gi_brain_freeze'             : 'gi brain-freeze',
-	'gi_bowling_pin'              : 'gi bowling-pin',
-	'gi_bowie_knife'              : 'gi bowie-knife',
-	'gi_bottom_right'             : 'gi bottom-right',
-	'gi_bottled_bolt'             : 'gi bottled-bolt',
-	'gi_bottle_vapors'            : 'gi bottle-vapors',
-	'gi_boot_stomp'               : 'gi boot-stomp',
-	'gi_boomerang'                : 'gi boomerang',
-	'gi_book'                     : 'gi book',
-	'gi_bone_knife'               : 'gi bone-knife',
-	'gi_bone_bite'                : 'gi bone-bite',
-	'gi_bombs'                    : 'gi bombs',
-	'gi_bomb_explosion'           : 'gi bomb-explosion',
-	'gi_bolt_shield'              : 'gi bolt-shield',
-	'gi_bleeding_hearts'          : 'gi bleeding-hearts',
-	'gi_bleeding_eye'             : 'gi bleeding-eye',
-	'gi_blaster'                  : 'gi blaster',
-	'gi_blast'                    : 'gi blast',
-	'gi_blade_bite'               : 'gi blade-bite',
-	'gi_bird_mask'                : 'gi bird-mask',
-	'gi_bird_claw'                : 'gi bird-claw',
-	'gi_biohazard'                : 'gi biohazard',
-	'gi_bell'                     : 'gi bell',
-	'gi_beetle'                   : 'gi beetle',
-	'gi_beer'                     : 'gi beer',
-	'gi_bear_trap'                : 'gi bear-trap',
-	'gi_beam_wake'                : 'gi beam-wake',
-	'gi_batwings'                 : 'gi batwings',
-	'gi_battery_white'            : 'gi battery-white',
-	'gi_battery_positive'         : 'gi battery-positive',
-	'gi_battery_negative'         : 'gi battery-negative',
-	'gi_battery_black'            : 'gi battery-black',
-	'gi_battery_75'               : 'gi battery-75',
-	'gi_battery_50'               : 'gi battery-50',
-	'gi_battery_25'               : 'gi battery-25',
-	'gi_battery_100'              : 'gi battery-100',
-	'gi_battery_0'                : 'gi battery-0',
-	'gi_batteries'                : 'gi batteries',
-	'gi_battered_axe'             : 'gi battered-axe',
-	'gi_bat_sword'                : 'gi bat-sword',
-	'gi_barrier'                  : 'gi barrier',
-	'gi_barbed_arrow'             : 'gi barbed-arrow',
-	'gi_ball'                     : 'gi ball',
-	'gi_axe'                      : 'gi axe',
-	'gi_axe_swing'                : 'gi axe-swing',
-	'gi_aware'                    : 'gi aware',
-	'gi_aura'                     : 'gi aura',
-	'gi_arson'                    : 'gi arson',
-	'gi_arrow_flights'            : 'gi arrow-flights',
-	'gi_arrow_cluster'            : 'gi arrow-cluster',
-	'gi_aries'                    : 'gi aries',
-	'gi_arena'                    : 'gi arena',
-	'gi_archery_target'           : 'gi archery-target',
-	'gi_archer'                   : 'gi archer',
-	'gi_arcane_mask'              : 'gi arcane-mask',
-	'gi_aquarius'                 : 'gi aquarius',
-	'gi_apple'                    : 'gi apple',
-	'gi_anvil'                    : 'gi anvil',
-	'gi_ankh'                     : 'gi ankh',
-	'gi_angel_wings'              : 'gi angel-wings',
-	'gi_anchor'                   : 'gi anchor',
-	'gi_ammo_bag'                 : 'gi ammo-bag',
-	'gi_alligator_clip'           : 'gi alligator-clip',
-	'gi_all_for_one'              : 'gi all-for-one',
-	'gi_alien_fire'               : 'gi alien-fire',
-	'gi_acorn'                    : 'gi acorn',
-	'gi_acid'                     : 'gi acid'
-};
-
-module.exports = gameIcons;

themes/fonts/iconFonts/gameIcons.less

@@ -1,516 +0,0 @@
-@font-face {
-	font-family : 'Game-Icons';
-	font-style : normal;
-	font-weight : normal;
-	src : url('../../../fonts/iconFonts/gameIcons.woff') format('woff');
-	font-display : block;
-}
-  
-.gi {
-	/* use !important to prevent issues with browser extensions that change fonts */
-	display                 : inline;
-	font-family             : 'Game-Icons' !important;
-	line-height             : 1;
-	vertical-align          : baseline;
-	text-rendering          : auto;
-  
-	/* Better Font Rendering =========== */
-	-webkit-font-smoothing  : antialiased;
-	-moz-osx-font-smoothing : grayscale;
-  
-	&.zigzag-leaf::before { content : '\e900'; }
-	&.zebra-shield::before { content : '\e901'; }
-	&.x-mark::before { content : '\e902'; }
-	&.wyvern::before { content : '\e903'; }
-	&.wrench::before { content : '\e904'; }
-	&.wooden-sign::before { content : '\e905'; }
-	&.wolf-howl::before { content : '\e906'; }
-	&.wolf-head::before { content : '\e907'; }
-	&.wireless-signal::before { content : '\e908'; }
-	&.wifi::before { content : '\e909'; }
-	&.water-drop::before { content : '\e90a'; }
-	&.virgo::before { content : '\e90b'; }
-	&.vine-whip::before { content : '\e90c'; }
-	&.vial::before { content : '\e90d'; }
-	&.vest::before { content : '\e90e'; }
-	&.venomous-snake::before { content : '\e90f'; }
-	&.vase::before { content : '\e910'; }
-	&.unplugged::before { content : '\e911'; }
-	&.underhand::before { content : '\e912'; }
-	&.uncertainty::before { content : '\e913'; }
-	&.two-hearts::before { content : '\e914'; }
-	&.two-dragons::before { content : '\e915'; }
-	&.turd::before { content : '\e916'; }
-	&.trophy::before { content : '\e917'; }
-	&.triforce::before { content : '\e918'; }
-	&.trident::before { content : '\e919'; }
-	&.trefoil-lily::before { content : '\e91a'; }
-	&.trail::before { content : '\e91b'; }
-	&.tower::before { content : '\e91c'; }
-	&.torch::before { content : '\e91d'; }
-	&.tooth::before { content : '\e91e'; }
-	&.tombstone::before { content : '\e91f'; }
-	&.toast::before { content : '\e920'; }
-	&.tic-tac-toe::before { content : '\e921'; }
-	&.three-keys::before { content : '\e922'; }
-	&.thorny-vine::before { content : '\e923'; }
-	&.thorn-arrow::before { content : '\e924'; }
-	&.tesla::before { content : '\e925'; }
-	&.tentacle::before { content : '\e926'; }
-	&.telescope::before { content : '\e927'; }
-	&.taurus::before { content : '\e928'; }
-	&.targeted::before { content : '\e929'; }
-	&.target-laser::before { content : '\e92a'; }
-	&.target-arrows::before { content : '\e92b'; }
-	&.syringe::before { content : '\e92c'; }
-	&.surveillance-camera::before { content : '\e92d'; }
-	&.supersonic-arrow::before { content : '\e92e'; }
-	&.super-mushroom::before { content : '\e92f'; }
-	&.sunbeams::before { content : '\e930'; }
-	&.sun::before { content : '\e931'; }
-	&.sun-symbol::before { content : '\e932'; }
-	&.suits::before { content : '\e933'; }
-	&.suckered-tentacle::before { content : '\e934'; }
-	&.stopwatch::before { content : '\e935'; }
-	&.sprout::before { content : '\e936'; }
-	&.sprout-emblem::before { content : '\e937'; }
-	&.spray-can::before { content : '\e938'; }
-	&.splash::before { content : '\e939'; }
-	&.spiral-shell::before { content : '\e93a'; }
-	&.spinning-sword::before { content : '\e93b'; }
-	&.spiked-tentacle::before { content : '\e93c'; }
-	&.spiked-mace::before { content : '\e93d'; }
-	&.spikeball::before { content : '\e93e'; }
-	&.spider-face::before { content : '\e93f'; }
-	&.speech-bubbles::before { content : '\e940'; }
-	&.speech-bubble::before { content : '\e941'; }
-	&.spear-head::before { content : '\e942'; }
-	&.spawn-node::before { content : '\e943'; }
-	&.spades::before { content : '\e944'; }
-	&.spades-card::before { content : '\e945'; }
-	&.soccer-ball::before { content : '\e946'; }
-	&.snowflake::before { content : '\e947'; }
-	&.snorkel::before { content : '\e948'; }
-	&.snake::before { content : '\e949'; }
-	&.snail::before { content : '\e94a'; }
-	&.small-fire::before { content : '\e94b'; }
-	&.slash-ring::before { content : '\e94c'; }
-	&.skull::before { content : '\e94d'; }
-	&.skull-trophy::before { content : '\e94e'; }
-	&.site::before { content : '\e94f'; }
-	&.sideswipe::before { content : '\e950'; }
-	&.sickle::before { content : '\e951'; }
-	&.shuriken::before { content : '\e952'; }
-	&.shovel::before { content : '\e953'; }
-	&.shotgun-shell::before { content : '\e954'; }
-	&.shot-through-the-heart::before { content : '\e955'; }
-	&.shoe-prints::before { content : '\e956'; }
-	&.ship-emblem::before { content : '\e957'; }
-	&.shield::before { content : '\e958'; }
-	&.sheriff::before { content : '\e959'; }
-	&.sheep::before { content : '\e95a'; }
-	&.shark::before { content : '\e95b'; }
-	&.seagull::before { content : '\e95c'; }
-	&.sea-serpent::before { content : '\e95d'; }
-	&.scythe::before { content : '\e95e'; }
-	&.scroll-unfurled::before { content : '\e95f'; }
-	&.scorpio::before { content : '\e960'; }
-	&.save::before { content : '\e961'; }
-	&.satellite::before { content : '\e962'; }
-	&.sapphire::before { content : '\e963'; }
-	&.sagittarius::before { content : '\e964'; }
-	&.rune-stone::before { content : '\e965'; }
-	&.rss::before { content : '\e966'; }
-	&.round-shield::before { content : '\e967'; }
-	&.round-bottom-flask::before { content : '\e968'; }
-	&.robot-arm::before { content : '\e969'; }
-	&.roast-chicken::before { content : '\e96a'; }
-	&.ringing-bell::before { content : '\e96b'; }
-	&.rifle::before { content : '\e96c'; }
-	&.revolver::before { content : '\e96d'; }
-	&.reverse::before { content : '\e96e'; }
-	&.repair::before { content : '\e96f'; }
-	&.relic-blade::before { content : '\e970'; }
-	&.regeneration::before { content : '\e971'; }
-	&.recycle::before { content : '\e972'; }
-	&.reactor::before { content : '\e973'; }
-	&.raven::before { content : '\e974'; }
-	&.radioactive::before { content : '\e975'; }
-	&.radial-balance::before { content : '\e976'; }
-	&.radar-dish::before { content : '\e977'; }
-	&.rabbit::before { content : '\e978'; }
-	&.quill-ink::before { content : '\e979'; }
-	&.queen-crown::before { content : '\e97a'; }
-	&.pyramids::before { content : '\e97b'; }
-	&.potion::before { content : '\e97c'; }
-	&.poison-cloud::before { content : '\e97d'; }
-	&.podium::before { content : '\e97e'; }
-	&.player::before { content : '\e97f'; }
-	&.player-thunder-struck::before { content : '\e980'; }
-	&.player-teleport::before { content : '\e981'; }
-	&.player-shot::before { content : '\e982'; }
-	&.player-pyromaniac::before { content : '\e983'; }
-	&.player-pain::before { content : '\e984'; }
-	&.player-lift::before { content : '\e985'; }
-	&.player-king::before { content : '\e986'; }
-	&.player-dodge::before { content : '\e987'; }
-	&.player-despair::before { content : '\e988'; }
-	&.plain-dagger::before { content : '\e989'; }
-	&.pisces::before { content : '\e98a'; }
-	&.ping-pong::before { content : '\e98b'; }
-	&.pine-tree::before { content : '\e98c'; }
-	&.pills::before { content : '\e98d'; }
-	&.pill::before { content : '\e98e'; }
-	&.perspective-dice-three::before { content : '\e98f'; }
-	&.perspective-dice-six::before { content : '\e990'; }
-	&.perspective-dice-six-two::before { content : '\e991'; }
-	&.perspective-dice-random::before { content : '\e992'; }
-	&.perspective-dice-one::before { content : '\e993'; }
-	&.perspective-dice-four::before { content : '\e994'; }
-	&.perspective-dice-five::before { content : '\e995'; }
-	&.pawprint::before { content : '\e996'; }
-	&.pawn::before { content : '\e997'; }
-	&.palm-tree::before { content : '\e998'; }
-	&.overmind::before { content : '\e999'; }
-	&.overhead::before { content : '\e99a'; }
-	&.ophiuchus::before { content : '\e99b'; }
-	&.on-target::before { content : '\e99c'; }
-	&.omega::before { content : '\e99d'; }
-	&.octopus::before { content : '\e99e'; }
-	&.ocean-emblem::before { content : '\e99f'; }
-	&.ocarina::before { content : '\e9a0'; }
-	&.nuclear::before { content : '\e9a1'; }
-	&.noose::before { content : '\e9a2'; }
-	&.nodular::before { content : '\e9a3'; }
-	&.nails::before { content : '\e9a4'; }
-	&.musket::before { content : '\e9a5'; }
-	&.muscle-up::before { content : '\e9a6'; }
-	&.muscle-fat::before { content : '\e9a7'; }
-	&.mp5::before { content : '\e9a8'; }
-	&.moon-sun::before { content : '\e9a9'; }
-	&.montains::before { content : '\e9aa'; }
-	&.monster-skull::before { content : '\e9ab'; }
-	&.mirror::before { content : '\e9ac'; }
-	&.mining-diamonds::before { content : '\e9ad'; }
-	&.mine-wagon::before { content : '\e9ae'; }
-	&.microphone::before { content : '\e9af'; }
-	&.metal-gate::before { content : '\e9b0'; }
-	&.medical-pack::before { content : '\e9b1'; }
-	&.meat::before { content : '\e9b2'; }
-	&.meat-hook::before { content : '\e9b3'; }
-	&.match::before { content : '\e9b4'; }
-	&.mass-driver::before { content : '\e9b5'; }
-	&.magnet::before { content : '\e9b6'; }
-	&.maggot::before { content : '\e9b7'; }
-	&.love-howl::before { content : '\e9b8'; }
-	&.locked-fortress::before { content : '\e9b9'; }
-	&.load::before { content : '\e9ba'; }
-	&.lit-candelabra::before { content : '\e9bb'; }
-	&.lion::before { content : '\e9bc'; }
-	&.lightning::before { content : '\e9bd'; }
-	&.lightning-trio::before { content : '\e9be'; }
-	&.lightning-sword::before { content : '\e9bf'; }
-	&.lightning-storm::before { content : '\e9c0'; }
-	&.lightning-bolt::before { content : '\e9c1'; }
-	&.lighthouse::before { content : '\e9c2'; }
-	&.light-bulb::before { content : '\e9c3'; }
-	&.libra::before { content : '\e9c4'; }
-	&.lever::before { content : '\e9c5'; }
-	&.level-two::before { content : '\e9c6'; }
-	&.level-two-advanced::before { content : '\e9c7'; }
-	&.level-three::before { content : '\e9c8'; }
-	&.level-three-advanced::before { content : '\e9c9'; }
-	&.level-four::before { content : '\e9ca'; }
-	&.level-four-advanced::before { content : '\e9cb'; }
-	&.leo::before { content : '\e9cc'; }
-	&.leaf::before { content : '\e9cd'; }
-	&.lava::before { content : '\e9ce'; }
-	&.laser-site::before { content : '\e9cf'; }
-	&.laser-blast::before { content : '\e9d0'; }
-	&.large-hammer::before { content : '\e9d1'; }
-	&.lantern-flame::before { content : '\e9d2'; }
-	&.kunai::before { content : '\e9d3'; }
-	&.knight-helmet::before { content : '\e9d4'; }
-	&.knife::before { content : '\e9d5'; }
-	&.knife-fork::before { content : '\e9d6'; }
-	&.kitchen-knives::before { content : '\e9d7'; }
-	&.key::before { content : '\e9d8'; }
-	&.key-basic::before { content : '\e9d9'; }
-	&.kettlebell::before { content : '\e9da'; }
-	&.kaleidoscope::before { content : '\e9db'; }
-	&.jigsaw-piece::before { content : '\e9dc'; }
-	&.jetpack::before { content : '\e9dd'; }
-	&.interdiction::before { content : '\e9de'; }
-	&.insect-jaws::before { content : '\e9df'; }
-	&.incense::before { content : '\e9e0'; }
-	&.implosion::before { content : '\e9e1'; }
-	&.ice-cube::before { content : '\e9e2'; }
-	&.hydra::before { content : '\e9e3'; }
-	&.hydra-shot::before { content : '\e9e4'; }
-	&.hourglass::before { content : '\e9e5'; }
-	&.hot-surface::before { content : '\e9e6'; }
-	&.hospital-cross::before { content : '\e9e7'; }
-	&.horseshoe::before { content : '\e9e8'; }
-	&.horns::before { content : '\e9e9'; }
-	&.horn-call::before { content : '\e9ea'; }
-	&.hood::before { content : '\e9eb'; }
-	&.honeycomb::before { content : '\e9ec'; }
-	&.hole-ladder::before { content : '\e9ed'; }
-	&.hive-emblem::before { content : '\e9ee'; }
-	&.help::before { content : '\e9ef'; }
-	&.helmet::before { content : '\e9f0'; }
-	&.heavy-shield::before { content : '\e9f1'; }
-	&.heavy-fall::before { content : '\e9f2'; }
-	&.heat-haze::before { content : '\e9f3'; }
-	&.hearts::before { content : '\e9f4'; }
-	&.hearts-card::before { content : '\e9f5'; }
-	&.heartburn::before { content : '\e9f6'; }
-	&.heart-tower::before { content : '\e9f7'; }
-	&.heart-bottle::before { content : '\e9f8'; }
-	&.health::before { content : '\e9f9'; }
-	&.health-increase::before { content : '\e9fa'; }
-	&.health-decrease::before { content : '\e9fb'; }
-	&.harpoon-trident::before { content : '\e9fc'; }
-	&.hand::before { content : '\e9fd'; }
-	&.hand-saw::before { content : '\e9fe'; }
-	&.hand-emblem::before { content : '\e9ff'; }
-	&.hammer::before { content : '\ea00'; }
-	&.hammer-drop::before { content : '\ea01'; }
-	&.halberd::before { content : '\ea02'; }
-	&.guillotine::before { content : '\ea03'; }
-	&.guarded-tower::before { content : '\ea04'; }
-	&.groundbreaker::before { content : '\ea05'; }
-	&.grenade::before { content : '\ea06'; }
-	&.grass::before { content : '\ea07'; }
-	&.grass-patch::before { content : '\ea08'; }
-	&.grappling-hook::before { content : '\ea09'; }
-	&.gold-bar::before { content : '\ea0a'; }
-	&.gloop::before { content : '\ea0b'; }
-	&.glass-heart::before { content : '\ea0c'; }
-	&.gemini::before { content : '\ea0d'; }
-	&.gem::before { content : '\ea0e'; }
-	&.gem-pendant::before { content : '\ea0f'; }
-	&.gecko::before { content : '\ea10'; }
-	&.gears::before { content : '\ea11'; }
-	&.gear-heart::before { content : '\ea12'; }
-	&.gear-hammer::before { content : '\ea13'; }
-	&.gavel::before { content : '\ea14'; }
-	&.gamepad-cross::before { content : '\ea15'; }
-	&.frozen-arrow::before { content : '\ea16'; }
-	&.frostfire::before { content : '\ea17'; }
-	&.frost-emblem::before { content : '\ea18'; }
-	&.fox::before { content : '\ea19'; }
-	&.forward::before { content : '\ea1a'; }
-	&.forging::before { content : '\ea1b'; }
-	&.footprint::before { content : '\ea1c'; }
-	&.food-chain::before { content : '\ea1d'; }
-	&.focused-lightning::before { content : '\ea1e'; }
-	&.fluffy-swirl::before { content : '\ea1f'; }
-	&.flowers::before { content : '\ea20'; }
-	&.flower::before { content : '\ea21'; }
-	&.flat-hammer::before { content : '\ea22'; }
-	&.flask::before { content : '\ea23'; }
-	&.flaming-trident::before { content : '\ea24'; }
-	&.flaming-claw::before { content : '\ea25'; }
-	&.flaming-arrow::before { content : '\ea26'; }
-	&.flame-symbol::before { content : '\ea27'; }
-	&.fizzing-flask::before { content : '\ea28'; }
-	&.fish::before { content : '\ea29'; }
-	&.fireball-sword::before { content : '\ea2a'; }
-	&.fire::before { content : '\ea2b'; }
-	&.fire-symbol::before { content : '\ea2c'; }
-	&.fire-shield::before { content : '\ea2d'; }
-	&.fire-ring::before { content : '\ea2e'; }
-	&.fire-breath::before { content : '\ea2f'; }
-	&.fire-bomb::before { content : '\ea30'; }
-	&.fedora::before { content : '\ea31'; }
-	&.feathered-wing::before { content : '\ea32'; }
-	&.feather-wing::before { content : '\ea33'; }
-	&.fast-ship::before { content : '\ea34'; }
-	&.falling::before { content : '\ea35'; }
-	&.fall-down::before { content : '\ea36'; }
-	&.fairy::before { content : '\ea37'; }
-	&.fairy-wand::before { content : '\ea38'; }
-	&.eyeball::before { content : '\ea39'; }
-	&.eye-shield::before { content : '\ea3a'; }
-	&.eye-monster::before { content : '\ea3b'; }
-	&.explosive-materials::before { content : '\ea3c'; }
-	&.explosion::before { content : '\ea3d'; }
-	&.energise::before { content : '\ea3e'; }
-	&.emerald::before { content : '\ea3f'; }
-	&.eggplant::before { content : '\ea40'; }
-	&.egg::before { content : '\ea41'; }
-	&.egg-pod::before { content : '\ea42'; }
-	&.duel::before { content : '\ea43'; }
-	&.droplets::before { content : '\ea44'; }
-	&.droplet::before { content : '\ea45'; }
-	&.droplet-splash::before { content : '\ea46'; }
-	&.dripping-sword::before { content : '\ea47'; }
-	&.dripping-knife::before { content : '\ea48'; }
-	&.dripping-blade::before { content : '\ea49'; }
-	&.drill::before { content : '\ea4a'; }
-	&.dragonfly::before { content : '\ea4b'; }
-	&.dragon::before { content : '\ea4c'; }
-	&.dragon-wing::before { content : '\ea4d'; }
-	&.dragon-breath::before { content : '\ea4e'; }
-	&.doubled::before { content : '\ea4f'; }
-	&.double-team::before { content : '\ea50'; }
-	&.diving-dagger::before { content : '\ea51'; }
-	&.divert::before { content : '\ea52'; }
-	&.dinosaur::before { content : '\ea53'; }
-	&.dice-two::before { content : '\ea54'; }
-	&.dice-three::before { content : '\ea55'; }
-	&.dice-six::before { content : '\ea56'; }
-	&.dice-one::before { content : '\ea57'; }
-	&.dice-four::before { content : '\ea58'; }
-	&.dice-five::before { content : '\ea59'; }
-	&.diamonds::before { content : '\ea5a'; }
-	&.diamonds-card::before { content : '\ea5b'; }
-	&.diamond::before { content : '\ea5c'; }
-	&.desert-skull::before { content : '\ea5d'; }
-	&.dervish-swords::before { content : '\ea5e'; }
-	&.demolish::before { content : '\ea5f'; }
-	&.defibrillate::before { content : '\ea60'; }
-	&.decapitation::before { content : '\ea61'; }
-	&.death-skull::before { content : '\ea62'; }
-	&.dead-tree::before { content : '\ea63'; }
-	&.daisy::before { content : '\ea64'; }
-	&.daggers::before { content : '\ea65'; }
-	&.cycle::before { content : '\ea66'; }
-	&.cut-palm::before { content : '\ea67'; }
-	&.cubes::before { content : '\ea68'; }
-	&.crystals::before { content : '\ea69'; }
-	&.crystal-wand::before { content : '\ea6a'; }
-	&.crystal-cluster::before { content : '\ea6b'; }
-	&.crystal-ball::before { content : '\ea6c'; }
-	&.crush::before { content : '\ea6d'; }
-	&.crowned-heart::before { content : '\ea6e'; }
-	&.crown::before { content : '\ea6f'; }
-	&.crown-of-thorns::before { content : '\ea70'; }
-	&.crossed-swords::before { content : '\ea71'; }
-	&.crossed-sabres::before { content : '\ea72'; }
-	&.crossed-pistols::before { content : '\ea73'; }
-	&.crossed-bones::before { content : '\ea74'; }
-	&.crossed-axes::before { content : '\ea75'; }
-	&.crossbow::before { content : '\ea76'; }
-	&.croc-sword::before { content : '\ea77'; }
-	&.cracked-shield::before { content : '\ea78'; }
-	&.cracked-helm::before { content : '\ea79'; }
-	&.crab-claw::before { content : '\ea7a'; }
-	&.corked-tube::before { content : '\ea7b'; }
-	&.compass::before { content : '\ea7c'; }
-	&.cold-heart::before { content : '\ea7d'; }
-	&.cog::before { content : '\ea7e'; }
-	&.cog-wheel::before { content : '\ea7f'; }
-	&.coffee-mug::before { content : '\ea80'; }
-	&.cluster-bomb::before { content : '\ea81'; }
-	&.clovers::before { content : '\ea82'; }
-	&.clovers-card::before { content : '\ea83'; }
-	&.clover::before { content : '\ea84'; }
-	&.clockwork::before { content : '\ea85'; }
-	&.cloak-and-dagger::before { content : '\ea86'; }
-	&.circular-shield::before { content : '\ea87'; }
-	&.circular-saw::before { content : '\ea88'; }
-	&.circle-of-circles::before { content : '\ea89'; }
-	&.chicken-leg::before { content : '\ea8a'; }
-	&.chessboard::before { content : '\ea8b'; }
-	&.chemical-arrow::before { content : '\ea8c'; }
-	&.cheese::before { content : '\ea8d'; }
-	&.chain::before { content : '\ea8e'; }
-	&.cat::before { content : '\ea8f'; }
-	&.castle-flag::before { content : '\ea90'; }
-	&.castle-emblem::before { content : '\ea91'; }
-	&.carrot::before { content : '\ea92'; }
-	&.capricorn::before { content : '\ea93'; }
-	&.capitol::before { content : '\ea94'; }
-	&.cannon-shot::before { content : '\ea95'; }
-	&.candle::before { content : '\ea96'; }
-	&.candle-fire::before { content : '\ea97'; }
-	&.cancer::before { content : '\ea98'; }
-	&.cancel::before { content : '\ea99'; }
-	&.campfire::before { content : '\ea9a'; }
-	&.butterfly::before { content : '\ea9b'; }
-	&.burst-blob::before { content : '\ea9c'; }
-	&.burning-meteor::before { content : '\ea9d'; }
-	&.burning-eye::before { content : '\ea9e'; }
-	&.burning-embers::before { content : '\ea9f'; }
-	&.burning-book::before { content : '\eaa0'; }
-	&.bullets::before { content : '\eaa1'; }
-	&.bubbling-potion::before { content : '\eaa2'; }
-	&.broken-skull::before { content : '\eaa3'; }
-	&.broken-shield::before { content : '\eaa4'; }
-	&.broken-heart::before { content : '\eaa5'; }
-	&.broken-bottle::before { content : '\eaa6'; }
-	&.broken-bone::before { content : '\eaa7'; }
-	&.broadsword::before { content : '\eaa8'; }
-	&.broadhead-arrow::before { content : '\eaa9'; }
-	&.bridge::before { content : '\eaaa'; }
-	&.brandy-bottle::before { content : '\eaab'; }
-	&.brain-freeze::before { content : '\eaac'; }
-	&.bowling-pin::before { content : '\eaad'; }
-	&.bowie-knife::before { content : '\eaae'; }
-	&.bottom-right::before { content : '\eaaf'; }
-	&.bottled-bolt::before { content : '\eab0'; }
-	&.bottle-vapors::before { content : '\eab1'; }
-	&.boot-stomp::before { content : '\eab2'; }
-	&.boomerang::before { content : '\eab3'; }
-	&.book::before { content : '\eab4'; }
-	&.bone-knife::before { content : '\eab5'; }
-	&.bone-bite::before { content : '\eab6'; }
-	&.bombs::before { content : '\eab7'; }
-	&.bomb-explosion::before { content : '\eab8'; }
-	&.bolt-shield::before { content : '\eab9'; }
-	&.bleeding-hearts::before { content : '\eaba'; }
-	&.bleeding-eye::before { content : '\eabb'; }
-	&.blaster::before { content : '\eabc'; }
-	&.blast::before { content : '\eabd'; }
-	&.blade-bite::before { content : '\eabe'; }
-	&.bird-mask::before { content : '\eabf'; }
-	&.bird-claw::before { content : '\eac0'; }
-	&.biohazard::before { content : '\eac1'; }
-	&.bell::before { content : '\eac2'; }
-	&.beetle::before { content : '\eac3'; }
-	&.beer::before { content : '\eac4'; }
-	&.bear-trap::before { content : '\eac5'; }
-	&.beam-wake::before { content : '\eac6'; }
-	&.batwings::before { content : '\eac7'; }
-	&.battery-white::before { content : '\eac8'; }
-	&.battery-positive::before { content : '\eac9'; }
-	&.battery-negative::before { content : '\eaca'; }
-	&.battery-black::before { content : '\eacb'; }
-	&.battery-75::before { content : '\eacc'; }
-	&.battery-50::before { content : '\eacd'; }
-	&.battery-25::before { content : '\eace'; }
-	&.battery-100::before { content : '\eacf'; }
-	&.battery-0::before { content : '\ead0'; }
-	&.batteries::before { content : '\ead1'; }
-	&.battered-axe::before { content : '\ead2'; }
-	&.bat-sword::before { content : '\ead3'; }
-	&.barrier::before { content : '\ead4'; }
-	&.barbed-arrow::before { content : '\ead5'; }
-	&.ball::before { content : '\ead6'; }
-	&.axe::before { content : '\ead7'; }
-	&.axe-swing::before { content : '\ead8'; }
-	&.aware::before { content : '\ead9'; }
-	&.aura::before { content : '\eada'; }
-	&.arson::before { content : '\eadb'; }
-	&.arrow-flights::before { content : '\eadc'; }
-	&.arrow-cluster::before { content : '\eadd'; }
-	&.aries::before { content : '\eade'; }
-	&.arena::before { content : '\eadf'; }
-	&.archery-target::before { content : '\eae0'; }
-	&.archer::before { content : '\eae1'; }
-	&.arcane-mask::before { content : '\eae2'; }
-	&.aquarius::before { content : '\eae3'; }
-	&.apple::before { content : '\eae4'; }
-	&.anvil::before { content : '\eae5'; }
-	&.ankh::before { content : '\eae6'; }
-	&.angel-wings::before { content : '\eae7'; }
-	&.anchor::before { content : '\eae8'; }
-	&.ammo-bag::before { content : '\eae9'; }
-	&.alligator-clip::before { content : '\eaea'; }
-	&.all-for-one::before { content : '\eaeb'; }
-	&.alien-fire::before { content : '\eaec'; }
-	&.acorn::before { content : '\eaed'; }
-	&.acid::before { content : '\eaee'; }
-}