From 358ae4662710c1bededfd714ae1b0b3368812573 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 3 Nov 2022 19:08:44 +0200
Subject: [PATCH 01/46] Began work on copy to for library nodes

---
 .../api/library/methods/copyLibraryNodeTo.js  | 100 ++++++++++++++++++
 .../library/methods/duplicateLibraryNode.js   |   2 +-
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 app/imports/api/library/methods/copyLibraryNodeTo.js

diff --git a/app/imports/api/library/methods/copyLibraryNodeTo.js b/app/imports/api/library/methods/copyLibraryNodeTo.js
new file mode 100644
index 00000000..e87eb5e2
--- /dev/null
+++ b/app/imports/api/library/methods/copyLibraryNodeTo.js
@@ -0,0 +1,100 @@
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import SimpleSchema from 'simpl-schema';
+i
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
+import LibraryNodes from '/imports/api/library/LibraryNodes.js';
+import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import {
+  setLineageOfDocs,
+  renewDocIds
+} from '/imports/api/parenting/parenting.js';
+import { reorderDocs } from '/imports/api/parenting/order.js';
+import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
+
+var snackbar;
+if (Meteor.isClient) {
+  snackbar = require(
+    '/imports/ui/components/snackbars/SnackbarQueue.js'
+  ).snackbar
+}
+
+const DUPLICATE_CHILDREN_LIMIT = 100;
+
+const copyLibraryNodeTo = new ValidatedMethod({
+  name: 'libraryNodes.copyTo',
+  validate: new SimpleSchema({
+    _id: {
+      type: String,
+      regEx: SimpleSchema.RegEx.Id,
+    },
+    parent: {
+      type: RefSchema,
+    },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 1,
+    timeInterval: 5000,
+  },
+  run({ _id, parent }) {
+    if (parent.collection !== 'libraryNodes' && parent.collection !== 'libraries') {
+      throw new Meteor.Error('Invalid destination',
+        'Library documents can only be copied to destinations inside other libraries'
+      );
+    }
+    const libraryNode = LibraryNodes.findOne(_id);
+    const parentDoc = fetchDocByRef(parent);
+    assertDocEditPermission(libraryNode, this.userId);
+
+    let randomSrc = DDP.randomStream('copyLibraryNodeTo');
+    let libraryNodeId = randomSrc.id();
+    libraryNode._id = libraryNodeId;
+
+    let decendants = LibraryNodes.find({
+      'ancestors.id': _id,
+      removed: { $ne: true },
+    }, {
+      limit: DUPLICATE_CHILDREN_LIMIT + 1,
+      sort: { order: 1 },
+    }).fetch();
+
+    if (decendants.length > DUPLICATE_CHILDREN_LIMIT) {
+      decendants.pop();
+      if (Meteor.isClient) {
+        snackbar({
+          text: `Only the first ${DUPLICATE_CHILDREN_LIMIT} children were duplicated`,
+        });
+      }
+    }
+
+    const nodes = [libraryNode, decendants];
+
+    const newAncestry = parentDoc.ancestors || [];
+    newAncestry.push(parent);
+    // re-map all the ancestors
+    setLineageOfDocs({
+      docArray: nodes,
+      newAncestry,
+      oldParent: libraryNode.parent,
+    });
+
+    // Give the docs new IDs without breaking internal references
+    renewDocIds({ docArray: nodes });
+
+    // Order the root node
+    libraryNode.order = (parentDoc.order || 0) + 0.5;
+
+    LibraryNodes.batchInsert(nodes);
+
+    // Tree structure changed by inserts, reorder the tree
+    reorderDocs({
+      collection: LibraryNodes,
+      ancestorId: parent.collection === 'libraries' ? parent.id : parentDoc.ancestors[0].id,
+    });
+
+    return libraryNodeId;
+  },
+});
+
+export default duplicateLibraryNode;
diff --git a/app/imports/api/library/methods/duplicateLibraryNode.js b/app/imports/api/library/methods/duplicateLibraryNode.js
index 107f3c6b..59b54c8a 100644
--- a/app/imports/api/library/methods/duplicateLibraryNode.js
+++ b/app/imports/api/library/methods/duplicateLibraryNode.js
@@ -16,7 +16,7 @@ if (Meteor.isClient) {
   ).snackbar
 }
 
-const DUPLICATE_CHILDREN_LIMIT = 50;
+const DUPLICATE_CHILDREN_LIMIT = 100;
 
 const duplicateLibraryNode = new ValidatedMethod({
   name: 'libraryNodes.duplicate',

From 8f56a60fb142a9583525c6a2e9df2aa48f49854b Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 3 Nov 2022 20:18:59 +0200
Subject: [PATCH 02/46] Added copy-to and related sharing permissions

---
 .../api/library/methods/copyLibraryNodeTo.js  | 23 +++--
 .../library/methods/duplicateLibraryNode.js   |  4 +-
 app/imports/api/library/methods/index.js      |  1 +
 app/imports/api/sharing/SharingSchema.js      |  4 +
 app/imports/api/sharing/sharing.js            | 22 ++++-
 app/imports/api/sharing/sharingPermissions.js | 88 ++++++++++++++-----
 app/imports/ui/components/ColorPicker.vue     |  4 +
 app/imports/ui/components/propertyToolbar.vue | 20 +++++
 app/imports/ui/library/LibraryNodeDialog.vue  | 47 +++++++++-
 .../ui/library/MoveLibraryNodeDialog.vue      |  8 +-
 app/imports/ui/sharing/ShareDialog.vue        | 20 +++++
 11 files changed, 202 insertions(+), 39 deletions(-)

diff --git a/app/imports/api/library/methods/copyLibraryNodeTo.js b/app/imports/api/library/methods/copyLibraryNodeTo.js
index e87eb5e2..f99b184f 100644
--- a/app/imports/api/library/methods/copyLibraryNodeTo.js
+++ b/app/imports/api/library/methods/copyLibraryNodeTo.js
@@ -1,10 +1,12 @@
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import SimpleSchema from 'simpl-schema';
-i
 import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import { RefSchema } from '/imports/api/parenting/ChildSchema.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+import {
+  assertDocCopyPermission,
+  assertDocEditPermission
+} from '/imports/api/sharing/sharingPermissions.js';
 import {
   setLineageOfDocs,
   renewDocIds
@@ -19,7 +21,7 @@ if (Meteor.isClient) {
   ).snackbar
 }
 
-const DUPLICATE_CHILDREN_LIMIT = 100;
+const DUPLICATE_CHILDREN_LIMIT = 500;
 
 const copyLibraryNodeTo = new ValidatedMethod({
   name: 'libraryNodes.copyTo',
@@ -35,7 +37,7 @@ const copyLibraryNodeTo = new ValidatedMethod({
   mixins: [RateLimiterMixin],
   rateLimit: {
     numRequests: 1,
-    timeInterval: 5000,
+    timeInterval: 10000,
   },
   run({ _id, parent }) {
     if (parent.collection !== 'libraryNodes' && parent.collection !== 'libraries') {
@@ -45,11 +47,8 @@ const copyLibraryNodeTo = new ValidatedMethod({
     }
     const libraryNode = LibraryNodes.findOne(_id);
     const parentDoc = fetchDocByRef(parent);
-    assertDocEditPermission(libraryNode, this.userId);
-
-    let randomSrc = DDP.randomStream('copyLibraryNodeTo');
-    let libraryNodeId = randomSrc.id();
-    libraryNode._id = libraryNodeId;
+    assertDocCopyPermission(libraryNode, this.userId);
+    assertDocEditPermission(parentDoc, this.userId);
 
     let decendants = LibraryNodes.find({
       'ancestors.id': _id,
@@ -68,7 +67,7 @@ const copyLibraryNodeTo = new ValidatedMethod({
       }
     }
 
-    const nodes = [libraryNode, decendants];
+    const nodes = [libraryNode, ...decendants];
 
     const newAncestry = parentDoc.ancestors || [];
     newAncestry.push(parent);
@@ -92,9 +91,7 @@ const copyLibraryNodeTo = new ValidatedMethod({
       collection: LibraryNodes,
       ancestorId: parent.collection === 'libraries' ? parent.id : parentDoc.ancestors[0].id,
     });
-
-    return libraryNodeId;
   },
 });
 
-export default duplicateLibraryNode;
+export default copyLibraryNodeTo;
diff --git a/app/imports/api/library/methods/duplicateLibraryNode.js b/app/imports/api/library/methods/duplicateLibraryNode.js
index 59b54c8a..ff35b8fb 100644
--- a/app/imports/api/library/methods/duplicateLibraryNode.js
+++ b/app/imports/api/library/methods/duplicateLibraryNode.js
@@ -16,7 +16,7 @@ if (Meteor.isClient) {
   ).snackbar
 }
 
-const DUPLICATE_CHILDREN_LIMIT = 100;
+const DUPLICATE_CHILDREN_LIMIT = 500;
 
 const duplicateLibraryNode = new ValidatedMethod({
   name: 'libraryNodes.duplicate',
@@ -28,7 +28,7 @@ const duplicateLibraryNode = new ValidatedMethod({
   }).validator(),
   mixins: [RateLimiterMixin],
   rateLimit: {
-    numRequests: 5,
+    numRequests: 1,
     timeInterval: 5000,
   },
   run({ _id }) {
diff --git a/app/imports/api/library/methods/index.js b/app/imports/api/library/methods/index.js
index 1b566bc5..e67eec8a 100644
--- a/app/imports/api/library/methods/index.js
+++ b/app/imports/api/library/methods/index.js
@@ -1,2 +1,3 @@
+import '/imports/api/library/methods/copyLibraryNodeTo.js';
 import '/imports/api/library/methods/duplicateLibraryNode.js';
 import '/imports/api/library/methods/updateReferenceNode.js';
diff --git a/app/imports/api/sharing/SharingSchema.js b/app/imports/api/sharing/SharingSchema.js
index 2a4f87c3..629f90bb 100644
--- a/app/imports/api/sharing/SharingSchema.js
+++ b/app/imports/api/sharing/SharingSchema.js
@@ -33,6 +33,10 @@ let SharingSchema = new SimpleSchema({
     defaultValue: false,
     index: 1,
   },
+  readersCanCopy: {
+    type: Boolean,
+    optional: true,
+  },
 });
 
 export default SharingSchema;
diff --git a/app/imports/api/sharing/sharing.js b/app/imports/api/sharing/sharing.js
index f6c8d8b7..7062ff40 100644
--- a/app/imports/api/sharing/sharing.js
+++ b/app/imports/api/sharing/sharing.js
@@ -27,6 +27,26 @@ const setPublic = new ValidatedMethod({
   },
 });
 
+const setReadersCanCopy = new ValidatedMethod({
+  name: 'sharing.setReadersCanCopy',
+  validate: new SimpleSchema({
+    docRef: RefSchema,
+    readersCanCopy: { type: Boolean },
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ docRef, readersCanCopy }) {
+    let doc = fetchDocByRef(docRef);
+    assertOwnership(doc, this.userId);
+    return getCollectionByName(docRef.collection).update(docRef.id, {
+      $set: { readersCanCopy },
+    });
+  },
+});
+
 const updateUserSharePermissions = new ValidatedMethod({
   name: 'sharing.updateUserSharePermissions',
   validate: new SimpleSchema({
@@ -129,4 +149,4 @@ const transferOwnership = new ValidatedMethod({
   },
 });
 
-export { setPublic, updateUserSharePermissions, transferOwnership };
+export { setPublic, setReadersCanCopy, updateUserSharePermissions, transferOwnership };
diff --git a/app/imports/api/sharing/sharingPermissions.js b/app/imports/api/sharing/sharingPermissions.js
index 58629c62..5591c59c 100644
--- a/app/imports/api/sharing/sharingPermissions.js
+++ b/app/imports/api/sharing/sharingPermissions.js
@@ -1,24 +1,25 @@
 import { _ } from 'meteor/underscore';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 
-function assertIdValid(userId){
-  if (!userId || typeof userId !== 'string'){
+function assertIdValid(userId) {
+  if (!userId || typeof userId !== 'string') {
     throw new Meteor.Error('Permission denied',
       'No user ID. Are you logged in?');
   }
 }
 
-function assertdocExists(doc){
-  if (!doc){
+function assertdocExists(doc) {
+  if (!doc) {
     throw new Meteor.Error('Permission denied',
       'Permission denied: No such document exists');
   }
 }
 
-export function assertOwnership(doc, userId){
+export function assertOwnership(doc, userId) {
   assertIdValid(userId);
   assertdocExists(doc);
-  if (doc.owner === userId ){
+
+  if (doc.owner === userId) {
     return true;
   } else {
     throw new Meteor.Error('Permission denied',
@@ -37,13 +38,12 @@ export function assertEditPermission(doc, userId) {
   assertdocExists(doc);
   const user = Meteor.users.findOne(userId, {
     fields: {
-      'services.patreon': 1,
       'roles': 1,
     }
   });
 
   // Admin override
-  if (user.roles && user.roles.includes('admin')){
+  if (user.roles && user.roles.includes('admin')) {
     return true;
   }
 
@@ -51,7 +51,7 @@ export function assertEditPermission(doc, userId) {
   if (
     doc.owner === userId ||
     _.contains(doc.writers, userId)
-  ){
+  ) {
     return true;
   } else {
     throw new Meteor.Error('Edit permission denied',
@@ -59,9 +59,46 @@ export function assertEditPermission(doc, userId) {
   }
 }
 
-function getRoot(doc){
+/**
+ * Assert that the user can edit the root document which manages its own sharing
+ * permissions.
+ *
+ * Warning: the doc and userId must be set by a trusted source
+ */
+export function assertCopyPermission(doc, userId) {
+  assertIdValid(userId);
   assertdocExists(doc);
-  if (doc.ancestors && doc.ancestors.length && doc.ancestors[0]){
+  const user = Meteor.users.findOne(userId, {
+    fields: {
+      'roles': 1,
+    }
+  });
+
+  // Admin override
+  if (user.roles && user.roles.includes('admin')) {
+    return true;
+  }
+
+  // Ensure the user is authorized for this specific document
+  if (
+    doc.owner === userId ||
+    _.contains(doc.writers, userId)
+  ) {
+    return true;
+  } else if (
+    (_.contains(doc.readers, userId) || doc.public) &&
+    doc.readersCanCopy
+  ) {
+    return true;
+  } else {
+    throw new Meteor.Error('Copy permission denied',
+      'You do not have permission to copy this document');
+  }
+}
+
+function getRoot(doc) {
+  assertdocExists(doc);
+  if (doc.ancestors && doc.ancestors.length && doc.ancestors[0]) {
     return fetchDocByRef(doc.ancestors[0]);
   } else {
     return doc;
@@ -74,11 +111,22 @@ function getRoot(doc){
  *
  * Warning: the doc and userId must be set by a trusted source
  */
-export function assertDocEditPermission(doc, userId){
+export function assertDocEditPermission(doc, userId) {
   let root = getRoot(doc);
   assertEditPermission(root, userId);
 }
 
+/**
+ * Assert that the user can copy a descendant document whose root ancestor
+ * implements sharing permissions.
+ *
+ * Warning: the doc and userId must be set by a trusted source
+ */
+export function assertDocCopyPermission(doc, userId) {
+  let root = getRoot(doc);
+  assertCopyPermission(root, userId);
+}
+
 export function assertViewPermission(doc, userId) {
   assertdocExists(doc);
   if (doc.public) return true;
@@ -88,17 +136,17 @@ export function assertViewPermission(doc, userId) {
     doc.owner === userId ||
     _.contains(doc.readers, userId) ||
     _.contains(doc.writers, userId)
-  ){
+  ) {
     return true;
   } else {
-    
+
     // Admin override
     const user = Meteor.users.findOne(userId, {
       fields: {
         'roles': 1,
       }
     });
-    if (user.roles && user.roles.includes('admin')){
+    if (user.roles && user.roles.includes('admin')) {
       return true;
     }
 
@@ -113,20 +161,20 @@ export function assertViewPermission(doc, userId) {
  *
  * Warning: the doc and userId must be set by a trusted source
  */
-export function assertDocViewPermission(doc, userId){
+export function assertDocViewPermission(doc, userId) {
   let root = getRoot(doc);
   assertViewPermission(root, userId);
 }
 
-export function assertAdmin(userId){
+export function assertAdmin(userId) {
   assertIdValid(userId);
-  let user = Meteor.users.findOne(userId, {fields: {roles: 1}});
-  if (!user){
+  let user = Meteor.users.findOne(userId, { fields: { roles: 1 } });
+  if (!user) {
     throw new Meteor.Error('Permission denied',
       'UserId does not match any existing user');
   }
   let isAdmin = user.roles && user.roles.includes('admin')
-  if (!isAdmin){
+  if (!isAdmin) {
     throw new Meteor.Error('Permission denied',
       'User does not have the admin role');
   }
diff --git a/app/imports/ui/components/ColorPicker.vue b/app/imports/ui/components/ColorPicker.vue
index bb1115f6..cc1423bd 100644
--- a/app/imports/ui/components/ColorPicker.vue
+++ b/app/imports/ui/components/ColorPicker.vue
@@ -10,6 +10,7 @@
         :outlined="!!label"
         :icon="!label"
         :min-width="label && 108"
+        :disabled="context.editPermission === false"
         v-on="on"
       >
         {{ label }}
@@ -124,6 +125,9 @@
   }
 
   export default {
+    inject: {
+      context: { default: {} }
+    },
     props: {
      //hex string
       value: {
diff --git a/app/imports/ui/components/propertyToolbar.vue b/app/imports/ui/components/propertyToolbar.vue
index 28b454d7..af6ba016 100644
--- a/app/imports/ui/components/propertyToolbar.vue
+++ b/app/imports/ui/components/propertyToolbar.vue
@@ -69,6 +69,7 @@
             </v-list-item>
             <v-list-item
               v-if="$listeners && $listeners.duplicate"
+              :disabled="context.editPermission === false"
               @click="$emit('duplicate')"
             >
               <v-list-item-content>
@@ -80,8 +81,23 @@
                 <v-icon>mdi-content-copy</v-icon>
               </v-list-item-action>
             </v-list-item>
+            <v-list-item
+              v-if="$listeners && $listeners.copy"
+              :disabled="context.copyPermission === false"
+              @click="$emit('copy')"
+            >
+              <v-list-item-content>
+                <v-list-item-title>
+                  Copy To
+                </v-list-item-title>
+              </v-list-item-content>
+              <v-list-item-action>
+                <v-icon>mdi-content-duplicate</v-icon>
+              </v-list-item-action>
+            </v-list-item>
             <v-list-item
               v-if="$listeners && $listeners.move"
+              :disabled="context.editPermission === false"
               @click="$emit('move')"
             >
               <v-list-item-content>
@@ -95,6 +111,7 @@
             </v-list-item>
             <v-list-item
               v-if="$listeners && $listeners.remove"
+              :disabled="context.editPermission === false"
               @click="$emit('remove')"
             >
               <v-list-item-content>
@@ -157,6 +174,9 @@ export default {
     PropertyIcon,
     ColorPicker,
   },
+  inject: {
+    context: { default: {} }
+  },
   props: {
     model: {
       type: Object,
diff --git a/app/imports/ui/library/LibraryNodeDialog.vue b/app/imports/ui/library/LibraryNodeDialog.vue
index e67c0cc2..977f3906 100644
--- a/app/imports/ui/library/LibraryNodeDialog.vue
+++ b/app/imports/ui/library/LibraryNodeDialog.vue
@@ -8,6 +8,7 @@
         :embedded="embedded"
         @duplicate="duplicate"
         @move="move"
+        @copy="copy"
         @remove="remove"
         @toggle-editing="editing = !editing"
         @color-changed="value => change({path: ['color'], value})"
@@ -95,10 +96,13 @@
   import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
   import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
   import { get } from 'lodash';
-  import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
+  import {
+    assertDocEditPermission, assertDocCopyPermission
+  } from '/imports/api/sharing/sharingPermissions.js';
   import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
   import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
   import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+  import copyLibraryNodeTo from '/imports/api/library/methods/copyLibraryNodeTo.js';
 
   let formIndex = {};
   for (let key in propertyFormIndex){
@@ -126,7 +130,7 @@
     },
     reactiveProvide: {
       name: 'context',
-      include: ['editPermission', 'isLibraryForm'],
+      include: ['editPermission', 'copyPermission', 'isLibraryForm'],
     },
     data(){return {
       editing: !!this.startInEditTab,
@@ -162,6 +166,14 @@
           return false;
         }
       },
+      copyPermission(){
+        try {
+          assertDocCopyPermission(this.model, Meteor.userId());
+          return true;
+        } catch (e) {
+          return false;
+        }
+      },
     },
     methods: {
       getPropertyName,
@@ -200,6 +212,37 @@
           }
         });
       },
+      copy(){
+        const thisId = this._id;
+        this.$store.commit('pushDialogStack', {
+          component: 'move-library-node-dialog',
+          elementId: 'property-toolbar-menu-button',
+          data: {
+            action: 'Copy',
+          },
+          callback(parentId){
+            if (!parentId) return;
+            copyLibraryNodeTo.call({
+              _id: thisId,
+              parent: {
+                collection: 'libraryNodes',
+                id: parentId
+              },
+            }, (error) => {
+              if (error) {
+                console.error(error);
+                snackbar({
+                  text: error.reason || error.message || error.toString(),
+                });
+              } else {
+                snackbar({
+                  text: 'Copied successfully',
+                });
+              }
+            });
+          }
+        });
+      },
       change({path, value, ack}){
         updateLibraryNode.call({_id: this.currentId, path, value}, (error) =>{
           if (ack){
diff --git a/app/imports/ui/library/MoveLibraryNodeDialog.vue b/app/imports/ui/library/MoveLibraryNodeDialog.vue
index ce412813..f0d22101 100644
--- a/app/imports/ui/library/MoveLibraryNodeDialog.vue
+++ b/app/imports/ui/library/MoveLibraryNodeDialog.vue
@@ -16,7 +16,7 @@
         color="primary"
         @click="$store.dispatch('popDialogStack', node._id)"
       >
-        Move
+        {{ action || 'Move' }}
       </v-btn>
     </template>
   </dialog-base>
@@ -30,6 +30,12 @@ export default {
     DialogBase,
     LibraryAndNode,
   },
+  props: {
+    action: {
+      type: String,
+      default: undefined,
+    },
+  },
   data() {
     return {
       node: undefined,
diff --git a/app/imports/ui/sharing/ShareDialog.vue b/app/imports/ui/sharing/ShareDialog.vue
index 8cd82873..27d8318f 100644
--- a/app/imports/ui/sharing/ShareDialog.vue
+++ b/app/imports/ui/sharing/ShareDialog.vue
@@ -13,6 +13,16 @@
         :value="!!model.public + ''"
         @change="(value, ack) => setSheetPublic({value, ack})"
       />
+      <smart-select
+        v-if="docRef.collection === 'libraries'"
+        label="Who can copy from this library"
+        :items="[
+          {text: 'Only people with edit permission', value: 'false'},
+          {text: 'Anyone with read permission', value: 'true'}
+        ]"
+        :value="!!model.readersCanCopy + ''"
+        @change="(value, ack) => setReadersCanCopy({value, ack})"
+      />
       <text-field
         v-if="model.public && docRef.collection === 'libraries'"
         readonly
@@ -30,6 +40,7 @@
           @change="(value, ack) => getUser({value, ack})"
         />
         <v-btn
+          class="ml-2 mt-2"
           :disabled="userFoundState !== 'found'"
           @click="updateSharing(userId, 'reader')"
         >
@@ -126,6 +137,7 @@
 <script lang="js">
 import {
   setPublic,
+  setReadersCanCopy,
   updateUserSharePermissions
 } from '/imports/api/sharing/sharing.js';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
@@ -157,6 +169,14 @@ export default {
         ack(error && error.reason || error);
       });
     },
+    setReadersCanCopy({ value, ack }) {
+      setReadersCanCopy.call({
+        docRef: this.docRef,
+        readersCanCopy: value === 'true',
+      }, (error) => {
+        ack(error && error.reason || error);
+      });
+    },
     getUser({ value, ack }) {
       this.userSearched = value;
       if (!value) {

From d63ad9ea8fd966d2e5f6a1f01aa0ee16db225818 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 3 Nov 2022 20:39:02 +0200
Subject: [PATCH 03/46] Added hide when total/value zero to attributes

---
 app/imports/api/properties/Attributes.js      |  8 ++
 .../character/characterSheetTabs/StatsTab.vue |  4 +
 .../attributes/HealthBarCardContainer.vue     |  4 +
 .../ui/properties/forms/AttributeForm.vue     | 88 ++++++++++++++-----
 4 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index d486d5f9..a2681d33 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -107,6 +107,14 @@ let AttributeSchema = createPropertySchema({
     type: Boolean,
     optional: true,
   },
+  hideWhenTotalZero: {
+    type: Boolean,
+    optional: true,
+  },
+  hideWhenValueZero: {
+    type: Boolean,
+    optional: true,
+  },
   // Automatically zero the adjustment on these conditions
   reset: {
     type: String,
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index e8122e32..a201c69c 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -365,6 +365,10 @@ const getProperties = function (creature, filter, options = {
   filter.removed = { $ne: true };
   filter.inactive = { $ne: true };
   filter.overridden = { $ne: true };
+  filter.$nor = [
+    { hideWhenTotalZero: true, total: 0 },
+    { hideWhenValueZero: true, value: 0 },
+  ];
 
   return CreatureProperties.find(filter, options);
 };
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
index 639beee0..db3b9c66 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
@@ -42,6 +42,10 @@ export default {
         removed: { $ne: true },
         inactive: { $ne: true },
         overridden: { $ne: true },
+        $nor: [
+          { hideWhenTotalZero: true, total: 0 },
+          { hideWhenValueZero: true, value: 0 },
+        ],
       };
       if (creature.settings.hideUnusedStats) {
         filter.hide = { $ne: true };
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index 42814d86..4dc36f07 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -151,26 +151,74 @@
           @change="change('tags', ...arguments)"
         />
         <div class="layout column align-center">
-          <smart-switch
-            v-if="model.attributeType !== 'hitDice'"
-            label="Allow decimal values"
-            class="no-flex"
-            :value="model.decimal"
-            :error-messages="errors.decimal"
-            @change="change('decimal', ...arguments)"
-          />
-          <smart-switch
-            label="Can be damaged into negative values"
-            :value="model.ignoreLowerLimit"
-            :error-messages="errors.ignoreLowerLimit"
-            @change="change('ignoreLowerLimit', ...arguments)"
-          />
-          <smart-switch
-            label="Can be incremented above total"
-            :value="model.ignoreUpperLimit"
-            :error-messages="errors.ignoreUpperLimit"
-            @change="change('ignoreUpperLimit', ...arguments)"
-          />
+          <v-row dense>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                v-if="model.attributeType !== 'hitDice'"
+                label="Allow decimal values"
+                class="mx-4"
+                :value="model.decimal"
+                :error-messages="errors.decimal"
+                @change="change('decimal', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Can be damaged into negative values"
+                class="mx-4"
+                :value="model.ignoreLowerLimit"
+                :error-messages="errors.ignoreLowerLimit"
+                @change="change('ignoreLowerLimit', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Can be incremented above total"
+                class="mx-4"
+                :value="model.ignoreUpperLimit"
+                :error-messages="errors.ignoreUpperLimit"
+                @change="change('ignoreUpperLimit', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Hide when total is zero"
+                class="mx-4"
+                :value="model.hideWhenTotalZero"
+                :error-messages="errors.hideWhenTotalZero"
+                @change="change('hideWhenTotalZero', ...arguments)"
+              />
+            </v-col>
+            <v-col
+              cols="12"
+              sm="6"
+              md="4"
+            >
+              <smart-switch
+                label="Hide when value is zero"
+                class="mx-4"
+                :value="model.hideWhenValueZero"
+                :error-messages="errors.hideWhenValueZero"
+                @change="change('hideWhenValueZero', ...arguments)"
+              />
+            </v-col>
+          </v-row>
           <div
             class="layout justify-center"
             style="align-self: stretch;"

From c0ccafa7876a0e2242274bf5c4efb61a19bea2b7 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 3 Nov 2022 20:50:10 +0200
Subject: [PATCH 04/46] Added overflow stops to health bars

---
 .../applyPropertyByType/applyDamage.js        | 48 +++++++++++--------
 app/imports/api/properties/Attributes.js      | 10 ++++
 .../ui/properties/forms/AttributeForm.vue     | 15 +++++-
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
index c35546de..f1c0c832 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
@@ -1,6 +1,6 @@
 import { some, intersection, difference, remove, includes } from 'lodash';
 import applyProperty from '../applyProperty.js';
-import {insertCreatureLog} from '/imports/api/creature/log/CreatureLogs.js';
+import { insertCreatureLog } from '/imports/api/creature/log/CreatureLogs.js';
 import resolve, { Context, toString } from '/imports/parser/resolve.js';
 import logErrors from './shared/logErrors.js';
 import applyEffectsToCalculationParseNode from '/imports/api/engine/actions/applyPropertyByType/shared/applyEffectsToCalculationParseNode.js';
@@ -10,9 +10,9 @@ import {
 } from '/imports/api/engine/loadCreatures.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
-export default function applyDamage(node, actionContext){
+export default function applyDamage(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
-  const applyChildren = function(){
+  const applyChildren = function () {
     applyNodeTriggers(node, 'after', actionContext);
     node.children.forEach(child => applyProperty(child, actionContext));
   };
@@ -28,10 +28,10 @@ export default function applyDamage(node, actionContext){
   // Determine if the hit is critical
   let criticalHit = scope['$criticalHit']?.value &&
     prop.damageType !== 'healing' // Can't critically heal
-  ;
+    ;
   // Double the damage rolls if the hit is critical
   let context = new Context({
-    options: {doubleRolls: criticalHit},
+    options: { doubleRolls: criticalHit },
   });
 
   // Gather all the lines we need to log into an array
@@ -40,8 +40,8 @@ export default function applyDamage(node, actionContext){
 
   // roll the dice only and store that string
   applyEffectsToCalculationParseNode(prop.amount, actionContext.log);
-  const {result: rolled} = resolve('roll', prop.amount.parseNode, scope, context);
-  if (rolled.parseType !== 'constant'){
+  const { result: rolled } = resolve('roll', prop.amount.parseNode, scope, context);
+  if (rolled.parseType !== 'constant') {
     logValue.push(toString(rolled));
   }
   logErrors(context.errors, actionContext);
@@ -50,13 +50,13 @@ export default function applyDamage(node, actionContext){
   context.errors = [];
 
   // Resolve the roll to a final value
-  const {result: reduced} = resolve('reduce', rolled, scope, context);
+  const { result: reduced } = resolve('reduce', rolled, scope, context);
   logErrors(context.errors, actionContext);
 
   // Store the result
-  if (reduced.parseType === 'constant'){
+  if (reduced.parseType === 'constant') {
     prop.amount.value = reduced.value;
-  } else if (reduced.parseType === 'error'){
+  } else if (reduced.parseType === 'error') {
     prop.amount.value = null;
   } else {
     prop.amount.value = toString(reduced);
@@ -64,7 +64,7 @@ export default function applyDamage(node, actionContext){
   let damage = +reduced.value;
 
   // If we didn't end up with a constant of finite amount, give up
-  if (reduced?.parseType !== 'constant' || !isFinite(reduced.value)){
+  if (reduced?.parseType !== 'constant' || !isFinite(reduced.value)) {
     return applyChildren();
   }
 
@@ -83,7 +83,7 @@ export default function applyDamage(node, actionContext){
   // Memoise the damage suffix for the log
   let suffix = (criticalHit ? ' critical ' : ' ') +
     prop.damageType +
-    (prop.damageType !== 'healing' ? ' damage ': '');
+    (prop.damageType !== 'healing' ? ' damage ' : '');
 
   if (damageTargets && damageTargets.length) {
     // Iterate through all the targets
@@ -107,7 +107,7 @@ export default function applyDamage(node, actionContext){
       });
 
       // Log the damage done
-      if (target._id === actionContext.creature._id){
+      if (target._id === actionContext.creature._id) {
         // Target is same as self, log damage as such
         logValue.push(`**${damageDealt}** ${suffix}  to self`);
       } else {
@@ -136,33 +136,33 @@ export default function applyDamage(node, actionContext){
   return applyChildren();
 }
 
-function applyDamageMultipliers({target, damage, damageProp, logValue}){
+function applyDamageMultipliers({ target, damage, damageProp, logValue }) {
   const damageType = damageProp?.damageType;
   if (!damageType) return damage;
 
   const multiplier = target?.variables?.[damageType];
   if (!multiplier) return damage;
 
-  const damageTypeText = damageType == 'healing' ? 'healing': `${damageType} damage`;
+  const damageTypeText = damageType == 'healing' ? 'healing' : `${damageType} damage`;
 
   if (
     multiplier.immunity &&
     some(multiplier.immunities, multiplierAppliesTo(damageProp, 'immunity'))
-  ){
+  ) {
     logValue.push(`Immune to ${damageTypeText}`);
     return 0;
   } else {
     if (
       multiplier.resistance &&
       some(multiplier.resistances, multiplierAppliesTo(damageProp, 'resistance'))
-    ){
+    ) {
       logValue.push(`Resistant to ${damageTypeText}`);
       damage = Math.floor(damage / 2);
     }
     if (
       multiplier.vulnerability &&
       some(multiplier.vulnerabilities, multiplierAppliesTo(damageProp, 'vulnerability'))
-    ){
+    ) {
       logValue.push(`Vulnerable to ${damageTypeText}`);
       damage = Math.floor(damage * 2);
     }
@@ -170,7 +170,7 @@ function applyDamageMultipliers({target, damage, damageProp, logValue}){
   return damage;
 }
 
-function multiplierAppliesTo(damageProp, multiplierType){
+function multiplierAppliesTo(damageProp, multiplierType) {
   return multiplier => {
     // Apply the default 'ignore x' tags
     if (includes(damageProp.tags, `ignore ${multiplierType}`)) return false;
@@ -187,7 +187,7 @@ function multiplierAppliesTo(damageProp, multiplierType){
   }
 }
 
-function dealDamage({target, damageType, amount, actionContext}){
+function dealDamage({ target, damageType, amount, actionContext }) {
   // Get all the health bars and do damage to them
   let healthBars = getPropertiesOfType(target._id, 'attribute');
 
@@ -239,6 +239,14 @@ function dealDamage({target, damageType, amount, actionContext}){
       actionContext
     });
     damageLeft -= damageAdded;
+    // Prevent overflow
+    if (
+      damageType === 'healing' ?
+        healthBar.healthBarNoHealingOverflow :
+        healthBar.healthBarNoDamageOverflow
+    ) {
+      damageLeft = 0;
+    }
   });
   return totalDamage;
 }
diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index a2681d33..1052e2e5 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -69,6 +69,16 @@ let AttributeSchema = createPropertySchema({
     type: Boolean,
     optional: true,
   },
+  // Control how the health bar handles overflow
+  healthBarNoDamageOverflow: {
+    type: Boolean,
+    optional: true,
+  },
+  healthBarNoHealingOverflow: {
+    type: Boolean,
+    optional: true,
+  },
+  // Control when the health bar takes damage or healing
   healthBarDamageOrder: {
     type: SimpleSchema.Integer,
     optional: true,
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index 4dc36f07..1d76e1a0 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -106,10 +106,17 @@
             />
             <smart-switch
               label="Ignore damage"
+              class="mr-4"
               :value="model.healthBarNoDamage"
               :error-messages="errors.healthBarNoDamage"
               @change="change('healthBarNoDamage', ...arguments)"
             />
+            <smart-switch
+              label="Prevent damage overflow"
+              :value="model.healthBarNoDamageOverflow"
+              :error-messages="errors.healthBarNoDamageOverflow"
+              @change="change('healthBarNoDamageOverflow', ...arguments)"
+            />
           </v-layout>
           <v-layout wrap>
             <text-field
@@ -125,14 +132,20 @@
             />
             <smart-switch
               label="Ignore healing"
+              class="mr-4"
               :value="model.healthBarNoHealing"
               :error-messages="errors.healthBarNoHealing"
               @change="change('healthBarNoHealing', ...arguments)"
             />
+            <smart-switch
+              label="Prevent healing overflow"
+              :value="model.healthBarNoHealingOverflow"
+              :error-messages="errors.healthBarNoHealingOverflow"
+              @change="change('healthBarNoHealingOverflow', ...arguments)"
+            />
           </v-layout>
         </form-section>
       </v-expand-transition>
-
       <form-section
         v-if="$slots.children"
         name="Children"

From 21b0029df7b2ac8755df9e66bd84266279231f4c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 3 Nov 2022 20:51:58 +0200
Subject: [PATCH 05/46] bumped version

---
 app/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/package.json b/app/package.json
index d212f19c..23f1e79f 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dicecloud",
-  "version": "2.0.42",
+  "version": "2.0.43",
   "description": "Unofficial Online Realtime D&D 5e App",
   "license": "GPL-3.0",
   "repository": {
@@ -124,4 +124,4 @@
       "vuetify/no-deprecated-classes": "error"
     }
   }
-}
+}
\ No newline at end of file

From a462cc5ca2e78ed42bc8a911b19c443d77ccd625 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 4 Nov 2022 12:34:22 +0200
Subject: [PATCH 06/46] Updated packages

---
 app/package-lock.json | 462 ++++++++++--------------------------------
 app/package.json      |  16 +-
 2 files changed, 111 insertions(+), 367 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index fcedb023..1fe4cb46 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dicecloud",
-  "version": "2.0.42",
+  "version": "2.0.43",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -56,11 +56,11 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz",
-      "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==",
+      "version": "7.20.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
+      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
       "requires": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.13.10"
       }
     },
     "@chenfengyuan/vue-countdown": {
@@ -179,22 +179,23 @@
       "dev": true
     },
     "@types/semver": {
-      "version": "7.3.12",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.12.tgz",
-      "integrity": "sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==",
+      "version": "7.3.13",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
+      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==",
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.1.tgz",
-      "integrity": "sha512-FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.0.tgz",
+      "integrity": "sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/type-utils": "5.40.1",
-        "@typescript-eslint/utils": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.42.0",
+        "@typescript-eslint/type-utils": "5.42.0",
+        "@typescript-eslint/utils": "5.42.0",
         "debug": "^4.3.4",
         "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
         "regexpp": "^3.2.0",
         "semver": "^7.3.7",
         "tsutils": "^3.21.0"
@@ -221,14 +222,14 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.40.1.tgz",
-      "integrity": "sha512-IK6x55va5w4YvXd4b3VrXQPldV9vQTxi5ov+g4pMANsXPTXOcfjx08CRR1Dfrcc51syPtXHF5bgLlMHYFrvQtg==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.0.tgz",
+      "integrity": "sha512-Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/typescript-estree": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.42.0",
+        "@typescript-eslint/types": "5.42.0",
+        "@typescript-eslint/typescript-estree": "5.42.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
@@ -244,23 +245,23 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.40.1.tgz",
-      "integrity": "sha512-jkn4xsJiUQucI16OLCXrLRXDZ3afKhOIqXs4R3O+M00hdQLKR58WuyXPZZjhKLFCEP2g+TXdBRtLQ33UfAdRUg==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz",
+      "integrity": "sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/visitor-keys": "5.40.1"
+        "@typescript-eslint/types": "5.42.0",
+        "@typescript-eslint/visitor-keys": "5.42.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.40.1.tgz",
-      "integrity": "sha512-DLAs+AHQOe6n5LRraXiv27IYPhleF0ldEmx6yBqBgBLaNRKTkffhV1RPsjoJBhVup2zHxfaRtan8/YRBgYhU9Q==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.0.tgz",
+      "integrity": "sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.40.1",
-        "@typescript-eslint/utils": "5.40.1",
+        "@typescript-eslint/typescript-estree": "5.42.0",
+        "@typescript-eslint/utils": "5.42.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -277,19 +278,19 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.40.1.tgz",
-      "integrity": "sha512-Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.0.tgz",
+      "integrity": "sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.1.tgz",
-      "integrity": "sha512-5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz",
+      "integrity": "sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/visitor-keys": "5.40.1",
+        "@typescript-eslint/types": "5.42.0",
+        "@typescript-eslint/visitor-keys": "5.42.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -318,16 +319,16 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.40.1.tgz",
-      "integrity": "sha512-a2TAVScoX9fjryNrW6BZRnreDUszxqm9eQ9Esv8n5nXApMW0zeANUYlwh/DED04SC/ifuBvXgZpIK5xeJHQ3aw==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.0.tgz",
+      "integrity": "sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.40.1",
-        "@typescript-eslint/types": "5.40.1",
-        "@typescript-eslint/typescript-estree": "5.40.1",
+        "@typescript-eslint/scope-manager": "5.42.0",
+        "@typescript-eslint/types": "5.42.0",
+        "@typescript-eslint/typescript-estree": "5.42.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
@@ -354,12 +355,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.1.tgz",
-      "integrity": "sha512-A2DGmeZ+FMja0geX5rww+DpvILpwo1OsiQs0M+joPWJYsiEFBLsH0y1oFymPNul6Z5okSmHpP4ivkc2N0Cgfkw==",
+      "version": "5.42.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz",
+      "integrity": "sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.40.1",
+        "@typescript-eslint/types": "5.42.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
@@ -544,9 +545,9 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
     },
     "aws-sdk": {
-      "version": "2.1234.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1234.0.tgz",
-      "integrity": "sha512-QFuSeYM8DPiXytspLnWToy4MWJPGYFCgAy4hi+lRd6ueJtCey7MBIgFNHW814uAJzKUDEdJUJZPvDZvtLM1d/Q==",
+      "version": "2.1247.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1247.0.tgz",
+      "integrity": "sha512-hBiVzkm5pxGchl+dn+uIApk76n3UOGuDmQBr1H2J25Ls8F7M9sNiumJby/cSjis+U+gAhl7u414SMY+ZTAJAkQ==",
       "requires": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -594,9 +595,9 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base64-js": {
       "version": "1.5.1",
@@ -893,12 +894,12 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "core-js": {
       "version": "2.6.12",
@@ -958,7 +959,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decompress-response": {
       "version": "6.0.0",
@@ -988,15 +989,6 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
-    "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -1005,7 +997,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "detect-libc": {
       "version": "2.0.1",
@@ -1096,47 +1088,6 @@
         "ansi-colors": "^4.1.1"
       }
     },
-    "es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
     "escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1519,28 +1470,12 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==",
       "dev": true
     },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
     "gauge": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
@@ -1578,15 +1513,6 @@
         "has-symbols": "^1.0.3"
       }
     },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
     "getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -1645,6 +1571,14 @@
         "slash": "^3.0.0"
       }
     },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -1680,25 +1614,12 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true
     },
-    "has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "requires": {
-        "get-intrinsic": "^1.1.1"
-      }
-    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -1715,7 +1636,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "http-signature": {
       "version": "1.2.0",
@@ -1792,16 +1713,6 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
     "is-arguments": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
@@ -1816,14 +1727,6 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
     "is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -1833,28 +1736,11 @@
         "binary-extensions": "^2.0.0"
       }
     },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
     "is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
     },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1883,67 +1769,21 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
     "is-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz",
+      "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==",
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
         "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0"
       }
     },
@@ -1952,14 +1792,6 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -2090,7 +1922,7 @@
     "lodash.omit": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="
+      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA="
     },
     "lodash.template": {
       "version": "4.5.0",
@@ -2157,9 +1989,9 @@
       }
     },
     "marked": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.1.1.tgz",
-      "integrity": "sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw=="
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.1.tgz",
+      "integrity": "sha512-VK1/jNtwqDLvPktNpL0Fdg3qoeUZhmRsuiIjPEy/lHwXW4ouLoZfO4XoWd4ClDt+hupV1VLpkZhEovjU0W/kqA=="
     },
     "mem": {
       "version": "6.1.1",
@@ -3008,9 +2840,9 @@
       "integrity": "sha1-IBvZSSceGfbgrwodwMzFg95HxjA="
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -3073,6 +2905,12 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
+    "natural-compare-lite": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
+    },
     "nearley": {
       "version": "2.20.1",
       "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
@@ -3156,28 +2994,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "once": {
       "version": "1.4.0",
@@ -3396,7 +3213,7 @@
         "strip-json-comments": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
         }
       }
     },
@@ -3424,16 +3241,6 @@
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
       "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
     },
-    "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      }
-    },
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
@@ -3470,7 +3277,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -3528,25 +3335,15 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.55.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz",
-      "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==",
+      "version": "1.56.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.56.0.tgz",
+      "integrity": "sha512-WFJ9XrpkcnqZcYuLRJh5qiV6ibQOR4AezleeEjTjMsCocYW59dEG19U3fwTTXxzi2Ed3yjPBp727hbbj53pHFw==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -3570,7 +3367,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "setimmediate": {
       "version": "1.0.5",
@@ -3617,16 +3414,6 @@
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
-    "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-      "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      }
-    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -3660,7 +3447,7 @@
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
       "requires": {
         "is-arrayish": "^0.3.1"
       }
@@ -3783,26 +3570,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      }
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -4041,17 +3808,6 @@
       "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
       "dev": true
     },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
     "underscore": {
       "version": "1.13.6",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
@@ -4096,7 +3852,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
       "version": "3.4.0",
@@ -4191,9 +3947,9 @@
       }
     },
     "vuetify": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.11.tgz",
-      "integrity": "sha512-SX6BzS068t/RMj0d/sxxS/LsKdk9FpkL7CWShLyOMmJa/hiG63L0bvcopEaWYdRzzuQt7Nx174sk+KB6SvmYBw=="
+      "version": "2.6.12",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.6.12.tgz",
+      "integrity": "sha512-qe3hcMpWmT1O15tp+p65lOS7UKZ/hQYQktCsw9iXx2u3RwVbX6GR82gY2iROrKsiAzYDvMgrYxWQwY/pUfkekw=="
     },
     "vuetify-upload-button": {
       "version": "2.0.2",
@@ -4228,34 +3984,22 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
     "which-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
+      "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==",
       "requires": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
         "for-each": "^0.3.3",
+        "gopd": "^1.0.1",
         "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.9"
+        "is-typed-array": "^1.1.10"
       }
     },
     "wide-align": {
diff --git a/app/package.json b/app/package.json
index 23f1e79f..b38cc787 100644
--- a/app/package.json
+++ b/app/package.json
@@ -19,11 +19,11 @@
     "npm": "6.13.x"
   },
   "dependencies": {
-    "@babel/runtime": "^7.19.4",
+    "@babel/runtime": "^7.20.1",
     "@chenfengyuan/vue-countdown": "^1.1.5",
     "@tozd/vue-observer-utils": "^0.5.0",
     "animejs": "^2.2.0",
-    "aws-sdk": "^2.1234.0",
+    "aws-sdk": "^2.1247.0",
     "bcrypt": "^5.1.0",
     "chroma-js": "^2.4.2",
     "core-js": "^2.6.11",
@@ -35,7 +35,7 @@
     "ignore": "^5.2.0",
     "ignore-styles": "^5.0.1",
     "lodash": "^4.17.20",
-    "marked": "^4.1.1",
+    "marked": "^4.2.1",
     "meteor-node-stubs": "^1.2.5",
     "minify-css-string": "^1.0.0",
     "moo": "^0.5.2",
@@ -56,20 +56,20 @@
     "vue-reactive-provide": "^0.3.0",
     "vue-router": "^3.6.5",
     "vuedraggable": "^2.23.2",
-    "vuetify": "^2.6.11",
+    "vuetify": "^2.6.12",
     "vuetify-upload-button": "^2.0.2",
     "vuex": "^3.1.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.40.1",
-    "@typescript-eslint/parser": "^5.40.1",
+    "@typescript-eslint/eslint-plugin": "^5.42.0",
+    "@typescript-eslint/parser": "^5.42.0",
     "@vue/compiler-dom": "^3.2.41",
     "chai": "^4.3.6",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^7.20.0",
     "eslint-plugin-vuetify": "^1.1.0",
     "mem": "^6.1.1",
-    "sass": "^1.55.0",
+    "sass": "^1.56.0",
     "typescript": "^4.8.4"
   },
   "eslintConfig": {
@@ -124,4 +124,4 @@
       "vuetify/no-deprecated-classes": "error"
     }
   }
-}
\ No newline at end of file
+}

From 0bfdb73b474ef2f182f4bf7240d285728ecd7399 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 4 Nov 2022 12:34:37 +0200
Subject: [PATCH 07/46] Added a quick exit for migrations if the database is
 new

---
 app/imports/constants/MAINTENANCE_MODE.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/imports/constants/MAINTENANCE_MODE.js b/app/imports/constants/MAINTENANCE_MODE.js
index 42045410..aece8399 100644
--- a/app/imports/constants/MAINTENANCE_MODE.js
+++ b/app/imports/constants/MAINTENANCE_MODE.js
@@ -1,15 +1,23 @@
 import { Migrations } from 'meteor/percolate:migrations';
 import SCHEMA_VERSION from '/imports/constants/SCHEMA_VERSION.js';
 
-if (Meteor.isServer){
-  Meteor.startup(()=>{
+if (Meteor.isServer) {
+  Meteor.startup(() => {
     const dbVersion = Migrations.getVersion();
+    // If there are no users, this is a new DB, set the version to latest
+    const aUser = Meteor.users.findOne({});
+    const latestVersion = Migrations._list[Migrations._list.length - 1].version
+    if (!aUser && dbVersion !== latestVersion) {
+      Migrations._collection.update({ _id: 'control' }, { version: latestVersion });
+      return;
+    }
+    // Otherwise put the app in maintenance mode if it's not the right version
     if (
       !Meteor.settings.public.maintenanceMode &&
       dbVersion !== undefined &&
       SCHEMA_VERSION !== dbVersion
-    ){
-      Meteor.settings.public.maintenanceMode =  {
+    ) {
+      Meteor.settings.public.maintenanceMode = {
         reason: 'App data needs to be migrated to the latest version'
       };
     }

From c436309ba8e8f9138be8c5b0e7b97941e5edeaf5 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 7 Nov 2022 00:07:42 +0200
Subject: [PATCH 08/46] Work on column-based print layout

---
 .../CharacterSheetPrinted.vue                 | 124 ++++
 .../PrintedCharacter.vue                      |  58 ++
 .../printedCharacterSheet/PrintedFeatures.vue |  60 ++
 .../PrintedInventory.vue                      | 233 +++++++
 .../printedCharacterSheet/PrintedSpells.vue   | 109 ++++
 .../printedCharacterSheet/PrintedStats.vue    | 572 ++++++++++++++++++
 app/imports/ui/router.js                      |  11 +
 7 files changed, 1167 insertions(+)
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue

diff --git a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
new file mode 100644
index 00000000..cffd8bc5
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
@@ -0,0 +1,124 @@
+<template>
+  <div class="character-sheet-printed fill-height">
+    <v-fade-transition mode="out-in">
+      <div
+        v-if="!$subReady.singleCharacter"
+        key="character-loading"
+        class="fill-height layout justify-center align-center"
+      >
+        <v-progress-circular
+          indeterminate
+          color="primary"
+          size="64"
+        />
+      </div>
+      <div v-else-if="!creature">
+        <v-layout
+          column
+          align-center
+          justify-center
+        >
+          <h2 style="margin: 48px 28px 16px">
+            Character not found
+          </h2>
+          <h3>
+            Either this character does not exist, or you don't have permission
+            to view it.
+          </h3>
+        </v-layout>
+      </div>
+      <v-theme-provider
+        v-else
+        light
+      >
+        <printed-stats :creature-id="creatureId" />
+        <printed-features :creature-id="creatureId" />
+        <printed-inventory :creature-id="creatureId" />
+        <printed-spells
+          v-if="!creature.settings.hideSpellsTab"
+          :creature-id="creatureId"
+        />
+        <printed-character :creature-id="creatureId" />
+      </v-theme-provider>
+    </v-fade-transition>
+  </div>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import PrintedStats from '/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue';
+import PrintedFeatures from '/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue';
+import PrintedInventory from '/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue';
+import PrintedSpells from '/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue';
+import PrintedCharacter from '/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue';
+import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
+
+export default {
+  components: {
+    PrintedStats,
+    PrintedFeatures,
+    PrintedInventory,
+    PrintedSpells,
+    PrintedCharacter,
+  },
+  computed: {
+    creatureId() {
+      return this.$route.params.id
+    }
+  },
+  reactiveProvide: {
+    name: 'context',
+    include: ['creatureId', 'editPermission'],
+  },
+  watch: {
+    'creature.name'(value) {
+      this.$store.commit('setPageTitle', value ? ('Print ' + value) : 'Print Character Sheet');
+    },
+  },
+  mounted() {
+    this.$store.commit('setPageTitle',
+      (this.creature && this.creature.name) ?
+        ('Print ' + this.creature.name) :
+        'Print Character Sheet'
+    );
+    this.nameObserver = Creatures.find({
+      creatureId: this.creatureId,
+    }, {
+      fields: { name: 1 },
+    }).observe({
+      added: ({ name }) =>
+        this.$store.commit('setPageTitle', name ? ('Print ' + name) : 'Print Character Sheet'),
+      changed: ({ name }) =>
+        this.$store.commit('setPageTitle', name ? ('Print ' + name) : 'Print Character Sheet'),
+    });
+  },
+  beforeDestroy() {
+    this.nameObserver.stop();
+  },
+  meteor: {
+    $subscribe: {
+      'singleCharacter'() {
+        return [this.creatureId];
+      },
+    },
+    creature() {
+      return Creatures.findOne(this.creatureId);
+    },
+    editPermission() {
+      try {
+        assertEditPermission(this.creature, Meteor.userId());
+        return true;
+      } catch (e) {
+        return false;
+      }
+    },
+  },
+}
+</script>
+
+<style>
+.character-sheet-printed {
+  background: white;
+  color: black;
+}
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue
new file mode 100644
index 00000000..f37e7b5b
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue
@@ -0,0 +1,58 @@
+<template>
+  <div class="build-tab">
+    <column-layout wide-columns>
+      <div>
+        <creature-summary :creature="creature" />
+      </div>
+      <div
+        v-for="note in notes"
+        :key="note._id"
+      >
+        <note-card
+          :model="note"
+        />
+      </div>
+    </column-layout>
+  </div>
+</template>
+
+<script lang="js">
+import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
+import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+
+export default {
+  components: {
+    ColumnLayout,
+    CreatureSummary,
+    NoteCard,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+  },
+  meteor: {
+    notes(){
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'note',
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        sort: {order: 1},
+      });
+    },
+    creature(){
+      return Creatures.findOne(this.creatureId);
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue
new file mode 100644
index 00000000..c1bfc215
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue
@@ -0,0 +1,60 @@
+<template lang="html">
+  <div class="features">
+    <column-layout wide-columns>
+      <div
+        v-for="feature in features"
+        :key="feature._id"
+      >
+        <feature-card
+          :model="feature"
+          :data-id="feature._id"
+          @click="featureClicked(feature)"
+        />
+      </div>
+    </column-layout>
+  </div>
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import FeatureCard from '/imports/ui/properties/components/features/FeatureCard.vue';
+
+export default {
+  components: {
+    ColumnLayout,
+    FeatureCard,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+  },
+  meteor: {
+    features() {
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'feature',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { order: 1 }
+      });
+    },
+  },
+  methods: {
+    featureClicked({ _id }) {
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `${_id}`,
+        data: { _id },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="css" scoped>
+
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
new file mode 100644
index 00000000..ea77fddd
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
@@ -0,0 +1,233 @@
+<template lang="html">
+  <div class="inventory">
+    <column-layout wide-columns>
+      <div>
+        <v-card>
+          <v-list>
+            <v-list-item>
+              <v-list-item-avatar>
+                <v-icon>$vuetify.icons.injustice</v-icon>
+              </v-list-item-avatar>
+              <v-list-item-content>
+                <v-list-item-title>
+                  Weight Carried
+                </v-list-item-title>
+              </v-list-item-content>
+              <v-list-item-action>
+                <v-list-item-title>
+                  {{ weightCarried }} lb
+                </v-list-item-title>
+              </v-list-item-action>
+            </v-list-item>
+            <v-list-item>
+              <v-list-item-avatar>
+                <v-icon>$vuetify.icons.cash</v-icon>
+              </v-list-item-avatar>
+              <v-list-item-content>
+                <v-list-item-title>
+                  Net worth
+                </v-list-item-title>
+              </v-list-item-content>
+              <v-list-item-action>
+                <v-list-item-title>
+                  <coin-value :value="variables && variables.valueTotal && variables.valueTotal.value|| 0" />
+                </v-list-item-title>
+              </v-list-item-action>
+            </v-list-item>
+            <v-list-item v-if="variables && variables.itemsAttuned && variables.itemsAttuned.value">
+              <v-list-item-avatar>
+                <v-icon>$vuetify.icons.spell</v-icon>
+              </v-list-item-avatar>
+              <v-list-item-content>
+                <v-list-item-title>
+                  Items attuned
+                </v-list-item-title>
+              </v-list-item-content>
+              <v-list-item-action>
+                <v-list-item-title>
+                  {{ variables.itemsAttuned.value }}
+                </v-list-item-title>
+              </v-list-item-action>
+            </v-list-item>
+          </v-list>
+        </v-card>
+      </div>
+      <div>
+        <toolbar-card transparent-toolbar>
+          <v-toolbar-title slot="toolbar">
+            Equipped
+          </v-toolbar-title>
+          <v-card-text class="px-0">
+            <item-list
+              equipment
+              :items="equippedItems"
+              :parent-ref="equipmentParentRef"
+            />
+          </v-card-text>
+        </toolbar-card>
+      </div>
+      <div>
+        <toolbar-card transparent-toolbar>
+          <v-toolbar-title slot="toolbar">
+            Carried
+          </v-toolbar-title>
+          <v-card-text class="px-0">
+            <item-list
+              :items="carriedItems"
+              :parent-ref="carriedParentRef"
+            />
+          </v-card-text>
+        </toolbar-card>
+      </div>
+      <div
+        v-for="container in containersWithoutAncestorContainers"
+        :key="container._id"
+      >
+        <container-card :model="container" />
+      </div>
+    </column-layout>
+  </div>
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ContainerCard from '/imports/ui/properties/components/inventory/ContainerCard.vue';
+import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
+import ItemList from '/imports/ui/properties/components/inventory/ItemList.vue';
+import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
+import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
+import CoinValue from '/imports/ui/components/CoinValue.vue';
+import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
+import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
+
+export default {
+  components: {
+    ColumnLayout,
+    ContainerCard,
+    ToolbarCard,
+    ItemList,
+    CoinValue,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      organize: false,
+    }
+  },
+  meteor: {
+    containers() {
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'container',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { order: 1 },
+      });
+    },
+    creature() {
+      return Creatures.findOne(this.creatureId, {
+        fields: {
+          color: 1,
+          variables: 1,
+        }
+      });
+    },
+    variables() {
+      return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {};
+    },
+    containersWithoutAncestorContainers() {
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: this.containerIds
+        },
+        type: 'container',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { order: 1 },
+      });
+    },
+    carriedItems() {
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: this.containerIds
+        },
+        type: 'item',
+        equipped: { $ne: true },
+        removed: { $ne: true },
+        deactivatedByAncestor: { $ne: true },
+      }, {
+        sort: { order: 1 },
+      });
+    },
+    equippedItems() {
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+        },
+        type: 'item',
+        equipped: true,
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { order: 1 },
+      });
+    },
+    equipmentParentRef() {
+      return getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.equipment
+      ) || getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.inventory
+      ) || {
+        id: this.creatureId,
+        collection: 'creatures'
+      };
+    },
+    carriedParentRef() {
+      return getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.carried
+      ) || getParentRefByTag(
+        this.creatureId, BUILT_IN_TAGS.inventory
+      ) || {
+        id: this.creatureId,
+        collection: 'creatures'
+      };
+    },
+  },
+  computed: {
+    containerIds() {
+      return this.containers.map(container => container._id);
+    },
+    weightCarried() {
+      return stripFloatingPointOddities(
+        this.variables &&
+        this.variables.weightCarried &&
+        this.variables.weightCarried.value || 0
+      );
+    },
+  },
+  methods: {
+    clickProperty(_id) {
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `tree-node-${_id}`,
+        data: { _id },
+      });
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
new file mode 100644
index 00000000..a5e307cc
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
@@ -0,0 +1,109 @@
+<template lang="html">
+  <div class="spells">
+    <column-layout wide-columns>
+      <div v-if="spellsWithoutList.length">
+        <v-card>
+          <spell-list
+            :spells="spellsWithoutList"
+            :parent-ref="{id: creatureId, collection: 'creatures'}"
+          />
+        </v-card>
+      </div>
+      <div
+        v-for="spellList in spellListsWithoutAncestorSpellLists"
+        :key="spellList._id"
+      >
+        <spellList-card
+          :model="spellList"
+          :organize="organize"
+        />
+      </div>
+    </column-layout>
+  </div>
+</template>
+
+<script lang="js">
+import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import SpellListCard from '/imports/ui/properties/components/spells/SpellListCard.vue';
+import SpellList from '/imports/ui/properties/components/spells/SpellList.vue';
+
+export default {
+  components: {
+    ColumnLayout,
+    SpellList,
+    SpellListCard,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    }
+  },
+  data() {
+    return {
+      organize: false,
+    }
+  },
+  meteor: {
+    spellLists() {
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'spellList',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { order: 1 }
+      });
+    },
+    spellsWithoutList() {
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: this.spellListIds,
+        },
+        type: 'spell',
+        removed: { $ne: true },
+        deactivatedByAncestor: { $ne: true },
+        deactivatedByToggle: { $ne: true },
+      }, {
+        sort: {
+          level: 1,
+          order: 1,
+        }
+      });
+    },
+    spellListsWithoutAncestorSpellLists() {
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: this.spellListIds,
+        },
+        type: 'spellList',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { order: 1 }
+      });
+    },
+  },
+  computed: {
+    spellListIds() {
+      return this.spellLists.map(spellList => spellList._id);
+    },
+  },
+  methods: {
+    clickProperty(_id) {
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `spell-list-tile-${_id}`,
+        data: { _id },
+      });
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
new file mode 100644
index 00000000..b4717b20
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
@@ -0,0 +1,572 @@
+<template lang="html">
+  <div class="stats-tab ma-2">
+    <health-bar-card-container :creature-id="creatureId" />
+
+    <column-layout>
+      <div
+        v-if="abilities.length"
+        class="ability-scores"
+      >
+        <div class="layout flex column">
+          <div
+            v-for="ability in abilities"
+            :key="ability._id"
+            class="ability"
+          >
+            <div class="score">
+              <div class="double-border top big-number">
+                <template v-if="creature.settings.swapScoresAndMods">
+                  {{ ability.total }}
+                </template>
+                <template v-else>
+                  {{ numberToSignedString(ability.modifier) }}
+                </template>
+              </div>
+              <div class="bottom">
+                <template v-if="creature.settings.swapScoresAndMods">
+                  {{ numberToSignedString(ability.modifier) }}
+                </template>
+                <template v-else>
+                  {{ ability.total }}
+                </template>
+              </div>
+            </div>
+            <div class="double-border name label">
+              {{ ability.name }}
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-for="toggle in toggles"
+        :key="toggle._id"
+        class="number-label"
+      >
+        <div class="box double-border" />
+        <div class="label double-border">
+          {{ toggle.name }}
+        </div>
+      </div>
+
+      <div
+        v-for="stat in stats"
+        :key="stat._id"
+        class="number-label"
+        :class="stat.variableName == 'armor' && 'shield-number-label'"
+      >
+        <div
+          :class="stat.variableName == 'armor' ? 'shield-border' : 'octogon-border'"
+          class="number big-number"
+        >
+          {{ stat.value }}
+        </div>
+        <div class="label double-border">
+          {{ stat.name }}
+        </div>
+      </div>
+
+      <div
+        v-for="modifier in modifiers"
+        :key="modifier._id"
+        class="number-label"
+      >
+        <div class="number octogon-border big-number">
+          {{ numberToSignedString(modifier.value) }}
+        </div>
+        <div class="label double-border">
+          {{ modifier.name }}
+        </div>
+      </div>
+
+      <div
+        v-for="check in checks"
+        :key="check._id"
+        class="number-label"
+      >
+        <div class="number octogon-border big-number">
+          {{ numberToSignedString(check.value) }}
+        </div>
+        <div class="label double-border">
+          {{ check.name }}
+        </div>
+      </div>
+
+      <div
+        v-if="hitDice.length"
+        class="hit-dice m-2"
+      >
+        <div class="double-border">
+          <div>
+            <span class="label">
+              Total:
+            </span>
+            <span
+              v-for="hitDie in hitDice"
+              :key="hitDie._id"
+              style="margin-right: 4px;"
+            >
+              {{ hitDie.total }}{{ hitDie.hitDiceSize }}
+            </span>
+          </div>
+          <div style="height: 80px;" />
+          <div
+            style="text-align: center;"
+            class="label"
+          >
+            Hit Dice
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-for="resource in resources"
+        :key="resource._id"
+        class="resource"
+      >
+        <div>{{ resource.total }}</div>
+        <div>{{ resource.name }}</div>
+      </div>
+
+      <damage-multiplier-card
+        v-if="multipliers && multipliers.length"
+        :multipliers="multipliers"
+      />
+
+      <div
+        v-if="spellSlots && spellSlots.length"
+      >
+        <div>Spell Slots</div>
+        <div
+          v-for="spellSlot in spellSlots"
+          :key="spellSlot._id"
+        >
+          <div>
+            {{ spellSlot.name }}
+          </div>
+          <div
+            v-if="spellSlot.total > 6"
+          >
+            {{ spellSlot.total }}
+          </div>
+          <div
+            v-else
+          >
+            <v-icon
+              v-for="i in spellSlot.total"
+              :key="i"
+            >
+              mdi-radiobox-blank
+            </v-icon>
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-if="savingThrows.length"
+        class="saving-throws"
+      >
+        <div>
+          <v-list>
+            <v-subheader>Saving Throws</v-subheader>
+            <skill-list-tile
+              v-for="save in savingThrows"
+              :key="save._id"
+              :model="save"
+              :data-id="save._id"
+            />
+          </v-list>
+        </div>
+      </div>
+
+      <div
+        v-if="skills.length"
+        class="skills"
+      >
+        <div>
+          <v-list>
+            <v-subheader>Skills</v-subheader>
+            <skill-list-tile
+              v-for="skill in skills"
+              :key="skill._id"
+              :model="skill"
+              :data-id="skill._id"
+            />
+          </v-list>
+        </div>
+      </div>
+
+      <div
+        v-for="action in actions"
+        :key="action._id"
+        class="action"
+      >
+        <action-card
+          :model="action"
+          :data-id="action._id"
+        />
+      </div>
+
+      <div
+        v-if="weapons && weapons.length"
+        class="weapon-proficiencies"
+      >
+        <v-card>
+          <v-list>
+            <v-subheader>
+              Weapons
+            </v-subheader>
+            <skill-list-tile
+              v-for="weapon in weapons"
+              :key="weapon._id"
+              hide-modifier
+              :model="weapon"
+              :data-id="weapon._id"
+            />
+          </v-list>
+        </v-card>
+      </div>
+      <div
+        v-if="armors && armors.length"
+        class="armor-proficiencies"
+      >
+        <v-card>
+          <v-list>
+            <v-subheader>
+              Armor
+            </v-subheader>
+            <skill-list-tile
+              v-for="armor in armors"
+              :key="armor._id"
+              hide-modifier
+              :model="armor"
+              :data-id="armor._id"
+            />
+          </v-list>
+        </v-card>
+      </div>
+      <div
+        v-if="tools && tools.length"
+        class="tool-proficiencies"
+      >
+        <v-card>
+          <v-list>
+            <v-subheader>
+              Tools
+            </v-subheader>
+            <skill-list-tile
+              v-for="tool in tools"
+              :key="tool._id"
+              hide-modifier
+              :model="tool"
+              :data-id="tool._id"
+            />
+          </v-list>
+        </v-card>
+      </div>
+      <div
+        v-if="languages && languages.length"
+        class="language-proficiencies"
+      >
+        <v-card>
+          <v-list>
+            <v-subheader>
+              Languages
+            </v-subheader>
+            <skill-list-tile
+              v-for="language in languages"
+              :key="language._id"
+              hide-modifier
+              :model="language"
+              :data-id="language._id"
+            />
+          </v-list>
+        </v-card>
+      </div>
+    </column-layout>
+  </div>
+  </column-layout>
+  </div>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import DamageMultiplierCard from '/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue';
+import HealthBarCardContainer from '/imports/ui/properties/components/attributes/HealthBarCardContainer.vue';
+import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.vue';
+import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+
+const getProperties = function (creature, filter, options = {
+  sort: { order: 1 }
+}) {
+  if (!creature) return;
+  if (creature.settings.hideUnusedStats) {
+    filter.hide = { $ne: true };
+  }
+  filter['ancestors.id'] = creature._id;
+  filter.removed = { $ne: true };
+  filter.inactive = { $ne: true };
+  filter.overridden = { $ne: true };
+  filter.$nor = [
+    { hideWhenTotalZero: true, total: 0 },
+    { hideWhenValueZero: true, value: 0 },
+  ];
+
+  return CreatureProperties.find(filter, options);
+};
+
+const getAttributeOfType = function (creature, type) {
+  return getProperties(creature, {
+    type: 'attribute',
+    attributeType: type,
+  });
+};
+
+const getSkillOfType = function (creature, type) {
+  return getProperties(creature, {
+    type: 'skill',
+    skillType: type,
+  });
+}
+
+export default {
+  components: {
+    ColumnLayout,
+    DamageMultiplierCard,
+    HealthBarCardContainer,
+    SkillListTile,
+    ActionCard,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      doCheckLoading: false,
+    }
+  },
+  meteor: {
+    creature() {
+      return Creatures.findOne(this.creatureId, { fields: { settings: 1 } });
+    },
+    abilities() {
+      return getAttributeOfType(this.creature, 'ability');
+    },
+    stats() {
+      return getAttributeOfType(this.creature, 'stat');
+    },
+    toggles() {
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'toggle',
+        removed: { $ne: true },
+        deactivatedByAncestor: { $ne: true },
+        showUI: true,
+      }, {
+        sort: { order: 1 }
+      });
+    },
+    modifiers() {
+      return getAttributeOfType(this.creature, 'modifier');
+    },
+    resources() {
+      return getAttributeOfType(this.creature, 'resource');
+    },
+    spellSlots() {
+      return getAttributeOfType(this.creature, 'spellSlot');
+    },
+    hasSpells() {
+      const cursor = getProperties(this.creature, {
+        type: 'spell',
+      })
+      return cursor && cursor.count();
+    },
+    hitDice() {
+      return getAttributeOfType(this.creature, 'hitDice');
+    },
+    checks() {
+      return getSkillOfType(this.creature, 'check');
+    },
+    savingThrows() {
+      return getSkillOfType(this.creature, 'save');
+    },
+    skills() {
+      return getSkillOfType(this.creature, 'skill');
+    },
+    tools() {
+      return getSkillOfType(this.creature, 'tool');
+    },
+    weapons() {
+      return getSkillOfType(this.creature, 'weapon');
+    },
+    armors() {
+      return getSkillOfType(this.creature, 'armor');
+    },
+    languages() {
+      return getSkillOfType(this.creature, 'language');
+    },
+    actions() {
+      return getProperties(this.creature, { type: 'action' });
+    },
+    appliedBuffs() {
+      return getProperties(this.creature, { type: 'buff' });
+    },
+    multipliers() {
+      return getProperties(this.creature, {
+        type: 'damageMultiplier'
+      }, {
+        sort: { value: 1, order: 1 }
+      });
+    },
+  },
+  methods: {
+    numberToSignedString,
+  },
+};
+</script>
+
+<style lang="css" scoped>
+  .double-border {
+    position: relative;
+    padding: 11px 10px;
+  }
+  .double-border::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-image-source: url(/images/print/doubleLineImageBorder.png);
+    border-image-slice: 110 126 fill;
+    border-image-width: 16px;
+    border-image-repeat: stretch;
+    box-sizing: content-box;
+    z-index: -1;
+  }
+  .octogon-border {
+    position: relative;
+    padding: 4px 20px;
+  }
+  .octogon-border::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border-image: url(/images/print/octogonBorder.png) 124 118 fill;
+    border-image-width: 22px;
+    z-index: -1;
+  }
+  .shield-border {
+    min-width: 64px !important;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    aspect-ratio: 0.87;
+    padding: 12px;
+  }
+  .shield-border::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: url(/images/print/shieldBorder.png);
+    background-size: contain;
+    background-position: center;
+    background-repeat: no-repeat;
+    z-index: -1;
+  }
+  .shield-number-label {
+    align-items: center !important;
+  }
+  .big-number {
+    font-size: 20pt;
+  }
+  .ability {
+    display: flex;
+    align-items: start;
+    margin: 4px 0;
+  }
+  .ability .score {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .ability .top {
+    min-width: 64px;
+    text-align: center;
+    margin-bottom: -10px;
+    padding: 14px;
+    z-index: 1;
+  }
+  .ability .bottom {
+    font-size: 10pt;
+    position: relative;
+    padding: 0 16px;
+    z-index: 2;
+  }
+  .ability .bottom::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    border: solid white;
+    border-image-source: url(/images/print/upwardPointingBorder.png);
+    border-image-slice: 0 85 fill;
+    border-image-width: 0 16px;
+    border-image-outset: 0px 0px;
+    border-image-repeat: stretch;
+    box-sizing: content-box;
+    z-index: -1;
+  }
+  .ability .name {
+    margin-top: 10px;
+    margin-left: -16px;
+    padding-left: 20px;
+  }
+
+  .number-label {
+    display: flex;
+    align-items: flex-start;
+  }
+
+  .label {
+    font-size: 10pt;
+    font-variant: small-caps;
+    flex-grow: 1;
+  }
+
+  .number-label .label {
+    margin-top: 4px;
+    margin-left: -30px;
+    padding-left: 34px;
+    z-index: -1;
+  }
+
+  .number-label .number {
+    min-width: 72px;
+    text-align: center;
+    z-index: 1;
+  }
+
+  .number-label .box {
+    width: 48px;
+    height: 48px;
+    margin-left: 10px;
+    z-index: 1;
+  }
+
+</style>
diff --git a/app/imports/ui/router.js b/app/imports/ui/router.js
index 6fd075d9..bb8dc307 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/ui/router.js
@@ -12,6 +12,7 @@ const LibraryCollectionToolbar = () => import('/imports/ui/library/LibraryCollec
 const CharacterSheetPage = () => import('/imports/ui/pages/CharacterSheetPage.vue');
 const CharacterSheetToolbar = () => import('/imports/ui/creature/character/CharacterSheetToolbar.vue');
 const CharacterSheetRightDrawer = () => import('/imports/ui/creature/character/CharacterSheetRightDrawer.vue');
+const CharacterSheetPrinted = () => import('/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue');
 const SignIn = () => import('/imports/ui/pages/SignIn.vue');
 const Register = () => import('/imports/ui/pages/Register.vue');
 const IconAdmin = () => import('/imports/ui/icons/IconAdmin.vue');
@@ -177,6 +178,16 @@ RouterFactory.configure(router => {
     meta: {
       title: 'Character Sheet',
     },
+  }, {
+    name: 'printCharacterSheet',
+    path: '/print-character/:id',
+    alias: '/print-character/:id/:urlName',
+    components: {
+      default: CharacterSheetPrinted,
+    },
+    meta: {
+      title: 'Print Character Sheet',
+    },
   }, {
     path: '/tabletops',
     name: 'tabletops',

From 008ef625175b3f63421722714540182c25d034b2 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 7 Nov 2022 16:18:35 +0200
Subject: [PATCH 09/46] Printing implemented, needs print button on sheet

---
 .../CharacterSheetPrinted.vue                 | 239 ++++++-
 .../PrintedCharacter.vue                      |  58 --
 .../printedCharacterSheet/PrintedFeatures.vue |  60 --
 .../PrintedInventory.vue                      | 209 +++---
 .../printedCharacterSheet/PrintedSpells.vue   |  75 ++-
 .../printedCharacterSheet/PrintedStats.vue    | 619 ++++++++++--------
 .../components/PrintedAction.vue              | 247 +++++++
 .../components/PrintedContainer.vue           | 135 ++++
 .../components/PrintedDamageMultipliers.vue   |  71 ++
 .../components/PrintedItem.vue                | 173 +++++
 .../components/PrintedSkill.vue               | 105 +++
 .../components/PrintedSpell.vue               |  82 +++
 .../components/PrintedSpellList.vue           |  39 ++
 app/package-lock.json                         |  45 +-
 app/package.json                              |   3 +-
 .../{octogonBorder.png => octagonBorder.png}  | Bin
 16 files changed, 1618 insertions(+), 542 deletions(-)
 delete mode 100644 app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue
 delete mode 100644 app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
 create mode 100644 app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
 rename app/public/images/print/{octogonBorder.png => octagonBorder.png} (100%)

diff --git a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
index cffd8bc5..cba250c3 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
+++ b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
@@ -31,14 +31,45 @@
         v-else
         light
       >
-        <printed-stats :creature-id="creatureId" />
-        <printed-features :creature-id="creatureId" />
-        <printed-inventory :creature-id="creatureId" />
-        <printed-spells
-          v-if="!creature.settings.hideSpellsTab"
-          :creature-id="creatureId"
-        />
-        <printed-character :creature-id="creatureId" />
+        <div class="page pa-3">
+          <div class="px-3 d-flex align-center">
+            <div class="logo-background" />
+            <div class="creature-name mr-3">
+              {{ creature.name }}
+            </div>
+            <div class="text-right flex mr-4">
+              <div v-if="creature.alignment || background">
+                {{ creature.alignment }} {{ background }}
+              </div>
+              <dir v-if="race || creature.gender">
+                {{ race }} {{ creature.gender }}
+              </dir>
+              <div v-if="level && classes && classes.length === 1">
+                Level {{ level }} {{ classes[0].name }}
+              </div>
+              <div v-else-if="level">
+                Level {{ level }} ({{ classes.map(c => `${c.name} ${c.level}`).join(', ') }})
+              </div>
+            </div>
+            <qrcode-vue
+              style="height: 100px"
+              render-as="svg"
+              :value="creatureUrl"
+            />
+          </div>
+          <div
+            class="text-right mt-3 mr-4"
+            style="font-size: 8pt; margin-bottom: -4px;"
+          >
+            {{ creatureUrl }}
+          </div>
+          <printed-stats :creature-id="creatureId" />
+          <printed-inventory :creature-id="creatureId" />
+          <printed-spells
+            v-if="!creature.settings.hideSpellsTab"
+            :creature-id="creatureId"
+          />
+        </div>
       </v-theme-provider>
     </v-fade-transition>
   </div>
@@ -46,25 +77,59 @@
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import PrintedStats from '/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue';
-import PrintedFeatures from '/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue';
 import PrintedInventory from '/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue';
 import PrintedSpells from '/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue';
-import PrintedCharacter from '/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
+import QrcodeVue from 'qrcode.vue'
 
 export default {
   components: {
     PrintedStats,
-    PrintedFeatures,
     PrintedInventory,
     PrintedSpells,
-    PrintedCharacter,
+    QrcodeVue,
   },
   computed: {
     creatureId() {
       return this.$route.params.id
-    }
+    },
+    creatureUrl() {
+      let props = this.$router.resolve({ 
+        name: 'characterSheet',
+        params: { id: this.creatureId},
+      });
+      return new URL(props?.href, document.baseURI).href
+    },
+    level() {
+      return this.variables?.level?.value;
+    },
+    highestLevels(){
+      let highestLevels = {};
+      let highestLevelsList = [];
+      this.classLevels.forEach(classLevel => {
+        let name = classLevel.variableName;
+        if (
+          !highestLevels[name] ||
+          highestLevels[name].level < classLevel.level
+        ){
+          highestLevels[name] = classLevel;
+        }
+      });
+      for (let name in highestLevels){
+        highestLevelsList.push(highestLevels[name]);
+      }
+      highestLevelsList.sort((a, b) => a.level - b.level);
+      return highestLevelsList;
+    },
+    classes() {
+      return [
+        ...this.highestLevels,
+        ...this.classProperties
+      ].sort((a, b) => a.order - b.order);
+    },
   },
   reactiveProvide: {
     name: 'context',
@@ -104,6 +169,55 @@ export default {
     creature() {
       return Creatures.findOne(this.creatureId);
     },
+    variables() {
+      return CreatureVariables.findOne({ _creatureId: this.creatureId }) || {};
+    },
+    race() {
+      if (this.variables?.race?.value?.valueType === 'string') return this.variables.race.value.value;
+      const prop = CreatureProperties.findOne({
+        'ancestors.id': this.creatureId,
+        tags: 'race',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+        overridden: { $ne: true },
+      });
+      if (prop?.name) return prop.name;
+      return '';
+    },
+    background() {
+      if (this.variables?.background?.value?.valueType === 'string') return this.variables.background.value.value;
+      const prop = CreatureProperties.findOne({
+        'ancestors.id': this.creatureId,
+        tags: 'background',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+        overridden: { $ne: true },
+      });
+      if (prop?.name) return prop.name;
+      return '';
+    },
+    classProperties(){
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'class',
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        sort: {order: 1}
+      }).fetch();
+    },
+    classLevels() {
+      const classVariableNames = this.classProperties.map(c => c.variableName)
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'classLevel',
+        variableName: {$nin: classVariableNames},
+        removed: {$ne: true},
+        inactive: {$ne: true},
+      }, {
+        sort: {order: 1}
+      });
+    },
     editPermission() {
       try {
         assertEditPermission(this.creature, Meteor.userId());
@@ -120,5 +234,104 @@ export default {
 .character-sheet-printed {
   background: white;
   color: black;
+  font-size: 11pt;
+}
+.page {
+  padding: 4px;
+}
+.character-sheet-printed .inactive {
+  opacity: 1 !important;
+}
+.character-sheet-printed .creature-name {
+  font-size: 24pt;
+  background-color: white;
+}
+.character-sheet-printed .logo-background {
+  width: 60px;
+  height: 60px;
+  margin-right: 8px;
+  background-image: url(/crown-dice-logo-cropped-transparent.png);
+  background-size: contain;
+  background-position: 0 center;
+}
+
+.character-sheet-printed .v-divider {
+  border-color: rgba(0,0,0,0.3);
+  max-width: unset;
+}
+
+.character-sheet-printed .double-border {
+  position: relative;
+  padding: 11px 10px;
+  page-break-inside: avoid;
+}
+
+.character-sheet-printed .double-border::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  border-image-source: url(/images/print/doubleLineImageBorder.png);
+  border-image-slice: 110 126 fill;
+  border-image-width: 16px;
+  border-image-repeat: stretch;
+  box-sizing: content-box;
+  z-index: -1;
+}
+
+.character-sheet-printed .octagon-border {
+  position: relative;
+  padding: 4px 20px;
+  page-break-inside: avoid;
+}
+.character-sheet-printed .octagon-border::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  border-image: url(/images/print/octagonBorder.png) 124 118 fill;
+  border-image-width: 22px;
+  z-index: -1;
+}
+
+.character-sheet-printed .stats .label {
+  font-size: 10pt;
+  font-variant: small-caps;
+}
+
+.character-sheet-printed .label {
+  font-size: 14pt;
+  font-variant: all-small-caps;
+  font-weight: 600;
+}
+
+.character-sheet-printed .span-all {
+  column-span: all;
+}
+
+@media screen {
+  .character-sheet-printed {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+  .character-sheet-printed .page {
+    width: 210mm;
+  }
+}
+@media print {
+  header {
+    display: none !important;
+  }
+  nav {
+    display: none !important;
+  }
+  .v-main {
+    padding: 0 !important;
+  }
 }
 </style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue
deleted file mode 100644
index f37e7b5b..00000000
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedCharacter.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-<template>
-  <div class="build-tab">
-    <column-layout wide-columns>
-      <div>
-        <creature-summary :creature="creature" />
-      </div>
-      <div
-        v-for="note in notes"
-        :key="note._id"
-      >
-        <note-card
-          :model="note"
-        />
-      </div>
-    </column-layout>
-  </div>
-</template>
-
-<script lang="js">
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
-import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-
-export default {
-  components: {
-    ColumnLayout,
-    CreatureSummary,
-    NoteCard,
-  },
-  props: {
-    creatureId: {
-      type: String,
-      required: true,
-    },
-  },
-  meteor: {
-    notes(){
-      return CreatureProperties.find({
-        'ancestors.id': this.creatureId,
-        type: 'note',
-        removed: {$ne: true},
-        inactive: {$ne: true},
-      }, {
-        sort: {order: 1},
-      });
-    },
-    creature(){
-      return Creatures.findOne(this.creatureId);
-    },
-  },
-}
-</script>
-
-<style lang="css" scoped>
-
-</style>
\ No newline at end of file
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue
deleted file mode 100644
index c1bfc215..00000000
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template lang="html">
-  <div class="features">
-    <column-layout wide-columns>
-      <div
-        v-for="feature in features"
-        :key="feature._id"
-      >
-        <feature-card
-          :model="feature"
-          :data-id="feature._id"
-          @click="featureClicked(feature)"
-        />
-      </div>
-    </column-layout>
-  </div>
-</template>
-
-<script lang="js">
-import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import FeatureCard from '/imports/ui/properties/components/features/FeatureCard.vue';
-
-export default {
-  components: {
-    ColumnLayout,
-    FeatureCard,
-  },
-  props: {
-    creatureId: {
-      type: String,
-      required: true,
-    },
-  },
-  meteor: {
-    features() {
-      return CreatureProperties.find({
-        'ancestors.id': this.creatureId,
-        type: 'feature',
-        removed: { $ne: true },
-        inactive: { $ne: true },
-      }, {
-        sort: { order: 1 }
-      });
-    },
-  },
-  methods: {
-    featureClicked({ _id }) {
-      this.$store.commit('pushDialogStack', {
-        component: 'creature-property-dialog',
-        elementId: `${_id}`,
-        data: { _id },
-      });
-    },
-  },
-};
-</script>
-
-<style lang="css" scoped>
-
-</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
index ea77fddd..53694a81 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
@@ -1,90 +1,84 @@
 <template lang="html">
-  <div class="inventory">
+  <div
+    class="inventory"
+    style="page-break-before: always;"
+  >
     <column-layout wide-columns>
-      <div>
-        <v-card>
-          <v-list>
-            <v-list-item>
-              <v-list-item-avatar>
-                <v-icon>$vuetify.icons.injustice</v-icon>
-              </v-list-item-avatar>
-              <v-list-item-content>
-                <v-list-item-title>
-                  Weight Carried
-                </v-list-item-title>
-              </v-list-item-content>
-              <v-list-item-action>
-                <v-list-item-title>
-                  {{ weightCarried }} lb
-                </v-list-item-title>
-              </v-list-item-action>
-            </v-list-item>
-            <v-list-item>
-              <v-list-item-avatar>
-                <v-icon>$vuetify.icons.cash</v-icon>
-              </v-list-item-avatar>
-              <v-list-item-content>
-                <v-list-item-title>
-                  Net worth
-                </v-list-item-title>
-              </v-list-item-content>
-              <v-list-item-action>
-                <v-list-item-title>
-                  <coin-value :value="variables && variables.valueTotal && variables.valueTotal.value|| 0" />
-                </v-list-item-title>
-              </v-list-item-action>
-            </v-list-item>
-            <v-list-item v-if="variables && variables.itemsAttuned && variables.itemsAttuned.value">
-              <v-list-item-avatar>
-                <v-icon>$vuetify.icons.spell</v-icon>
-              </v-list-item-avatar>
-              <v-list-item-content>
-                <v-list-item-title>
-                  Items attuned
-                </v-list-item-title>
-              </v-list-item-content>
-              <v-list-item-action>
-                <v-list-item-title>
-                  {{ variables.itemsAttuned.value }}
-                </v-list-item-title>
-              </v-list-item-action>
-            </v-list-item>
-          </v-list>
-        </v-card>
-      </div>
-      <div>
-        <toolbar-card transparent-toolbar>
-          <v-toolbar-title slot="toolbar">
-            Equipped
-          </v-toolbar-title>
-          <v-card-text class="px-0">
-            <item-list
-              equipment
-              :items="equippedItems"
-              :parent-ref="equipmentParentRef"
+      <div class="span-all">
+        <div class="double-border">
+          <div class="label text-center">
+            Inventory
+          </div>
+          <div class="d-flex inventory-stat">
+            <v-icon>$vuetify.icons.injustice</v-icon>
+            Weight Carried:
+            {{ weightCarried }} lb
+          </div>
+          <div class="d-flex inventory-stat">
+            <v-icon>$vuetify.icons.cash</v-icon>
+            Net worth:
+            <coin-value
+              class="ml-2"
+              :value="variables && variables.valueTotal && variables.valueTotal.value|| 0"
             />
-          </v-card-text>
-        </toolbar-card>
+          </div>
+          <div class="d-flex inventory-stat">
+            <v-icon>$vuetify.icons.spell</v-icon>
+            Items attuned:
+            {{ variables.itemsAttuned && variables.itemsAttuned.value }}
+          </div>
+        </div>
       </div>
-      <div>
-        <toolbar-card transparent-toolbar>
-          <v-toolbar-title slot="toolbar">
-            Carried
-          </v-toolbar-title>
-          <v-card-text class="px-0">
-            <item-list
-              :items="carriedItems"
-              :parent-ref="carriedParentRef"
-            />
-          </v-card-text>
-        </toolbar-card>
+      <div class="span-all">
+        <div class="octagon-border label text-center">
+          Equipped
+        </div>
       </div>
       <div
-        v-for="container in containersWithoutAncestorContainers"
-        :key="container._id"
+        v-for="item in equippedItems"
+        :key="item._id"
       >
-        <container-card :model="container" />
+        <printed-item
+          class="double-border"
+          :model="item"
+        />
       </div>
+      <div class="span-all">
+        <div class="octagon-border label text-center">
+          Carried
+        </div>
+      </div>
+      <div
+        v-for="item in carriedItems"
+        :key="item._id"
+      >
+        <printed-item
+          class="double-border"
+          :model="item"
+        />
+      </div>
+      <template
+        v-for="container in containersWithoutAncestorContainers"
+      >
+        <div 
+          :key="container._id"
+          class="span-all container-header"
+        >
+          <printed-container
+            class="octagon-border"
+            :model="container"
+          />
+        </div>
+        <div
+          v-for="item in container.items"
+          :key="item._id"
+        >
+          <printed-item
+            class="double-border"
+            :model="item"
+          />
+        </div>
+      </template>
     </column-layout>
   </div>
 </template>
@@ -93,22 +87,20 @@
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import ContainerCard from '/imports/ui/properties/components/inventory/ContainerCard.vue';
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import ItemList from '/imports/ui/properties/components/inventory/ItemList.vue';
 import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
 import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
 import CoinValue from '/imports/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
-import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
+import PrintedItem from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue';
+import PrintedContainer from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 
 export default {
   components: {
     ColumnLayout,
-    ContainerCard,
-    ToolbarCard,
-    ItemList,
     CoinValue,
+    PrintedItem,
+    PrintedContainer,
   },
   props: {
     creatureId: {
@@ -154,6 +146,17 @@ export default {
         inactive: { $ne: true },
       }, {
         sort: { order: 1 },
+      }).map(c => {
+        c.items = CreatureProperties.find({
+          'parent.id': c._id,
+          type: { $in: ['item', 'container'] },
+          removed: { $ne: true },
+          equipped: { $ne: true },
+          deactivatedByAncestor: { $ne: true },
+        }, {
+          sort: { order: 1 },
+        }).fetch();
+        return c;
       });
     },
     carriedItems() {
@@ -229,5 +232,39 @@ export default {
 </script>
 
 <style lang="css" scoped>
+.octagon-border {
+  position: relative;
+  padding: 4px 20px;
+  page-break-inside: avoid;
+}
+.octagon-border::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  border-image: url(/images/print/octagonBorder.png) 124 118 fill;
+  border-image-width: 22px;
+  z-index: -1;
+}
 
+.label {
+  font-size: 14pt;
+  font-variant: small-caps;
+  flex-grow: 1;
+}
+
+.inventory-stat {
+  font-size: 12pt;
+  line-height: 32px;
+}
+.inventory-stat > .v-icon {
+  margin-right: 8px;
+}
+
+.container-header {
+  page-break-after: avoid;
+  page-break-inside: avoid;
+}
 </style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
index a5e307cc..1d60374b 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
@@ -1,23 +1,38 @@
 <template lang="html">
-  <div class="spells">
+  <div
+    class="spells"
+    style="page-break-before: always;"
+  >
     <column-layout wide-columns>
-      <div v-if="spellsWithoutList.length">
-        <v-card>
-          <spell-list
-            :spells="spellsWithoutList"
-            :parent-ref="{id: creatureId, collection: 'creatures'}"
-          />
-        </v-card>
+      <div class="span-all">
+        <div class="label text-center octagon-border">
+          Spells
+        </div>
       </div>
       <div
-        v-for="spellList in spellListsWithoutAncestorSpellLists"
-        :key="spellList._id"
+        v-for="spell in spellsWithoutList"
+        :key="spell._id"
       >
-        <spellList-card
-          :model="spellList"
-          :organize="organize"
-        />
+        <printed-spell :model="spell" />
       </div>
+      <template
+        v-for="spellList in spellListsWithoutAncestorSpellLists"
+      >
+        <div
+          :key="spellList._id"
+          class="span-all"
+        >
+          <printed-spell-list
+            :model="spellList"
+          />
+        </div>
+        <div
+          v-for="spell in spellList.spells"
+          :key="spell._id"
+        >
+          <printed-spell :model="spell" />
+        </div>
+      </template>
     </column-layout>
   </div>
 </template>
@@ -25,14 +40,14 @@
 <script lang="js">
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import SpellListCard from '/imports/ui/properties/components/spells/SpellListCard.vue';
-import SpellList from '/imports/ui/properties/components/spells/SpellList.vue';
+import PrintedSpell from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue';
+import PrintedSpellList from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue';
 
 export default {
   components: {
     ColumnLayout,
-    SpellList,
-    SpellListCard,
+    PrintedSpell,
+    PrintedSpellList,
   },
   props: {
     creatureId: {
@@ -84,21 +99,25 @@ export default {
         inactive: { $ne: true },
       }, {
         sort: { order: 1 }
+      }).map(sl => {
+        sl.spells = CreatureProperties.find({
+          'ancestors.id': sl._id,
+          type: 'spell',
+          removed: { $ne: true },
+          inactive: { $ne: true },
+        }, {
+          sort: {
+            level: 1,
+            order: 1,
+          }
+        }).fetch();
+        return sl;
       });
     },
   },
   computed: {
     spellListIds() {
-      return this.spellLists.map(spellList => spellList._id);
-    },
-  },
-  methods: {
-    clickProperty(_id) {
-      this.$store.commit('pushDialogStack', {
-        component: 'creature-property-dialog',
-        elementId: `spell-list-tile-${_id}`,
-        data: { _id },
-      });
+      return this.spellLists?.map(spellList => spellList._id);
     },
   },
 }
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
index b4717b20..4d9e0a29 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
@@ -1,7 +1,5 @@
 <template lang="html">
-  <div class="stats-tab ma-2">
-    <health-bar-card-container :creature-id="creatureId" />
-
+  <div class="stats">
     <column-layout>
       <div
         v-if="abilities.length"
@@ -56,7 +54,7 @@
         :class="stat.variableName == 'armor' && 'shield-number-label'"
       >
         <div
-          :class="stat.variableName == 'armor' ? 'shield-border' : 'octogon-border'"
+          :class="stat.variableName == 'armor' ? 'shield-border' : 'octagon-border'"
           class="number big-number"
         >
           {{ stat.value }}
@@ -71,7 +69,7 @@
         :key="modifier._id"
         class="number-label"
       >
-        <div class="number octogon-border big-number">
+        <div class="number octagon-border big-number">
           {{ numberToSignedString(modifier.value) }}
         </div>
         <div class="label double-border">
@@ -84,14 +82,37 @@
         :key="check._id"
         class="number-label"
       >
-        <div class="number octogon-border big-number">
+        <div class="number octagon-border big-number">
           {{ numberToSignedString(check.value) }}
         </div>
         <div class="label double-border">
           {{ check.name }}
         </div>
       </div>
-
+      <div
+        v-for="healthBar in healthBars"
+        :key="healthBar._id"
+        class="m-2"
+      >
+        <div class="double-border">
+          <div class="label">
+            Total: {{ healthBar.total }}
+          </div>
+          <div style="height: 60px;" />
+          <div
+            style="text-align: center;"
+            class="label"
+          >
+            {{ healthBar.name }}
+          </div>
+        </div>
+      </div>
+      <div>
+        <printed-damage-multipliers
+          class="double-border"
+          :multipliers="multipliers"
+        />
+      </div>
       <div
         v-if="hitDice.length"
         class="hit-dice m-2"
@@ -109,7 +130,7 @@
               {{ hitDie.total }}{{ hitDie.hitDiceSize }}
             </span>
           </div>
-          <div style="height: 80px;" />
+          <div style="height: 60px;" />
           <div
             style="text-align: center;"
             class="label"
@@ -122,182 +143,238 @@
       <div
         v-for="resource in resources"
         :key="resource._id"
-        class="resource"
       >
-        <div>{{ resource.total }}</div>
-        <div>{{ resource.name }}</div>
+        <div
+          class="double-border"
+          :class="resource.total <= 8 && 'mb-2'"
+        >
+          <div
+            v-if="resource.total <= 8"
+            class="label"
+          >
+            {{ resource.name }}
+          </div>
+          <div
+            v-if="resource.total > 8"
+          >
+            total: {{ resource.total }}
+            <div style="height: 60px;" />
+          </div>
+          <div
+            v-if="resource.total <= 8"
+            class="d-flex justify-end"
+          >
+            <div
+              v-for="i in resource.total"
+              :key="i"
+              class="resource-bubble"
+            />
+          </div>
+          <div
+            v-if="resource.total > 8"
+            class="label text-center"
+          >
+            {{ resource.name }}
+          </div>
+        </div>
       </div>
 
-      <damage-multiplier-card
-        v-if="multipliers && multipliers.length"
-        :multipliers="multipliers"
-      />
-
       <div
         v-if="spellSlots && spellSlots.length"
       >
-        <div>Spell Slots</div>
-        <div
-          v-for="spellSlot in spellSlots"
-          :key="spellSlot._id"
-        >
-          <div>
-            {{ spellSlot.name }}
+        <div class="double-border">
+          <div class="label text-center">
+            Spell Slots
           </div>
           <div
-            v-if="spellSlot.total > 6"
+            v-for="spellSlot in spellSlots"
+            :key="spellSlot._id"
+            class="mb-7"
+            :class="spellSlot.total <= 8 && 'mb-7'"
           >
-            {{ spellSlot.total }}
-          </div>
-          <div
-            v-else
-          >
-            <v-icon
-              v-for="i in spellSlot.total"
-              :key="i"
+            <div class="label">
+              {{ spellSlot.name }}
+            </div>
+            <div
+              v-if="spellSlot.total > 8"
             >
-              mdi-radiobox-blank
-            </v-icon>
+              Total: {{ spellSlot.total }}
+            </div>
+            <div
+              v-else
+              class="d-flex"
+            >
+              <div
+                v-for="i in spellSlot.total"
+                :key="i"
+                class="resource-bubble"
+              />
+            </div>
           </div>
         </div>
       </div>
 
       <div
         v-if="savingThrows.length"
-        class="saving-throws"
       >
-        <div>
-          <v-list>
-            <v-subheader>Saving Throws</v-subheader>
-            <skill-list-tile
-              v-for="save in savingThrows"
-              :key="save._id"
-              :model="save"
-              :data-id="save._id"
-            />
-          </v-list>
+        <div
+          class="double-border"
+        >
+          <printed-skill
+            v-for="save in savingThrows"
+            :key="save._id"
+            :model="save"
+            :data-id="save._id"
+          />
+          <div class="label text-center">
+            Saving Throws
+          </div>
         </div>
       </div>
 
       <div
         v-if="skills.length"
-        class="skills"
       >
-        <div>
-          <v-list>
-            <v-subheader>Skills</v-subheader>
-            <skill-list-tile
-              v-for="skill in skills"
-              :key="skill._id"
-              :model="skill"
-              :data-id="skill._id"
-            />
-          </v-list>
+        <div
+          class="double-border"
+        >
+          <printed-skill
+            v-for="skill in skills"
+            :key="skill._id"
+            :model="skill"
+            :data-id="skill._id"
+          />
+          <div class="label text-center">
+            Skills
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="weapons && weapons.length"
+      >
+        <div
+          class="double-border"
+        >
+          <printed-skill
+            v-for="weapon in weapons"
+            :key="weapon._id"
+            hide-modifier
+            :model="weapon"
+            :data-id="weapon._id"
+          />
+          <div class="label text-center">
+            Weapons
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="armors && armors.length"
+      >
+        <div
+          class="double-border"
+        >
+          <printed-skill
+            v-for="armor in armors"
+            :key="armor._id"
+            hide-modifier
+            :model="armor"
+            :data-id="armor._id"
+          />
+          <div class="label text-center">
+            Armor
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="tools && tools.length"
+      >
+        <div
+          class="double-border"
+        >
+          <printed-skill
+            v-for="tool in tools"
+            :key="tool._id"
+            hide-modifier
+            :model="tool"
+            :data-id="tool._id"
+          />
+          <div class="label text-center">
+            Tools
+          </div>
+        </div>
+      </div>
+      <div
+        v-if="languages && languages.length"
+      >
+        <div
+          class="double-border"
+        >
+          <printed-skill
+            v-for="language in languages"
+            :key="language._id"
+            hide-modifier
+            :model="language"
+            :data-id="language._id"
+          />
+          <div class="label text-center">
+            Languages
+          </div>
+        </div>
+      </div>
+
+      <div
+        v-for="note in notes"
+        :key="note._id"
+      >
+        <div class="double-border">
+          <div class="label text-center">
+            {{ note.name }}
+          </div>
+          <property-description
+            text
+            :model="note.summary"
+          />
         </div>
       </div>
 
       <div
         v-for="action in actions"
         :key="action._id"
-        class="action"
       >
-        <action-card
-          :model="action"
-          :data-id="action._id"
-        />
+        <div class="double-border">
+          <printed-action
+            :model="action"
+          />
+        </div>
       </div>
 
       <div
-        v-if="weapons && weapons.length"
-        class="weapon-proficiencies"
+        v-for="feature in features"
+        :key="feature._id"
       >
-        <v-card>
-          <v-list>
-            <v-subheader>
-              Weapons
-            </v-subheader>
-            <skill-list-tile
-              v-for="weapon in weapons"
-              :key="weapon._id"
-              hide-modifier
-              :model="weapon"
-              :data-id="weapon._id"
-            />
-          </v-list>
-        </v-card>
-      </div>
-      <div
-        v-if="armors && armors.length"
-        class="armor-proficiencies"
-      >
-        <v-card>
-          <v-list>
-            <v-subheader>
-              Armor
-            </v-subheader>
-            <skill-list-tile
-              v-for="armor in armors"
-              :key="armor._id"
-              hide-modifier
-              :model="armor"
-              :data-id="armor._id"
-            />
-          </v-list>
-        </v-card>
-      </div>
-      <div
-        v-if="tools && tools.length"
-        class="tool-proficiencies"
-      >
-        <v-card>
-          <v-list>
-            <v-subheader>
-              Tools
-            </v-subheader>
-            <skill-list-tile
-              v-for="tool in tools"
-              :key="tool._id"
-              hide-modifier
-              :model="tool"
-              :data-id="tool._id"
-            />
-          </v-list>
-        </v-card>
-      </div>
-      <div
-        v-if="languages && languages.length"
-        class="language-proficiencies"
-      >
-        <v-card>
-          <v-list>
-            <v-subheader>
-              Languages
-            </v-subheader>
-            <skill-list-tile
-              v-for="language in languages"
-              :key="language._id"
-              hide-modifier
-              :model="language"
-              :data-id="language._id"
-            />
-          </v-list>
-        </v-card>
+        <div class="double-border">
+          <div class="label text-center">
+            {{ feature.name }}
+          </div>
+          <property-description
+            text
+            :model="feature.summary"
+          />
+        </div>
       </div>
     </column-layout>
   </div>
-  </column-layout>
-  </div>
 </template>
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import DamageMultiplierCard from '/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue';
-import HealthBarCardContainer from '/imports/ui/properties/components/attributes/HealthBarCardContainer.vue';
-import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.vue';
-import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
+import PrintedAction from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import PrintedSkill from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue';
+import PrintedDamageMultipliers from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue';
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
 
 const getProperties = function (creature, filter, options = {
   sort: { order: 1 }
@@ -335,10 +412,10 @@ const getSkillOfType = function (creature, type) {
 export default {
   components: {
     ColumnLayout,
-    DamageMultiplierCard,
-    HealthBarCardContainer,
-    SkillListTile,
-    ActionCard,
+    PrintedDamageMultipliers,
+    PrintedAction,
+    PrintedSkill,
+    PropertyDescription,
   },
   props: {
     creatureId: {
@@ -372,6 +449,9 @@ export default {
         sort: { order: 1 }
       });
     },
+    healthBars() {
+      return getAttributeOfType(this.creature, 'healthBar');
+    },
     modifiers() {
       return getAttributeOfType(this.creature, 'modifier');
     },
@@ -412,7 +492,9 @@ export default {
       return getSkillOfType(this.creature, 'language');
     },
     actions() {
-      return getProperties(this.creature, { type: 'action' });
+      return getProperties(this.creature, { type: 'action' }, {
+        sort: { actionType: 1, order: 1 }
+      });
     },
     appliedBuffs() {
       return getProperties(this.creature, { type: 'buff' });
@@ -424,6 +506,12 @@ export default {
         sort: { value: 1, order: 1 }
       });
     },
+    features() {
+      return getProperties(this.creature, { type: 'feature' });
+    },
+    notes(){
+      return getProperties(this.creature, { type: 'note', summary: {$exists: true} });
+    },
   },
   methods: {
     numberToSignedString,
@@ -432,141 +520,120 @@ export default {
 </script>
 
 <style lang="css" scoped>
-  .double-border {
-    position: relative;
-    padding: 11px 10px;
-  }
-  .double-border::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    border-image-source: url(/images/print/doubleLineImageBorder.png);
-    border-image-slice: 110 126 fill;
-    border-image-width: 16px;
-    border-image-repeat: stretch;
-    box-sizing: content-box;
-    z-index: -1;
-  }
-  .octogon-border {
-    position: relative;
-    padding: 4px 20px;
-  }
-  .octogon-border::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    border-image: url(/images/print/octogonBorder.png) 124 118 fill;
-    border-image-width: 22px;
-    z-index: -1;
-  }
-  .shield-border {
-    min-width: 64px !important;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: relative;
-    aspect-ratio: 0.87;
-    padding: 12px;
-  }
-  .shield-border::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background: url(/images/print/shieldBorder.png);
-    background-size: contain;
-    background-position: center;
-    background-repeat: no-repeat;
-    z-index: -1;
-  }
-  .shield-number-label {
-    align-items: center !important;
-  }
-  .big-number {
-    font-size: 20pt;
-  }
-  .ability {
-    display: flex;
-    align-items: start;
-    margin: 4px 0;
-  }
-  .ability .score {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-  .ability .top {
-    min-width: 64px;
-    text-align: center;
-    margin-bottom: -10px;
-    padding: 14px;
-    z-index: 1;
-  }
-  .ability .bottom {
-    font-size: 10pt;
-    position: relative;
-    padding: 0 16px;
-    z-index: 2;
-  }
-  .ability .bottom::before {
-    content: "";
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    border: solid white;
-    border-image-source: url(/images/print/upwardPointingBorder.png);
-    border-image-slice: 0 85 fill;
-    border-image-width: 0 16px;
-    border-image-outset: 0px 0px;
-    border-image-repeat: stretch;
-    box-sizing: content-box;
-    z-index: -1;
-  }
-  .ability .name {
-    margin-top: 10px;
-    margin-left: -16px;
-    padding-left: 20px;
-  }
+.shield-border {
+  min-width: 64px !important;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  aspect-ratio: 0.87;
+  padding: 12px;
+}
+.shield-border::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: url(/images/print/shieldBorder.png);
+  print-color-adjust: exact;
+  -webkit-print-color-adjust: exact;
+  background-size: contain;
+  background-position: center;
+  background-repeat: no-repeat;
+  z-index: -1;
+}
+.shield-number-label {
+  align-items: center !important;
+}
+.big-number {
+  font-size: 20pt;
+}
+.ability {
+  display: flex;
+  align-items: start;
+  margin: 4px 0;
+}
+.ability .score {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.ability .top {
+  min-width: 64px;
+  text-align: center;
+  margin-bottom: -10px;
+  padding: 14px;
+  z-index: 1;
+}
+.ability .bottom {
+  font-size: 10pt;
+  position: relative;
+  padding: 0 16px;
+  z-index: 2;
+}
+.ability .bottom::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  border: solid white;
+  border-image-source: url(/images/print/upwardPointingBorder.png);
+  border-image-slice: 0 85 fill;
+  border-image-width: 0 16px;
+  border-image-outset: 0px 0px;
+  border-image-repeat: stretch;
+  box-sizing: content-box;
+  z-index: -1;
+}
+.ability .name {
+  margin-top: 10px;
+  margin-left: -16px;
+  padding-left: 20px;
+}
 
-  .number-label {
-    display: flex;
-    align-items: flex-start;
-  }
+.number-label {
+  display: flex;
+  align-items: flex-start;
+}
 
-  .label {
-    font-size: 10pt;
-    font-variant: small-caps;
-    flex-grow: 1;
-  }
+.label {
+  font-size: 10pt;
+  font-variant: small-caps;
+  flex-grow: 1;
+}
 
-  .number-label .label {
-    margin-top: 4px;
-    margin-left: -30px;
-    padding-left: 34px;
-    z-index: -1;
-  }
+.number-label .label {
+  margin-top: 4px;
+  margin-left: -30px;
+  padding-left: 34px;
+  z-index: -1;
+}
 
-  .number-label .number {
-    min-width: 72px;
-    text-align: center;
-    z-index: 1;
-  }
+.number-label .number {
+  min-width: 72px;
+  text-align: center;
+  z-index: 1;
+}
 
-  .number-label .box {
-    width: 48px;
-    height: 48px;
-    margin-left: 10px;
-    z-index: 1;
-  }
+.number-label .box {
+  width: 48px;
+  height: 48px;
+  margin-left: 10px;
+  z-index: 1;
+}
 
+.resource-bubble {
+  margin-bottom: -20px;
+  margin-top: 4px;
+  margin-right: 4px;
+  background-color: white;
+  border: solid black 2px;
+  border-radius: 50%;
+  width: 24px;
+  height: 24px;
+}
 </style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
new file mode 100644
index 00000000..5f1adf07
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
@@ -0,0 +1,247 @@
+<template lang="html">
+  <div
+    class="action-card"
+    :class="cardClasses"
+  >
+    <div class="label text-center">
+      {{ actionTypeName }}
+    </div>
+    <div class="d-flex align-center">
+      <div class="avatar">
+        <div
+          v-if="rollBonus"
+        >
+          <template v-if="rollBonus && !rollBonusTooLong">
+            {{ rollBonus }}
+          </template>
+          <property-icon
+            v-else
+            :model="model"
+            color="rgba(0,0,0,0.7)"
+          />
+        </div>
+        <property-icon
+          v-else
+          :model="model"
+          color="rgba(0,0,0,0.7)"
+        />
+      </div>
+      <div
+        class="action-header flex d-flex column justify-center pl-1"
+      >
+        <div class="action-title my-1">
+          {{ model.name || propertyName }}
+        </div>
+      </div>
+    </div>
+    <div
+      v-if="Number.isFinite(model.uses)"
+      class="action-sub-title d-flex align-center"
+    >
+      {{ model.uses }} uses
+    </div>
+    <div class="pb-3">
+      <div
+        v-if="model.resources && model.resources.attributesConsumed.length ||
+          model.resources.itemsConsumed.length"
+        class="resources my-2"
+      >
+        <div
+          v-for="attributeConsumed in model.resources.attributesConsumed"
+          :key="attributeConsumed._id"
+          class="layout align-center justify-start"
+        >
+          Cost: {{ attributeConsumed.quantity && attributeConsumed.quantity.value }} {{ attributeConsumed.statName || attributeConsumed.variableName }}
+        </div>
+        <div
+          v-for="itemConsumed in model.resources.itemsConsumed"
+          :key="itemConsumed._id"
+        >
+          <template v-if="itemConsumed.itemName">
+            Uses: {{ itemConsumed.quantity && itemConsumed.quantity.value || 0 }} {{ itemConsumed.itemName || itemConsumed.tag }}
+          </template>
+        </div>
+      </div>
+      <template v-if="model.summary">
+        <markdown-text :markdown="model.summary.value || model.summary.text" />
+      </template>
+      <v-divider v-if="children && children.length" />
+      <tree-node-list
+        v-if="children && children.length"
+        start-expanded
+        :children="children"
+        @selected="e => $emit('sub-click', e)"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="js">
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import AttributeConsumedView from '/imports/ui/properties/components/actions/AttributeConsumedView.vue';
+import ItemConsumedView from '/imports/ui/properties/components/actions/ItemConsumedView.vue';
+import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { some } from 'lodash';
+
+export default {
+  components: {
+    AttributeConsumedView,
+    ItemConsumedView,
+    MarkdownText,
+    PropertyIcon,
+    TreeNodeList,
+  },
+  inject: {
+    context: {
+      default: {},
+    },
+    theme: {
+      default: {
+        isDark: false,
+      },
+    },
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      activated: undefined,
+      doActionLoading: false,
+      hovering: false,
+    }
+  },
+  computed: {
+    rollBonus() {
+      if (!this.model.attackRoll) return;
+      return numberToSignedString(this.model.attackRoll.value);
+    },
+    rollBonusTooLong() {
+      return this.rollBonus && this.rollBonus.length > 3;
+    },
+    propertyName() {
+      return getPropertyName(this.model.type);
+    },
+    cardClasses() {
+      return {
+        'theme--dark': this.theme.isDark,
+        'theme--light': !this.theme.isDark,
+        'muted-text': this.model.insufficientResources,
+        'active': this.activated,
+        'elevation-8': this.hovering,
+      }
+    },
+    actionTypeName() {
+      return {
+        'action': 'Action',
+        'bonus': 'Bonus Action',
+        'attack': 'Attack',
+        'reaction': 'Reaction',
+        'free': 'Free Action',
+        'long': 'Long Action'
+      }[this.model.actionType] || this.model.actionType
+    }
+  },
+  meteor: {
+    children() {
+      const indicesOfTerminatingProps = [];
+      const decendants = CreatureProperties.find({
+        'ancestors.id': this.model._id,
+        'removed': { $ne: true },
+      }, {
+        sort: {order: 1}
+      }).map(prop => {
+        // Get all the props we don't want to show the decendants of and
+        // where they might appear in the ancestor list
+        if (prop.type === 'buff' || prop.type === 'folder') {
+          indicesOfTerminatingProps.push({
+            id: prop._id,
+            ancestorIndex: prop.ancestors.length,
+          });
+        }
+        return prop;
+      }).filter(prop => {
+        // Filter out folders entirely
+        if (prop.type === 'folder') return false;
+        // Filter out decendants of terminating props
+        return !some(indicesOfTerminatingProps, buffIndex => {
+          return prop.ancestors[buffIndex.ancestorIndex]?.id === buffIndex.id;
+        });
+      });
+      return nodeArrayToTree(decendants);
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+.action-card {
+  transition: box-shadow .4s cubic-bezier(0.25, 0.8, 0.25, 1),
+    transform 0.075s ease;
+}
+
+.avatar {
+  font-size: 18pt;
+  text-align: center;
+  min-width: 40px;
+  min-height: 40px;
+}
+
+.label {
+  font-size: 10pt;
+  font-variant: small-caps;
+  flex-grow: 1;
+}
+
+.action-title {
+  font-size: 16px;
+  font-weight: 400;
+  line-height: 24px;
+  position: relative;
+  text-align: left;
+  transition: .3s cubic-bezier(.25, .8, .5, 1);
+  width: 100%;
+}
+
+.resources {
+  font-size: 10pt;
+}
+
+.action-child {
+  height: 32px;
+}
+
+.theme--light.muted-text {
+  color: rgba(0, 0, 0, .3) !important;
+}
+
+.theme--dark.muted-text {
+  color: hsla(0, 0%, 100%, .3) !important;
+}
+
+.action-card {
+  transition: transform 0.15s cubic;
+}
+</style>
+
+<style lang="css">
+.action-card.theme--light.muted-text .v-icon {
+  color: rgba(0, 0, 0, .3) !important;
+}
+
+.action-card.theme--dark.muted-text .v-icon {
+  color: hsla(0, 0%, 100%, .3) !important;
+}
+
+.action-card .property-description>p:last-of-type {
+  margin-bottom: 0;
+}
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
new file mode 100644
index 00000000..a15ed8c8
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="container">
+    <div class="d-flex justify-center">
+      <property-icon
+        class="ml-2"
+        color="rgba(0,0,0,0.7)"
+        :model="model"
+      />
+      <div class="label">
+        {{ model.name }}
+      </div>
+    </div>
+
+    <div
+      v-if="model.value !== undefined || model.weight !== undefined"
+      class="weight-value my-2 d-flex justify-space-between"
+    >
+      <div class="value ml-4">
+        <div
+          v-if="model.value !== undefined"
+        >
+          <v-layout align-center>
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.two_coins
+            </v-icon>
+            <coin-value
+              class="mr-2"
+              :value="model.value"
+            />
+          </v-layout>
+
+          <v-layout
+            align-center
+            class="mb-2"
+          >
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.cash
+            </v-icon>
+            <coin-value
+              :value="model.contentsValue"
+            />
+            <span
+              class="ml-1"
+            >
+              contents
+            </span>
+          </v-layout>
+        </div>
+      </div>
+  
+      <div class="weight ml-4">
+        <div
+          v-if="model.weight !== undefined"
+        >
+          <v-layout align-center>
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.weight
+            </v-icon>
+            {{ model.weight }} lb
+          </v-layout>
+
+          <v-layout
+            align-center
+            class="mb-2"
+          >
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.injustice
+            </v-icon>
+            {{ model.contentsWeight }} lb
+            <span
+              class="ml-1"
+            >
+              contents
+            </span>
+          </v-layout>
+        </div>
+      </div>
+    </div>
+
+    <property-description
+      text
+      :model="model.description"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import PROPERTIES from '/imports/constants/PROPERTIES.js';
+import CoinValue from '/imports/ui/components/CoinValue.vue';
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
+
+export default {
+  components: {
+    CoinValue,
+    PropertyDescription,
+  },
+  mixins: [treeNodeViewMixin],
+  inject: {
+    context: { default: {} }
+  },
+  props: {
+    preparingSpells: Boolean,
+  },
+  data() {
+    return {
+      incrementLoading: false,
+    }
+  },
+  computed: {
+    hasClickListener() {
+      return this.$listeners && !!this.$listeners.click;
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+.item-avatar {
+  min-width: 32px;
+}
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
new file mode 100644
index 00000000..386aabcd
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
@@ -0,0 +1,71 @@
+<template lang="html">
+  <div>
+    <div
+      v-for="(multiplier, multiplierIndex) in multipliers"
+      :key="multiplier._id"
+      :data-id="multiplier._id"
+      @click="$emit('click-multiplier', {_id: multiplier._id})"
+    >
+      <v-divider v-if="multiplierIndex" />
+      <div>
+        <div
+          v-if="multiplier.name"
+          class="label text-center"
+        >
+          {{ multiplier.name }}
+        </div>
+        <div class="font-weight-medium">
+          {{ title(multiplier) }}
+        </div>
+        <div class="d-flex flex-wrap align-center">
+          {{ multiplier.damageTypes.join(', ') }}
+        </div>
+        <div
+          v-if="multiplier.includeTags && multiplier.includeTags.length"
+          class="d-flex flex-wrap align-center"
+        >
+          <div>
+            For:
+          </div>
+          {{ multiplier.includeTags.join(', ') }}
+        </div>
+        <div
+          v-if="multiplier.excludeTags && multiplier.excludeTags.length"
+          class="d-flex flex-wrap align-center"
+        >
+          <div>
+            Except:
+          </div>
+          {{ multiplier.excludeTags.join(', ') }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="js">
+export default {
+  props: {
+    multipliers:{
+      type: Array,
+      required: true,
+    }
+  },
+  methods: {
+    title(prop){
+      switch (prop.value){
+        case 0: return 'Immunity';
+        case 0.5: return 'Resistance';
+        case 2: return 'Vulnerability';
+      }
+    }
+  }
+}
+</script>
+
+<style lang="css" scoped>
+.label {
+  font-size: 10pt;
+  font-variant: small-caps;
+}
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
new file mode 100644
index 00000000..ccc5b85d
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
@@ -0,0 +1,173 @@
+<template>
+  <div class="item">
+    <div class="d-flex justify-space-between">
+      <div class="label">
+        {{ title }}
+        <template v-if="attunementText">
+          ({{ attunementText }})
+        </template>
+      </div>
+      <property-icon
+        class="ml-2"
+        color="rgba(0,0,0,0.7)"
+        :model="model"
+      />
+    </div>
+
+    <div
+      v-if="model.value !== undefined || model.weight !== undefined"
+      class="weight-value my-2 d-flex justify-space-between"
+    >
+      <div class="value ml-4">
+        <div
+          v-if="model.value !== undefined"
+        >
+          <v-layout
+            v-if="model.quantity > 1"
+            align-center
+            class="mb-2"
+          >
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.cash
+            </v-icon>
+            <coin-value
+              :value="model.value * model.quantity"
+            />
+          </v-layout>
+          <v-layout align-center>
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.two_coins
+            </v-icon>
+            <coin-value
+              class="mr-2"
+              :value="model.value"
+            />
+            <span
+              v-if="model.quantity > 1"
+              class="ml-1"
+            >
+              each
+            </span>
+          </v-layout>
+        </div>
+      </div>
+  
+      <div class="weight ml-4">
+        <div
+          v-if="model.weight !== undefined"
+        >
+          <v-layout
+            v-if="model.quantity > 1"
+            align-center
+            class="mb-2"
+          >
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.injustice
+            </v-icon>
+            {{ totalWeight }} lb
+          </v-layout>
+          <v-layout align-center>
+            <v-icon
+              class="mr-2"
+              small
+            >
+              $vuetify.icons.weight
+            </v-icon>
+            {{ model.weight }} lb
+            <span
+              v-if="model.quantity > 1"
+              class="ml-1"
+            >
+              each
+            </span>
+          </v-layout>
+        </div>
+      </div>
+    </div>
+
+    <property-description
+      text
+      :model="model.description"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import PROPERTIES from '/imports/constants/PROPERTIES.js';
+import CoinValue from '/imports/ui/components/CoinValue.vue';
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
+
+export default {
+  components: {
+    CoinValue,
+    PropertyDescription,
+  },
+  mixins: [treeNodeViewMixin],
+  inject: {
+    context: { default: {} }
+  },
+  props: {
+    preparingSpells: Boolean,
+  },
+  data() {
+    return {
+      incrementLoading: false,
+    }
+  },
+  computed: {
+    hasClickListener() {
+      return this.$listeners && !!this.$listeners.click;
+    },
+    title() {
+      let model = this.model;
+      if (!model) return;
+      if (model.quantity !== 1) {
+        if (model.plural) {
+          return `${model.quantity} ${model.plural}`;
+        } else if (model.name) {
+          return `${model.quantity} ${model.name}`;
+        }
+      } else if (model.name) {
+        return model.name;
+      }
+      let prop = PROPERTIES[model.type]
+      return prop && prop.name;
+    },
+    totalValue() {
+      return stripFloatingPointOddities(this.model.value * this.model.quantity);
+    },
+    totalWeight() {
+      return stripFloatingPointOddities(this.model.weight * this.model.quantity);
+    },
+    attunementText() {
+      if (this.model.requiresAttunement) {
+        if (this.model.attuned) return 'Attuned';
+        return 'Requires attunement';
+      }
+      return undefined;
+    }
+  },
+}
+</script>
+
+<style lang="css" scoped>
+.item-avatar {
+  min-width: 32px;
+}
+.item .label {
+  font-size: 14pt;
+  font-variant: all-small-caps;
+  font-weight: 600;
+}
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
new file mode 100644
index 00000000..2920634c
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
@@ -0,0 +1,105 @@
+<template lang="html">
+  <div
+    class="printed-skill pl-0 d-flex align-center"
+  >
+    <div class="d-flex align-center">
+      <div
+        v-if="!hideModifier"
+        class="d-flex align-center"
+      >
+        <proficiency-icon
+          :value="model.proficiency"
+          class="prof-icon"
+        />
+        <div class="prof-mod ml-2 mr-4 text-right">
+          {{ displayedModifier }}
+        </div>
+        <v-icon
+          v-if="model.advantage > 0"
+          size="20px"
+        >
+          mdi-chevron-double-up
+        </v-icon>
+        <v-icon
+          v-if="model.advantage < 0"
+          size="20px"
+        >
+          mdi-chevron-double-down
+        </v-icon>
+      </div>
+      <proficiency-icon
+        v-else
+        :value="model.proficiency"
+        class="prof-icon mr-2"
+      />
+      <div class="text-truncate">
+        {{ model.name }}
+        <template v-if="model.conditionalBenefits && model.conditionalBenefits.length">
+          *
+        </template>
+        <template v-if="'passiveBonus' in model">
+          ({{ passiveScore }})
+        </template>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="js">
+import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+
+export default {
+  components: {
+    ProficiencyIcon,
+  },
+  inject: {
+    context: {
+      default: {},
+    },
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+    hideModifier: Boolean,
+  },
+  data() {
+    return {
+      checkLoading: false,
+    }
+  },
+  computed: {
+    displayedModifier() {
+      let mod = this.model.value;
+      if (this.model.fail) {
+        return 'fail';
+      } else {
+        return numberToSignedString(mod);
+      }
+    },
+    passiveScore() {
+      return 10 + this.model.value + this.model.passiveBonus;
+    }
+  },
+}
+</script>
+
+<style lang="css" scoped>
+.printed-skill{
+  min-height: 30px;
+}
+
+.prof-icon {
+  min-width: 30px;
+}
+
+.prof-mod {
+  min-width: 24px;
+}
+
+.v-icon.theme--light {
+  color: rgba(0, 0, 0, 0.7) !important;
+}
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
new file mode 100644
index 00000000..8367c2a0
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
@@ -0,0 +1,82 @@
+<template lang="html">
+  <div
+    class="double-border"
+  >
+    <div
+      v-if="model.name"
+      class="label"
+    >
+      {{ model.name }}
+    </div>
+    <div v-if="model.level">
+      {{ levelText }} {{ model.school }} {{ model.ritual ? '(ritual)' : '' }}
+    </div>
+    <div v-else>
+      {{ model.school }} cantrip
+    </div>
+    <div>
+      Casting Time: {{ model.castingTime }}
+    </div>
+    <div>
+      Range: {{ model.range }}
+    </div>
+    <div>
+      Components: {{ spellComponents }}
+    </div>
+    <div>
+      Duration: {{ model.duration }}
+    </div>
+    <property-description
+      text
+      :model="model.summary"
+    />
+    <v-divider class="my-2" />
+    <property-description
+      text
+      :model="model.description"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+
+const levelText = [
+  'cantrip', '1st-level', '2nd-level', '3rd-level', '4th-level', '5th-level',
+  '6th-level', '7th-level', '8th-level', '9th-level'
+];
+
+export default {
+  components: {
+    PropertyDescription,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    levelText() {
+      return levelText[this.model.level]
+    },
+    spellComponents() {
+      let components = [];
+      if (this.model.ritual) components.push('Ritual');
+      if (this.model.concentration) components.push('Concentration');
+      if (this.model.verbal) components.push('Verbal');
+      if (this.model.somatic) components.push('Somatic');
+      if (this.model.material) components.push(`Material (${this.model.material})`);
+      return components.join(', ');
+    },
+  }
+}
+</script>
+
+<style lang="css" scoped>
+.label {
+  font-size: 14pt;
+  font-variant: all-small-caps;
+  font-weight: 600;
+}
+</style>
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
new file mode 100644
index 00000000..0ee80376
--- /dev/null
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="octagon-border">
+    <div class="label text-center">
+      {{ model.name }}
+    </div>
+    <div>
+      Spell Save DC: {{ model.dc && model.dc.value }}
+    </div>
+    <div>
+      Spell Attack Bonus: {{ model.attackRollBonus && model.attackRollBonus.value }}
+    </div>
+    <div>
+      Maximum prepared spells: {{ model.maxPrepared && model.maxPrepared.value }}
+    </div>
+    <property-description
+      text
+      :model="model.description"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+
+export default {
+  components: {
+    PropertyDescription,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    
+  }
+}
+</script>
\ No newline at end of file
diff --git a/app/package-lock.json b/app/package-lock.json
index fcedb023..04d47295 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dicecloud",
-  "version": "2.0.42",
+  "version": "2.0.43",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -594,9 +594,9 @@
       }
     },
     "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "base64-js": {
       "version": "1.5.1",
@@ -893,12 +893,12 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "core-js": {
       "version": "2.6.12",
@@ -958,7 +958,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decompress-response": {
       "version": "6.0.0",
@@ -1005,7 +1005,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "detect-libc": {
       "version": "2.0.1",
@@ -1715,7 +1715,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "http-signature": {
       "version": "1.2.0",
@@ -2090,7 +2090,7 @@
     "lodash.omit": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="
+      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA="
     },
     "lodash.template": {
       "version": "4.5.0",
@@ -3008,9 +3008,9 @@
       "integrity": "sha1-IBvZSSceGfbgrwodwMzFg95HxjA="
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -3156,7 +3156,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-inspect": {
       "version": "1.12.2",
@@ -3352,6 +3352,11 @@
         "yargs": "^15.3.1"
       }
     },
+    "qrcode.vue": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-1.7.0.tgz",
+      "integrity": "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g=="
+    },
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -3396,7 +3401,7 @@
         "strip-json-comments": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
         }
       }
     },
@@ -3470,7 +3475,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -3570,7 +3575,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "setimmediate": {
       "version": "1.0.5",
@@ -3660,7 +3665,7 @@
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
       "requires": {
         "is-arrayish": "^0.3.1"
       }
@@ -4096,7 +4101,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
       "version": "3.4.0",
@@ -4243,7 +4248,7 @@
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
     "which-typed-array": {
       "version": "1.1.8",
diff --git a/app/package.json b/app/package.json
index 23f1e79f..52342baf 100644
--- a/app/package.json
+++ b/app/package.json
@@ -44,6 +44,7 @@
     "ngraph.path": "^1.4.0",
     "pretty-bytes": "^6.0.0",
     "qrcode": "^1.5.1",
+    "qrcode.vue": "^1.7.0",
     "request": "^2.88.2",
     "sharp": "^0.30.7",
     "simpl-schema": "^1.13.1",
@@ -124,4 +125,4 @@
       "vuetify/no-deprecated-classes": "error"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/public/images/print/octogonBorder.png b/app/public/images/print/octagonBorder.png
similarity index 100%
rename from app/public/images/print/octogonBorder.png
rename to app/public/images/print/octagonBorder.png

From a1d992ec8de6a172db925c8c7d9aefb6092d6be0 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 7 Nov 2022 16:38:54 +0200
Subject: [PATCH 10/46] Fixed blank multipliers box

---
 .../creature/character/printedCharacterSheet/PrintedStats.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
index 4d9e0a29..e3bad2a4 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
+++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
@@ -107,7 +107,7 @@
           </div>
         </div>
       </div>
-      <div>
+      <div v-if="multipliers && multipliers.length">
         <printed-damage-multipliers
           class="double-border"
           :multipliers="multipliers"

From bed4d4b162e9050fa62a74039382418a549c25b1 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 8 Nov 2022 16:59:52 +0200
Subject: [PATCH 11/46] Fixed logo not showing

---
 .../CharacterSheetPrinted.vue                 |  2 ++
 app/package-lock.json                         | 26 +++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
index cba250c3..5a4c5b53 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
+++ b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
@@ -253,6 +253,8 @@ export default {
   background-image: url(/crown-dice-logo-cropped-transparent.png);
   background-size: contain;
   background-position: 0 center;
+  print-color-adjust: exact;
+  -webkit-print-color-adjust: exact;
 }
 
 .character-sheet-printed .v-divider {
diff --git a/app/package-lock.json b/app/package-lock.json
index 04d47295..74b38a56 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -893,12 +893,12 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "core-js": {
       "version": "2.6.12",
@@ -958,7 +958,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
     },
     "decompress-response": {
       "version": "6.0.0",
@@ -1005,7 +1005,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
     },
     "detect-libc": {
       "version": "2.0.1",
@@ -1715,7 +1715,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
     },
     "http-signature": {
       "version": "1.2.0",
@@ -2090,7 +2090,7 @@
     "lodash.omit": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-      "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA="
+      "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="
     },
     "lodash.template": {
       "version": "4.5.0",
@@ -3156,7 +3156,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "object-inspect": {
       "version": "1.12.2",
@@ -3401,7 +3401,7 @@
         "strip-json-comments": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
         }
       }
     },
@@ -3475,7 +3475,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
     },
     "require-from-string": {
       "version": "2.0.2",
@@ -3575,7 +3575,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
     "setimmediate": {
       "version": "1.0.5",
@@ -3665,7 +3665,7 @@
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
       "requires": {
         "is-arrayish": "^0.3.1"
       }
@@ -4101,7 +4101,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "uuid": {
       "version": "3.4.0",
@@ -4248,7 +4248,7 @@
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+      "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
     },
     "which-typed-array": {
       "version": "1.1.8",

From 48291d2c8f59bb8516db8a1827d3a0fe5b69b487 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 8 Nov 2022 17:17:26 +0200
Subject: [PATCH 12/46] Added help to property creation forms

---
 .../AddCreaturePropertyDialog.vue             | 33 +++++++++++++++++--
 .../ui/library/LibraryNodeInsertForm.vue      | 25 ++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
index 944c7642..720b4c45 100644
--- a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
@@ -8,6 +8,22 @@
       </v-toolbar-title>
       <v-spacer />
       <v-slide-x-reverse-transition hide-on-leave>
+        <v-switch
+          v-if="tab === 0"
+          :input-value="showPropertyHelp"
+          append-icon="mdi-help"
+          hide-details
+          flat
+          @change="propertyHelpChanged"
+        />
+        <v-btn 
+          v-if="tab === 1"
+          icon
+          data-id="help-button"
+          @click="helpDialog"
+        >
+          <v-icon>mdi-help</v-icon>
+        </v-btn>
         <v-switch
           v-if="tab === 0"
           :input-value="showPropertyHelp"
@@ -173,7 +189,7 @@
 <script lang="js">
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+import PROPERTIES, { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
 import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
 import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
@@ -235,7 +251,11 @@ export default {
     },
     toolbarColor(){
       return getThemeColor('secondary');
-    }
+    },
+    docsPath() {
+      const propDef = PROPERTIES[this.type];
+      return propDef && propDef.docsPath;
+    },
   },
   watch: {
     type(newType){
@@ -259,6 +279,15 @@ export default {
         });
       });
     },
+    helpDialog() {
+      this.$store.commit('pushDialogStack', {
+        component: 'help-dialog',
+        elementId: 'help-button',
+        data: {
+          path: this.docsPath,
+        },
+      });
+    },
     searchChanged(val, ack){
       this._subs.searchLibraryNodes.setData('searchTerm', val);
       this._subs.searchLibraryNodes.setData('limit', undefined);
diff --git a/app/imports/ui/library/LibraryNodeInsertForm.vue b/app/imports/ui/library/LibraryNodeInsertForm.vue
index ebd94d49..c006dde6 100644
--- a/app/imports/ui/library/LibraryNodeInsertForm.vue
+++ b/app/imports/ui/library/LibraryNodeInsertForm.vue
@@ -12,6 +12,13 @@
         :value="model.color"
         @input="value => change({path: ['color'], value})"
       />
+      <v-btn
+        icon
+        data-id="help-button"
+        @click="helpDialog"
+      >
+        <v-icon>mdi-help</v-icon>
+      </v-btn>
     </template>
     <component
       :is="type"
@@ -44,6 +51,7 @@ import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormI
 import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
 import ColorPicker from '/imports/ui/components/ColorPicker.vue';
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
+import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
   components: {
@@ -77,6 +85,12 @@ export default {
       isLibraryForm: true,
     };
   },
+  computed: {
+    docsPath() {
+      const propDef = PROPERTIES[this.type];
+      return propDef && propDef.docsPath;
+    },
+  },
   watch: {
     type(newType) {
       if (!newType) return;
@@ -87,6 +101,17 @@ export default {
       this.model = model;
     },
   },
+  methods: {
+    helpDialog() {
+      this.$store.commit('pushDialogStack', {
+        component: 'help-dialog',
+        elementId: 'help-button',
+        data: {
+          path: this.docsPath,
+        },
+      });
+    },
+  }
 }
 </script>
 

From 03f87b0afa0d584c3d8682b37cd0355930a57077 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 8 Nov 2022 18:09:00 +0200
Subject: [PATCH 13/46] Added spellcasting ability to spell lists

---
 .../computeComputation/computeByType.js       |  2 +
 .../computeByType/computeSpellList.js         |  6 +++
 app/imports/api/properties/SpellLists.js      | 12 +++++
 .../components/PrintedSpellList.vue           |  6 +++
 .../ui/properties/forms/SpellListForm.vue     | 46 +++++++++++++++++++
 .../ui/properties/viewers/SpellListViewer.vue | 12 +++++
 .../viewers/shared/PropertyField.vue          |  9 +++-
 app/private/docs/property/spell-list.md       |  4 ++
 8 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js

diff --git a/app/imports/api/engine/computation/computeComputation/computeByType.js b/app/imports/api/engine/computation/computeComputation/computeByType.js
index 7597b976..0b5633e3 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType.js
@@ -5,6 +5,7 @@ import skill from './computeByType/computeSkill.js';
 import pointBuy from './computeByType/computePointBuy.js';
 import propertySlot from './computeByType/computeSlot.js';
 import container from './computeByType/computeContainer.js';
+import spellList from './computeByType/computeSpellList.js';
 import _calculation from './computeByType/computeCalculation.js';
 
 export default Object.freeze({
@@ -17,4 +18,5 @@ export default Object.freeze({
   pointBuy,
   propertySlot,
   spell: action,
+  spellList,
 });
diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js
new file mode 100644
index 00000000..63dc6003
--- /dev/null
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js
@@ -0,0 +1,6 @@
+export default function computeSpelllist(computation, node) {
+  const prop = node.data;
+
+  const ability = computation.scope[prop.ability];
+  prop.abilityMod = ability?.modifier || 0;
+}
\ No newline at end of file
diff --git a/app/imports/api/properties/SpellLists.js b/app/imports/api/properties/SpellLists.js
index 01434ea2..285832eb 100644
--- a/app/imports/api/properties/SpellLists.js
+++ b/app/imports/api/properties/SpellLists.js
@@ -17,6 +17,12 @@ let SpellListSchema = createPropertySchema({
     type: 'fieldToCompute',
     optional: true,
   },
+  // The variable name of the ability this spell relies on
+  ability: {
+    type: String,
+    optional: true,
+    max: STORAGE_LIMITS.variableName,
+  },
   // Calculation of The attack roll bonus used by spell attacks in this list
   attackRollBonus: {
     type: 'fieldToCompute',
@@ -38,6 +44,12 @@ const ComputedOnlySpellListSchema = createPropertySchema({
     type: 'computedOnlyField',
     optional: true,
   },
+  // Computed value determined by the ability
+  abilityMod: {
+    type: SimpleSchema.Integer,
+    optional: true,
+    removeBeforeCompute: true,
+  },
   attackRollBonus: {
     type: 'computedOnlyField',
     optional: true,
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
index 0ee80376..e158000f 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
+++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
@@ -6,6 +6,12 @@
     <div>
       Spell Save DC: {{ model.dc && model.dc.value }}
     </div>
+    <div v-if="model.ability">
+      Spell casting ability: {{ model.ability }}
+    </div>
+    <div v-if="model.ability">
+      Spell casting ability modifier: {{ model.abilityMod }}
+    </div>
     <div>
       Spell Attack Bonus: {{ model.attackRollBonus && model.attackRollBonus.value }}
     </div>
diff --git a/app/imports/ui/properties/forms/SpellListForm.vue b/app/imports/ui/properties/forms/SpellListForm.vue
index b44ea60c..3855b78a 100644
--- a/app/imports/ui/properties/forms/SpellListForm.vue
+++ b/app/imports/ui/properties/forms/SpellListForm.vue
@@ -27,6 +27,15 @@
         $emit('change', {path: ['maxPrepared', ...path], value, ack})"
     />
 
+    <smart-combobox
+      label="Spellcasting ability"
+      :value="model.ability"
+      hint="Which ability is used to cast spells in this spell list"
+      :items="abilityScoreList"
+      :error-messages="errors.ability"
+      @change="changeAbility"
+    />
+
     <computed-field
       label="Spell save DC"
       hint="The spell save DC of spells in this list"
@@ -67,9 +76,46 @@
 
 <script lang="js">
 import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
 
 export default {
   mixins: [propertyFormMixin],
+  meteor: {
+    abilityScoreList() {
+      return createListOfProperties({
+        type: 'attribute',
+        attributeType: 'ability',
+      });
+    },
+  },
+  methods: {
+    changeAbility(value, ack) {
+      this.$emit('change', { path: ['ability'], value, ack })
+      const oldValue = this.model.ability;
+
+      const attackRollBonus = this.model.attackRollBonus?.calculation;
+      if (
+        !attackRollBonus ||
+        attackRollBonus === `proficiencyBonus + ${oldValue}.modifier`
+      ) {
+        this.$emit('change', {
+          path: ['attackRollBonus', 'calculation'],
+          value: `proficiencyBonus + ${value}.modifier`
+        });
+      }
+
+      const dc = this.model.dc?.calculation;
+      if (
+        !dc || 
+        dc === `8 + proficiencyBonus + ${oldValue}.modifier`
+      ) {
+        this.$emit('change', {
+          path: ['dc', 'calculation'],
+          value: `8 + proficiencyBonus + ${value}.modifier`
+        });
+      }
+    }
+  }
 };
 </script>
 
diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/ui/properties/viewers/SpellListViewer.vue
index f7c35b57..6aae147e 100644
--- a/app/imports/ui/properties/viewers/SpellListViewer.vue
+++ b/app/imports/ui/properties/viewers/SpellListViewer.vue
@@ -13,6 +13,18 @@
         center
         :calculation="model.maxPrepared"
       />
+      <property-field
+        name="Spellcasting ability"
+        mono
+        :value="model.ability"
+      />
+      <property-field
+        name="Spellcasting ability modifier"
+        large
+        center
+        signed
+        :value="model.abilityMod"
+      />
       <property-field
         name="Spell Save DC"
         large
diff --git a/app/imports/ui/properties/viewers/shared/PropertyField.vue b/app/imports/ui/properties/viewers/shared/PropertyField.vue
index 4f9084b1..b37685d7 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyField.vue
+++ b/app/imports/ui/properties/viewers/shared/PropertyField.vue
@@ -41,7 +41,7 @@
         >
           <slot>
             <template v-if="value !== undefined">
-              {{ value }}
+              {{ valueText }}
             </template>
             <template v-else-if="calculation !== undefined">
               {{ calculationText }}
@@ -117,6 +117,13 @@ export default {
       if (!this.calculation) return;
       return typeof this.calculation.value === 'string'
     },
+    valueText() {
+      if (this.signed) {
+        return numberToSignedString(this.value);
+      } else {
+        return this.value;
+      }
+    },
     calculationText(){
       const calculation = this.calculation;
       if (!calculation) {
diff --git a/app/private/docs/property/spell-list.md b/app/private/docs/property/spell-list.md
index b36885c8..6216b3c0 100644
--- a/app/private/docs/property/spell-list.md
+++ b/app/private/docs/property/spell-list.md
@@ -18,6 +18,10 @@ Allows [inline calculations](/docs/inline-calculations).
 
 A [computed field](/docs/computed-fields) that determines how many spells can be considered ready to cast in this spell list.
 
+### Spell casting ability
+
+The spellcasting ablity for this spell list. The variable name of the ability can be accessed using `#spellList.ability` and the ability modifier with `#spellList.abilityMod`. Setting this field will automatically update Spell save DC and Attack roll bonus if they aren't set manually.
+
 ### Spell save DC
 
 A [computed field](/docs/computed-fields) that determines the DC of saving throws in this spell list. Spells can access the DC of their spell list using `#spellList.dc`

From 60b21c19015be943386b742716a2ed0af8a2872d Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 8 Nov 2022 18:29:27 +0200
Subject: [PATCH 14/46] Fixed bugs with effects they were not providing
 advantage or conditional benefits

---
 .../computeVariable/aggregate/aggregateEffect.js     | 12 ++++++------
 .../creatureProperties/AddCreaturePropertyDialog.vue |  8 --------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js
index 3b1b987e..ae609923 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js
@@ -1,6 +1,6 @@
 import { pick } from 'lodash';
 
-export default function aggregateEffect({node, linkedNode, link}){
+export default function aggregateEffect({ node, linkedNode, link }) {
   if (link.data !== 'effect') return;
   // store the effect aggregator, its presence indicates that the variable is
   // targeted by effects
@@ -38,6 +38,7 @@ export default function aggregateEffect({node, linkedNode, link}){
     operation: linkedNode.data.operation,
     amount: effectAmount,
     type: linkedNode.data.type,
+    text: linkedNode.data.text,
     // ancestors: linkedNode.data.ancestors,
   });
 
@@ -45,14 +46,13 @@ export default function aggregateEffect({node, linkedNode, link}){
   const aggregator = node.data.effectAggregator;
   // Get the result of the effect
   const result = linkedNode.data.amount?.value;
-  // Skip aggregating if the result is not resolved completely
-  if (typeof result === 'string' || result === undefined) return;
+
   // Aggregate the effect based on its operation
-  switch(linkedNode.data.operation){
+  switch (linkedNode.data.operation) {
     case 'base':
       // Take the largest base value
-      if (Number.isFinite(result)){
-        if(Number.isFinite(aggregator.base)){
+      if (Number.isFinite(result)) {
+        if (Number.isFinite(aggregator.base)) {
           aggregator.base = Math.max(aggregator.base, result);
         } else {
           aggregator.base = result;
diff --git a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue b/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
index 720b4c45..60eea258 100644
--- a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
+++ b/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
@@ -24,14 +24,6 @@
         >
           <v-icon>mdi-help</v-icon>
         </v-btn>
-        <v-switch
-          v-if="tab === 0"
-          :input-value="showPropertyHelp"
-          append-icon="mdi-help"
-          hide-details
-          flat
-          @change="propertyHelpChanged"
-        />
         <text-field
           v-if="tab === 2"
           prepend-inner-icon="mdi-magnify"

From 1ec29365cbb4184181fc10ee920ff500ddc2d610 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 8 Nov 2022 23:01:09 +0200
Subject: [PATCH 15/46] Added custom sheet events Made rest buttons optional

---
 .../api/creature/creatures/Creatures.js       |   5 +
 .../creatures/methods/restCreature.js         | 147 ++++++++++-------
 .../applyPropertyByType/applyAction.js        | 100 ++++++------
 app/imports/api/properties/Actions.js         |  21 ++-
 app/imports/api/properties/Attributes.js      |   4 +-
 app/imports/ui/components/ResetSelector.vue   |  46 ++++++
 app/imports/ui/creature/CreatureForm.vue      |   5 +
 .../character/characterSheetTabs/StatsTab.vue |  22 ++-
 .../components/actions/EventButton.vue        |  80 +++++++++
 .../components/toggles/ToggleCard.vue         |  14 +-
 .../ui/properties/forms/ActionForm.vue        | 153 +++++++++---------
 .../ui/properties/forms/AttributeForm.vue     |   9 +-
 app/imports/ui/properties/forms/SpellForm.vue |  18 +--
 .../shared/lists/createListOfProperties.js    |  11 +-
 .../forms/shared/propertyFormIndex.js         |  58 +++----
 .../viewers/shared/propertyViewerIndex.js     |  58 +++----
 app/package.json                              |   5 +-
 17 files changed, 481 insertions(+), 275 deletions(-)
 create mode 100644 app/imports/ui/components/ResetSelector.vue
 create mode 100644 app/imports/ui/properties/components/actions/EventButton.vue

diff --git a/app/imports/api/creature/creatures/Creatures.js b/app/imports/api/creature/creatures/Creatures.js
index f13932ee..b94fe7e4 100644
--- a/app/imports/api/creature/creatures/Creatures.js
+++ b/app/imports/api/creature/creatures/Creatures.js
@@ -18,6 +18,11 @@ let CreatureSettingsSchema = new SimpleSchema({
     type: Boolean,
     optional: true,
   },
+  //hide rest buttons
+  hideRestButtons: {
+    type: Boolean,
+    optional: true,
+  },
   // Swap around the modifier and stat
   swapStatAndModifier: {
     type: Boolean,
diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 49d228aa..b943a584 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -49,7 +49,7 @@ const restCreature = new ValidatedMethod({
     applyTriggers(afterTriggers, null, actionContext);
 
     // Insert log
-    actionContext.writeLog();    
+    actionContext.writeLog();
   },
 });
 
@@ -57,88 +57,123 @@ function doRestWork(restType, actionContext) {
   const creatureId = actionContext.creature._id;
   // Long rests reset short rest properties as well
   let resetFilter;
-  if (restType === 'shortRest'){
+  if (restType === 'shortRest') {
     resetFilter = 'shortRest'
   } else {
-    resetFilter = {$in: ['shortRest', 'longRest']}
+    resetFilter = { $in: ['shortRest', 'longRest'] }
   }
+  resetProperties(creatureId, resetFilter, actionContext);
+
+  // Reset half hit dice on a long rest, starting with the highest dice
+  if (restType === 'longRest') {
+    resetHitDice(creatureId, actionContext);
+  }
+}
+
+export function resetProperties(creatureId, resetFilter, actionContext) {
   // Only apply to active properties
-  let filter = {
+  const filter = {
     'ancestors.id': creatureId,
     reset: resetFilter,
     removed: { $ne: true },
     inactive: { $ne: true },
   };
   // update all attribute's damage
-  filter.type = 'attribute';
-  CreatureProperties.update(filter, {
+  const attributeFilter = {
+    ...filter,
+    type: 'attribute',
+    damage: { $ne: 0 },
+  }
+  CreatureProperties.find(attributeFilter, {
+    fields: { name: 1, damage: 1 }
+  }).forEach(prop => {
+    actionContext.addLog({
+      name: prop.name,
+      value: prop.damage >= 0 ? `Restored ${prop.damage}` : `Removed ${-prop.damage}`
+    });
+  });
+  CreatureProperties.update(attributeFilter, {
     $set: {
       damage: 0,
       dirty: true,
     }
   }, {
-    selector: {type: 'attribute'},
+    selector: { type: 'attribute' },
     multi: true,
   });
   // Update all action-like properties' usesUsed
-  filter.type = {$in: [
-    'action',
-    'attack',
-    'spell'
-  ]};
-  CreatureProperties.update(filter, {
+  const actionFilter = {
+    ...filter,
+    type: {
+      $in: ['action', 'spell']
+    },
+    usesUsed: { $ne: 0 },
+  };
+  CreatureProperties.find(actionFilter, {
+    fields: { name: 1, usesUsed: 1 }
+  }).forEach(prop => {
+    actionContext.addLog({
+      name: prop.name,
+      value: prop.usesUsed >= 0 ? `Restored ${prop.usesUsed} uses` : `Removed ${-prop.usesUsed} uses`
+    });
+  });
+  CreatureProperties.update(actionFilter, {
     $set: {
       usesUsed: 0,
       dirty: true,
     }
   }, {
-    selector: {type: 'action'},
+    selector: { type: 'action' },
     multi: true,
   });
-  // Reset half hit dice on a long rest, starting with the highest dice
-  if (restType === 'longRest'){
-    let hitDice = CreatureProperties.find({
-      'ancestors.id': creatureId,
-      type: 'attribute',
-      attributeType: 'hitDice',
-      removed: {$ne: true},
-      inactive: {$ne: true},
-    }, {
-      fields: {
-        hitDiceSize: 1,
-        damage: 1,
-        total: 1,
+}
+
+function resetHitDice(creatureId, actionContext) {
+  let hitDice = CreatureProperties.find({
+    'ancestors.id': creatureId,
+    type: 'attribute',
+    attributeType: 'hitDice',
+    removed: { $ne: true },
+    inactive: { $ne: true },
+  }, {
+    fields: {
+      hitDiceSize: 1,
+      damage: 1,
+      total: 1,
+    }
+  }).fetch();
+  // Use a collator to do sorting in natural order
+  let collator = new Intl.Collator('en', {
+    numeric: true, sensitivity: 'base'
+  });
+  // Get the hit dice in decending order of hitDiceSize
+  let compare = (a, b) => collator.compare(b.hitDiceSize, a.hitDiceSize)
+  hitDice.sort(compare);
+  // Get the total number of hit dice that can be recovered this rest
+  let totalHd = hitDice.reduce((sum, hd) => sum + (hd.total || 0), 0);
+  let resetMultiplier = actionContext.creature.settings.hitDiceResetMultiplier || 0.5;
+  let recoverableHd = Math.max(Math.floor(totalHd * resetMultiplier), 1);
+  // recover each hit dice in turn until the recoverable amount is used up
+  let amountToRecover, resultingDamage;
+  hitDice.forEach(hd => {
+    if (!recoverableHd) return;
+    amountToRecover = Math.min(recoverableHd, hd.damage || 0);
+    if (!amountToRecover) return;
+    recoverableHd -= amountToRecover;
+    resultingDamage = hd.damage - amountToRecover;
+    actionContext.addLog({
+      name: hd.name,
+      value: amountToRecover >= 0 ? `Restored ${amountToRecover} hit dice` : `Removed ${-amountToRecover} hit dice`
+    });
+    CreatureProperties.update(hd._id, {
+      $set: {
+        damage: resultingDamage,
+        dirty: true,
       }
-    }).fetch();
-    // Use a collator to do sorting in natural order
-    let collator = new Intl.Collator('en', {
-      numeric: true, sensitivity: 'base'
+    }, {
+      selector: { type: 'attribute' },
     });
-    // Get the hit dice in decending order of hitDiceSize
-    let compare = (a, b) => collator.compare(b.hitDiceSize, a.hitDiceSize)
-    hitDice.sort(compare);
-    // Get the total number of hit dice that can be recovered this rest
-    let totalHd = hitDice.reduce((sum, hd) => sum + (hd.total || 0), 0);
-    let resetMultiplier = actionContext.creature.settings.hitDiceResetMultiplier || 0.5;
-    let recoverableHd = Math.max(Math.floor(totalHd*resetMultiplier), 1);
-    // recover each hit dice in turn until the recoverable amount is used up
-    let amountToRecover, resultingDamage;
-    hitDice.forEach(hd => {
-      if (!recoverableHd) return;
-      amountToRecover = Math.min(recoverableHd, hd.damage || 0);
-      if (!amountToRecover) return;
-      recoverableHd -= amountToRecover;
-      resultingDamage = hd.damage - amountToRecover;
-      CreatureProperties.update(hd._id, {
-        $set: {
-          damage: resultingDamage,
-          dirty: true,
-        }
-      }, {
-        selector: {type: 'attribute'},
-      });
-    });
-  }
+  });
 }
 
 export default restCreature;
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
index 8d6bd185..becf0775 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
@@ -7,6 +7,7 @@ import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/met
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import { resetProperties } from '/imports/api/creature/creatures/methods/restCreature.js';
 
 export default function applyAction(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
@@ -16,7 +17,7 @@ export default function applyAction(node, actionContext) {
 
   // Log the name and summary
   let content = { name: prop.name };
-  if (prop.summary?.text){
+  if (prop.summary?.text) {
     recalculateInlineCalculations(prop.summary, actionContext);
     content.value = prop.summary.value;
   }
@@ -29,24 +30,27 @@ export default function applyAction(node, actionContext) {
   const attack = prop.attackRoll || prop.attackRollBonus;
 
   // Attack if there is an attack roll
-  if (attack && attack.calculation){
-    if (targets.length){
+  if (attack && attack.calculation) {
+    if (targets.length) {
       targets.forEach(target => {
-        applyAttackToTarget({attack, target, actionContext});
+        applyAttackToTarget({ attack, target, actionContext });
         // Apply the children, but only to the current target
         actionContext.targets = [target];
         applyChildren(node, actionContext);
       });
     } else {
-      applyAttackWithoutTarget({attack, actionContext});
+      applyAttackWithoutTarget({ attack, actionContext });
       applyChildren(node, actionContext);
     }
   } else {
     applyChildren(node, actionContext);
   }
+  if (prop.actionType === 'event' && prop.variableName) {
+    resetProperties(actionContext.creature._id, prop.variableName, actionContext);
+  }
 }
 
-function applyAttackWithoutTarget({attack, actionContext}){
+function applyAttackWithoutTarget({ attack, actionContext }) {
   delete actionContext.scope['$attackHit'];
   delete actionContext.scope['$attackMiss'];
   delete actionContext.scope['$criticalHit'];
@@ -62,16 +66,16 @@ function applyAttackWithoutTarget({attack, actionContext}){
     criticalMiss,
   } = rollAttack(attack, scope);
   let name = criticalHit ? 'Critical Hit!' : criticalMiss ? 'Critical Miss!' : 'To Hit';
-  if (scope['$attackAdvantage'] === 1){
+  if (scope['$attackAdvantage'] === 1) {
     name += ' (Advantage)';
-  } else if(scope['$attackAdvantage'] === -1){
+  } else if (scope['$attackAdvantage'] === -1) {
     name += ' (Disadvantage)';
   }
-  if (!criticalMiss){
-    scope['$attackHit'] = {value: true}
+  if (!criticalMiss) {
+    scope['$attackHit'] = { value: true }
   }
-  if (!criticalHit){
-    scope['$attackMiss'] = {value: true};
+  if (!criticalHit) {
+    scope['$attackMiss'] = { value: true };
   }
 
   actionContext.addLog({
@@ -81,7 +85,7 @@ function applyAttackWithoutTarget({attack, actionContext}){
   });
 }
 
-function applyAttackToTarget({attack, target, actionContext}){
+function applyAttackToTarget({ attack, target, actionContext }) {
   const scope = actionContext.scope;
   delete scope['$attackHit'];
   delete scope['$attackMiss'];
@@ -99,15 +103,15 @@ function applyAttackToTarget({attack, target, actionContext}){
     criticalMiss,
   } = rollAttack(attack, scope);
 
-  if (target.variables.armor){
+  if (target.variables.armor) {
     const armor = target.variables.armor.value;
 
     let name = criticalHit ? 'Critical Hit!' :
       criticalMiss ? 'Critical Miss!' :
-      result > armor ? 'Hit!' : 'Miss!';
-    if (scope['$attackAdvantage'] === 1){
+        result > armor ? 'Hit!' : 'Miss!';
+    if (scope['$attackAdvantage'] === 1) {
       name += ' (Advantage)';
-    } else if(scope['$attackAdvantage'] === -1){
+    } else if (scope['$attackAdvantage'] === -1) {
       name += ' (Disadvantage)';
     }
 
@@ -116,15 +120,15 @@ function applyAttackToTarget({attack, target, actionContext}){
       value: `${resultPrefix}\n**${result}**`,
       inline: true,
     });
-    if (criticalMiss || result < armor){
-      scope['$attackMiss'] = {value: true};
+    if (criticalMiss || result < armor) {
+      scope['$attackMiss'] = { value: true };
     } else {
-      scope['$attackHit'] = {value: true};
+      scope['$attackHit'] = { value: true };
     }
   } else {
     actionContext.addLog({
       name: 'Error',
-      value:'Target has no `armor`',
+      value: 'Target has no `armor`',
     });
     actionContext.addLog({
       name: criticalHit ? 'Critical Hit!' : criticalMiss ? 'Critical Miss!' : 'To Hit',
@@ -134,10 +138,10 @@ function applyAttackToTarget({attack, target, actionContext}){
   }
 }
 
-function rollAttack(attack, scope){
+function rollAttack(attack, scope) {
   const rollModifierText = numberToSignedString(attack.value, true);
   let value, resultPrefix;
-  if (scope['$attackAdvantage'] === 1){
+  if (scope['$attackAdvantage'] === 1) {
     const [a, b] = rollDice(2, 20);
     if (a >= b) {
       value = a;
@@ -146,7 +150,7 @@ function rollAttack(attack, scope){
       value = b;
       resultPrefix = `1d20 [ ~~${a}~~, ${b} ] ${rollModifierText}`;
     }
-  } else if (scope['$attackAdvantage'] === -1){
+  } else if (scope['$attackAdvantage'] === -1) {
     const [a, b] = rollDice(2, 20);
     if (a <= b) {
       value = a;
@@ -159,25 +163,25 @@ function rollAttack(attack, scope){
     value = rollDice(1, 20)[0];
     resultPrefix = `1d20 [${value}] ${rollModifierText}`
   }
-  scope['$attackRoll'] = {value};
+  scope['$attackRoll'] = { value };
   const result = value + attack.value;
-  const {criticalHit, criticalMiss} = applyCrits(value, scope);
-  return {resultPrefix, result, value, criticalHit, criticalMiss};
+  const { criticalHit, criticalMiss } = applyCrits(value, scope);
+  return { resultPrefix, result, value, criticalHit, criticalMiss };
 }
 
-function applyCrits(value, scope){
+function applyCrits(value, scope) {
   let criticalHitTarget = scope.criticalHitTarget?.value || 20;
   let criticalHit = value >= criticalHitTarget;
   let criticalMiss;
-  if (criticalHit){
-    scope['$criticalHit'] = {value: true};
+  if (criticalHit) {
+    scope['$criticalHit'] = { value: true };
   } else {
     criticalMiss = value === 1;
-    if (criticalMiss){
-      scope['$criticalMiss'] = {value: true};
+    if (criticalMiss) {
+      scope['$criticalMiss'] = { value: true };
     }
   }
-  return {criticalHit, criticalMiss};
+  return { criticalHit, criticalMiss };
 }
 
 function applyChildren(node, actionContext) {
@@ -185,9 +189,9 @@ function applyChildren(node, actionContext) {
   node.children.forEach(child => applyProperty(child, actionContext));
 }
 
-function spendResources(prop, actionContext){
+function spendResources(prop, actionContext) {
   // Check Uses
-  if (prop.usesLeft <= 0){
+  if (prop.usesLeft <= 0) {
     if (!prop.silent) actionContext.addLog({
       name: 'Error',
       value: `${prop.name || 'action'} does not have enough uses left`,
@@ -195,7 +199,7 @@ function spendResources(prop, actionContext){
     return true;
   }
   // Resources
-  if (prop.insufficientResources){
+  if (prop.insufficientResources) {
     if (!prop.silent) actionContext.addLog({
       name: 'Error',
       value: 'This creature doesn\'t have sufficient resources to perform this action',
@@ -209,14 +213,14 @@ function spendResources(prop, actionContext){
   try {
     prop.resources.itemsConsumed.forEach(itemConsumed => {
       recalculateCalculation(itemConsumed.quantity, actionContext);
-      if (!itemConsumed.itemId){
+      if (!itemConsumed.itemId) {
         throw 'No ammo was selected for this prop';
       }
       let item = CreatureProperties.findOne(itemConsumed.itemId);
-      if (!item || item.ancestors[0].id !== prop.ancestors[0].id){
+      if (!item || item.ancestors[0].id !== prop.ancestors[0].id) {
         throw 'The prop\'s ammo was not found on the creature';
       }
-      if (!item.equipped){
+      if (!item.equipped) {
         throw 'The selected ammo is not equipped';
       }
       if (
@@ -229,16 +233,16 @@ function spendResources(prop, actionContext){
         value: itemConsumed.quantity.value,
       });
       let logName = item.name;
-      if (itemConsumed.quantity.value > 1 || itemConsumed.quantity.value < -1){
+      if (itemConsumed.quantity.value > 1 || itemConsumed.quantity.value < -1) {
         logName = item.plural || logName;
       }
-      if (itemConsumed.quantity.value > 0){
+      if (itemConsumed.quantity.value > 0) {
         spendLog.push(logName + ': ' + itemConsumed.quantity.value);
-      } else if (itemConsumed.quantity.value < 0){
+      } else if (itemConsumed.quantity.value < 0) {
         gainLog.push(logName + ': ' + -itemConsumed.quantity.value);
       }
     });
-  } catch (e){
+  } catch (e) {
     actionContext.addLog({
       name: 'Error',
       value: e,
@@ -251,9 +255,9 @@ function spendResources(prop, actionContext){
   itemQuantityAdjustments.forEach(adjustQuantityWork);
 
   // Use uses
-  if (prop.usesLeft){
+  if (prop.usesLeft) {
     CreatureProperties.update(prop._id, {
-      $inc: {usesUsed: 1}
+      $inc: { usesUsed: 1 }
     }, {
       selector: prop
     });
@@ -270,7 +274,7 @@ function spendResources(prop, actionContext){
 
     if (!attConsumed.quantity?.value) return;
     let stat = actionContext.scope[attConsumed.variableName];
-    if (!stat){
+    if (!stat) {
       spendLog.push(stat.name + ': ' + ' not found');
       return;
     }
@@ -280,9 +284,9 @@ function spendResources(prop, actionContext){
       value: attConsumed.quantity.value,
       actionContext,
     });
-    if (attConsumed.quantity.value > 0){
+    if (attConsumed.quantity.value > 0) {
       spendLog.push(stat.name + ': ' + attConsumed.quantity.value);
-    } else if (attConsumed.quantity.value < 0){
+    } else if (attConsumed.quantity.value < 0) {
       gainLog.push(stat.name + ': ' + -attConsumed.quantity.value);
     }
   });
diff --git a/app/imports/api/properties/Actions.js b/app/imports/api/properties/Actions.js
index 1ff4d6fd..99910081 100644
--- a/app/imports/api/properties/Actions.js
+++ b/app/imports/api/properties/Actions.js
@@ -2,6 +2,7 @@ import SimpleSchema from 'simpl-schema';
 import createPropertySchema from '/imports/api/properties/subSchemas/createPropertySchema.js';
 import { storedIconsSchema } from '/imports/api/icons/Icons.js';
 import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
+import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
 /*
  * Actions are things a character can do
@@ -24,9 +25,17 @@ let ActionSchema = createPropertySchema({
   // long actions take longer than 1 round to cast
   actionType: {
     type: String,
-    allowedValues: ['action', 'bonus', 'attack', 'reaction', 'free', 'long'],
+    allowedValues: ['action', 'bonus', 'attack', 'reaction', 'free', 'long', 'event'],
     defaultValue: 'action',
   },
+  // If the action type is an event, what is the variable name of that event?
+  variableName: {
+    type: String,
+    optional: true,
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
+  },
   // Who is the action directed at
   target: {
     type: String,
@@ -56,8 +65,10 @@ let ActionSchema = createPropertySchema({
   // How this action's uses are reset automatically
   reset: {
     type: String,
-    allowedValues: ['longRest', 'shortRest'],
     optional: true,
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
   },
   // Resources
   resources: {
@@ -74,7 +85,7 @@ let ActionSchema = createPropertySchema({
   'resources.itemsConsumed.$._id': {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
+    autoValue() {
       if (!this.isSet) return Random.id();
     }
   },
@@ -101,7 +112,7 @@ let ActionSchema = createPropertySchema({
   'resources.attributesConsumed.$._id': {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
-    autoValue(){
+    autoValue() {
       if (!this.isSet) return Random.id();
     }
   },
@@ -218,4 +229,4 @@ const ComputedActionSchema = new SimpleSchema()
   .extend(ActionSchema)
   .extend(ComputedOnlyActionSchema);
 
-export { ActionSchema, ComputedOnlyActionSchema, ComputedActionSchema};
+export { ActionSchema, ComputedOnlyActionSchema, ComputedActionSchema };
diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index 1052e2e5..28f79243 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -129,7 +129,9 @@ let AttributeSchema = createPropertySchema({
   reset: {
     type: String,
     optional: true,
-    allowedValues: ['shortRest', 'longRest'],
+    regEx: VARIABLE_NAME_REGEX,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
   },
 });
 
diff --git a/app/imports/ui/components/ResetSelector.vue b/app/imports/ui/components/ResetSelector.vue
new file mode 100644
index 00000000..a9248ec8
--- /dev/null
+++ b/app/imports/ui/components/ResetSelector.vue
@@ -0,0 +1,46 @@
+<template>
+  <smart-select
+    label="Reset"
+    clearable
+    style="flex-basis: 300px;"
+    :hint="hint"
+    :items="resetOptions"
+    :value="value"
+    :error-messages="errorMessages"
+    :menu-props="{auto: true, lazy: true}"
+    @change="(value, ack) => $emit('change', value, ack)"
+  />
+</template>
+
+<script lang="js">
+import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+
+export default {
+  props: {
+    value: [String, Number, Date, Array, Object, Boolean],
+    errorMessages: [String, Array],
+    hint: {
+      type: String,
+      default: undefined,
+    }
+  },
+  meteor: {
+    resetOptions() {
+      const eventActions = createListOfProperties({
+        type: 'action',
+        actionType: 'event',
+      }, true);
+      const defaultEvents = [
+        {
+          text: 'Short rest',
+          value: 'shortRest',
+        }, {
+          text: 'Long rest',
+          value: 'longRest',
+        }
+      ];
+      return [...defaultEvents, ...eventActions];
+    },
+  },
+}
+</script>
diff --git a/app/imports/ui/creature/CreatureForm.vue b/app/imports/ui/creature/CreatureForm.vue
index d2ea8eeb..1fdc4073 100644
--- a/app/imports/ui/creature/CreatureForm.vue
+++ b/app/imports/ui/creature/CreatureForm.vue
@@ -39,6 +39,11 @@
           :input-value="model.settings.hideUnusedStats"
           @change="value => $emit('change', {path: ['settings','hideUnusedStats'], value: !!value})"
         />
+        <v-switch
+          label="Hide rest buttons"
+          :input-value="model.settings.hideRestButtons"
+          @change="value => $emit('change', {path: ['settings','hideRestButtons'], value: !!value})"
+        />
         <v-switch
           label="Show spells tab"
           :input-value="!model.settings.hideSpellsTab"
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index a201c69c..c7042577 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -3,19 +3,30 @@
     <health-bar-card-container :creature-id="creatureId" />
 
     <column-layout>
-      <div class="character-buttons">
+      <div
+        v-if="!creature.settings.hideRestButtons || (events && events.length)"
+        class="character-buttons"
+      >
         <v-card>
           <v-card-text class="layout column align-center">
             <rest-button
+              v-if="!creature.settings.hideRestButtons"
               :creature-id="creatureId"
               type="shortRest"
               class="ma-1"
             />
             <rest-button
+              v-if="!creature.settings.hideRestButtons"
               :creature-id="creatureId"
               type="longRest"
               class="ma-1"
             />
+            <event-button
+              v-for="event in events"
+              :key="event._id"
+              :model="event"
+              class="ma-1"
+            />
           </v-card-text>
         </v-card>
       </div>
@@ -352,7 +363,9 @@ import RestButton from '/imports/ui/creature/RestButton.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import ToggleCard from '/imports/ui/properties/components/toggles/ToggleCard.vue';
 import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
+import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
 import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { uniqBy } from 'lodash';
 
 const getProperties = function (creature, filter, options = {
   sort: { order: 1 }
@@ -401,6 +414,7 @@ export default {
     SpellSlotListTile,
     ActionCard,
     ToggleCard,
+    EventButton,
   },
   props: {
     creatureId: {
@@ -473,8 +487,12 @@ export default {
     languages() {
       return getSkillOfType(this.creature, 'language');
     },
+    events() {
+      const events = getProperties(this.creature, { type: 'action', actionType: 'event' });
+      return uniqBy(events.fetch(), e => e.variableName);
+    },
     actions() {
-      return getProperties(this.creature, { type: 'action' });
+      return getProperties(this.creature, { type: 'action', actionType: { $ne: 'event' } });
     },
     appliedBuffs() {
       return getProperties(this.creature, { type: 'buff' });
diff --git a/app/imports/ui/properties/components/actions/EventButton.vue b/app/imports/ui/properties/components/actions/EventButton.vue
new file mode 100644
index 00000000..29bdb0c6
--- /dev/null
+++ b/app/imports/ui/properties/components/actions/EventButton.vue
@@ -0,0 +1,80 @@
+<template lang="html">
+  <v-btn
+    :loading="doActionLoading"
+    :disabled="context.editPermission === false"
+    outlined
+    class="event-button"
+    style="min-width: 160px; max-width: 100%;"
+    :color="model.color"
+    @click="doAction"
+  >
+    <property-icon
+      style="margin-left: -4px; margin-right: 8px;"
+      :model="model"
+    />
+    <div
+      class="text-truncate"
+    >
+      {{ model.name }}
+    </div>
+  </v-btn>
+</template>
+
+<script lang="js">
+import doAction from '/imports/api/engine/actions/doAction.js';
+import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+
+export default {
+  components: {
+    PropertyIcon,
+  },
+  inject: {
+    context: { default: {} }
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  data(){return {
+    activated: undefined,
+    doActionLoading: false,
+    hovering: false,
+  }},
+  methods: {
+    click(e) {
+      this.$emit('click', e);
+    },
+    doAction({ advantage }) {
+      this.doActionLoading = true;
+      this.shwing();
+      doAction.call({
+        actionId: this.model._id,
+        scope: {
+          $attackAdvantage: advantage,
+        }
+      }, error => {
+        this.doActionLoading = false;
+        if (error) {
+          console.error(error);
+          snackbar({ text: error.reason });
+        }
+      });
+    },
+    shwing() {
+      this.activated = true;
+      setTimeout(() => {
+        this.activated = undefined;
+      }, 150);
+    }
+  }
+}
+</script>
+
+<style lang="css">
+.event-button .v-btn__content {
+  max-width: 100%;
+}
+</style>
diff --git a/app/imports/ui/properties/components/toggles/ToggleCard.vue b/app/imports/ui/properties/components/toggles/ToggleCard.vue
index 3659f0aa..207783d8 100644
--- a/app/imports/ui/properties/components/toggles/ToggleCard.vue
+++ b/app/imports/ui/properties/components/toggles/ToggleCard.vue
@@ -1,7 +1,9 @@
 <template lang="html">
   <v-card
-    :hover="hasClickListener"
+    :class="hover ? 'elevation-8': ''"
     @click="click"
+    @mouseover="hover = true"
+    @mouseleave="hover = false"
   >
     <div class="layout align-center">
       <div
@@ -18,19 +20,29 @@
         {{ model.name }}
       </v-card-title>
     </div>
+    <card-highlight :active="hover" />
   </v-card>
 </template>
 
 <script lang="js">
 import flipToggle from '/imports/api/creature/creatureProperties/methods/flipToggle.js';
+import CardHighlight from '/imports/ui/components/CardHighlight.vue';
 
   export default {
+    components: {
+      CardHighlight,
+    },
     props: {
       model: {
         type: Object,
         required: true,
       },
     },
+    data() {
+      return {
+        hover: false,
+      }
+    },
     computed: {
       hasClickListener(){
         return this.$listeners && !!this.$listeners.click
diff --git a/app/imports/ui/properties/forms/ActionForm.vue b/app/imports/ui/properties/forms/ActionForm.vue
index 91bebdd2..3f2e5497 100644
--- a/app/imports/ui/properties/forms/ActionForm.vue
+++ b/app/imports/ui/properties/forms/ActionForm.vue
@@ -41,6 +41,17 @@
       </v-col>
     </v-row>
 
+    <v-slide-x-transition mode="out-in">
+      <text-field
+        v-if="model.actionType === 'event'"
+        label="Event variable name"
+        :value="model.variableName"
+        hint="Variable name of the event that this action represents"
+        :error-messages="errors.variableName"
+        @change="change('variableName', ...arguments)"
+      />
+    </v-slide-x-transition>
+
     <v-slide-x-transition mode="out-in">
       <v-switch
         v-if="!isAttack"
@@ -154,15 +165,10 @@
             />
           </v-col>
         </v-row>
-        <smart-select
-          label="Reset"
-          clearable
+        <reset-selector
           hint="When number of uses used should be reset to zero"
-          style="flex-basis: 300px;"
-          :items="resetOptions"
           :value="model.reset"
           :error-messages="errors.reset"
-          :menu-props="{auto: true, lazy: true}"
           @change="change('reset', ...arguments)"
         />
       </form-section>
@@ -171,77 +177,74 @@
 </template>
 
 <script lang="js">
-  import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
-  import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-  import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
+import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
+import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
+import ResetSelector from '/imports/ui/components/ResetSelector.vue';
 
-  export default {
-    components: {
-      ResourcesForm,
-      IconColorMenu,
-    },
-    mixins: [propertyFormMixin],
-    data(){
-      let data = {
-        actionTypes: [
-          {
-            text: 'Action',
-            value: 'action',
-          }, {
-            text: 'Bonus action',
-            value: 'bonus',
-          }, {
-            text: 'Attack action',
-            value: 'attack',
-            help: 'Attack actions replace a single attack when you choose to use your Action to attack',
-          }, {
-            text: 'Reaction',
-            value: 'reaction',
-          }, {
-            text: 'Free action',
-            value: 'free',
-            help: 'You can take one free action on your turn without using an action or bonus action'
-          }, {
-            text: 'Long action',
-            value: 'long',
-            help: 'Long actions take longer than one turn to complete'
-          },
-        ],
-        targetOptions: [
-          {
-            text: 'Self',
-            value: 'self',
-          }, {
-            text: 'Single target',
-            value: 'singleTarget',
-          }, {
-            text: 'Multiple targets',
-            value: 'multipleTargets',
-          },
-        ],
-        resetOptions: [
-          {
-            text: 'Short rest',
-            value: 'shortRest',
-          }, {
-            text: 'Long rest',
-            value: 'longRest',
-          }
-        ],
-        attackSwitch: false,
-      };
-      data.actionTypeHints = {};
-      data.actionTypes.forEach(type => {
-        data.actionTypeHints[type.value] = type.help;
-      });
-      return data;
-    },
-    computed: {
-      isAttack(){
-        return this.attackSwitch || !!this.model.attackRoll?.calculation
-      }
+export default {
+  components: {
+    ResourcesForm,
+    IconColorMenu,
+    ResetSelector,
+  },
+  mixins: [propertyFormMixin],
+  data(){
+    let data = {
+      actionTypes: [
+        {
+          text: 'Action',
+          value: 'action',
+        }, {
+          text: 'Bonus action',
+          value: 'bonus',
+        }, {
+          text: 'Attack action',
+          value: 'attack',
+          help: 'Attack actions replace a single attack when you choose to use your Action to attack',
+        }, {
+          text: 'Reaction',
+          value: 'reaction',
+        }, {
+          text: 'Free action',
+          value: 'free',
+          help: 'You can take one free action on your turn without using an action or bonus action'
+        }, {
+          text: 'Long action',
+          value: 'long',
+          help: 'Long actions take longer than one turn to complete'
+        }, {
+          text: 'Event',
+          value: 'event',
+          help: 'Events are actions that happen to the character like rests or dawn'
+        },
+      ],
+      targetOptions: [
+        {
+          text: 'Self',
+          value: 'self',
+        }, {
+          text: 'Single target',
+          value: 'singleTarget',
+        }, {
+          text: 'Multiple targets',
+          value: 'multipleTargets',
+        },
+      ],
+      attackSwitch: false,
+    };
+    data.actionTypeHints = {};
+    data.actionTypes.forEach(type => {
+      data.actionTypeHints[type.value] = type.help;
+    });
+    return data;
+  },
+  computed: {
+    isAttack(){
+      return this.attackSwitch || !!this.model.attackRoll?.calculation
     }
-  };
+  },
+};
 </script>
 
 <style lang="css" scoped>
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index 1d76e1a0..8569e69b 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -250,16 +250,11 @@
           </div>
         </div>
         <div class="layout wrap">
-          <smart-select
+          <reset-selector
             v-if="model.attributeType !== 'hitDice'"
-            label="Reset"
-            clearable
-            style="flex-basis: 300px;"
             hint="When damage should be reset to zero"
-            :items="resetOptions"
             :value="model.reset"
             :error-messages="errors.reset"
-            :menu-props="{auto: true, lazy: true}"
             @change="change('reset', ...arguments)"
           />
         </div>
@@ -273,12 +268,14 @@ import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
 import FormSections from '/imports/ui/properties/forms/shared/FormSections.vue';
 import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
 import ColorPicker from '/imports/ui/components/ColorPicker.vue';
+import ResetSelector from '/imports/ui/components/ResetSelector.vue';
 
 export default {
   components: {
     FormSection,
     FormSections,
     ColorPicker,
+    ResetSelector,
   },
   mixins: [propertyFormMixin],
   inject: {
diff --git a/app/imports/ui/properties/forms/SpellForm.vue b/app/imports/ui/properties/forms/SpellForm.vue
index 4544857c..ee03d9ba 100644
--- a/app/imports/ui/properties/forms/SpellForm.vue
+++ b/app/imports/ui/properties/forms/SpellForm.vue
@@ -278,15 +278,10 @@
             />
           </v-col>
         </v-row>
-        <smart-select
-          label="Reset"
-          clearable
+        <reset-selector
           hint="When number of uses used should be reset to zero"
-          style="flex-basis: 300px;"
-          :items="resetOptions"
           :value="model.reset"
           :error-messages="errors.reset"
-          :menu-props="{auto: true, lazy: true}"
           @change="change('reset', ...arguments)"
         />
       </form-section>
@@ -318,6 +313,7 @@ import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/F
 import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
 import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
 import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
+import ResetSelector from '/imports/ui/components/ResetSelector.vue';
 
 export default {
   components: {
@@ -325,6 +321,7 @@ export default {
     FormSection,
     IconColorMenu,
     ResourcesForm,
+    ResetSelector,
   },
   mixins: [propertyFormMixin],
   data() {
@@ -401,15 +398,6 @@ export default {
           value: 'multipleTargets',
         },
       ],
-      resetOptions: [
-        {
-          text: 'Short rest',
-          value: 'shortRest',
-        }, {
-          text: 'Long rest',
-          value: 'longRest',
-        }
-      ],
       attackSwitch: false,
     };
   },
diff --git a/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js b/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js
index 2ddd2f1f..ed5f9d3d 100644
--- a/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js
+++ b/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js
@@ -1,12 +1,12 @@
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 
-export default function createListOfProperties(filter = {}){
-  filter.removed = {$ne: true};
+export default function createListOfProperties(filter = {}, getNamesWithValues) {
+  filter.removed = { $ne: true };
   let propertyList = [];
   let variableNames = new Set();
-  function addUniquePropertys(property){
-    if (property.variableName && !variableNames.has(property.variableName)){
+  function addUniquePropertys(property) {
+    if (property.variableName && !variableNames.has(property.variableName)) {
       variableNames.add(property.variableName);
       propertyList.push({
         text: property.name || property.variableName,
@@ -15,8 +15,9 @@ export default function createListOfProperties(filter = {}){
       });
     }
   }
-  let options = {sort: {order: 1, variableName: 1}}
+  let options = { sort: { order: 1, variableName: 1 } }
   CreatureProperties.find(filter, options).forEach(addUniquePropertys);
   LibraryNodes.find(filter, options).forEach(addUniquePropertys);
+  if (getNamesWithValues) return propertyList;
   return Array.from(variableNames);
 }
diff --git a/app/imports/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
index bd6c6ba9..ef29ea2d 100644
--- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js
+++ b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
@@ -1,32 +1,32 @@
-const ActionForm = () => import('/imports/ui/properties/forms/ActionForm.vue');
-const AdjustmentForm = () => import('/imports/ui/properties/forms/AdjustmentForm.vue');
-const AttributeForm = () => import('/imports/ui/properties/forms/AttributeForm.vue');
-const BuffForm = () => import('/imports/ui/properties/forms/BuffForm.vue');
-const BuffRemoverForm = () => import('/imports/ui/properties/forms/BuffRemoverForm.vue');
-const BranchForm = () => import('/imports/ui/properties/forms/BranchForm.vue');
-const ClassForm = () => import('/imports/ui/properties/forms/ClassForm.vue');
-const ClassLevelForm = () => import('/imports/ui/properties/forms/ClassLevelForm.vue');
-const ConstantForm = () => import('/imports/ui/properties/forms/ConstantForm.vue');
-const ContainerForm = () => import('/imports/ui/properties/forms/ContainerForm.vue');
-const DamageForm = () => import('/imports/ui/properties/forms/DamageForm.vue');
-const DamageMultiplierForm = () => import('/imports/ui/properties/forms/DamageMultiplierForm.vue');
-const EffectForm = () => import('/imports/ui/properties/forms/EffectForm.vue');
-const FeatureForm = () => import('/imports/ui/properties/forms/FeatureForm.vue');
-const FolderForm = () => import('/imports/ui/properties/forms/FolderForm.vue');
-const ItemForm = () => import('/imports/ui/properties/forms/ItemForm.vue');
-const NoteForm = () => import('/imports/ui/properties/forms/NoteForm.vue');
-const PointBuyForm = () => import('/imports/ui/properties/forms/PointBuyForm.vue');
-const ProficiencyForm = () => import('/imports/ui/properties/forms/ProficiencyForm.vue');
-const ReferenceForm = () => import('/imports/ui/properties/forms/ReferenceForm.vue');
-const RollForm = () => import('/imports/ui/properties/forms/RollForm.vue');
-const SavingThrowForm = () => import('/imports/ui/properties/forms/SavingThrowForm.vue');
-const SkillForm = () => import('/imports/ui/properties/forms/SkillForm.vue');
-const SlotForm = () => import('/imports/ui/properties/forms/SlotForm.vue');
-const SlotFillerForm = () => import('/imports/ui/properties/forms/SlotFillerForm.vue');
-const SpellListForm = () => import('/imports/ui/properties/forms/SpellListForm.vue');
-const SpellForm = () => import('/imports/ui/properties/forms/SpellForm.vue');
-const ToggleForm = () => import('/imports/ui/properties/forms/ToggleForm.vue');
-const TriggerForm = () => import('/imports/ui/properties/forms/TriggerForm.vue');
+import ActionForm from '/imports/ui/properties/forms/ActionForm.vue';
+import AdjustmentForm from '/imports/ui/properties/forms/AdjustmentForm.vue';
+import AttributeForm from '/imports/ui/properties/forms/AttributeForm.vue';
+import BuffForm from '/imports/ui/properties/forms/BuffForm.vue';
+import BuffRemoverForm from '/imports/ui/properties/forms/BuffRemoverForm.vue';
+import BranchForm from '/imports/ui/properties/forms/BranchForm.vue';
+import ClassForm from '/imports/ui/properties/forms/ClassForm.vue';
+import ClassLevelForm from '/imports/ui/properties/forms/ClassLevelForm.vue';
+import ConstantForm from '/imports/ui/properties/forms/ConstantForm.vue';
+import ContainerForm from '/imports/ui/properties/forms/ContainerForm.vue';
+import DamageForm from '/imports/ui/properties/forms/DamageForm.vue';
+import DamageMultiplierForm from '/imports/ui/properties/forms/DamageMultiplierForm.vue';
+import EffectForm from '/imports/ui/properties/forms/EffectForm.vue';
+import FeatureForm from '/imports/ui/properties/forms/FeatureForm.vue';
+import FolderForm from '/imports/ui/properties/forms/FolderForm.vue';
+import ItemForm from '/imports/ui/properties/forms/ItemForm.vue';
+import NoteForm from '/imports/ui/properties/forms/NoteForm.vue';
+import PointBuyForm from '/imports/ui/properties/forms/PointBuyForm.vue';
+import ProficiencyForm from '/imports/ui/properties/forms/ProficiencyForm.vue';
+import ReferenceForm from '/imports/ui/properties/forms/ReferenceForm.vue';
+import RollForm from '/imports/ui/properties/forms/RollForm.vue';
+import SavingThrowForm from '/imports/ui/properties/forms/SavingThrowForm.vue';
+import SkillForm from '/imports/ui/properties/forms/SkillForm.vue';
+import SlotForm from '/imports/ui/properties/forms/SlotForm.vue';
+import SlotFillerForm from '/imports/ui/properties/forms/SlotFillerForm.vue';
+import SpellListForm from '/imports/ui/properties/forms/SpellListForm.vue';
+import SpellForm from '/imports/ui/properties/forms/SpellForm.vue';
+import ToggleForm from '/imports/ui/properties/forms/ToggleForm.vue';
+import TriggerForm from '/imports/ui/properties/forms/TriggerForm.vue';
 
 export default {
   action: ActionForm,
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
index 15d148e7..70151b48 100644
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -1,32 +1,32 @@
-const ActionViewer = () => import ('/imports/ui/properties/viewers/ActionViewer.vue');
-const AdjustmentViewer = () => import ('/imports/ui/properties/viewers/AdjustmentViewer.vue');
-const AttributeViewer = () => import ('/imports/ui/properties/viewers/AttributeViewer.vue');
-const BuffViewer = () => import ('/imports/ui/properties/viewers/BuffViewer.vue');
-const BuffRemoverViewer = () => import ('/imports/ui/properties/viewers/BuffRemoverViewer.vue');
-const BranchViewer = () => import ('/imports/ui/properties/viewers/BranchViewer.vue');
-const ContainerViewer = () => import ('/imports/ui/properties/viewers/ContainerViewer.vue');
-const ClassViewer = () => import ('/imports/ui/properties/viewers/ClassViewer.vue');
-const ClassLevelViewer = () => import ('/imports/ui/properties/viewers/ClassLevelViewer.vue');
-const ConstantViewer = () => import ('/imports/ui/properties/viewers/ConstantViewer.vue');
-const DamageViewer = () => import ('/imports/ui/properties/viewers/DamageViewer.vue');
-const DamageMultiplierViewer = () => import ('/imports/ui/properties/viewers/DamageMultiplierViewer.vue');
-const EffectViewer = () => import ('/imports/ui/properties/viewers/EffectViewer.vue');
-const FeatureViewer = () => import ('/imports/ui/properties/viewers/FeatureViewer.vue');
-const FolderViewer = () => import ('/imports/ui/properties/viewers/FolderViewer.vue');
-const ItemViewer = () => import ('/imports/ui/properties/viewers/ItemViewer.vue');
-const NoteViewer = () => import ('/imports/ui/properties/viewers/NoteViewer.vue');
-const PointBuyViewer = () => import ('/imports/ui/properties/viewers/PointBuyViewer.vue');
-const ProficiencyViewer = () => import ('/imports/ui/properties/viewers/ProficiencyViewer.vue');
-const ReferenceViewer = () => import ('/imports/ui/properties/viewers/ReferenceViewer.vue');
-const RollViewer = () => import ('/imports/ui/properties/viewers/RollViewer.vue');
-const SkillViewer = () => import ('/imports/ui/properties/viewers/SkillViewer.vue');
-const SavingThrowViewer = () => import ('/imports/ui/properties/viewers/SavingThrowViewer.vue');
-const SlotViewer = () => import ('/imports/ui/properties/viewers/SlotViewer.vue');
-const SlotFillerViewer = () => import ('/imports/ui/properties/viewers/SlotFillerViewer.vue');
-const SpellListViewer = () => import ('/imports/ui/properties/viewers/SpellListViewer.vue');
-const SpellViewer = () => import ('/imports/ui/properties/viewers/SpellViewer.vue');
-const ToggleViewer = () => import ('/imports/ui/properties/viewers/ToggleViewer.vue');
-const TriggerViewer = () => import ('/imports/ui/properties/viewers/TriggerViewer.vue');
+import ActionViewer from '/imports/ui/properties/viewers/ActionViewer.vue';
+import AdjustmentViewer from '/imports/ui/properties/viewers/AdjustmentViewer.vue';
+import AttributeViewer from '/imports/ui/properties/viewers/AttributeViewer.vue';
+import BuffViewer from '/imports/ui/properties/viewers/BuffViewer.vue';
+import BuffRemoverViewer from '/imports/ui/properties/viewers/BuffRemoverViewer.vue';
+import BranchViewer from '/imports/ui/properties/viewers/BranchViewer.vue';
+import ContainerViewer from '/imports/ui/properties/viewers/ContainerViewer.vue';
+import ClassViewer from '/imports/ui/properties/viewers/ClassViewer.vue';
+import ClassLevelViewer from '/imports/ui/properties/viewers/ClassLevelViewer.vue';
+import ConstantViewer from '/imports/ui/properties/viewers/ConstantViewer.vue';
+import DamageViewer from '/imports/ui/properties/viewers/DamageViewer.vue';
+import DamageMultiplierViewer from '/imports/ui/properties/viewers/DamageMultiplierViewer.vue';
+import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
+import FeatureViewer from '/imports/ui/properties/viewers/FeatureViewer.vue';
+import FolderViewer from '/imports/ui/properties/viewers/FolderViewer.vue';
+import ItemViewer from '/imports/ui/properties/viewers/ItemViewer.vue';
+import NoteViewer from '/imports/ui/properties/viewers/NoteViewer.vue';
+import PointBuyViewer from '/imports/ui/properties/viewers/PointBuyViewer.vue';
+import ProficiencyViewer from '/imports/ui/properties/viewers/ProficiencyViewer.vue';
+import ReferenceViewer from '/imports/ui/properties/viewers/ReferenceViewer.vue';
+import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
+import SkillViewer from '/imports/ui/properties/viewers/SkillViewer.vue';
+import SavingThrowViewer from '/imports/ui/properties/viewers/SavingThrowViewer.vue';
+import SlotViewer from '/imports/ui/properties/viewers/SlotViewer.vue';
+import SlotFillerViewer from '/imports/ui/properties/viewers/SlotFillerViewer.vue';
+import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue';
+import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue';
+import ToggleViewer from '/imports/ui/properties/viewers/ToggleViewer.vue';
+import TriggerViewer from '/imports/ui/properties/viewers/TriggerViewer.vue';
 
 export default {
   action: ActionViewer,
diff --git a/app/package.json b/app/package.json
index 94c1ce5a..e4cc506b 100644
--- a/app/package.json
+++ b/app/package.json
@@ -121,8 +121,7 @@
       "quotes": [
         "error",
         "single"
-      ],
-      "vuetify/no-deprecated-classes": "error"
+      ]
     }
   }
-}
+}
\ No newline at end of file

From 83772312547b18d27a7dec560141e51f8115bf59 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 9 Nov 2022 00:00:54 +0200
Subject: [PATCH 16/46] Began work on stat grouping by folder

---
 app/imports/api/properties/Folders.js         |  5 ++
 .../character/characterSheetTabs/StatsTab.vue | 11 ++++
 .../components/folders/FolderGroupCard.vue    | 39 ++++++++++++
 .../folders/propertyComponentIndex.js         | 61 +++++++++++++++++++
 .../ui/properties/forms/FolderForm.vue        |  6 ++
 5 files changed, 122 insertions(+)
 create mode 100644 app/imports/ui/properties/components/folders/FolderGroupCard.vue
 create mode 100644 app/imports/ui/properties/components/folders/propertyComponentIndex.js

diff --git a/app/imports/api/properties/Folders.js b/app/imports/api/properties/Folders.js
index 45055ce1..aa68e56f 100644
--- a/app/imports/api/properties/Folders.js
+++ b/app/imports/api/properties/Folders.js
@@ -7,6 +7,11 @@ let FolderSchema = new createPropertySchema({
   name: {
     type: String,
     max: STORAGE_LIMITS.name,
+    optional: true,
+  },
+  groupStats: {
+    type: Boolean,
+    optional: true,
   },
 });
 
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index c7042577..32f1b3c2 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -3,6 +3,12 @@
     <health-bar-card-container :creature-id="creatureId" />
 
     <column-layout>
+      <div
+        v-for="folder in folders"
+        :key="folder._id"
+      >
+        <folder-group-card :model="folder" />
+      </div>
       <div
         v-if="!creature.settings.hideRestButtons || (events && events.length)"
         class="character-buttons"
@@ -365,6 +371,7 @@ import ToggleCard from '/imports/ui/properties/components/toggles/ToggleCard.vue
 import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
 import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
 import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import FolderGroupCard from '/imports/ui/properties/components/folders/FolderGroupCard.vue';
 import { uniqBy } from 'lodash';
 
 const getProperties = function (creature, filter, options = {
@@ -415,6 +422,7 @@ export default {
     ActionCard,
     ToggleCard,
     EventButton,
+    FolderGroupCard,
   },
   props: {
     creatureId: {
@@ -504,6 +512,9 @@ export default {
         sort: { value: 1, order: 1 }
       });
     },
+    folders() {
+      return getProperties(this.creature, { type: 'folder', groupStats: true });
+    },
   },
   methods: {
     clickProperty({ _id }) {
diff --git a/app/imports/ui/properties/components/folders/FolderGroupCard.vue b/app/imports/ui/properties/components/folders/FolderGroupCard.vue
new file mode 100644
index 00000000..34662396
--- /dev/null
+++ b/app/imports/ui/properties/components/folders/FolderGroupCard.vue
@@ -0,0 +1,39 @@
+<template>
+  <v-card>
+    <v-subheader v-if="model.name">
+      {{ model.name }}
+    </v-subheader>
+    <component
+      :is="prop.type"
+      v-for="prop in properties"
+      :key="prop._id"
+      :model="prop"
+    />
+  </v-card>
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import propComponents from '/imports/ui/properties/components/folders/propertyComponentIndex.js';
+
+export default {
+  components: {
+    ...propComponents,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    }
+  },
+  meteor: {
+    properties() {
+      return CreatureProperties.find({
+        'ancestors.id': this.model._id
+      }, {
+        sort: { order: 1 },
+      });
+    },
+  },
+}
+</script>
\ No newline at end of file
diff --git a/app/imports/ui/properties/components/folders/propertyComponentIndex.js b/app/imports/ui/properties/components/folders/propertyComponentIndex.js
new file mode 100644
index 00000000..4b8ed64a
--- /dev/null
+++ b/app/imports/ui/properties/components/folders/propertyComponentIndex.js
@@ -0,0 +1,61 @@
+import action from '/imports/ui/properties/components/actions/EventButton.vue';
+//import adjustment from '';
+import attribute from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
+//import buff from '';
+//import buffRemover from '';
+//import branch from '';
+//import constant from '';
+//import container from '';
+//import classComponent from '';
+//import classLevel from '';
+//import damage from '';
+//import damageMultiplier from '';
+//import effect from '';
+//import feature from '';
+//import folder from '';
+//import item from '';
+//import note from '';
+//import pointBuy from '';
+//import proficiency from '';
+//import propertySlot from '';
+//import reference from '';
+//import roll from '';
+//import savingThrow from '';
+//import skill from '';
+//import slotFiller from '';
+//import spellList from '';
+//import spell from '';
+import toggle from '/imports/ui/properties/components/toggles/ToggleCard.vue';
+//import trigger from '';
+
+export default {
+  action,
+  //adjustment,
+  attribute,
+  //buff,
+  //buffRemover,
+  //branch,
+  //constant,
+  //container,
+  //class: classComponent,
+  //classLevel,
+  //damage,
+  //damageMultiplier,
+  //effect,
+  //feature,
+  //folder,
+  //item,
+  //note,
+  //pointBuy,
+  //proficiency,
+  //propertySlot,
+  //reference,
+  //roll,
+  //savingThrow,
+  //skill,
+  //slotFiller,
+  //spellList,
+  //spell,
+  toggle,
+  //trigger,
+};
diff --git a/app/imports/ui/properties/forms/FolderForm.vue b/app/imports/ui/properties/forms/FolderForm.vue
index 77c96aec..b616505e 100644
--- a/app/imports/ui/properties/forms/FolderForm.vue
+++ b/app/imports/ui/properties/forms/FolderForm.vue
@@ -26,6 +26,12 @@
             :value="model.tags"
             @change="change('tags', ...arguments)"
           />
+          <smart-switch
+            label="Group children on stats tab"
+            :value="model.groupStats"
+            :error-messages="errors.groupStats"
+            @change="change('groupStats', ...arguments)"
+          />
         </form-section>
       </form-sections>
     </div>

From 3d31d62860b1c5ecb9688ca9a774cd7e8e42bd6e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 9 Nov 2022 14:58:52 +0200
Subject: [PATCH 17/46] Completed folder stat grouping UI

---
 app/imports/api/properties/Attributes.js      |   3 +-
 .../character/characterSheetTabs/StatsTab.vue | 133 ++++++++++--------
 .../components/attributes/AttributeCard.vue   |  71 +---------
 .../attributes/AttributeCardContent.vue       |  97 +++++++++++++
 .../components/attributes/HealthBar.vue       | 104 ++++++--------
 .../components/attributes/HealthBarCard.vue   |   8 +-
 .../components/attributes/ResourceCard.vue    |  85 ++---------
 .../attributes/ResourceCardContent.vue        |  89 ++++++++++++
 .../attributes/SpellSlotListTile.vue          |   1 -
 .../components/buffs/BuffListItem.vue         |  30 ++++
 .../components/folders/FolderGroupCard.vue    |  70 +++++++--
 .../ActionGroupComponent.vue                  |  35 +++++
 .../AttributeGroupComponent.vue               |  95 +++++++++++++
 .../folders/propertyComponentIndex.js         |  30 ++--
 .../components/inventory/ItemListTile.vue     |   2 +-
 15 files changed, 559 insertions(+), 294 deletions(-)
 create mode 100644 app/imports/ui/properties/components/attributes/AttributeCardContent.vue
 create mode 100644 app/imports/ui/properties/components/attributes/ResourceCardContent.vue
 create mode 100644 app/imports/ui/properties/components/buffs/BuffListItem.vue
 create mode 100644 app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
 create mode 100644 app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue

diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js
index 28f79243..94e5d657 100644
--- a/app/imports/api/properties/Attributes.js
+++ b/app/imports/api/properties/Attributes.js
@@ -28,8 +28,7 @@ let AttributeSchema = createPropertySchema({
       'stat', // Speed, Armor Class
       'modifier', // Proficiency Bonus, displayed as +x
       'hitDice', // d12 hit dice
-      'healthBar', // Hitpoints, Temporary Hitpoints, can take damage
-      'bar', // Displayed as a health bar, can't take damage
+      'healthBar', // Hitpoints, Temporary Hitpoints
       'resource', // Rages, sorcery points
       'spellSlot', // Level 1, 2, 3... spell slots
       'utility', // Aren't displayed, Jump height, Carry capacity
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 32f1b3c2..78847e45 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -1,14 +1,29 @@
 <template lang="html">
   <div class="stats-tab ma-2">
-    <health-bar-card-container :creature-id="creatureId" />
+    <div
+      v-if="healthBars.length"
+      class="px-2 pt-2"
+    >
+      <v-card class="pa-2">
+        <health-bar
+          v-for="healthBar in healthBars"
+          :key="healthBar._id"
+          :model="healthBar"
+          @change="({ type, value }) => incrementChange(healthBar._id, { type, value: -value })"
+          @click="clickProperty({_id: healthBar._id})"
+        />
+      </v-card>
+    </div>
 
     <column-layout>
-      <div
+      <folder-group-card
         v-for="folder in folders"
         :key="folder._id"
-      >
-        <folder-group-card :model="folder" />
-      </div>
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
       <div
         v-if="!creature.settings.hideRestButtons || (events && events.length)"
         class="character-buttons"
@@ -50,26 +65,14 @@
         <v-card>
           <v-list>
             <v-subheader>Buffs and conditions</v-subheader>
-            <v-list-item
+            <buff-list-item
               v-for="buff in appliedBuffs"
               :key="buff._id"
               :data-id="buff._id"
+              :model="buff"
               @click="clickProperty({_id: buff._id})"
-            >
-              <v-list-item-content>
-                <v-list-item-title>
-                  {{ buff.name }}
-                </v-list-item-title>
-              </v-list-item-content>
-              <v-list-item-action v-if="!buff.hideRemoveButton">
-                <v-btn
-                  icon
-                  @click.stop="softRemove(buff._id)"
-                >
-                  <v-icon>mdi-delete</v-icon>
-                </v-btn>
-              </v-list-item-action>
-            </v-list-item>
+              @remove="softRemove(buff._id)"
+            />
           </v-list>
         </v-card>
       </div>
@@ -199,7 +202,6 @@
               :model="spellSlot"
               :data-id="spellSlot._id"
               @click="clickProperty({_id: spellSlot._id})"
-              @cast="castSpellWithSlot(spellSlot._id)"
             />
           </v-list>
           <div
@@ -355,11 +357,11 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
 import AttributeCard from '/imports/ui/properties/components/attributes/AttributeCard.vue';
 import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
 import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 import DamageMultiplierCard from '/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue';
-import HealthBarCardContainer from '/imports/ui/properties/components/attributes/HealthBarCardContainer.vue';
 import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.vue';
 import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.vue';
 import ResourceCard from '/imports/ui/properties/components/attributes/ResourceCard.vue';
@@ -368,13 +370,14 @@ import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue
 import RestButton from '/imports/ui/creature/RestButton.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import ToggleCard from '/imports/ui/properties/components/toggles/ToggleCard.vue';
+import BuffListItem from '/imports/ui/properties/components/buffs/BuffListItem.vue';
 import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
 import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
 import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
 import FolderGroupCard from '/imports/ui/properties/components/folders/FolderGroupCard.vue';
 import { uniqBy } from 'lodash';
 
-const getProperties = function (creature, filter, options = {
+const getProperties = function (creature, folderIds, filter, options = {
   sort: { order: 1 }
 }) {
   if (!creature) return;
@@ -382,6 +385,7 @@ const getProperties = function (creature, filter, options = {
     filter.hide = { $ne: true };
   }
   filter['ancestors.id'] = creature._id;
+  filter['parent.id'] = {$nin: folderIds},
   filter.removed = { $ne: true };
   filter.inactive = { $ne: true };
   filter.overridden = { $ne: true };
@@ -393,15 +397,15 @@ const getProperties = function (creature, filter, options = {
   return CreatureProperties.find(filter, options);
 };
 
-const getAttributeOfType = function (creature, type) {
-  return getProperties(creature, {
+const getAttributeOfType = function (creature, folderIds, type) {
+  return getProperties(creature, folderIds, {
     type: 'attribute',
     attributeType: type,
   });
 };
 
-const getSkillOfType = function (creature, type) {
-  return getProperties(creature, {
+const getSkillOfType = function (creature, folderIds, type) {
+  return getProperties(creature, folderIds, {
     type: 'skill',
     skillType: type,
   });
@@ -409,12 +413,13 @@ const getSkillOfType = function (creature, type) {
 
 export default {
   components: {
+    HealthBar,
     RestButton,
+    BuffListItem,
     AbilityListTile,
     AttributeCard,
     ColumnLayout,
     DamageMultiplierCard,
-    HealthBarCardContainer,
     HitDiceListTile,
     SkillListTile,
     ResourceCard,
@@ -439,16 +444,27 @@ export default {
     creature() {
       return Creatures.findOne(this.creatureId, { fields: { settings: 1 } });
     },
+    
+    folders() {
+      return getProperties(this.creature, [], { type: 'folder', groupStats: true });
+    },
+    folderIds() {
+      return this.folders.map(f => f._id);
+    },
+    healthBars() {
+      return getAttributeOfType(this.creature, this.folderIds, 'healthBar');
+    },
     abilities() {
-      return getAttributeOfType(this.creature, 'ability');
+      return getAttributeOfType(this.creature, this.folderIds, 'ability');
     },
     stats() {
-      return getAttributeOfType(this.creature, 'stat');
+      return getAttributeOfType(this.creature, this.folderIds, 'stat');
     },
     toggles() {
       return CreatureProperties.find({
-        'ancestors.id': this.creatureId,
         type: 'toggle',
+        'ancestors.id': this.creatureId,
+        'parent.id': { $nin: this.folderIds },
         removed: { $ne: true },
         deactivatedByAncestor: { $ne: true },
         showUI: true,
@@ -457,64 +473,61 @@ export default {
       });
     },
     modifiers() {
-      return getAttributeOfType(this.creature, 'modifier');
+      return getAttributeOfType(this.creature, this.folderIds, 'modifier');
     },
     resources() {
-      return getAttributeOfType(this.creature, 'resource');
+      return getAttributeOfType(this.creature, this.folderIds, 'resource');
     },
     spellSlots() {
-      return getAttributeOfType(this.creature, 'spellSlot');
+      return getAttributeOfType(this.creature, this.folderIds, 'spellSlot');
     },
     hasSpells() {
-      const cursor = getProperties(this.creature, {
+      const cursor = getProperties(this.creature, this.folderIds, {
         type: 'spell',
       })
       return cursor && cursor.count();
     },
     hitDice() {
-      return getAttributeOfType(this.creature, 'hitDice');
+      return getAttributeOfType(this.creature, this.folderIds, 'hitDice');
     },
     checks() {
-      return getSkillOfType(this.creature, 'check');
+      return getSkillOfType(this.creature, this.folderIds, 'check');
     },
     savingThrows() {
-      return getSkillOfType(this.creature, 'save');
+      return getSkillOfType(this.creature, this.folderIds, 'save');
     },
     skills() {
-      return getSkillOfType(this.creature, 'skill');
+      return getSkillOfType(this.creature, this.folderIds, 'skill');
     },
     tools() {
-      return getSkillOfType(this.creature, 'tool');
+      return getSkillOfType(this.creature, this.folderIds, 'tool');
     },
     weapons() {
-      return getSkillOfType(this.creature, 'weapon');
+      return getSkillOfType(this.creature, this.folderIds, 'weapon');
     },
     armors() {
-      return getSkillOfType(this.creature, 'armor');
+      return getSkillOfType(this.creature, this.folderIds, 'armor');
     },
     languages() {
-      return getSkillOfType(this.creature, 'language');
+      return getSkillOfType(this.creature, this.folderIds, 'language');
     },
     events() {
-      const events = getProperties(this.creature, { type: 'action', actionType: 'event' });
+      const events = getProperties(this.creature, this.folderIds, { type: 'action', actionType: 'event' });
       return uniqBy(events.fetch(), e => e.variableName);
     },
     actions() {
-      return getProperties(this.creature, { type: 'action', actionType: { $ne: 'event' } });
+      return getProperties(this.creature, this.folderIds, { type: 'action', actionType: { $ne: 'event' } });
     },
     appliedBuffs() {
-      return getProperties(this.creature, { type: 'buff' });
+      return getProperties(this.creature, this.folderIds, { type: 'buff' });
     },
     multipliers() {
-      return getProperties(this.creature, {
+      return getProperties(this.creature, this.folderIds, {
         type: 'damageMultiplier'
       }, {
         sort: { value: 1, order: 1 }
       });
     },
-    folders() {
-      return getProperties(this.creature, { type: 'folder', groupStats: true });
-    },
   },
   methods: {
     clickProperty({ _id }) {
@@ -532,13 +545,23 @@ export default {
       });
     },
     incrementChange(_id, { type, value }) {
-      if (type === 'increment') {
-        damageProperty.call({ _id, operation: 'increment', value: -value });
-      }
+      damageProperty.call({
+        _id,
+        operation: type,
+        value: -value
+      }, error => {
+        if (error) {
+          snackbar({ text: error.reason || error.message || error.toString() });
+          console.error(error);
+        }
+      });
     },
     softRemove(_id) {
       softRemoveProperty.call({ _id }, error => {
-        if (error) console.error(error);
+        if (error) {
+          snackbar({ text: error.reason || error.message || error.toString() });
+          console.error(error);
+        }
       });
     },
     castSpell() {
diff --git a/app/imports/ui/properties/components/attributes/AttributeCard.vue b/app/imports/ui/properties/components/attributes/AttributeCard.vue
index 7b3e1492..f1fd03f9 100644
--- a/app/imports/ui/properties/components/attributes/AttributeCard.vue
+++ b/app/imports/ui/properties/components/attributes/AttributeCard.vue
@@ -5,54 +5,19 @@
     @mouseover="hasClickListener ? hovering = true : undefined"
     @mouseleave="hasClickListener ? hovering = false : undefined"
   >
-    <div class="layout align-center">
-      <roll-popup
-        v-if="model.attributeType === 'modifier' || model.type === 'skill'"
-        button-class="px-0"
-        text
-        height="70"
-        min-width="72"
-        :roll-text="computedValue && computedValue.toString()"
-        :name="model.name"
-        :advantage="model.advantage"
-        :loading="checkLoading"
-        :disabled="!context.editPermission"
-        @roll="check"
-      >
-        <v-card-title class="value text-h4 flex-shrink-0">
-          {{ computedValue }}
-        </v-card-title>
-      </roll-popup>
-      <v-card-title
-        v-else
-        class="value text-h4 flex-shrink-0"
-      >
-        {{ computedValue }}
-      </v-card-title>
-      <v-card-title class="name text-subtitle-1 text-truncate d-block pl-0">
-        {{ model.name }}
-      </v-card-title>
-    </div>
+    <attribute-card-content :model="model" />
     <card-highlight :active="hasClickListener && hovering" />
   </v-card>
 </template>
 
 <script lang="js">
-  import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-  import RollPopup from '/imports/ui/components/RollPopup.vue';
-  import doCheck from '/imports/api/engine/actions/doCheck.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
   import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+  import AttributeCardContent from '/imports/ui/properties/components/attributes/AttributeCardContent.vue';
 
   export default {
     components: {
-      RollPopup,
       CardHighlight,
-    },
-    inject: {
-      context: {
-        default: {},
-      },
+      AttributeCardContent,
     },
     props: {
       model: {
@@ -68,41 +33,11 @@
       hasClickListener(){
         return this.$listeners && !!this.$listeners.click
       },
-      computedValue(){
-        if (this.model.attributeType === 'modifier' || this.model.type === 'skill'){
-          return numberToSignedString(this.model.value);
-        } else {
-          return this.model.value
-        }
-      }
     },
     methods: {
-      signed: numberToSignedString,
       click(e){
         this.$emit('click', e);
       },
-      check({advantage}){
-        this.checkLoading = true;
-        doCheck.call({
-          propId: this.model._id,
-          scope: {
-            $checkAdvantage: advantage,
-          },
-        }, error => {
-          this.checkLoading = false;
-          if (error){
-            console.error(error);
-            snackbar({text: error.reason});
-          }
-        });
-      },
     },
   }
 </script>
-
-<style lang="css" scoped>
-  .value {
-    min-width: 72px;
-    justify-content: center;
-  }
-</style>
diff --git a/app/imports/ui/properties/components/attributes/AttributeCardContent.vue b/app/imports/ui/properties/components/attributes/AttributeCardContent.vue
new file mode 100644
index 00000000..439ad70f
--- /dev/null
+++ b/app/imports/ui/properties/components/attributes/AttributeCardContent.vue
@@ -0,0 +1,97 @@
+<template>
+  <div
+    class="layout align-center"
+    @click="$emit('click')" 
+    @mouseover="$emit('mouseover')"
+    @mouseleave="$emit('mouseleave')"
+  >
+    <roll-popup
+      v-if="model.attributeType === 'modifier' || model.type === 'skill'"
+      button-class="px-0"
+      text
+      height="70"
+      min-width="72"
+      :roll-text="computedValue && computedValue.toString()"
+      :name="model.name"
+      :advantage="model.advantage"
+      :loading="checkLoading"
+      :disabled="!context.editPermission"
+      @roll="check"
+    >
+      <v-card-title class="value text-h4 flex-shrink-0">
+        {{ computedValue }}
+      </v-card-title>
+    </roll-popup>
+    <v-card-title
+      v-else
+      class="value text-h4 flex-shrink-0"
+    >
+      {{ computedValue }}
+    </v-card-title>
+    <v-card-title class="name text-subtitle-1 text-truncate d-block pl-0">
+      {{ model.name }}
+    </v-card-title>
+  </div>
+</template>
+
+<script lang="js">
+import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import RollPopup from '/imports/ui/components/RollPopup.vue';
+import doCheck from '/imports/api/engine/actions/doCheck.js';
+import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+
+export default {
+  components: {
+    RollPopup,
+  },
+  inject: {
+    context: {
+      default: {},
+    },
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  data(){return {
+    checkLoading: false,
+    hovering: false,
+  }},
+  computed: {
+    computedValue(){
+      if (this.model.attributeType === 'modifier' || this.model.type === 'skill'){
+        return numberToSignedString(this.model.value);
+      } else {
+        return this.model.value
+      }
+    }
+  },
+  methods: {
+    signed: numberToSignedString,
+    check({advantage}){
+      this.checkLoading = true;
+      doCheck.call({
+        propId: this.model._id,
+        scope: {
+          $checkAdvantage: advantage,
+        },
+      }, error => {
+        this.checkLoading = false;
+        if (error){
+          console.error(error);
+          snackbar({text: error.reason});
+        }
+      });
+    },
+  },
+}
+</script>
+
+<style lang="css" scoped>
+  .value {
+    min-width: 72px;
+    justify-content: center;
+  }
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/properties/components/attributes/HealthBar.vue b/app/imports/ui/properties/components/attributes/HealthBar.vue
index da4bbb7d..cc83302b 100644
--- a/app/imports/ui/properties/components/attributes/HealthBar.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBar.vue
@@ -6,7 +6,7 @@
     style="min-height: 42px;"
     :class="{ hover }"
     class="my-1 health-bar"
-    :data-id="_id"
+    :data-id="model._id"
   >
     <div
       class="subheading text-truncate pa-2 name"
@@ -14,14 +14,10 @@
       @mouseleave="hover = false"
       @click="$emit('click')"
     >
-      {{ name }}
+      {{ model.name }}
     </div>
     <v-flex
-      style="
-        height: 24px;
-        flex-basis: 300px;
-        flex-grow: 100;
-      "
+      style="height: 24px; flex-basis: 300px; flex-grow: 100;"
     >
       <div
         column
@@ -50,8 +46,7 @@
               'white--text': isTextLight,
               'black--text': !isTextLight,
             }"
-            style="
-              font-size: 15px;
+            style="font-size: 15px;
               line-height: 24px;
               font-weight: 600;
               position: absolute;
@@ -59,30 +54,30 @@
               top: 0;
               right: 0;
               bottom: 0;
-              text-align: center;
-
-            "
+              text-align: center;"
           >
-            {{ value }} / {{ maxValue }}
+            {{ model.value }} / {{ model.total }}
           </div>
         </div>
       </div>
-      <transition name="transition">
+      <v-menu
+        v-model="editing"
+        absolute
+        transition="scale-transition"
+        origin="center center"
+        content-class="no-menu-shadow"
+        :position-x="x"
+        :position-y="y"
+        :min-width="305"
+        :close-on-content-click="false"
+      >
         <increment-menu
-          v-show="editing"
-          :value="value"
+          :value="model.value"
           :open="editing"
           @change="changeIncrementMenu"
           @close="cancelEdit"
         />
-      </transition>
-      <transition name="background-transition">
-        <div
-          v-if="editing"
-          class="page-tint"
-          @click="cancelEdit"
-        />
-      </transition>
+      </v-menu>
     </v-flex>
   </v-layout>
 </template>
@@ -104,31 +99,9 @@ export default {
     },
   },
   props: {
-    value: {
-      type: Number,
-      default: undefined,
-    },
-    maxValue: {
-      type: Number,
-      default: undefined,
-    },
-    name: {
-      type: String,
-      default: undefined,
-    },
-    color: {
-      type: String,
-      default() {
-        return this.$vuetify.theme.currentTheme.primary
-      },
-    },
-    midColor: {
-      type: String,
-      default: undefined,
-    },
-    lowColor: {
-      type: String,
-      default: undefined,
+    model: {
+      type: Object,
+      required: true,
     },
     _id: String,
   },
@@ -136,24 +109,29 @@ export default {
     return {
       editing: false,
       hover: false,
+      x: 0,
+      y: 0,
     };
   },
   computed: {
     fillFraction() {
-      let fraction = this.value / this.maxValue;
+      let fraction = this.model.value / this.model.total;
       if (fraction < 0) fraction = 0;
       if (fraction > 1) fraction = 1;
       return fraction;
     },
+    color() {
+      return this.model.color || this.$vuetify.theme.currentTheme.primary
+    },
     barColor() {
-      const fraction = this.value / this.maxValue;
+      const fraction = this.model.value / this.model.total;
       if (!Number.isFinite(fraction)) return this.color;
       if (fraction > 0.5) {
         return this.color;
-      } else if (this.midColor && this.lowColor) {
-        return chroma.mix(this.lowColor, this.midColor, fraction * 2).hex();
-      } else if (this.midColor) {
-        return this.midColor;
+      } else if (this.model.healthBarColorMid && this.model.healthBarColorLow) {
+        return chroma.mix(this.model.healthBarColorLow, this.model.healthBarColorMid, fraction * 2).hex();
+      } else if (this.model.healthBarColorMid) {
+        return this.model.healthBarColorMid;
       }
       return this.color;
     },
@@ -166,7 +144,7 @@ export default {
     isTextLight() {
       return isDarkColor(this.barBackgroundColor);
       /* Change color at the halfway mark
-      const fraction = this.value / this.maxValue;
+      const fraction = this.model.value / this.model.total;
       if (fraction >= 0.5){
         return isDarkColor(this.barColor);
       } else {
@@ -176,8 +154,14 @@ export default {
     }
   },
   methods: {
-    edit() {
-      this.editing = true;
+    edit(e) {
+      e.preventDefault()
+      this.editing = false;
+      this.x = e.clientX - 165;
+      this.y = e.clientY - 24;
+      this.$nextTick(() => {
+        this.editing = true
+      });
     },
     cancelEdit() {
       this.editing = false;
@@ -199,6 +183,10 @@ export default {
   z-index: 7;
   position: relative;
 }
+
+.no-menu-shadow {
+  box-shadow: none !important;
+}
 </style>
 
 <style scoped>
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCard.vue b/app/imports/ui/properties/components/attributes/HealthBarCard.vue
index c3409ee0..48b4b89a 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCard.vue
+++ b/app/imports/ui/properties/components/attributes/HealthBarCard.vue
@@ -3,13 +3,7 @@
     <health-bar
       v-for="attribute in attributes"
       :key="attribute._id"
-      :value="attribute.value"
-      :max-value="attribute.total"
-      :name="attribute.name"
-      :color="attribute.color"
-      :mid-color="attribute.healthBarColorMid"
-      :low-color="attribute.healthBarColorLow"
-      :_id="attribute._id"
+      :model="attribute"
       @change="e => $emit('change', {_id: attribute._id, change: e})"
       @click="e => $emit('click', {_id: attribute._id})"
     />
diff --git a/app/imports/ui/properties/components/attributes/ResourceCard.vue b/app/imports/ui/properties/components/attributes/ResourceCard.vue
index c5759892..1ebd7c91 100644
--- a/app/imports/ui/properties/components/attributes/ResourceCard.vue
+++ b/app/imports/ui/properties/components/attributes/ResourceCard.vue
@@ -3,57 +3,26 @@
     class="resource-card"
     :class="hover ? 'elevation-8': ''"
   >
-    <v-layout>
-      <div class="buttons layout column justify-center pl-3">
-        <v-btn
-          icon
-          small
-          :disabled="(model.value >= model.total && !model.ignoreUpperLimit) || context.editPermission === false"
-          @click="increment(1)"
-        >
-          <v-icon>mdi-chevron-up</v-icon>
-        </v-btn>
-        <v-btn
-          icon
-          small
-          :disabled="(model.value <= 0 && !model.ignoreLowerLimit) || context.editPermission === false"
-          @click="increment(-1)"
-        >
-          <v-icon>mdi-chevron-down</v-icon>
-        </v-btn>
-      </div>
-      <div class="layout align-center value pl-2 pr-3">
-        <div class="text-h4">
-          {{ model.value }}
-        </div>
-        <div
-          v-if="model.total !== 0"
-          class="text-h6 ml-2 max-value"
-        >
-          /{{ model.total }}
-        </div>
-      </div>
-      <div
-        class="content layout align-center pr-3"
-        @click="click"
-        @mouseover="hover = true"
-        @mouseleave="hover = false"
-      >
-        <div class="text-truncate ">
-          {{ model.name }}
-        </div>
-      </div>
-    </v-layout>
+    <resource-card-content
+      :model="model"
+      :hover="hover"
+      @mouseover="hover = true"
+      @mouseleave="hover = false"
+      @click="$emit('click')"
+      @change="e => $emit('change', e)"
+    />
     <card-highlight :active="hover" />
   </v-card>
 </template>
 
 <script lang="js">
 import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import ResourceCardContent from '/imports/ui/properties/components/attributes/ResourceCardContent.vue';
 
 export default {
   components: {
     CardHighlight,
+    ResourceCardContent,
   },
   inject: {
     context: { default: {} }
@@ -69,46 +38,16 @@ export default {
       hover: false,
     }
   },
-  methods: {
-    click(e) {
-      this.$emit('click', e);
-    },
-    increment(value) {
-      this.$emit('change', { type: 'increment', value })
-    },
-  },
 };
 </script>
 
-<style lang="css" scoped>
+<style lang="css">
 .resource-card {
   transition: box-shadow .4s cubic-bezier(0.25, 0.8, 0.25, 1);
 }
 
-.resource-card>div {
+.resource-card > div {
   padding-top: 16px;
   padding-bottom: 16px;
 }
-
-.buttons,
-.value {
-  flex-shrink: 0;
-  flex-grow: 0;
-}
-
-.buttons>.v-btn {
-  margin: 0;
-}
-
-.content {
-  cursor: pointer;
-}
-
-.max-value {
-  color: rgba(0, 0, 0, .54);
-}
-
-.theme--dark .max-value {
-  color: rgba(255, 255, 255, 0.54);
-}
 </style>
diff --git a/app/imports/ui/properties/components/attributes/ResourceCardContent.vue b/app/imports/ui/properties/components/attributes/ResourceCardContent.vue
new file mode 100644
index 00000000..1f9de91f
--- /dev/null
+++ b/app/imports/ui/properties/components/attributes/ResourceCardContent.vue
@@ -0,0 +1,89 @@
+<template>
+  <v-layout>
+    <div class="buttons layout column justify-center pl-3">
+      <v-btn
+        icon
+        small
+        :disabled="(model.value >= model.total && !model.ignoreUpperLimit) || context.editPermission === false"
+        @click="increment(1)"
+      >
+        <v-icon>mdi-chevron-up</v-icon>
+      </v-btn>
+      <v-btn
+        icon
+        small
+        :disabled="(model.value <= 0 && !model.ignoreLowerLimit) || context.editPermission === false"
+        @click="increment(-1)"
+      >
+        <v-icon>mdi-chevron-down</v-icon>
+      </v-btn>
+    </div>
+    <div class="layout align-center value pl-2 pr-3">
+      <div class="text-h4">
+        {{ model.value }}
+      </div>
+      <div
+        v-if="model.total !== 0"
+        class="text-h6 ml-2 max-value"
+      >
+        /{{ model.total }}
+      </div>
+    </div>
+    <div
+      class="content layout align-center pr-3"
+      @click="click"
+      @mouseover="$emit('mouseover')"
+      @mouseleave="$emit('mouseleave')"
+    >
+      <div class="text-truncate ">
+        {{ model.name }}
+      </div>
+    </div>
+  </v-layout>
+</template>
+
+<script lang="js">
+
+export default {
+  inject: {
+    context: { default: {} }
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+    hover: {
+      type: Boolean,
+    }
+  },
+  methods: {
+    click(e) {
+      this.$emit('click', e);
+    },
+    increment(value) {
+      this.$emit('change', { type: 'increment', value })
+    },
+  },
+};
+</script>
+
+<style lang="css" scoped>
+.buttons,
+.value {
+  flex-shrink: 0;
+  flex-grow: 0;
+}
+.buttons>.v-btn {
+  margin: 0;
+}
+.content {
+  cursor: pointer;
+}
+.max-value {
+  color: rgba(0, 0, 0, .54);
+}
+.theme--dark .max-value {
+  color: rgba(255, 255, 255, 0.54);
+}
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue b/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
index 584fc765..f4a00384 100644
--- a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
+++ b/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
@@ -61,7 +61,6 @@ export default {
       required: true,
     },
     dark: Boolean,
-    hideCastButton: Boolean,
     disabled: Boolean,
   },
   computed: {
diff --git a/app/imports/ui/properties/components/buffs/BuffListItem.vue b/app/imports/ui/properties/components/buffs/BuffListItem.vue
new file mode 100644
index 00000000..b122f33c
--- /dev/null
+++ b/app/imports/ui/properties/components/buffs/BuffListItem.vue
@@ -0,0 +1,30 @@
+<template>
+  <v-list-item
+    @click="$emit('click')"
+  >
+    <v-list-item-content>
+      <v-list-item-title>
+        {{ model.name }}
+      </v-list-item-title>
+    </v-list-item-content>
+    <v-list-item-action v-if="!model.hideRemoveButton">
+      <v-btn
+        icon
+        @click.stop="$emit('remove')"
+      >
+        <v-icon>mdi-delete</v-icon>
+      </v-btn>
+    </v-list-item-action>
+  </v-list-item>
+</template>
+
+<script lang="js">
+export default {
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+}
+</script>
\ No newline at end of file
diff --git a/app/imports/ui/properties/components/folders/FolderGroupCard.vue b/app/imports/ui/properties/components/folders/FolderGroupCard.vue
index 34662396..a216c8a6 100644
--- a/app/imports/ui/properties/components/folders/FolderGroupCard.vue
+++ b/app/imports/ui/properties/components/folders/FolderGroupCard.vue
@@ -1,15 +1,25 @@
 <template>
-  <v-card>
-    <v-subheader v-if="model.name">
-      {{ model.name }}
-    </v-subheader>
-    <component
-      :is="prop.type"
-      v-for="prop in properties"
-      :key="prop._id"
-      :model="prop"
-    />
-  </v-card>
+  <div
+    v-if="model.name || (properties && properties.length)"
+  >
+    <v-card
+      class="folder-group-card pb-2"
+    >
+      <v-subheader v-if="model.name">
+        {{ model.name }}
+      </v-subheader>
+      <component
+        :is="prop.type"
+        v-for="prop in properties"
+        :key="prop._id"
+        :model="prop"
+        :data-id="prop._id"
+        @click="$emit('click-property', {_id: prop._id})"
+        @sub-click="_id => $emit('sub-click', _id)"
+        @remove="$emit('remove', prop._id)"
+      />
+    </v-card>
+  </div>
 </template>
 
 <script lang="js">
@@ -28,12 +38,44 @@ export default {
   },
   meteor: {
     properties() {
-      return CreatureProperties.find({
-        'ancestors.id': this.model._id
+      const props = [];
+      CreatureProperties.find({
+        'parent.id': this.model._id,
+        removed: { $ne: true },
+        overridden: { $ne: true },
+        $or: [
+          {
+            type: 'toggle',
+            showUI: true,
+            deactivatedByAncestor: { $ne: true },
+          },
+          {
+            inactive: { $ne: true }
+          },
+        ],
+        $nor: [
+          { hideWhenTotalZero: true, total: 0 },
+          { hideWhenValueZero: true, value: 0 },
+        ],
       }, {
         sort: { order: 1 },
+      }).forEach(prop => {
+        if (this.$options.components[prop.type]) {
+          props.push(prop);
+        }
       });
+      return props;
     },
   },
 }
-</script>
\ No newline at end of file
+</script>
+
+<style>
+.folder-group-card .v-card {
+  box-shadow: none !important;
+  border-radius: 0 !important;
+}
+.folder-group-card .drag-handle {
+  display: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue b/app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
new file mode 100644
index 00000000..7bcb81da
--- /dev/null
+++ b/app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
@@ -0,0 +1,35 @@
+<template>
+  <div
+    v-if="model.actionType === 'event'"
+    class="d-flex justify-center"
+  >
+    <event-button
+      class="ma-1"
+      :model="model"
+    />
+  </div>
+  <action-card
+    v-else
+    :model="model"
+    @click="$emit('click')"
+    @sub-click="_id => $emit('sub-click', _id)"
+  />
+</template>
+
+<script lang="js">
+import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
+import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
+
+export default {
+  components: {
+    ActionCard,
+    EventButton,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+}
+</script>
\ No newline at end of file
diff --git a/app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue b/app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
new file mode 100644
index 00000000..30677f39
--- /dev/null
+++ b/app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="attribute">
+    <ability-list-tile
+      v-if="model.attributeType === 'ability'"
+      :model="model"
+      @click="$emit('click')"
+    />
+    <hit-dice-list-tile
+      v-else-if="model.attributeType === 'hitDice'"
+      :model="model"
+      @click="$emit('click')"
+      @change="({ type, value }) => damageProperty({type, value: -value})"
+    />
+    <health-bar
+      v-else-if="model.attributeType === 'healthBar'"
+      :model="model"
+      @change="damageProperty"
+      @click="$emit('click')"
+    />
+    <spell-slot-list-tile
+      v-else-if="model.attributeType === 'spellSlot'"
+      :model="model"
+      @click="$emit('click')"
+    />
+    <resource-card-content
+      v-else-if="model.attributeType === 'resource'"
+      :model="model"
+      @click="$emit('click')"
+      @change="({ type, value }) => damageProperty({type, value: -value})"
+      @mouseover="hover = true"
+      @mouseleave="hover = false"
+    />
+    <attribute-card-content
+      v-else-if="model.attributeType !== 'utility'"
+      class="pointer"
+      :model="model"
+      @click="$emit('click')"
+      @mouseover="hover = true"
+      @mouseleave="hover = false"
+    />
+    <card-highlight :active="hover" />
+  </div>
+</template>
+
+<script lang="js">
+import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
+import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.vue';
+import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
+import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
+import ResourceCardContent from '/imports/ui/properties/components/attributes/ResourceCardContent.vue';
+import AttributeCardContent from '/imports/ui/properties/components/attributes/AttributeCardContent.vue';
+import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+
+import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
+
+export default {
+  components: {
+    AbilityListTile,
+    HitDiceListTile,
+    HealthBar,
+    SpellSlotListTile,
+    ResourceCardContent,
+    AttributeCardContent,
+    CardHighlight,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+    hover: false,
+  }},
+  methods: {
+    damageProperty(change) {
+      damageProperty.call({
+        _id: this.model._id,
+        operation: change.type,
+        value: change.value
+      });
+    },
+  }
+}
+</script>
+
+<style lang="css" scoped>
+  .attribute {
+    position: relative;
+  }
+  .pointer {
+    cursor: pointer;
+  }
+</style>
\ No newline at end of file
diff --git a/app/imports/ui/properties/components/folders/propertyComponentIndex.js b/app/imports/ui/properties/components/folders/propertyComponentIndex.js
index 4b8ed64a..b61d0181 100644
--- a/app/imports/ui/properties/components/folders/propertyComponentIndex.js
+++ b/app/imports/ui/properties/components/folders/propertyComponentIndex.js
@@ -1,27 +1,27 @@
-import action from '/imports/ui/properties/components/actions/EventButton.vue';
+import action from '/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue';
 //import adjustment from '';
-import attribute from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
-//import buff from '';
+import attribute from './folderGroupComponents/AttributeGroupComponent.vue';
+import buff from '/imports/ui/properties/components/buffs/BuffListItem.vue';
 //import buffRemover from '';
 //import branch from '';
 //import constant from '';
-//import container from '';
+import container from '/imports/ui/properties/components/inventory/ContainerCard.vue';
 //import classComponent from '';
 //import classLevel from '';
 //import damage from '';
 //import damageMultiplier from '';
 //import effect from '';
-//import feature from '';
-//import folder from '';
-//import item from '';
-//import note from '';
+import feature from '/imports/ui/properties/components/features/FeatureCard.vue';
+// import folder from '';
+import item from '/imports/ui/properties/components/inventory/ItemListTile.vue';
+import note from '/imports/ui/properties/components/persona/NoteCard.vue';
 //import pointBuy from '';
 //import proficiency from '';
 //import propertySlot from '';
 //import reference from '';
 //import roll from '';
 //import savingThrow from '';
-//import skill from '';
+import skill from '/imports/ui/properties/components/skills/SkillListTile.vue';
 //import slotFiller from '';
 //import spellList from '';
 //import spell from '';
@@ -32,27 +32,27 @@ export default {
   action,
   //adjustment,
   attribute,
-  //buff,
+  buff,
   //buffRemover,
   //branch,
   //constant,
-  //container,
+  container,
   //class: classComponent,
   //classLevel,
   //damage,
   //damageMultiplier,
   //effect,
-  //feature,
+  feature,
   //folder,
-  //item,
-  //note,
+  item,
+  note,
   //pointBuy,
   //proficiency,
   //propertySlot,
   //reference,
   //roll,
   //savingThrow,
-  //skill,
+  skill,
   //slotFiller,
   //spellList,
   //spell,
diff --git a/app/imports/ui/properties/components/inventory/ItemListTile.vue b/app/imports/ui/properties/components/inventory/ItemListTile.vue
index 5dfa1b8e..72fb09c6 100644
--- a/app/imports/ui/properties/components/inventory/ItemListTile.vue
+++ b/app/imports/ui/properties/components/inventory/ItemListTile.vue
@@ -32,7 +32,7 @@
         @change="changeQuantity"
       />
     </v-list-item-action>
-    <v-list-item-action>
+    <v-list-item-action class="drag-handle">
       <v-icon
         :disabled="context.editPermission === false"
         style="height: 100%; width: 40px; cursor: move;"

From a437ff5aefc19640bc703f19ad51ee5ba27293e9 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 9 Nov 2022 15:02:41 +0200
Subject: [PATCH 18/46] Fixed log of recovering HD not having names

---
 app/imports/api/creature/creatures/methods/restCreature.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index b943a584..7ca7c16c 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -137,6 +137,7 @@ function resetHitDice(creatureId, actionContext) {
     inactive: { $ne: true },
   }, {
     fields: {
+      name: 1,
       hitDiceSize: 1,
       damage: 1,
       total: 1,

From c55d572134faeef25a1ead797820eb5b9060b4fa Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 16 Nov 2022 23:52:08 +0200
Subject: [PATCH 19/46] Bumped version

---
 app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/package.json b/app/package.json
index e4cc506b..ba3a017b 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dicecloud",
-  "version": "2.0.43",
+  "version": "2.0.44",
   "description": "Unofficial Online Realtime D&D 5e App",
   "license": "GPL-3.0",
   "repository": {

From 0f3a96da174b63bce330bfc6782f1577bfee3ad8 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 18 Nov 2022 14:21:22 +0200
Subject: [PATCH 20/46] Spell list ability modifier can take non-abilities
 defaults to .value if .modifier is undefined is now undefined for no
 .modifier or .value

---
 .../computeComputation/computeByType/computeSpellList.js  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js
index 63dc6003..499ddb97 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeSpellList.js
@@ -2,5 +2,9 @@ export default function computeSpelllist(computation, node) {
   const prop = node.data;
 
   const ability = computation.scope[prop.ability];
-  prop.abilityMod = ability?.modifier || 0;
-}
\ No newline at end of file
+  if (Number.isFinite(ability?.modifier)) {
+    prop.abilityMod = ability.modifier;
+  } else if (Number.isFinite(ability?.value)) {
+    prop.abilityMod = ability.value;
+  }
+}

From 060b5f93cab4e35a0798e85ea198c4051d0b6c47 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 17:19:07 +0200
Subject: [PATCH 21/46] Reduced bundle size and updates packages

---
 app/.meteor/packages                          |  24 +-
 app/.meteor/release                           |   2 +-
 app/.meteor/versions                          |  56 +-
 app/imports/api/files/s3FileStorage.js        |  34 +-
 app/imports/api/files/server/s3.js            |   2 +
 app/imports/api/sharing/sharingPermissions.js |  12 +-
 .../character/characterSheetTabs/StatsTab.vue |   1 +
 app/imports/ui/dialogStack/DialogStack.vue    |   2 -
 app/imports/ui/vuetify.js                     |   3 +-
 app/package-lock.json                         | 512 +++---------------
 app/package.json                              |  26 +-
 11 files changed, 166 insertions(+), 508 deletions(-)
 create mode 100644 app/imports/api/files/server/s3.js

diff --git a/app/.meteor/packages b/app/.meteor/packages
index dc62173e..ff36c66b 100644
--- a/app/.meteor/packages
+++ b/app/.meteor/packages
@@ -4,27 +4,27 @@
 # but you can also edit it by hand.
 
 accounts-password@2.3.1
-random@1.2.0
-underscore@1.0.10
+random@1.2.1
+underscore@1.0.11
 dburles:mongo-collection-instances
 accounts-google@1.4.0
-email@2.2.1
+email@2.2.2
 meteor-base@1.5.1
 mobile-experience@1.1.0
-mongo@1.16.0
-session@1.2.0
-tracker@1.2.0
+mongo@1.16.1
+session@1.2.1
+tracker@1.2.1
 logging@1.3.1
 reload@1.3.1
-ejson@1.1.2
-check@1.3.1
+ejson@1.1.3
+check@1.3.2
 standard-minifier-js@2.8.1
 shell-server@0.5.0
-ecmascript@0.16.2
+ecmascript@0.16.3
 es5-shim@4.8.0
-service-configuration@1.3.0
+service-configuration@1.3.1
 dynamic-import@0.7.2
-ddp-rate-limiter@1.1.0
+ddp-rate-limiter@1.1.1
 rate-limit@1.0.9
 mdg:validated-method
 static-html@1.3.2
@@ -37,7 +37,6 @@ simple:rest
 simple:rest-method-mixin
 mikowals:batch-insert
 peerlibrary:subscription-data
-seba:minifiers-autoprefixer
 zer0th:meteor-vuetify-loader
 akryum:vue-component
 akryum:vue-router2
@@ -49,3 +48,4 @@ simple:rest-json-error-handler
 littledata:synced-cron
 mdg:meteor-apm-agent
 typescript@4.5.4
+seba:minifiers-autoprefixer
diff --git a/app/.meteor/release b/app/.meteor/release
index 1d2a6d0f..42890181 100644
--- a/app/.meteor/release
+++ b/app/.meteor/release
@@ -1 +1 @@
-METEOR@2.8.0
+METEOR@2.8.1
diff --git a/app/.meteor/versions b/app/.meteor/versions
index b9f87f06..3f632f0b 100644
--- a/app/.meteor/versions
+++ b/app/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@2.2.4
+accounts-base@2.2.5
 accounts-google@1.4.0
 accounts-oauth@1.4.1
 accounts-password@2.3.1
@@ -22,26 +22,26 @@ bozhao:link-accounts@2.6.1
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
 callback-hook@1.4.0
-check@1.3.1
+check@1.3.2
 coffeescript@2.4.1
 coffeescript-compiler@2.4.1
 dburles:mongo-collection-instances@0.3.6
-ddp@1.4.0
-ddp-client@2.6.0
+ddp@1.4.1
+ddp-client@2.6.1
 ddp-common@1.4.0
-ddp-rate-limiter@1.1.0
+ddp-rate-limiter@1.1.1
 ddp-server@2.6.0
-diff-sequence@1.1.1
+diff-sequence@1.1.2
 dynamic-import@0.7.2
-ecmascript@0.16.2
+ecmascript@0.16.3
 ecmascript-runtime@0.8.0
 ecmascript-runtime-client@0.12.1
 ecmascript-runtime-server@0.11.0
-ejson@1.1.2
-email@2.2.1
+ejson@1.1.3
+email@2.2.2
 es5-shim@4.8.0
-fetch@0.1.1
-geojson-utils@1.0.10
+fetch@0.1.2
+geojson-utils@1.0.11
 google-oauth@1.4.2
 hot-code-push@1.0.4
 html-tools@1.1.3
@@ -57,7 +57,7 @@ localstorage@1.2.0
 logging@1.3.1
 mdg:meteor-apm-agent@3.5.1
 mdg:validated-method@1.2.0
-meteor@1.10.1
+meteor@1.10.2
 meteor-base@1.5.1
 meteortesting:browser-tests@1.3.5
 meteortesting:mocha@2.0.3
@@ -68,20 +68,20 @@ minifier-js@2.7.5
 minimongo@1.9.0
 mobile-experience@1.1.0
 mobile-status-bar@1.1.0
-modern-browsers@0.1.8
+modern-browsers@0.1.9
 modules@0.19.0
-modules-runtime@0.13.0
-mongo@1.16.0
+modules-runtime@0.13.1
+mongo@1.16.1
 mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
 mongo-livedata@1.0.12
-npm-mongo@4.9.0
+npm-mongo@4.11.0
 oauth@2.1.2
 oauth2@1.3.1
 ordered-dict@1.1.0
 ostrio:cookies@2.7.2
-ostrio:files@2.3.0
+ostrio:files@2.3.2
 patreon-oauth@0.1.0
 peerlibrary:assert@0.3.0
 peerlibrary:check-extension@0.7.0
@@ -93,20 +93,20 @@ peerlibrary:reactive-mongo@0.4.1
 peerlibrary:reactive-publish@0.10.0
 peerlibrary:server-autorun@0.8.0
 peerlibrary:subscription-data@0.8.0
-percolate:migrations@1.0.3
-promise@0.12.0
+percolate:migrations@1.1.0
+promise@0.12.1
 raix:eventemitter@1.0.0
-random@1.2.0
+random@1.2.1
 rate-limit@1.0.9
 react-fast-refresh@0.2.3
-reactive-dict@1.3.0
-reactive-var@1.0.11
+reactive-dict@1.3.1
+reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
 seba:minifiers-autoprefixer@2.0.1
-service-configuration@1.3.0
-session@1.2.0
+service-configuration@1.3.1
+session@1.2.1
 sha@1.0.9
 shell-server@0.5.0
 simple:json-routes@2.3.1
@@ -120,10 +120,10 @@ standard-minifier-js@2.8.1
 static-html@1.3.2
 templating-tools@1.2.2
 tmeasday:check-npm-versions@1.0.2
-tracker@1.2.0
+tracker@1.2.1
 typescript@4.5.4
-underscore@1.0.10
+underscore@1.0.11
 url@1.3.2
-webapp@1.13.1
-webapp-hashing@1.1.0
+webapp@1.13.2
+webapp-hashing@1.1.1
 zer0th:meteor-vuetify-loader@0.1.41
diff --git a/app/imports/api/files/s3FileStorage.js b/app/imports/api/files/s3FileStorage.js
index 3c3c540e..7103d044 100644
--- a/app/imports/api/files/s3FileStorage.js
+++ b/app/imports/api/files/s3FileStorage.js
@@ -4,7 +4,9 @@ import { each, clone } from 'lodash';
 import { Random } from 'meteor/random';
 import { FilesCollection } from 'meteor/ostrio:files';
 import stream from 'stream';
-import S3 from 'aws-sdk/clients/s3';
+if (Meteor.isServer) {
+  import S3 from '/imports/api/files/server/s3.js';
+}
 
 /* See fs-extra and graceful-fs NPM packages */
 /* For better i/o performance */
@@ -21,7 +23,7 @@ Meteor.settings.useS3 = !!(
   s3Conf && s3Conf.key && s3Conf.secret && s3Conf.bucket && s3Conf.endpoint
 );
 
-const bound  = Meteor.bindEnvironment((callback) => {
+const bound = Meteor.bindEnvironment((callback) => {
   return callback();
 });
 
@@ -43,14 +45,14 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     }
   });
 
-  createS3FilesCollection = function({
+  createS3FilesCollection = function ({
     collectionName,
     storagePath,
     onBeforeUpload,
     onAfterUpload,
     debug = !Meteor.isProduction,
     allowClientCode = false,
-  }){
+  }) {
     const collection = new FilesCollection({
       collectionName,
       storagePath,
@@ -58,7 +60,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
       onAfterUpload(fileRef) {
         // Call the provided afterUpload hook first
         onAfterUpload?.(fileRef);
-        
+
         // Start moving files to AWS:S3
         // after fully received by the Meteor server
 
@@ -128,19 +130,19 @@ if (Meteor.isServer && Meteor.settings.useS3) {
           };
 
           if (http.request.headers.range) {
-            const vRef  = fileRef.versions[version];
-            let range   = clone(http.request.headers.range);
+            const vRef = fileRef.versions[version];
+            let range = clone(http.request.headers.range);
             const array = range.split(/bytes=([0-9]*)-([0-9]*)/);
             const start = parseInt(array[1]);
-            let end     = parseInt(array[2]);
+            let end = parseInt(array[2]);
             if (isNaN(end)) {
               // Request data from AWS:S3 by small chunks
-              end       = (start + this.chunkSize) - 1;
+              end = (start + this.chunkSize) - 1;
               if (end >= vRef.size) {
-                end     = vRef.size - 1;
+                end = vRef.size - 1;
               }
             }
-            opts.Range   = `bytes=${start}-${end}`;
+            opts.Range = `bytes=${start}-${end}`;
             http.request.headers.range = `bytes=${start}-${end}`;
           }
 
@@ -198,9 +200,9 @@ if (Meteor.isServer && Meteor.settings.useS3) {
       _origRemove.call(this, search);
     };
 
-    collection.readJSONFile = async function(file){
+    collection.readJSONFile = async function (file) {
       // If there is the pipepath, use s3 to get the file
-      if (file?.versions?.original?.meta?.pipePath){
+      if (file?.versions?.original?.meta?.pipePath) {
         const path = file.versions.original.meta.pipePath;
         const data = await s3.getObject({
           Bucket: s3Conf.bucket,
@@ -217,14 +219,14 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     return collection;
   }
 } else {
-  createS3FilesCollection = function({
+  createS3FilesCollection = function ({
     collectionName,
     storagePath,
     onBeforeUpload,
     onAfterUpload,
     debug = !Meteor.isProduction,
     allowClientCode = false,
-  }){
+  }) {
     const collection = new FilesCollection({
       collectionName,
       storagePath,
@@ -236,7 +238,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
 
     if (Meteor.isServer) {
       // Use the normal file system to read files
-      collection.readJSONFile = async function(file){
+      collection.readJSONFile = async function (file) {
         const fileString = await fsp.readFile(file.path, 'utf8');
         return JSON.parse(fileString);
       };
diff --git a/app/imports/api/files/server/s3.js b/app/imports/api/files/server/s3.js
new file mode 100644
index 00000000..83719fa6
--- /dev/null
+++ b/app/imports/api/files/server/s3.js
@@ -0,0 +1,2 @@
+import S3 from 'aws-sdk/clients/s3';
+export default S3;
diff --git a/app/imports/api/sharing/sharingPermissions.js b/app/imports/api/sharing/sharingPermissions.js
index 5591c59c..c01675f4 100644
--- a/app/imports/api/sharing/sharingPermissions.js
+++ b/app/imports/api/sharing/sharingPermissions.js
@@ -1,4 +1,4 @@
-import { _ } from 'meteor/underscore';
+import { includes } from 'lodash';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 
 function assertIdValid(userId) {
@@ -50,7 +50,7 @@ export function assertEditPermission(doc, userId) {
   // Ensure the user is authorized for this specific document
   if (
     doc.owner === userId ||
-    _.contains(doc.writers, userId)
+    includes(doc.writers, userId)
   ) {
     return true;
   } else {
@@ -82,11 +82,11 @@ export function assertCopyPermission(doc, userId) {
   // Ensure the user is authorized for this specific document
   if (
     doc.owner === userId ||
-    _.contains(doc.writers, userId)
+    includes(doc.writers, userId)
   ) {
     return true;
   } else if (
-    (_.contains(doc.readers, userId) || doc.public) &&
+    (includes(doc.readers, userId) || doc.public) &&
     doc.readersCanCopy
   ) {
     return true;
@@ -134,8 +134,8 @@ export function assertViewPermission(doc, userId) {
 
   if (
     doc.owner === userId ||
-    _.contains(doc.readers, userId) ||
-    _.contains(doc.writers, userId)
+    includes(doc.readers, userId) ||
+    includes(doc.writers, userId)
   ) {
     return true;
   } else {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
index 78847e45..ac9b3711 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -1,5 +1,6 @@
 <template lang="html">
   <div class="stats-tab ma-2">
+    HMR TEST 2
     <div
       v-if="healthBars.length"
       class="px-2 pt-2"
diff --git a/app/imports/ui/dialogStack/DialogStack.vue b/app/imports/ui/dialogStack/DialogStack.vue
index 9a28588f..94e398a0 100644
--- a/app/imports/ui/dialogStack/DialogStack.vue
+++ b/app/imports/ui/dialogStack/DialogStack.vue
@@ -45,14 +45,12 @@
   import '/imports/ui/dialogStack/dialogStackWindowEvents.js';
   import mockElement from '/imports/ui/dialogStack/mockElement.js';
   import DialogComponentIndex from '/imports/ui/dialogStack/DialogComponentIndex.js';
-  import { VLayout } from 'vuetify/lib'
 
   const OFFSET = 16;
   const MOCK_DURATION = 400; // Keep in sync with css transition of .dialog
 
   export default {
     components: {
-      VLayout,
       ...DialogComponentIndex,
     },
     data(){return {
diff --git a/app/imports/ui/vuetify.js b/app/imports/ui/vuetify.js
index 12d363f0..34acac19 100644
--- a/app/imports/ui/vuetify.js
+++ b/app/imports/ui/vuetify.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
-import Vuetify from 'vuetify/lib';
+//import Vuetify from 'vuetify/lib';
+import Vuetify from 'vuetify/lib/framework';
 import { Scroll, Ripple } from 'vuetify/lib/directives';
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
 import SvgIconByName from '/imports/ui/icons/SvgIconByName.vue';
diff --git a/app/package-lock.json b/app/package-lock.json
index 6e4b3ba5..e158d2fc 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -50,9 +50,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz",
-      "integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA==",
+      "version": "7.20.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz",
+      "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==",
       "dev": true
     },
     "@babel/runtime": {
@@ -185,14 +185,14 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.0.tgz",
-      "integrity": "sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.43.0.tgz",
+      "integrity": "sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.42.0",
-        "@typescript-eslint/type-utils": "5.42.0",
-        "@typescript-eslint/utils": "5.42.0",
+        "@typescript-eslint/scope-manager": "5.43.0",
+        "@typescript-eslint/type-utils": "5.43.0",
+        "@typescript-eslint/utils": "5.43.0",
         "debug": "^4.3.4",
         "ignore": "^5.2.0",
         "natural-compare-lite": "^1.4.0",
@@ -222,14 +222,14 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.42.0.tgz",
-      "integrity": "sha512-Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.43.0.tgz",
+      "integrity": "sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "5.42.0",
-        "@typescript-eslint/types": "5.42.0",
-        "@typescript-eslint/typescript-estree": "5.42.0",
+        "@typescript-eslint/scope-manager": "5.43.0",
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/typescript-estree": "5.43.0",
         "debug": "^4.3.4"
       },
       "dependencies": {
@@ -245,23 +245,23 @@
       }
     },
     "@typescript-eslint/scope-manager": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.42.0.tgz",
-      "integrity": "sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz",
+      "integrity": "sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.42.0",
-        "@typescript-eslint/visitor-keys": "5.42.0"
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/visitor-keys": "5.43.0"
       }
     },
     "@typescript-eslint/type-utils": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.42.0.tgz",
-      "integrity": "sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.43.0.tgz",
+      "integrity": "sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/typescript-estree": "5.42.0",
-        "@typescript-eslint/utils": "5.42.0",
+        "@typescript-eslint/typescript-estree": "5.43.0",
+        "@typescript-eslint/utils": "5.43.0",
         "debug": "^4.3.4",
         "tsutils": "^3.21.0"
       },
@@ -278,19 +278,19 @@
       }
     },
     "@typescript-eslint/types": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.42.0.tgz",
-      "integrity": "sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.43.0.tgz",
+      "integrity": "sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.0.tgz",
-      "integrity": "sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz",
+      "integrity": "sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.42.0",
-        "@typescript-eslint/visitor-keys": "5.42.0",
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/visitor-keys": "5.43.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -319,16 +319,16 @@
       }
     },
     "@typescript-eslint/utils": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.42.0.tgz",
-      "integrity": "sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.43.0.tgz",
+      "integrity": "sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.9",
         "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.42.0",
-        "@typescript-eslint/types": "5.42.0",
-        "@typescript-eslint/typescript-estree": "5.42.0",
+        "@typescript-eslint/scope-manager": "5.43.0",
+        "@typescript-eslint/types": "5.43.0",
+        "@typescript-eslint/typescript-estree": "5.43.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^3.0.0",
         "semver": "^7.3.7"
@@ -355,12 +355,12 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "5.42.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.0.tgz",
-      "integrity": "sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg==",
+      "version": "5.43.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz",
+      "integrity": "sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "5.42.0",
+        "@typescript-eslint/types": "5.43.0",
         "eslint-visitor-keys": "^3.3.0"
       },
       "dependencies": {
@@ -373,31 +373,31 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.41.tgz",
-      "integrity": "sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==",
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
+      "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.41",
+        "@vue/shared": "3.2.45",
         "estree-walker": "^2.0.2",
         "source-map": "^0.6.1"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz",
-      "integrity": "sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==",
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
+      "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
       "dev": true,
       "requires": {
-        "@vue/compiler-core": "3.2.41",
-        "@vue/shared": "3.2.41"
+        "@vue/compiler-core": "3.2.45",
+        "@vue/shared": "3.2.45"
       }
     },
     "@vue/shared": {
-      "version": "3.2.41",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.41.tgz",
-      "integrity": "sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==",
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
+      "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==",
       "dev": true
     },
     "abbrev": {
@@ -445,11 +445,6 @@
         "uri-js": "^4.2.2"
       }
     },
-    "animejs": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/animejs/-/animejs-2.2.0.tgz",
-      "integrity": "sha1-Ne79/FNbgZScnLBvCz5gwC5v3IA="
-    },
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -470,16 +465,6 @@
         "color-convert": "^1.9.0"
       }
     },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dev": true,
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
     "aproba": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
@@ -545,9 +530,9 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
     },
     "aws-sdk": {
-      "version": "2.1247.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1247.0.tgz",
-      "integrity": "sha512-hBiVzkm5pxGchl+dn+uIApk76n3UOGuDmQBr1H2J25Ls8F7M9sNiumJby/cSjis+U+gAhl7u414SMY+ZTAJAkQ==",
+      "version": "2.1258.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1258.0.tgz",
+      "integrity": "sha512-siqNFXlhJZVN1BizPZebJViFXtTUPgcA+yLfHKl2eC4Ied7kE7spOjZmAzpuiGUTzFagk1oWCaJ1Hit4llIoGg==",
       "requires": {
         "buffer": "4.9.2",
         "events": "1.1.1",
@@ -628,12 +613,6 @@
         }
       }
     },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "dev": true
-    },
     "bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -703,25 +682,20 @@
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz",
+      "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==",
       "dev": true,
       "requires": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
+        "deep-eql": "^4.1.2",
         "get-func-name": "^2.0.0",
         "loupe": "^2.3.1",
         "pathval": "^1.1.1",
@@ -785,22 +759,6 @@
       "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
       "dev": true
     },
-    "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "dev": true,
-      "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      }
-    },
     "chownr": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
@@ -811,16 +769,6 @@
       "resolved": "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz",
       "integrity": "sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="
     },
-    "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
     "clone": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
@@ -894,12 +842,12 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
     },
     "core-js": {
       "version": "2.6.12",
@@ -956,11 +904,6 @@
         "ms": "2.1.2"
       }
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
-    },
     "decompress-response": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
@@ -970,9 +913,9 @@
       }
     },
     "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.2.tgz",
+      "integrity": "sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w==",
       "dev": true,
       "requires": {
         "type-detect": "^4.0.0"
@@ -997,18 +940,13 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
     },
     "detect-libc": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz",
       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="
     },
-    "dijkstrajs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.2.tgz",
-      "integrity": "sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="
-    },
     "dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -1048,9 +986,9 @@
       }
     },
     "dompurify": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.0.tgz",
-      "integrity": "sha512-Be9tbQMZds4a3C6xTmz68NlMfeONA//4dOavl/1rNw50E+/QO0KVpbcU0PcaW0nsQxurXls9ZocqFxk8R2mWEA=="
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz",
+      "integrity": "sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA=="
     },
     "ecc-jsbn": {
       "version": "0.1.2",
@@ -1066,11 +1004,6 @@
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
-    "encode-utf8": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
-      "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
-    },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -1392,15 +1325,6 @@
         "to-regex-range": "^5.0.1"
       }
     },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
     "flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -1458,13 +1382,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -1492,11 +1409,6 @@
         "wide-align": "^1.1.2"
       }
     },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
@@ -1636,7 +1548,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
     },
     "http-signature": {
       "version": "1.2.0",
@@ -1672,12 +1584,6 @@
       "resolved": "https://registry.npmjs.org/ignore-styles/-/ignore-styles-5.0.1.tgz",
       "integrity": "sha1-tJ7yJ0va/NikiAqWa/440aC/RnE="
     },
-    "immutable": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
-      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
-      "dev": true
-    },
     "import-fresh": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -1727,15 +1633,6 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
     "is-callable": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -1866,25 +1763,6 @@
         "verror": "1.10.0"
       }
     },
-    "less": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/less/-/less-1.4.2.tgz",
-      "integrity": "sha1-t97v6Yo6h77jZEEbPfLR7+WkEtA=",
-      "requires": {
-        "mime": "1.2.x",
-        "mkdirp": "~0.3.4",
-        "request": ">=2.12.0",
-        "ycssmin": ">=1.0.1"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
-          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
-          "optional": true
-        }
-      }
-    },
     "levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1895,14 +1773,6 @@
         "type-check": "~0.4.0"
       }
     },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -1948,9 +1818,9 @@
       "dev": true
     },
     "loupe": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz",
-      "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
       "dev": true,
       "requires": {
         "get-func-name": "^2.0.0"
@@ -1979,29 +1849,10 @@
         }
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "marked": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.1.tgz",
-      "integrity": "sha512-VK1/jNtwqDLvPktNpL0Fdg3qoeUZhmRsuiIjPEy/lHwXW4ouLoZfO4XoWd4ClDt+hupV1VLpkZhEovjU0W/kqA=="
-    },
-    "mem": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-6.1.1.tgz",
-      "integrity": "sha512-Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^3.0.0"
-      }
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.2.tgz",
+      "integrity": "sha512-JjBTFTAvuTgANXx82a5vzK9JLSMoV6V3LBVn4Uhdso6t7vXrGx7g1Cd2r6NYSsxrYbQGFCMqBDhFHyK5q2UvcQ=="
     },
     "merge2": {
       "version": "1.4.1",
@@ -2804,12 +2655,6 @@
         "picomatch": "^2.3.1"
       }
     },
-    "mime": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-      "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
-      "optional": true
-    },
     "mime-db": {
       "version": "1.46.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz",
@@ -2823,12 +2668,6 @@
         "mime-db": "1.46.0"
       }
     },
-    "mimic-fn": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
-      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
-      "dev": true
-    },
     "mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -2969,12 +2808,6 @@
         "abbrev": "1"
       }
     },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
-    },
     "npmlog": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
@@ -2994,7 +2827,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
     },
     "once": {
       "version": "1.4.0",
@@ -3018,33 +2851,6 @@
         "word-wrap": "^1.2.3"
       }
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -3054,11 +2860,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -3093,11 +2894,6 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
-    "pngjs": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
-      "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
-    },
     "prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -3158,17 +2954,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "qrcode": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.1.tgz",
-      "integrity": "sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==",
-      "requires": {
-        "dijkstrajs": "^1.0.1",
-        "encode-utf8": "^1.0.3",
-        "pngjs": "^5.0.0",
-        "yargs": "^15.3.1"
-      }
-    },
     "qrcode.vue": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-1.7.0.tgz",
@@ -3218,7 +3003,7 @@
         "strip-json-comments": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
         }
       }
     },
@@ -3232,15 +3017,6 @@
         "util-deprecate": "^1.0.1"
       }
     },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
     "regenerator-runtime": {
       "version": "0.13.10",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
@@ -3279,22 +3055,12 @@
         "uuid": "^3.3.2"
       }
     },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-    },
     "requireindex": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
@@ -3345,17 +3111,6 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
-    "sass": {
-      "version": "1.56.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.56.0.tgz",
-      "integrity": "sha512-WFJ9XrpkcnqZcYuLRJh5qiV6ibQOR4AezleeEjTjMsCocYW59dEG19U3fwTTXxzi2Ed3yjPBp727hbbj53pHFw==",
-      "dev": true,
-      "requires": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
-        "source-map-js": ">=0.6.2 <2.0.0"
-      }
-    },
     "sax": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
@@ -3372,7 +3127,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
     "setimmediate": {
       "version": "1.0.5",
@@ -3452,7 +3207,7 @@
     "simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
       "requires": {
         "is-arrayish": "^0.3.1"
       }
@@ -3516,12 +3271,6 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
-    "source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "dev": true
-    },
     "source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -3604,14 +3353,6 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
-    "styles": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/styles/-/styles-0.2.1.tgz",
-      "integrity": "sha1-hJJ7pEf6pvJJ7NIK3wu4X606UUE=",
-      "requires": {
-        "less": "~1.4.0"
-      }
-    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -3808,16 +3549,11 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "4.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz",
+      "integrity": "sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==",
       "dev": true
     },
-    "underscore": {
-      "version": "1.13.6",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
-      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
-    },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -3857,7 +3593,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "uuid": {
       "version": "3.4.0",
@@ -3989,11 +3725,6 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
-    },
     "which-typed-array": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz",
@@ -4021,39 +3752,6 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
-    "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        }
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -4078,48 +3776,10 @@
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
       "integrity": "sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="
     },
-    "y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
-    },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      }
-    },
-    "yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "ycssmin": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ycssmin/-/ycssmin-1.0.1.tgz",
-      "integrity": "sha1-fN3o23jPqwDSkBw7IwHjBPr03xY=",
-      "optional": true
     }
   }
 }
diff --git a/app/package.json b/app/package.json
index e4cc506b..c41c8601 100644
--- a/app/package.json
+++ b/app/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "run": "meteor",
     "debug": "meteor --inspect",
+    "bundle-viz": "meteor --extra-packages bundle-visualizer --production",
     "test": "meteor test --driver-package meteortesting:mocha --port 3001",
     "build": "meteor build ../build --architecture os.linux.x86_64"
   },
@@ -22,20 +23,18 @@
     "@babel/runtime": "^7.20.1",
     "@chenfengyuan/vue-countdown": "^1.1.5",
     "@tozd/vue-observer-utils": "^0.5.0",
-    "animejs": "^2.2.0",
-    "aws-sdk": "^2.1247.0",
+    "aws-sdk": "^2.1258.0",
     "bcrypt": "^5.1.0",
     "chroma-js": "^2.4.2",
-    "core-js": "^2.6.11",
     "css-box-shadow": "^1.0.0-3",
     "date-fns": "^1.30.1",
     "ddp-rate-limiter-mixin": "^1.1.10",
     "discord.js": "^12.5.3",
-    "dompurify": "^2.4.0",
+    "dompurify": "^2.4.1",
     "ignore": "^5.2.0",
     "ignore-styles": "^5.0.1",
     "lodash": "^4.17.20",
-    "marked": "^4.2.1",
+    "marked": "^4.2.2",
     "meteor-node-stubs": "^1.2.5",
     "minify-css-string": "^1.0.0",
     "moo": "^0.5.2",
@@ -43,15 +42,12 @@
     "ngraph.graph": "^19.1.0",
     "ngraph.path": "^1.4.0",
     "pretty-bytes": "^6.0.0",
-    "qrcode": "^1.5.1",
     "qrcode.vue": "^1.7.0",
     "request": "^2.88.2",
     "sharp": "^0.30.7",
     "simpl-schema": "^1.13.1",
     "source-map-support": "^0.5.21",
     "speakingurl": "^14.0.1",
-    "styles": "^0.2.1",
-    "underscore": "^1.13.6",
     "vue": "2.6.10",
     "vue-meteor-tracker": "^2.0.0",
     "vue-reactive-provide": "^0.3.0",
@@ -62,16 +58,14 @@
     "vuex": "^3.1.3"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.42.0",
-    "@typescript-eslint/parser": "^5.42.0",
-    "@vue/compiler-dom": "^3.2.41",
-    "chai": "^4.3.6",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
+    "@vue/compiler-dom": "^3.2.45",
+    "chai": "^4.3.7",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^7.20.0",
     "eslint-plugin-vuetify": "^1.1.0",
-    "mem": "^6.1.1",
-    "sass": "^1.56.0",
-    "typescript": "^4.8.4"
+    "typescript": "^4.9.3"
   },
   "eslintConfig": {
     "extends": [
@@ -124,4 +118,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}

From e3644eb9e83f238622642ecbb46a52e294506217 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 17:51:50 +0200
Subject: [PATCH 22/46] Moved UI to client folder to fix HMR

---
 app/client/main.js                            |   4 +-
 .../methods/duplicateProperty.js              |   2 +-
 .../applyPropertyByType/applyAction.js        |   2 +-
 .../applyPropertyByType/applySavingThrow.js   |  26 ++--
 app/imports/api/engine/actions/doCheck.js     |   2 +-
 .../api/library/methods/copyLibraryNodeTo.js  |   2 +-
 .../library/methods/duplicateLibraryNode.js   |   2 +-
 .../utility/numberToSignedString.js           |   0
 .../ui/components/CardHighlight.vue           |   0
 .../{ => client}/ui/components/CoinValue.vue  |   2 +-
 .../ui/components/ColorPicker.vue             |   4 +-
 .../ui/components/ColumnLayout.vue            |   0
 .../ui/components/HorizontalHex.vue           |   0
 .../ui/components/ImageUploadInput.vue        |   0
 .../ui/components/IncrementButton.vue         |   2 +-
 .../ui/components/IncrementMenu.vue           |   0
 .../{ => client}/ui/components/LabeledFab.vue |   0
 .../ui/components/MarkdownText.vue            |   0
 .../ui/components/ResetSelector.vue           |   2 +-
 .../{ => client}/ui/components/RollPopup.vue  |   2 +-
 .../{ => client}/ui/components/SharedIcon.vue |   0
 .../ui/components/ToolbarCard.vue             |   6 +-
 .../ui/components/TreeDetailLayout.vue        |   0
 .../ui/components/VerticalHex.vue             |   0
 .../ui/components/global/DatePicker.vue       |   2 +-
 .../ui/components/global/IconPicker.vue       |   4 +-
 .../ui/components/global/SmartBtn.vue         |   2 +-
 .../ui/components/global/SmartCheckbox.vue    |   2 +-
 .../ui/components/global/SmartCombobox.vue    |   2 +-
 .../ui/components/global/SmartInputMixin.js   |   0
 .../ui/components/global/SmartSelect.vue      |   2 +-
 .../ui/components/global/SmartSlider.vue      |   2 +-
 .../ui/components/global/SmartSwitch.vue      |   2 +-
 .../ui/components/global/SvgIcon.vue          |   0
 .../ui/components/global/TextArea.vue         |   2 +-
 .../ui/components/global/TextField.vue        |   2 +-
 .../ui/components/global/globalIndex.js       |  25 ++++
 .../ui/components/propertyToolbar.vue         |   8 +-
 .../ui/components/rolls/Check.vue             |   2 +-
 .../ui/components/snackbars/SnackbarQueue.js  |   0
 .../ui/components/snackbars/SnackbarQueue.vue |   4 +-
 .../ui/components/tree/TreeNode.vue           |   2 +-
 .../ui/components/tree/TreeNodeList.vue       |   2 +-
 .../ui/components/tree/TreeSearchInput.vue    |   0
 .../{ => client}/ui/creature/CreatureForm.vue |   4 +-
 .../ui/creature/CreatureFormDialog.vue        |   6 +-
 .../{ => client}/ui/creature/RestButton.vue   |   0
 .../ui/creature/archive/ArchiveDialog.vue     |   6 +-
 .../ui/creature/buildTree/BuildTreeNode.vue   |   8 +-
 .../creature/buildTree/BuildTreeNodeList.vue  |   2 +-
 .../ui/creature/buildTree/FillSlotButton.vue  |   0
 .../character/CharacterCreationDialog.vue     |   6 +-
 .../character/CharacterDeleteDialog.vue       |   4 +-
 .../ui/creature/character/CharacterSheet.vue  |  16 +-
 .../creature/character/CharacterSheetFab.vue  |   2 +-
 .../character/CharacterSheetRightDrawer.vue   |   2 +-
 .../character/CharacterSheetToolbar.vue       |   8 +-
 .../creature/character/CreatureRootDialog.vue |  10 +-
 .../ui/creature/character/CreatureSummary.vue |   2 +-
 .../creature/character/MiniCharacterSheet.vue |   0
 .../character/characterSheetTabs/BuildTab.vue |  12 +-
 .../characterSheetTabs/FeaturesTab.vue        |   4 +-
 .../characterSheetTabs/InventoryTab.vue       |  12 +-
 .../characterSheetTabs/JournalTab.vue         |   6 +-
 .../characterSheetTabs/SpellsTab.vue          |   6 +-
 .../character/characterSheetTabs/StatsTab.vue |  34 ++---
 .../character/characterSheetTabs/TreeTab.vue  |   8 +-
 .../character/errors/CharacterErrors.vue      |   2 +-
 .../character/errors/DependencyLoopError.vue  |   2 +-
 .../CharacterSheetPrinted.vue                 |   6 +-
 .../PrintedInventory.vue                      |   8 +-
 .../printedCharacterSheet/PrintedSpells.vue   |   6 +-
 .../printedCharacterSheet/PrintedStats.vue    |  12 +-
 .../components/PrintedAction.vue              |  12 +-
 .../components/PrintedContainer.vue           |   6 +-
 .../components/PrintedDamageMultipliers.vue   |   0
 .../components/PrintedItem.vue                |   6 +-
 .../components/PrintedSkill.vue               |   4 +-
 .../components/PrintedSpell.vue               |   2 +-
 .../components/PrintedSpellList.vue           |   2 +-
 .../creature/creatureList/ArchiveButton.vue   |   0
 .../CharacterListToolbarItems.vue             |   4 +-
 .../creatureList/CreatureFolderHeader.vue     |   2 +-
 .../creatureList/CreatureFolderList.vue       |   4 +-
 .../ui/creature/creatureList/CreatureList.vue |   4 +-
 .../creatureList/CreatureListTile.vue         |   2 +-
 .../creatureList/CreatureStorageStats.vue     |   0
 .../AddCreaturePropertyDialog.vue             |  16 +-
 .../creatureProperties/Breadcrumbs.vue        |   2 +-
 .../CreaturePropertiesTree.vue                |   2 +-
 .../CreaturePropertyCreationDialog.vue        |   4 +-
 .../CreaturePropertyDialog.vue                |  20 +--
 .../CreaturePropertyFromLibraryDialog.vue     |   4 +-
 .../CreaturePropertyInsertForm.vue            |   8 +-
 .../creature/experiences/ExperienceForm.vue   |   2 +-
 .../experiences/ExperienceInsertDialog.vue    |   6 +-
 .../experiences/ExperienceListDialog.vue      |   2 +-
 .../ui/creature/slots/LevelUpDialog.vue       |  10 +-
 .../ui/creature/slots/SlotCard.vue            |   4 +-
 .../ui/creature/slots/SlotCardsToFill.vue     |   8 +-
 .../ui/creature/slots/SlotFillDialog.vue      |  10 +-
 .../dialogStack/DeleteConfirmationDialog.vue  |   2 +-
 .../ui/dialogStack/DialogBase.vue             |   4 +-
 .../ui/dialogStack/DialogComponentIndex.js    |  66 ++++++++
 .../ui/dialogStack/DialogStack.vue            |   6 +-
 .../ui/dialogStack/HelpDialog.vue             |   4 +-
 .../ui/dialogStack/dialogStackStore.js        |  41 ++---
 .../ui/dialogStack/dialogStackWindowEvents.js |   8 +-
 .../ui/dialogStack/mockElement.js             |   0
 .../{ => client}/ui/files/ArchiveFileCard.vue |   2 +-
 .../ui/files/FileStorageStats.vue             |   2 +-
 .../{ => client}/ui/files/UserImageCard.vue   |   0
 .../{ => client}/ui/icons/IconAdmin.vue       |   4 +-
 .../{ => client}/ui/icons/SvgIconByName.vue   |   2 +-
 .../{ => client}/ui/icons/importIcons.js      |   0
 .../{ => client}/ui/layouts/AppLayout.vue     |   6 +-
 app/imports/client/ui/layouts/Sidebar.vue     | 140 +++++++++++++++++
 .../ui/layouts/SingleCardLayout.vue           |   0
 .../ui/library/InsertLibraryNodeButton.vue    |   0
 .../ui/library/LibraryAndNode.vue             |  16 +-
 .../ui/library/LibraryBrowser.vue             |   4 +-
 .../LibraryCollectionCreationDialog.vue       |   2 +-
 .../library/LibraryCollectionEditDialog.vue   |   4 +-
 .../ui/library/LibraryCollectionHeader.vue    |   2 +-
 .../ui/library/LibraryCollectionToolbar.vue   |   0
 .../ui/library/LibraryContentsContainer.vue   |   2 +-
 .../ui/library/LibraryCreationDialog.vue      |   2 +-
 .../ui/library/LibraryEditDialog.vue          |   6 +-
 .../{ => client}/ui/library/LibraryList.vue   |   6 +-
 .../ui/library/LibraryListTile.vue            |   2 +-
 .../ui/library/LibraryNodeCreationDialog.vue  |   4 +-
 .../ui/library/LibraryNodeDialog.vue          |  14 +-
 .../library/LibraryNodeExpansionContent.vue   |   4 +-
 .../ui/library/LibraryNodeInsertForm.vue      |   8 +-
 .../ui/library/MoveLibraryNodeDialog.vue      |   4 +-
 .../ui/library/SelectLibraryNodeDialog.vue    |   4 +-
 .../ui/library/SingleLibraryToolbar.vue       |   0
 .../{ => client}/ui/log/CharacterLog.vue      |   2 +-
 .../{ => client}/ui/log/LogContent.vue        |   2 +-
 app/imports/{ => client}/ui/log/LogEntry.vue  |   2 +-
 app/imports/{ => client}/ui/markdownCofig.js  |   0
 app/imports/{ => client}/ui/pages/About.vue   |   0
 app/imports/{ => client}/ui/pages/Account.vue |   6 +-
 app/imports/{ => client}/ui/pages/Admin.vue   |   0
 .../{ => client}/ui/pages/CharacterList.vue   |  61 ++++----
 .../ui/pages/CharacterSheetPage.vue           |   2 +-
 .../{ => client}/ui/pages/Documentation.vue   |   2 +-
 .../ui/pages/EmailVerificationError.vue       |   0
 .../ui/pages/EmailVerificationSuccess.vue     |   0
 .../{ => client}/ui/pages/Feedback.vue        |   0
 app/imports/{ => client}/ui/pages/Files.vue   |  10 +-
 app/imports/{ => client}/ui/pages/Friends.vue |   0
 .../ui/pages/FunctionReference.vue            |   0
 app/imports/{ => client}/ui/pages/Home.vue    |   0
 .../{ => client}/ui/pages/InviteError.vue     |   0
 .../{ => client}/ui/pages/InviteSuccess.vue   |   0
 .../{ => client}/ui/pages/LaunchCountdown.vue |   0
 app/imports/{ => client}/ui/pages/Library.vue |   4 +-
 .../ui/pages/LibraryCollection.vue            |   2 +-
 .../{ => client}/ui/pages/Maintenance.vue     |   0
 .../{ => client}/ui/pages/NotFound.vue        |   0
 .../{ => client}/ui/pages/NotImplemented.vue  |   0
 .../ui/pages/PatreonLevelTooLow.vue           |   0
 .../{ => client}/ui/pages/Register.vue        |   0
 .../{ => client}/ui/pages/ResetPassword.vue   |   0
 app/imports/{ => client}/ui/pages/SignIn.vue  |   0
 .../{ => client}/ui/pages/SingleLibrary.vue   |   4 +-
 .../{ => client}/ui/pages/Tabletop.vue        |   2 +-
 .../{ => client}/ui/pages/Tabletops.vue       |   4 +-
 .../components/actions/ActionCard.vue         |  18 +--
 .../actions/AttributeConsumedView.vue         |   0
 .../components/actions/EventButton.vue        |   4 +-
 .../components/actions/ItemConsumedView.vue   |   2 +-
 .../actions/SelectItemToConsume.vue           |   2 +-
 .../components/attributes/AbilityListTile.vue |   6 +-
 .../components/attributes/AttributeCard.vue   |   4 +-
 .../attributes/AttributeCardContent.vue       |   6 +-
 .../components/attributes/AttributeEffect.vue |   4 +-
 .../components/attributes/HealthBar.vue       |   4 +-
 .../components/attributes/HealthBarCard.vue   |   2 +-
 .../attributes/HealthBarCardContainer.vue     |   2 +-
 .../components/attributes/HitDiceListTile.vue |   2 +-
 .../components/attributes/ResourceCard.vue    |   4 +-
 .../attributes/ResourceCardContent.vue        |   0
 .../attributes/SpellSlotListTile.vue          |   2 +-
 .../components/attributes/SplitListLayout.vue |   0
 .../components/buffs/BuffListItem.vue         |   0
 .../DamageMultiplierCard.vue                  |   0
 .../components/effects/InlineEffect.vue       |   2 +-
 .../components/features/FeatureCard.vue       |   4 +-
 .../components/folders/FolderGroupCard.vue    |   2 +-
 .../ActionGroupComponent.vue                  |   4 +-
 .../AttributeGroupComponent.vue               |  14 +-
 .../folders/propertyComponentIndex.js         |  16 +-
 .../components/inventory/ContainerCard.vue    |   6 +-
 .../components/inventory/ItemList.vue         |   2 +-
 .../components/inventory/ItemListTile.vue     |   6 +-
 .../components/persona/NoteCard.vue           |   6 +-
 .../components/pointBuy/PointBuyCard.vue      |   2 +-
 .../components/skills/SkillListTile.vue       |   8 +-
 .../components/skills/SkillProficiency.vue    |   6 +-
 .../spells/CastSpellWithSlotDialog.vue        |  12 +-
 .../components/spells/SpellList.vue           |   4 +-
 .../components/spells/SpellListCard.vue       |   4 +-
 .../components/spells/SpellListTile.vue       |   2 +-
 .../components/spells/spellsWithSubheaders.js |   0
 .../components/toggles/ToggleCard.vue         |   2 +-
 .../ui/properties/forms/ActionForm.vue        |   8 +-
 .../ui/properties/forms/AdjustmentForm.vue    |   4 +-
 .../forms/AttributeConsumedForm.vue           |   4 +-
 .../ui/properties/forms/AttributeForm.vue     |  10 +-
 .../forms/AttributesConsumedListForm.vue      |   4 +-
 .../ui/properties/forms/BranchForm.vue        |   2 +-
 .../ui/properties/forms/BuffForm.vue          |   2 +-
 .../ui/properties/forms/BuffRemoverForm.vue   |   2 +-
 .../ui/properties/forms/ClassForm.vue         |   4 +-
 .../ui/properties/forms/ClassLevelForm.vue    |   2 +-
 .../ui/properties/forms/ConstantForm.vue      |   4 +-
 .../ui/properties/forms/ContainerForm.vue     |   4 +-
 .../ui/properties/forms/DamageForm.vue        |   2 +-
 .../properties/forms/DamageMultiplierForm.vue |   4 +-
 .../ui/properties/forms/EffectForm.vue        |   8 +-
 .../ui/properties/forms/FeatureForm.vue       |   2 +-
 .../ui/properties/forms/FolderForm.vue        |   4 +-
 .../ui/properties/forms/ItemConsumedForm.vue  |   2 +-
 .../ui/properties/forms/ItemForm.vue          |   4 +-
 .../forms/ItemsConsumedListForm.vue           |   4 +-
 .../ui/properties/forms/NoteForm.vue          |   2 +-
 .../ui/properties/forms/PointBuyForm.vue      |   8 +-
 .../ui/properties/forms/PointBuySpendForm.vue |   4 +-
 .../ui/properties/forms/ProficiencyForm.vue   |   6 +-
 .../ui/properties/forms/ReferenceForm.vue     |   6 +-
 .../ui/properties/forms/ResourcesForm.vue     |   6 +-
 .../ui/properties/forms/RollForm.vue          |   4 +-
 .../ui/properties/forms/SavingThrowForm.vue   |   4 +-
 .../ui/properties/forms/SkillForm.vue         |   8 +-
 .../ui/properties/forms/SlotFillerForm.vue    |   2 +-
 .../ui/properties/forms/SlotForm.vue          |   4 +-
 .../ui/properties/forms/SpellForm.vue         |  10 +-
 .../ui/properties/forms/SpellListForm.vue     |   4 +-
 .../ui/properties/forms/ToggleForm.vue        |   2 +-
 .../ui/properties/forms/TriggerForm.vue       |   4 +-
 .../forms/shared/CalculationErrorList.vue     |   0
 .../properties/forms/shared/ComputedField.vue |   2 +-
 .../properties/forms/shared/FormSection.vue   |   2 +-
 .../properties/forms/shared/FormSections.vue  |   0
 .../properties/forms/shared/IconColorMenu.vue |   4 +-
 .../forms/shared/InlineComputationField.vue   |   2 +-
 .../forms/shared/ProficiencySelect.vue        |   2 +-
 .../forms/shared/lists/attributeListMixin.js  |   2 +-
 .../shared/lists/createListOfProperties.js    |   0
 .../forms/shared/lists/saveListMixin.js       |   2 +-
 .../forms/shared/lists/skillListMixin.js      |   2 +-
 .../forms/shared/propertyFormIndex.js         |  61 ++++++++
 .../forms/shared/propertyFormMixin.js         |   6 +-
 .../forms/shared/schemaFormMixin.js           |   0
 .../ui/properties/shared/ProficiencyIcon.vue  |   2 +-
 .../ui/properties/shared/PropertyIcon.vue     |   0
 .../properties/shared/PropertySelectCard.vue  |   0
 .../ui/properties/shared/PropertySelector.vue |   2 +-
 .../ui/properties/shared/PropertyViewer.vue   |   2 +-
 .../shared/SelectablePropertyDialog.vue       |   6 +-
 .../ui/properties/shared/getPropertyTitle.js  |   0
 .../treeNodeViews/AdjustmentTreeNode.vue      |   2 +-
 .../treeNodeViews/BranchTreeNode.vue          |   2 +-
 .../treeNodeViews/ClassLevelTreeNode.vue      |   2 +-
 .../treeNodeViews/DamageTreeNode.vue          |   2 +-
 .../treeNodeViews/DefaultTreeNode.vue         |   2 +-
 .../treeNodeViews/EffectTreeNode.vue          |   4 +-
 .../properties/treeNodeViews/ItemTreeNode.vue |   2 +-
 .../treeNodeViews/ProficiencyTreeNode.vue     |   4 +-
 .../treeNodeViews/ReferenceTreeNode.vue       |   4 +-
 .../treeNodeViews/SavingThrowTreeNode.vue     |   2 +-
 .../properties/treeNodeViews/TreeNodeView.vue |   2 +-
 .../treeNodeViews/treeNodeViewIndex.js        |  23 +++
 .../treeNodeViews/treeNodeViewMixin.js        |   2 +-
 .../ui/properties/viewers/ActionViewer.vue    |  10 +-
 .../properties/viewers/AdjustmentViewer.vue   |   4 +-
 .../ui/properties/viewers/AttributeViewer.vue |  14 +-
 .../ui/properties/viewers/BranchViewer.vue    |   4 +-
 .../properties/viewers/BuffRemoverViewer.vue  |   4 +-
 .../ui/properties/viewers/BuffViewer.vue      |   4 +-
 .../properties/viewers/ClassLevelViewer.vue   |   2 +-
 .../ui/properties/viewers/ClassViewer.vue     |   2 +-
 .../ui/properties/viewers/ConstantViewer.vue  |   2 +-
 .../ui/properties/viewers/ContainerViewer.vue |   4 +-
 .../viewers/DamageMultiplierViewer.vue        |   2 +-
 .../ui/properties/viewers/DamageViewer.vue    |   2 +-
 .../ui/properties/viewers/EffectViewer.vue    |   4 +-
 .../ui/properties/viewers/FeatureViewer.vue   |   2 +-
 .../ui/properties/viewers/FolderViewer.vue    |   2 +-
 .../ui/properties/viewers/ItemViewer.vue      |   8 +-
 .../ui/properties/viewers/NoteViewer.vue      |   2 +-
 .../ui/properties/viewers/PointBuyViewer.vue  |   2 +-
 .../properties/viewers/ProficiencyViewer.vue  |   4 +-
 .../ui/properties/viewers/ReferenceViewer.vue |   4 +-
 .../ui/properties/viewers/RollViewer.vue      |   2 +-
 .../properties/viewers/SavingThrowViewer.vue  |   2 +-
 .../ui/properties/viewers/SkillViewer.vue     |  12 +-
 .../properties/viewers/SlotFillerViewer.vue   |   4 +-
 .../ui/properties/viewers/SlotViewer.vue      |   4 +-
 .../ui/properties/viewers/SpellListViewer.vue |   2 +-
 .../ui/properties/viewers/SpellViewer.vue     |   2 +-
 .../ui/properties/viewers/ToggleViewer.vue    |   2 +-
 .../ui/properties/viewers/TriggerViewer.vue   |   2 +-
 .../viewers/shared/PropertyDescription.vue    |   4 +-
 .../viewers/shared/PropertyField.vue          |   4 +-
 .../viewers/shared/PropertyName.vue           |   0
 .../viewers/shared/PropertyTags.vue           |   0
 .../viewers/shared/PropertyVariableName.vue   |   0
 .../viewers/shared/propertyViewerIndex.js     |  61 ++++++++
 .../viewers/shared/propertyViewerMixin.js     |  23 +++
 app/imports/{ => client}/ui/router.js         |  72 ++++-----
 .../{ => client}/ui/sharing/ShareDialog.vue   |   2 +-
 .../ui/sharing/TransferOwnershipDialog.vue    |   2 +-
 .../{ => client}/ui/styles/cardColors.css     |   0
 .../{ => client}/ui/styles/cardTitles.css     |   0
 .../{ => client}/ui/styles/centeredInputs.css |   0
 .../{ => client}/ui/styles/denseLists.css     |   0
 .../{ => client}/ui/styles/fitAvatars.css     |   0
 .../ui/styles/inheritBackgrounds.css          |   0
 .../ui/styles/largeFormatInputs.css           |   0
 .../{ => client}/ui/styles/lineClamp.css      |   0
 .../{ => client}/ui/styles/markdown.css       |   0
 .../{ => client}/ui/styles/speedDial.css      |   0
 .../{ => client}/ui/styles/stylesIndex.js     |   0
 .../{ => client}/ui/styles/toolbarFlex.css    |   0
 .../ui/tabletop/SelectCreaturesDialog.vue     |   4 +-
 .../ui/tabletop/TabletopActionCards.vue       |   2 +-
 .../ui/tabletop/TabletopComponent.vue         |  10 +-
 .../ui/tabletop/TabletopCreatureCard.vue      |   0
 .../{ => client}/ui/tabletop/TabletopLog.vue  |   0
 .../{ => client}/ui/tabletop/TabletopMap.vue  |   0
 .../ui/tabletop/TabletopRightDrawer.vue       |   2 +-
 .../ui/tabletop/TabletopToolbar.vue           |   0
 app/imports/{ => client}/ui/themes.js         |   0
 .../ui/user/DeleteUserAccountDialog.vue       |   4 +-
 .../{ => client}/ui/user/InviteDialog.vue     |   2 +-
 .../{ => client}/ui/user/TierTooLowDialog.vue |   2 +-
 .../{ => client}/ui/user/UsernameDialog.vue   |   2 +-
 .../{ => client}/ui/utility/escapeRegex.js    |   0
 .../{ => client}/ui/utility/getEffectIcon.js  |   0
 .../ui/utility/getProficiencyIcon.js          |   0
 .../{ => client}/ui/utility/getThemeColor.js  |   2 +-
 .../{ => client}/ui/utility/isDarkColor.js    |   0
 .../{ => client}/ui/utility/sortEffects.js    |   0
 .../{ => client}/ui/utility/swapCase.js       |   0
 .../{ => client}/ui/utility/valueToCoins.js   |   0
 app/imports/{ => client}/ui/vueSetup.js       |  12 +-
 app/imports/{ => client}/ui/vuetify.js        |   4 +-
 app/imports/{ => client}/ui/vuexStore.js      |   2 +-
 .../ui/components/global/globalIndex.js       |  25 ----
 .../ui/dialogStack/DialogComponentIndex.js    |  66 --------
 app/imports/ui/layouts/Sidebar.vue            | 141 ------------------
 .../forms/shared/propertyFormIndex.js         |  61 --------
 .../treeNodeViews/treeNodeViewIndex.js        |  23 ---
 .../viewers/shared/propertyViewerIndex.js     |  61 --------
 .../viewers/shared/propertyViewerMixin.js     |  23 ---
 358 files changed, 1069 insertions(+), 1066 deletions(-)
 rename app/imports/{ui => api}/utility/numberToSignedString.js (100%)
 rename app/imports/{ => client}/ui/components/CardHighlight.vue (100%)
 rename app/imports/{ => client}/ui/components/CoinValue.vue (89%)
 rename app/imports/{ => client}/ui/components/ColorPicker.vue (97%)
 rename app/imports/{ => client}/ui/components/ColumnLayout.vue (100%)
 rename app/imports/{ => client}/ui/components/HorizontalHex.vue (100%)
 rename app/imports/{ => client}/ui/components/ImageUploadInput.vue (100%)
 rename app/imports/{ => client}/ui/components/IncrementButton.vue (93%)
 rename app/imports/{ => client}/ui/components/IncrementMenu.vue (100%)
 rename app/imports/{ => client}/ui/components/LabeledFab.vue (100%)
 rename app/imports/{ => client}/ui/components/MarkdownText.vue (100%)
 rename app/imports/{ => client}/ui/components/ResetSelector.vue (89%)
 rename app/imports/{ => client}/ui/components/RollPopup.vue (97%)
 rename app/imports/{ => client}/ui/components/SharedIcon.vue (100%)
 rename app/imports/{ => client}/ui/components/ToolbarCard.vue (89%)
 rename app/imports/{ => client}/ui/components/TreeDetailLayout.vue (100%)
 rename app/imports/{ => client}/ui/components/VerticalHex.vue (100%)
 rename app/imports/{ => client}/ui/components/global/DatePicker.vue (92%)
 rename app/imports/{ => client}/ui/components/global/IconPicker.vue (94%)
 rename app/imports/{ => client}/ui/components/global/SmartBtn.vue (94%)
 rename app/imports/{ => client}/ui/components/global/SmartCheckbox.vue (77%)
 rename app/imports/{ => client}/ui/components/global/SmartCombobox.vue (93%)
 rename app/imports/{ => client}/ui/components/global/SmartInputMixin.js (100%)
 rename app/imports/{ => client}/ui/components/global/SmartSelect.vue (86%)
 rename app/imports/{ => client}/ui/components/global/SmartSlider.vue (88%)
 rename app/imports/{ => client}/ui/components/global/SmartSwitch.vue (77%)
 rename app/imports/{ => client}/ui/components/global/SvgIcon.vue (100%)
 rename app/imports/{ => client}/ui/components/global/TextArea.vue (84%)
 rename app/imports/{ => client}/ui/components/global/TextField.vue (88%)
 create mode 100644 app/imports/client/ui/components/global/globalIndex.js
 rename app/imports/{ => client}/ui/components/propertyToolbar.vue (95%)
 rename app/imports/{ => client}/ui/components/rolls/Check.vue (96%)
 rename app/imports/{ => client}/ui/components/snackbars/SnackbarQueue.js (100%)
 rename app/imports/{ => client}/ui/components/snackbars/SnackbarQueue.vue (95%)
 rename app/imports/{ => client}/ui/components/tree/TreeNode.vue (98%)
 rename app/imports/{ => client}/ui/components/tree/TreeNodeList.vue (98%)
 rename app/imports/{ => client}/ui/components/tree/TreeSearchInput.vue (100%)
 rename app/imports/{ => client}/ui/creature/CreatureForm.vue (98%)
 rename app/imports/{ => client}/ui/creature/CreatureFormDialog.vue (89%)
 rename app/imports/{ => client}/ui/creature/RestButton.vue (100%)
 rename app/imports/{ => client}/ui/creature/archive/ArchiveDialog.vue (95%)
 rename app/imports/{ => client}/ui/creature/buildTree/BuildTreeNode.vue (95%)
 rename app/imports/{ => client}/ui/creature/buildTree/BuildTreeNodeList.vue (87%)
 rename app/imports/{ => client}/ui/creature/buildTree/FillSlotButton.vue (100%)
 rename app/imports/{ => client}/ui/creature/character/CharacterCreationDialog.vue (96%)
 rename app/imports/{ => client}/ui/creature/character/CharacterDeleteDialog.vue (91%)
 rename app/imports/{ => client}/ui/creature/character/CharacterSheet.vue (85%)
 rename app/imports/{ => client}/ui/creature/character/CharacterSheetFab.vue (98%)
 rename app/imports/{ => client}/ui/creature/character/CharacterSheetRightDrawer.vue (88%)
 rename app/imports/{ => client}/ui/creature/character/CharacterSheetToolbar.vue (95%)
 rename app/imports/{ => client}/ui/creature/character/CreatureRootDialog.vue (91%)
 rename app/imports/{ => client}/ui/creature/character/CreatureSummary.vue (92%)
 rename app/imports/{ => client}/ui/creature/character/MiniCharacterSheet.vue (100%)
 rename app/imports/{ => client}/ui/creature/character/characterSheetTabs/BuildTab.vue (95%)
 rename app/imports/{ => client}/ui/creature/character/characterSheetTabs/FeaturesTab.vue (87%)
 rename app/imports/{ => client}/ui/creature/character/characterSheetTabs/InventoryTab.vue (92%)
 rename app/imports/{ => client}/ui/creature/character/characterSheetTabs/JournalTab.vue (80%)
 rename app/imports/{ => client}/ui/creature/character/characterSheetTabs/SpellsTab.vue (89%)
 rename app/imports/{ => client}/ui/creature/character/characterSheetTabs/StatsTab.vue (91%)
 rename app/imports/{ => client}/ui/creature/character/characterSheetTabs/TreeTab.vue (89%)
 rename app/imports/{ => client}/ui/creature/character/errors/CharacterErrors.vue (95%)
 rename app/imports/{ => client}/ui/creature/character/errors/DependencyLoopError.vue (96%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue (96%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/PrintedInventory.vue (94%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/PrintedSpells.vue (89%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/PrintedStats.vue (95%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue (91%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue (91%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue (100%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue (93%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue (91%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue (94%)
 rename app/imports/{ => client}/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue (89%)
 rename app/imports/{ => client}/ui/creature/creatureList/ArchiveButton.vue (100%)
 rename app/imports/{ => client}/ui/creature/creatureList/CharacterListToolbarItems.vue (56%)
 rename app/imports/{ => client}/ui/creature/creatureList/CreatureFolderHeader.vue (96%)
 rename app/imports/{ => client}/ui/creature/creatureList/CreatureFolderList.vue (89%)
 rename app/imports/{ => client}/ui/creature/creatureList/CreatureList.vue (93%)
 rename app/imports/{ => client}/ui/creature/creatureList/CreatureListTile.vue (95%)
 rename app/imports/{ => client}/ui/creature/creatureList/CreatureStorageStats.vue (100%)
 rename app/imports/{ => client}/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue (92%)
 rename app/imports/{ => client}/ui/creature/creatureProperties/Breadcrumbs.vue (97%)
 rename app/imports/{ => client}/ui/creature/creatureProperties/CreaturePropertiesTree.vue (96%)
 rename app/imports/{ => client}/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue (80%)
 rename app/imports/{ => client}/ui/creature/creatureProperties/CreaturePropertyDialog.vue (90%)
 rename app/imports/{ => client}/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue (82%)
 rename app/imports/{ => client}/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue (84%)
 rename app/imports/{ => client}/ui/creature/experiences/ExperienceForm.vue (93%)
 rename app/imports/{ => client}/ui/creature/experiences/ExperienceInsertDialog.vue (86%)
 rename app/imports/{ => client}/ui/creature/experiences/ExperienceListDialog.vue (98%)
 rename app/imports/{ => client}/ui/creature/slots/LevelUpDialog.vue (96%)
 rename app/imports/{ => client}/ui/creature/slots/SlotCard.vue (88%)
 rename app/imports/{ => client}/ui/creature/slots/SlotCardsToFill.vue (91%)
 rename app/imports/{ => client}/ui/creature/slots/SlotFillDialog.vue (96%)
 rename app/imports/{ => client}/ui/dialogStack/DeleteConfirmationDialog.vue (95%)
 rename app/imports/{ => client}/ui/dialogStack/DialogBase.vue (93%)
 create mode 100644 app/imports/client/ui/dialogStack/DialogComponentIndex.js
 rename app/imports/{ => client}/ui/dialogStack/DialogStack.vue (97%)
 rename app/imports/{ => client}/ui/dialogStack/HelpDialog.vue (93%)
 rename app/imports/{ => client}/ui/dialogStack/dialogStackStore.js (78%)
 rename app/imports/{ => client}/ui/dialogStack/dialogStackWindowEvents.js (50%)
 rename app/imports/{ => client}/ui/dialogStack/mockElement.js (100%)
 rename app/imports/{ => client}/ui/files/ArchiveFileCard.vue (96%)
 rename app/imports/{ => client}/ui/files/FileStorageStats.vue (94%)
 rename app/imports/{ => client}/ui/files/UserImageCard.vue (100%)
 rename app/imports/{ => client}/ui/icons/IconAdmin.vue (88%)
 rename app/imports/{ => client}/ui/icons/SvgIconByName.vue (84%)
 rename app/imports/{ => client}/ui/icons/importIcons.js (100%)
 rename app/imports/{ => client}/ui/layouts/AppLayout.vue (91%)
 create mode 100644 app/imports/client/ui/layouts/Sidebar.vue
 rename app/imports/{ => client}/ui/layouts/SingleCardLayout.vue (100%)
 rename app/imports/{ => client}/ui/library/InsertLibraryNodeButton.vue (100%)
 rename app/imports/{ => client}/ui/library/LibraryAndNode.vue (87%)
 rename app/imports/{ => client}/ui/library/LibraryBrowser.vue (95%)
 rename app/imports/{ => client}/ui/library/LibraryCollectionCreationDialog.vue (96%)
 rename app/imports/{ => client}/ui/library/LibraryCollectionEditDialog.vue (95%)
 rename app/imports/{ => client}/ui/library/LibraryCollectionHeader.vue (96%)
 rename app/imports/{ => client}/ui/library/LibraryCollectionToolbar.vue (100%)
 rename app/imports/{ => client}/ui/library/LibraryContentsContainer.vue (97%)
 rename app/imports/{ => client}/ui/library/LibraryCreationDialog.vue (94%)
 rename app/imports/{ => client}/ui/library/LibraryEditDialog.vue (94%)
 rename app/imports/{ => client}/ui/library/LibraryList.vue (95%)
 rename app/imports/{ => client}/ui/library/LibraryListTile.vue (94%)
 rename app/imports/{ => client}/ui/library/LibraryNodeCreationDialog.vue (74%)
 rename app/imports/{ => client}/ui/library/LibraryNodeDialog.vue (92%)
 rename app/imports/{ => client}/ui/library/LibraryNodeExpansionContent.vue (87%)
 rename app/imports/{ => client}/ui/library/LibraryNodeInsertForm.vue (87%)
 rename app/imports/{ => client}/ui/library/MoveLibraryNodeDialog.vue (83%)
 rename app/imports/{ => client}/ui/library/SelectLibraryNodeDialog.vue (84%)
 rename app/imports/{ => client}/ui/library/SingleLibraryToolbar.vue (100%)
 rename app/imports/{ => client}/ui/log/CharacterLog.vue (98%)
 rename app/imports/{ => client}/ui/log/LogContent.vue (92%)
 rename app/imports/{ => client}/ui/log/LogEntry.vue (86%)
 rename app/imports/{ => client}/ui/markdownCofig.js (100%)
 rename app/imports/{ => client}/ui/pages/About.vue (100%)
 rename app/imports/{ => client}/ui/pages/Account.vue (97%)
 rename app/imports/{ => client}/ui/pages/Admin.vue (100%)
 rename app/imports/{ => client}/ui/pages/CharacterList.vue (76%)
 rename app/imports/{ => client}/ui/pages/CharacterSheetPage.vue (69%)
 rename app/imports/{ => client}/ui/pages/Documentation.vue (96%)
 rename app/imports/{ => client}/ui/pages/EmailVerificationError.vue (100%)
 rename app/imports/{ => client}/ui/pages/EmailVerificationSuccess.vue (100%)
 rename app/imports/{ => client}/ui/pages/Feedback.vue (100%)
 rename app/imports/{ => client}/ui/pages/Files.vue (94%)
 rename app/imports/{ => client}/ui/pages/Friends.vue (100%)
 rename app/imports/{ => client}/ui/pages/FunctionReference.vue (100%)
 rename app/imports/{ => client}/ui/pages/Home.vue (100%)
 rename app/imports/{ => client}/ui/pages/InviteError.vue (100%)
 rename app/imports/{ => client}/ui/pages/InviteSuccess.vue (100%)
 rename app/imports/{ => client}/ui/pages/LaunchCountdown.vue (100%)
 rename app/imports/{ => client}/ui/pages/Library.vue (97%)
 rename app/imports/{ => client}/ui/pages/LibraryCollection.vue (95%)
 rename app/imports/{ => client}/ui/pages/Maintenance.vue (100%)
 rename app/imports/{ => client}/ui/pages/NotFound.vue (100%)
 rename app/imports/{ => client}/ui/pages/NotImplemented.vue (100%)
 rename app/imports/{ => client}/ui/pages/PatreonLevelTooLow.vue (100%)
 rename app/imports/{ => client}/ui/pages/Register.vue (100%)
 rename app/imports/{ => client}/ui/pages/ResetPassword.vue (100%)
 rename app/imports/{ => client}/ui/pages/SignIn.vue (100%)
 rename app/imports/{ => client}/ui/pages/SingleLibrary.vue (82%)
 rename app/imports/{ => client}/ui/pages/Tabletop.vue (92%)
 rename app/imports/{ => client}/ui/pages/Tabletops.vue (89%)
 rename app/imports/{ => client}/ui/properties/components/actions/ActionCard.vue (90%)
 rename app/imports/{ => client}/ui/properties/components/actions/AttributeConsumedView.vue (100%)
 rename app/imports/{ => client}/ui/properties/components/actions/EventButton.vue (89%)
 rename app/imports/{ => client}/ui/properties/components/actions/ItemConsumedView.vue (96%)
 rename app/imports/{ => client}/ui/properties/components/actions/SelectItemToConsume.vue (94%)
 rename app/imports/{ => client}/ui/properties/components/attributes/AbilityListTile.vue (92%)
 rename app/imports/{ => client}/ui/properties/components/attributes/AttributeCard.vue (81%)
 rename app/imports/{ => client}/ui/properties/components/attributes/AttributeCardContent.vue (89%)
 rename app/imports/{ => client}/ui/properties/components/attributes/AttributeEffect.vue (96%)
 rename app/imports/{ => client}/ui/properties/components/attributes/HealthBar.vue (97%)
 rename app/imports/{ => client}/ui/properties/components/attributes/HealthBarCard.vue (84%)
 rename app/imports/{ => client}/ui/properties/components/attributes/HealthBarCardContainer.vue (94%)
 rename app/imports/{ => client}/ui/properties/components/attributes/HitDiceListTile.vue (96%)
 rename app/imports/{ => client}/ui/properties/components/attributes/ResourceCard.vue (81%)
 rename app/imports/{ => client}/ui/properties/components/attributes/ResourceCardContent.vue (100%)
 rename app/imports/{ => client}/ui/properties/components/attributes/SpellSlotListTile.vue (96%)
 rename app/imports/{ => client}/ui/properties/components/attributes/SplitListLayout.vue (100%)
 rename app/imports/{ => client}/ui/properties/components/buffs/BuffListItem.vue (100%)
 rename app/imports/{ => client}/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue (100%)
 rename app/imports/{ => client}/ui/properties/components/effects/InlineEffect.vue (97%)
 rename app/imports/{ => client}/ui/properties/components/features/FeatureCard.vue (83%)
 rename app/imports/{ => client}/ui/properties/components/folders/FolderGroupCard.vue (94%)
 rename app/imports/{ => client}/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue (72%)
 rename app/imports/{ => client}/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue (73%)
 rename app/imports/{ => client}/ui/properties/components/folders/propertyComponentIndex.js (59%)
 rename app/imports/{ => client}/ui/properties/components/inventory/ContainerCard.vue (91%)
 rename app/imports/{ => client}/ui/properties/components/inventory/ItemList.vue (96%)
 rename app/imports/{ => client}/ui/properties/components/inventory/ItemListTile.vue (91%)
 rename app/imports/{ => client}/ui/properties/components/persona/NoteCard.vue (83%)
 rename app/imports/{ => client}/ui/properties/components/pointBuy/PointBuyCard.vue (94%)
 rename app/imports/{ => client}/ui/properties/components/skills/SkillListTile.vue (90%)
 rename app/imports/{ => client}/ui/properties/components/skills/SkillProficiency.vue (88%)
 rename app/imports/{ => client}/ui/properties/components/spells/CastSpellWithSlotDialog.vue (95%)
 rename app/imports/{ => client}/ui/properties/components/spells/SpellList.vue (93%)
 rename app/imports/{ => client}/ui/properties/components/spells/SpellListCard.vue (95%)
 rename app/imports/{ => client}/ui/properties/components/spells/SpellListTile.vue (96%)
 rename app/imports/{ => client}/ui/properties/components/spells/spellsWithSubheaders.js (100%)
 rename app/imports/{ => client}/ui/properties/components/toggles/ToggleCard.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/ActionForm.vue (95%)
 rename app/imports/{ => client}/ui/properties/forms/AdjustmentForm.vue (95%)
 rename app/imports/{ => client}/ui/properties/forms/AttributeConsumedForm.vue (82%)
 rename app/imports/{ => client}/ui/properties/forms/AttributeForm.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/AttributesConsumedListForm.vue (82%)
 rename app/imports/{ => client}/ui/properties/forms/BranchForm.vue (97%)
 rename app/imports/{ => client}/ui/properties/forms/BuffForm.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/BuffRemoverForm.vue (98%)
 rename app/imports/{ => client}/ui/properties/forms/ClassForm.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/ClassLevelForm.vue (95%)
 rename app/imports/{ => client}/ui/properties/forms/ConstantForm.vue (88%)
 rename app/imports/{ => client}/ui/properties/forms/ContainerForm.vue (93%)
 rename app/imports/{ => client}/ui/properties/forms/DamageForm.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/DamageMultiplierForm.vue (94%)
 rename app/imports/{ => client}/ui/properties/forms/EffectForm.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/FeatureForm.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/FolderForm.vue (86%)
 rename app/imports/{ => client}/ui/properties/forms/ItemConsumedForm.vue (89%)
 rename app/imports/{ => client}/ui/properties/forms/ItemForm.vue (95%)
 rename app/imports/{ => client}/ui/properties/forms/ItemsConsumedListForm.vue (82%)
 rename app/imports/{ => client}/ui/properties/forms/NoteForm.vue (93%)
 rename app/imports/{ => client}/ui/properties/forms/PointBuyForm.vue (93%)
 rename app/imports/{ => client}/ui/properties/forms/PointBuySpendForm.vue (92%)
 rename app/imports/{ => client}/ui/properties/forms/ProficiencyForm.vue (82%)
 rename app/imports/{ => client}/ui/properties/forms/ReferenceForm.vue (88%)
 rename app/imports/{ => client}/ui/properties/forms/ResourcesForm.vue (90%)
 rename app/imports/{ => client}/ui/properties/forms/RollForm.vue (92%)
 rename app/imports/{ => client}/ui/properties/forms/SavingThrowForm.vue (93%)
 rename app/imports/{ => client}/ui/properties/forms/SkillForm.vue (91%)
 rename app/imports/{ => client}/ui/properties/forms/SlotFillerForm.vue (96%)
 rename app/imports/{ => client}/ui/properties/forms/SlotForm.vue (97%)
 rename app/imports/{ => client}/ui/properties/forms/SpellForm.vue (95%)
 rename app/imports/{ => client}/ui/properties/forms/SpellListForm.vue (93%)
 rename app/imports/{ => client}/ui/properties/forms/ToggleForm.vue (97%)
 rename app/imports/{ => client}/ui/properties/forms/TriggerForm.vue (97%)
 rename app/imports/{ => client}/ui/properties/forms/shared/CalculationErrorList.vue (100%)
 rename app/imports/{ => client}/ui/properties/forms/shared/ComputedField.vue (91%)
 rename app/imports/{ => client}/ui/properties/forms/shared/FormSection.vue (89%)
 rename app/imports/{ => client}/ui/properties/forms/shared/FormSections.vue (100%)
 rename app/imports/{ => client}/ui/properties/forms/shared/IconColorMenu.vue (83%)
 rename app/imports/{ => client}/ui/properties/forms/shared/InlineComputationField.vue (91%)
 rename app/imports/{ => client}/ui/properties/forms/shared/ProficiencySelect.vue (95%)
 rename app/imports/{ => client}/ui/properties/forms/shared/lists/attributeListMixin.js (62%)
 rename app/imports/{ => client}/ui/properties/forms/shared/lists/createListOfProperties.js (100%)
 rename app/imports/{ => client}/ui/properties/forms/shared/lists/saveListMixin.js (60%)
 rename app/imports/{ => client}/ui/properties/forms/shared/lists/skillListMixin.js (58%)
 create mode 100644 app/imports/client/ui/properties/forms/shared/propertyFormIndex.js
 rename app/imports/{ => client}/ui/properties/forms/shared/propertyFormMixin.js (70%)
 rename app/imports/{ => client}/ui/properties/forms/shared/schemaFormMixin.js (100%)
 rename app/imports/{ => client}/ui/properties/shared/ProficiencyIcon.vue (79%)
 rename app/imports/{ => client}/ui/properties/shared/PropertyIcon.vue (100%)
 rename app/imports/{ => client}/ui/properties/shared/PropertySelectCard.vue (100%)
 rename app/imports/{ => client}/ui/properties/shared/PropertySelector.vue (96%)
 rename app/imports/{ => client}/ui/properties/shared/PropertyViewer.vue (82%)
 rename app/imports/{ => client}/ui/properties/shared/SelectablePropertyDialog.vue (88%)
 rename app/imports/{ => client}/ui/properties/shared/getPropertyTitle.js (100%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/AdjustmentTreeNode.vue (91%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/BranchTreeNode.vue (90%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/ClassLevelTreeNode.vue (81%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/DamageTreeNode.vue (89%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/DefaultTreeNode.vue (80%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/EffectTreeNode.vue (93%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/ItemTreeNode.vue (92%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/ProficiencyTreeNode.vue (79%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/ReferenceTreeNode.vue (75%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/SavingThrowTreeNode.vue (89%)
 rename app/imports/{ => client}/ui/properties/treeNodeViews/TreeNodeView.vue (86%)
 create mode 100644 app/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js
 rename app/imports/{ => client}/ui/properties/treeNodeViews/treeNodeViewMixin.js (84%)
 rename app/imports/{ => client}/ui/properties/viewers/ActionViewer.vue (92%)
 rename app/imports/{ => client}/ui/properties/viewers/AdjustmentViewer.vue (90%)
 rename app/imports/{ => client}/ui/properties/viewers/AttributeViewer.vue (90%)
 rename app/imports/{ => client}/ui/properties/viewers/BranchViewer.vue (87%)
 rename app/imports/{ => client}/ui/properties/viewers/BuffRemoverViewer.vue (92%)
 rename app/imports/{ => client}/ui/properties/viewers/BuffViewer.vue (86%)
 rename app/imports/{ => client}/ui/properties/viewers/ClassLevelViewer.vue (88%)
 rename app/imports/{ => client}/ui/properties/viewers/ClassViewer.vue (96%)
 rename app/imports/{ => client}/ui/properties/viewers/ConstantViewer.vue (79%)
 rename app/imports/{ => client}/ui/properties/viewers/ContainerViewer.vue (94%)
 rename app/imports/{ => client}/ui/properties/viewers/DamageMultiplierViewer.vue (94%)
 rename app/imports/{ => client}/ui/properties/viewers/DamageViewer.vue (87%)
 rename app/imports/{ => client}/ui/properties/viewers/EffectViewer.vue (95%)
 rename app/imports/{ => client}/ui/properties/viewers/FeatureViewer.vue (80%)
 rename app/imports/{ => client}/ui/properties/viewers/FolderViewer.vue (64%)
 rename app/imports/{ => client}/ui/properties/viewers/ItemViewer.vue (93%)
 rename app/imports/{ => client}/ui/properties/viewers/NoteViewer.vue (80%)
 rename app/imports/{ => client}/ui/properties/viewers/PointBuyViewer.vue (91%)
 rename app/imports/{ => client}/ui/properties/viewers/ProficiencyViewer.vue (83%)
 rename app/imports/{ => client}/ui/properties/viewers/ReferenceViewer.vue (80%)
 rename app/imports/{ => client}/ui/properties/viewers/RollViewer.vue (80%)
 rename app/imports/{ => client}/ui/properties/viewers/SavingThrowViewer.vue (83%)
 rename app/imports/{ => client}/ui/properties/viewers/SkillViewer.vue (92%)
 rename app/imports/{ => client}/ui/properties/viewers/SlotFillerViewer.vue (87%)
 rename app/imports/{ => client}/ui/properties/viewers/SlotViewer.vue (92%)
 rename app/imports/{ => client}/ui/properties/viewers/SpellListViewer.vue (91%)
 rename app/imports/{ => client}/ui/properties/viewers/SpellViewer.vue (93%)
 rename app/imports/{ => client}/ui/properties/viewers/ToggleViewer.vue (85%)
 rename app/imports/{ => client}/ui/properties/viewers/TriggerViewer.vue (94%)
 rename app/imports/{ => client}/ui/properties/viewers/shared/PropertyDescription.vue (85%)
 rename app/imports/{ => client}/ui/properties/viewers/shared/PropertyField.vue (96%)
 rename app/imports/{ => client}/ui/properties/viewers/shared/PropertyName.vue (100%)
 rename app/imports/{ => client}/ui/properties/viewers/shared/PropertyTags.vue (100%)
 rename app/imports/{ => client}/ui/properties/viewers/shared/PropertyVariableName.vue (100%)
 create mode 100644 app/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js
 create mode 100644 app/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js
 rename app/imports/{ => client}/ui/router.js (71%)
 rename app/imports/{ => client}/ui/sharing/ShareDialog.vue (99%)
 rename app/imports/{ => client}/ui/sharing/TransferOwnershipDialog.vue (95%)
 rename app/imports/{ => client}/ui/styles/cardColors.css (100%)
 rename app/imports/{ => client}/ui/styles/cardTitles.css (100%)
 rename app/imports/{ => client}/ui/styles/centeredInputs.css (100%)
 rename app/imports/{ => client}/ui/styles/denseLists.css (100%)
 rename app/imports/{ => client}/ui/styles/fitAvatars.css (100%)
 rename app/imports/{ => client}/ui/styles/inheritBackgrounds.css (100%)
 rename app/imports/{ => client}/ui/styles/largeFormatInputs.css (100%)
 rename app/imports/{ => client}/ui/styles/lineClamp.css (100%)
 rename app/imports/{ => client}/ui/styles/markdown.css (100%)
 rename app/imports/{ => client}/ui/styles/speedDial.css (100%)
 rename app/imports/{ => client}/ui/styles/stylesIndex.js (100%)
 rename app/imports/{ => client}/ui/styles/toolbarFlex.css (100%)
 rename app/imports/{ => client}/ui/tabletop/SelectCreaturesDialog.vue (89%)
 rename app/imports/{ => client}/ui/tabletop/TabletopActionCards.vue (91%)
 rename app/imports/{ => client}/ui/tabletop/TabletopComponent.vue (84%)
 rename app/imports/{ => client}/ui/tabletop/TabletopCreatureCard.vue (100%)
 rename app/imports/{ => client}/ui/tabletop/TabletopLog.vue (100%)
 rename app/imports/{ => client}/ui/tabletop/TabletopMap.vue (100%)
 rename app/imports/{ => client}/ui/tabletop/TabletopRightDrawer.vue (87%)
 rename app/imports/{ => client}/ui/tabletop/TabletopToolbar.vue (100%)
 rename app/imports/{ => client}/ui/themes.js (100%)
 rename app/imports/{ => client}/ui/user/DeleteUserAccountDialog.vue (95%)
 rename app/imports/{ => client}/ui/user/InviteDialog.vue (96%)
 rename app/imports/{ => client}/ui/user/TierTooLowDialog.vue (96%)
 rename app/imports/{ => client}/ui/user/UsernameDialog.vue (95%)
 rename app/imports/{ => client}/ui/utility/escapeRegex.js (100%)
 rename app/imports/{ => client}/ui/utility/getEffectIcon.js (100%)
 rename app/imports/{ => client}/ui/utility/getProficiencyIcon.js (100%)
 rename app/imports/{ => client}/ui/utility/getThemeColor.js (76%)
 rename app/imports/{ => client}/ui/utility/isDarkColor.js (100%)
 rename app/imports/{ => client}/ui/utility/sortEffects.js (100%)
 rename app/imports/{ => client}/ui/utility/swapCase.js (100%)
 rename app/imports/{ => client}/ui/utility/valueToCoins.js (100%)
 rename app/imports/{ => client}/ui/vueSetup.js (61%)
 rename app/imports/{ => client}/ui/vuetify.js (86%)
 rename app/imports/{ => client}/ui/vuexStore.js (95%)
 delete mode 100644 app/imports/ui/components/global/globalIndex.js
 delete mode 100644 app/imports/ui/dialogStack/DialogComponentIndex.js
 delete mode 100644 app/imports/ui/layouts/Sidebar.vue
 delete mode 100644 app/imports/ui/properties/forms/shared/propertyFormIndex.js
 delete mode 100644 app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
 delete mode 100644 app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
 delete mode 100644 app/imports/ui/properties/viewers/shared/propertyViewerMixin.js

diff --git a/app/client/main.js b/app/client/main.js
index d9d770b7..6305c8ae 100644
--- a/app/client/main.js
+++ b/app/client/main.js
@@ -1,6 +1,6 @@
 import '/imports/api/simpleSchemaConfig.js';
-import '/imports/ui/vueSetup.js';
-import '/imports/ui/styles/stylesIndex.js';
+import '/imports/client/ui/vueSetup.js';
+import '/imports/client/ui/styles/stylesIndex.js';
 import '/imports/client/config.js';
 import '/imports/client/serviceWorker.js';
 
diff --git a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
index 5a8c84fe..9bb40898 100644
--- a/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/duplicateProperty.js
@@ -12,7 +12,7 @@ import { reorderDocs } from '/imports/api/parenting/order.js';
 var snackbar;
 if (Meteor.isClient) {
   snackbar = require(
-    '/imports/ui/components/snackbars/SnackbarQueue.js'
+    '/imports/client/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
 }
 
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
index becf0775..2e78446f 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
@@ -5,7 +5,7 @@ import applyProperty from '../applyProperty.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { adjustQuantityWork } from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
 import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import { resetProperties } from '/imports/api/creature/creatures/methods/restCreature.js';
 
diff --git a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
index a5aa4bae..22de7aa7 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
@@ -1,10 +1,10 @@
 import rollDice from '/imports/parser/rollDice.js';
 import recalculateCalculation from './shared/recalculateCalculation.js';
 import applyProperty from '../applyProperty.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 
-export default function applySavingThrow(node, actionContext){
+export default function applySavingThrow(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
   const prop = node.node;
 
@@ -13,7 +13,7 @@ export default function applySavingThrow(node, actionContext){
   recalculateCalculation(prop.dc, actionContext);
 
   const dc = (prop.dc?.value);
-  if (!isFinite(dc)){
+  if (!isFinite(dc)) {
     actionContext.addLog({
       name: 'Error',
       value: 'Saving throw requires a DC',
@@ -29,8 +29,8 @@ export default function applySavingThrow(node, actionContext){
 
   // If there are no save targets, apply all children as if the save both
   // succeeeded and failed
-  if (!saveTargets?.length){
-    scope['$saveFailed'] = {value: true};
+  if (!saveTargets?.length) {
+    scope['$saveFailed'] = { value: true };
     scope['$saveSucceeded'] = { value: true };
     applyNodeTriggers(node, 'after', actionContext);
     return node.children.forEach(child => applyProperty(child, actionContext));
@@ -51,7 +51,7 @@ export default function applySavingThrow(node, actionContext){
 
     const save = target.variables[prop.stat];
 
-    if (!save){
+    if (!save) {
       actionContext.addLog({
         name: 'Saving throw error',
         value: 'No saving throw found: ' + prop.stat,
@@ -62,7 +62,7 @@ export default function applySavingThrow(node, actionContext){
     const rollModifierText = numberToSignedString(save.value, true);
 
     let value, values, resultPrefix;
-    if (save.advantage === 1){
+    if (save.advantage === 1) {
       const [a, b] = rollDice(2, 20);
       if (a >= b) {
         value = a;
@@ -71,7 +71,7 @@ export default function applySavingThrow(node, actionContext){
         value = b;
         resultPrefix = `Advantage\n1d20 [ ~~${a}~~, ${b} ] ${rollModifierText}`;
       }
-    } else if (save.advantage === -1){
+    } else if (save.advantage === -1) {
       const [a, b] = rollDice(2, 20);
       if (a <= b) {
         value = a;
@@ -85,14 +85,14 @@ export default function applySavingThrow(node, actionContext){
       value = values[0];
       resultPrefix = `1d20 [ ${value} ] ${rollModifierText}`
     }
-    scope['$saveDiceRoll'] = {value};
+    scope['$saveDiceRoll'] = { value };
     const result = value + save.value || 0;
-    scope['$saveRoll'] = {value: result};
+    scope['$saveRoll'] = { value: result };
     const saveSuccess = result >= dc;
-    if (saveSuccess){
-      scope['$saveSucceeded'] = {value: true};
+    if (saveSuccess) {
+      scope['$saveSucceeded'] = { value: true };
     } else {
-      scope['$saveFailed'] = {value: true};
+      scope['$saveFailed'] = { value: true };
     }
     if (!prop.silent) actionContext.addLog({
       name: saveSuccess ? 'Successful save' : 'Failed save',
diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js
index a5bc653b..8e9789a6 100644
--- a/app/imports/api/engine/actions/doCheck.js
+++ b/app/imports/api/engine/actions/doCheck.js
@@ -4,7 +4,7 @@ import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import rollDice from '/imports/parser/rollDice.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
 import { applyTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import ActionContext from '/imports/api/engine/actions/ActionContext.js';
 import evaluateCalculation from '/imports/api/engine/computation/utility/evaluateCalculation.js';
diff --git a/app/imports/api/library/methods/copyLibraryNodeTo.js b/app/imports/api/library/methods/copyLibraryNodeTo.js
index f99b184f..ea9ce06f 100644
--- a/app/imports/api/library/methods/copyLibraryNodeTo.js
+++ b/app/imports/api/library/methods/copyLibraryNodeTo.js
@@ -17,7 +17,7 @@ import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
 var snackbar;
 if (Meteor.isClient) {
   snackbar = require(
-    '/imports/ui/components/snackbars/SnackbarQueue.js'
+    '/imports/client/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
 }
 
diff --git a/app/imports/api/library/methods/duplicateLibraryNode.js b/app/imports/api/library/methods/duplicateLibraryNode.js
index ff35b8fb..83f20106 100644
--- a/app/imports/api/library/methods/duplicateLibraryNode.js
+++ b/app/imports/api/library/methods/duplicateLibraryNode.js
@@ -12,7 +12,7 @@ import { reorderDocs } from '/imports/api/parenting/order.js';
 var snackbar;
 if (Meteor.isClient) {
   snackbar = require(
-    '/imports/ui/components/snackbars/SnackbarQueue.js'
+    '/imports/client/ui/components/snackbars/SnackbarQueue.js'
   ).snackbar
 }
 
diff --git a/app/imports/ui/utility/numberToSignedString.js b/app/imports/api/utility/numberToSignedString.js
similarity index 100%
rename from app/imports/ui/utility/numberToSignedString.js
rename to app/imports/api/utility/numberToSignedString.js
diff --git a/app/imports/ui/components/CardHighlight.vue b/app/imports/client/ui/components/CardHighlight.vue
similarity index 100%
rename from app/imports/ui/components/CardHighlight.vue
rename to app/imports/client/ui/components/CardHighlight.vue
diff --git a/app/imports/ui/components/CoinValue.vue b/app/imports/client/ui/components/CoinValue.vue
similarity index 89%
rename from app/imports/ui/components/CoinValue.vue
rename to app/imports/client/ui/components/CoinValue.vue
index b13aa9ef..d5ccc0f8 100644
--- a/app/imports/ui/components/CoinValue.vue
+++ b/app/imports/client/ui/components/CoinValue.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script lang="js">
-import valueToCoins from '/imports/ui/utility/valueToCoins.js';
+import valueToCoins from '/imports/client/ui/utility/valueToCoins.js';
 
 export default {
   props:{
diff --git a/app/imports/ui/components/ColorPicker.vue b/app/imports/client/ui/components/ColorPicker.vue
similarity index 97%
rename from app/imports/ui/components/ColorPicker.vue
rename to app/imports/client/ui/components/ColorPicker.vue
index cc1423bd..92f304fe 100644
--- a/app/imports/ui/components/ColorPicker.vue
+++ b/app/imports/client/ui/components/ColorPicker.vue
@@ -99,9 +99,9 @@
 </template>
 
 <script lang="js">
-  import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+  import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
   import vuetifyColors from 'vuetify/es5/util/colors';
-  import { kebabToCamelCase, camelToKebabCase } from '/imports/ui/utility/swapCase.js';
+  import { kebabToCamelCase, camelToKebabCase } from '/imports/client/ui/utility/swapCase.js';
 
   function colorToHex(color, shade = 'base'){
     if (!color) return;
diff --git a/app/imports/ui/components/ColumnLayout.vue b/app/imports/client/ui/components/ColumnLayout.vue
similarity index 100%
rename from app/imports/ui/components/ColumnLayout.vue
rename to app/imports/client/ui/components/ColumnLayout.vue
diff --git a/app/imports/ui/components/HorizontalHex.vue b/app/imports/client/ui/components/HorizontalHex.vue
similarity index 100%
rename from app/imports/ui/components/HorizontalHex.vue
rename to app/imports/client/ui/components/HorizontalHex.vue
diff --git a/app/imports/ui/components/ImageUploadInput.vue b/app/imports/client/ui/components/ImageUploadInput.vue
similarity index 100%
rename from app/imports/ui/components/ImageUploadInput.vue
rename to app/imports/client/ui/components/ImageUploadInput.vue
diff --git a/app/imports/ui/components/IncrementButton.vue b/app/imports/client/ui/components/IncrementButton.vue
similarity index 93%
rename from app/imports/ui/components/IncrementButton.vue
rename to app/imports/client/ui/components/IncrementButton.vue
index 865ec7bb..62c3768d 100644
--- a/app/imports/ui/components/IncrementButton.vue
+++ b/app/imports/client/ui/components/IncrementButton.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="js">
-import IncrementMenu from '/imports/ui/components/IncrementMenu.vue';
+import IncrementMenu from '/imports/client/ui/components/IncrementMenu.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/IncrementMenu.vue b/app/imports/client/ui/components/IncrementMenu.vue
similarity index 100%
rename from app/imports/ui/components/IncrementMenu.vue
rename to app/imports/client/ui/components/IncrementMenu.vue
diff --git a/app/imports/ui/components/LabeledFab.vue b/app/imports/client/ui/components/LabeledFab.vue
similarity index 100%
rename from app/imports/ui/components/LabeledFab.vue
rename to app/imports/client/ui/components/LabeledFab.vue
diff --git a/app/imports/ui/components/MarkdownText.vue b/app/imports/client/ui/components/MarkdownText.vue
similarity index 100%
rename from app/imports/ui/components/MarkdownText.vue
rename to app/imports/client/ui/components/MarkdownText.vue
diff --git a/app/imports/ui/components/ResetSelector.vue b/app/imports/client/ui/components/ResetSelector.vue
similarity index 89%
rename from app/imports/ui/components/ResetSelector.vue
rename to app/imports/client/ui/components/ResetSelector.vue
index a9248ec8..c61e426a 100644
--- a/app/imports/ui/components/ResetSelector.vue
+++ b/app/imports/client/ui/components/ResetSelector.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="js">
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
 
 export default {
   props: {
diff --git a/app/imports/ui/components/RollPopup.vue b/app/imports/client/ui/components/RollPopup.vue
similarity index 97%
rename from app/imports/ui/components/RollPopup.vue
rename to app/imports/client/ui/components/RollPopup.vue
index 0167bc1d..f9f20f66 100644
--- a/app/imports/ui/components/RollPopup.vue
+++ b/app/imports/client/ui/components/RollPopup.vue
@@ -64,7 +64,7 @@
 </template>
 
 <script lang="js">
-import VerticalHex from '/imports/ui/components/VerticalHex.vue';
+import VerticalHex from '/imports/client/ui/components/VerticalHex.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/SharedIcon.vue b/app/imports/client/ui/components/SharedIcon.vue
similarity index 100%
rename from app/imports/ui/components/SharedIcon.vue
rename to app/imports/client/ui/components/SharedIcon.vue
diff --git a/app/imports/ui/components/ToolbarCard.vue b/app/imports/client/ui/components/ToolbarCard.vue
similarity index 89%
rename from app/imports/ui/components/ToolbarCard.vue
rename to app/imports/client/ui/components/ToolbarCard.vue
index 9187bdf9..f9447a29 100644
--- a/app/imports/ui/components/ToolbarCard.vue
+++ b/app/imports/client/ui/components/ToolbarCard.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script lang="js">
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/TreeDetailLayout.vue b/app/imports/client/ui/components/TreeDetailLayout.vue
similarity index 100%
rename from app/imports/ui/components/TreeDetailLayout.vue
rename to app/imports/client/ui/components/TreeDetailLayout.vue
diff --git a/app/imports/ui/components/VerticalHex.vue b/app/imports/client/ui/components/VerticalHex.vue
similarity index 100%
rename from app/imports/ui/components/VerticalHex.vue
rename to app/imports/client/ui/components/VerticalHex.vue
diff --git a/app/imports/ui/components/global/DatePicker.vue b/app/imports/client/ui/components/global/DatePicker.vue
similarity index 92%
rename from app/imports/ui/components/global/DatePicker.vue
rename to app/imports/client/ui/components/global/DatePicker.vue
index ea56e034..0901143e 100644
--- a/app/imports/ui/components/global/DatePicker.vue
+++ b/app/imports/client/ui/components/global/DatePicker.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 import { format } from 'date-fns';
 
 export default {
diff --git a/app/imports/ui/components/global/IconPicker.vue b/app/imports/client/ui/components/global/IconPicker.vue
similarity index 94%
rename from app/imports/ui/components/global/IconPicker.vue
rename to app/imports/client/ui/components/global/IconPicker.vue
index 13ef7954..02a4f878 100644
--- a/app/imports/ui/components/global/IconPicker.vue
+++ b/app/imports/client/ui/components/global/IconPicker.vue
@@ -78,8 +78,8 @@
 </template>
 
 <script lang="js">
-import SvgIcon from '/imports/ui/components/global/SvgIcon.vue';
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 import { findIcons } from '/imports/api/icons/Icons.js';
 
 export default {
diff --git a/app/imports/ui/components/global/SmartBtn.vue b/app/imports/client/ui/components/global/SmartBtn.vue
similarity index 94%
rename from app/imports/ui/components/global/SmartBtn.vue
rename to app/imports/client/ui/components/global/SmartBtn.vue
index 324fcf3e..219824ff 100644
--- a/app/imports/ui/components/global/SmartBtn.vue
+++ b/app/imports/client/ui/components/global/SmartBtn.vue
@@ -11,7 +11,7 @@
 
 <script lang="js">
 import { debounce } from 'lodash';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   inject: {
diff --git a/app/imports/ui/components/global/SmartCheckbox.vue b/app/imports/client/ui/components/global/SmartCheckbox.vue
similarity index 77%
rename from app/imports/ui/components/global/SmartCheckbox.vue
rename to app/imports/client/ui/components/global/SmartCheckbox.vue
index adc12c91..66cc572e 100644
--- a/app/imports/ui/components/global/SmartCheckbox.vue
+++ b/app/imports/client/ui/components/global/SmartCheckbox.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartCombobox.vue b/app/imports/client/ui/components/global/SmartCombobox.vue
similarity index 93%
rename from app/imports/ui/components/global/SmartCombobox.vue
rename to app/imports/client/ui/components/global/SmartCombobox.vue
index d5c985c0..99312f2d 100644
--- a/app/imports/ui/components/global/SmartCombobox.vue
+++ b/app/imports/client/ui/components/global/SmartCombobox.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
 export default {
   mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartInputMixin.js b/app/imports/client/ui/components/global/SmartInputMixin.js
similarity index 100%
rename from app/imports/ui/components/global/SmartInputMixin.js
rename to app/imports/client/ui/components/global/SmartInputMixin.js
diff --git a/app/imports/ui/components/global/SmartSelect.vue b/app/imports/client/ui/components/global/SmartSelect.vue
similarity index 86%
rename from app/imports/ui/components/global/SmartSelect.vue
rename to app/imports/client/ui/components/global/SmartSelect.vue
index 005ea2ae..7e24d3b9 100644
--- a/app/imports/ui/components/global/SmartSelect.vue
+++ b/app/imports/client/ui/components/global/SmartSelect.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
 export default {
   mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartSlider.vue b/app/imports/client/ui/components/global/SmartSlider.vue
similarity index 88%
rename from app/imports/ui/components/global/SmartSlider.vue
rename to app/imports/client/ui/components/global/SmartSlider.vue
index b9797d9b..5889b16d 100644
--- a/app/imports/ui/components/global/SmartSlider.vue
+++ b/app/imports/client/ui/components/global/SmartSlider.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SmartSwitch.vue b/app/imports/client/ui/components/global/SmartSwitch.vue
similarity index 77%
rename from app/imports/ui/components/global/SmartSwitch.vue
rename to app/imports/client/ui/components/global/SmartSwitch.vue
index 716e0998..a0ce5668 100644
--- a/app/imports/ui/components/global/SmartSwitch.vue
+++ b/app/imports/client/ui/components/global/SmartSwitch.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/SvgIcon.vue b/app/imports/client/ui/components/global/SvgIcon.vue
similarity index 100%
rename from app/imports/ui/components/global/SvgIcon.vue
rename to app/imports/client/ui/components/global/SvgIcon.vue
diff --git a/app/imports/ui/components/global/TextArea.vue b/app/imports/client/ui/components/global/TextArea.vue
similarity index 84%
rename from app/imports/ui/components/global/TextArea.vue
rename to app/imports/client/ui/components/global/TextArea.vue
index 2fe4f8c8..2ab49142 100644
--- a/app/imports/ui/components/global/TextArea.vue
+++ b/app/imports/client/ui/components/global/TextArea.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
 export default {
   mixins: [SmartInput],
diff --git a/app/imports/ui/components/global/TextField.vue b/app/imports/client/ui/components/global/TextField.vue
similarity index 88%
rename from app/imports/ui/components/global/TextField.vue
rename to app/imports/client/ui/components/global/TextField.vue
index 9c9f0919..283f5c01 100644
--- a/app/imports/ui/components/global/TextField.vue
+++ b/app/imports/client/ui/components/global/TextField.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/ui/components/global/SmartInputMixin.js';
+  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
   export default {
     mixins: [SmartInput],
diff --git a/app/imports/client/ui/components/global/globalIndex.js b/app/imports/client/ui/components/global/globalIndex.js
new file mode 100644
index 00000000..bb0898d5
--- /dev/null
+++ b/app/imports/client/ui/components/global/globalIndex.js
@@ -0,0 +1,25 @@
+import Vue from 'vue';
+// Global components
+import DatePicker from '/imports/client/ui/components/global/DatePicker.vue';
+import IconPicker from '/imports/client/ui/components/global/IconPicker.vue';
+import TextField from '/imports/client/ui/components/global/TextField.vue';
+import TextArea from '/imports/client/ui/components/global/TextArea.vue';
+import SmartSelect from '/imports/client/ui/components/global/SmartSelect.vue';
+import SmartBtn from '/imports/client/ui/components/global/SmartBtn.vue';
+import SmartCombobox from '/imports/client/ui/components/global/SmartCombobox.vue';
+import SmartCheckbox from '/imports/client/ui/components/global/SmartCheckbox.vue';
+import SmartSwitch from '/imports/client/ui/components/global/SmartSwitch.vue';
+import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue';
+import SmartSlider from '/imports/client/ui/components/global/SmartSlider.vue';
+
+Vue.component('DatePicker', DatePicker);
+Vue.component('IconPicker', IconPicker);
+Vue.component('TextField', TextField);
+Vue.component('TextArea', TextArea);
+Vue.component('SmartSelect', SmartSelect);
+Vue.component('SmartBtn', SmartBtn);
+Vue.component('SmartCombobox', SmartCombobox);
+Vue.component('SmartCheckbox', SmartCheckbox);
+Vue.component('SmartSlider', SmartSlider);
+Vue.component('SmartSwitch', SmartSwitch);
+Vue.component('SvgIcon', SvgIcon);
diff --git a/app/imports/ui/components/propertyToolbar.vue b/app/imports/client/ui/components/propertyToolbar.vue
similarity index 95%
rename from app/imports/ui/components/propertyToolbar.vue
rename to app/imports/client/ui/components/propertyToolbar.vue
index af6ba016..7743f685 100644
--- a/app/imports/ui/components/propertyToolbar.vue
+++ b/app/imports/client/ui/components/propertyToolbar.vue
@@ -162,11 +162,11 @@
 </template>
 
 <script lang="js">
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/components/rolls/Check.vue b/app/imports/client/ui/components/rolls/Check.vue
similarity index 96%
rename from app/imports/ui/components/rolls/Check.vue
rename to app/imports/client/ui/components/rolls/Check.vue
index 19103522..2fb95d8f 100644
--- a/app/imports/ui/components/rolls/Check.vue
+++ b/app/imports/client/ui/components/rolls/Check.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 export default {
   props: {
     attributeVarName: {
diff --git a/app/imports/ui/components/snackbars/SnackbarQueue.js b/app/imports/client/ui/components/snackbars/SnackbarQueue.js
similarity index 100%
rename from app/imports/ui/components/snackbars/SnackbarQueue.js
rename to app/imports/client/ui/components/snackbars/SnackbarQueue.js
diff --git a/app/imports/ui/components/snackbars/SnackbarQueue.vue b/app/imports/client/ui/components/snackbars/SnackbarQueue.vue
similarity index 95%
rename from app/imports/ui/components/snackbars/SnackbarQueue.vue
rename to app/imports/client/ui/components/snackbars/SnackbarQueue.vue
index 78a6c550..7f3eecf7 100644
--- a/app/imports/ui/components/snackbars/SnackbarQueue.vue
+++ b/app/imports/client/ui/components/snackbars/SnackbarQueue.vue
@@ -40,8 +40,8 @@
 
 <script lang="js">
 // Modified from https://gitlab.com/tozd/vue/snackbar-queue
-import { globalState } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import LogContent from '/imports/ui/log/LogContent.vue';
+import { globalState } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import LogContent from '/imports/client/ui/log/LogContent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/components/tree/TreeNode.vue b/app/imports/client/ui/components/tree/TreeNode.vue
similarity index 98%
rename from app/imports/ui/components/tree/TreeNode.vue
rename to app/imports/client/ui/components/tree/TreeNode.vue
index c17b435a..2a8ee46e 100644
--- a/app/imports/ui/components/tree/TreeNode.vue
+++ b/app/imports/client/ui/components/tree/TreeNode.vue
@@ -85,7 +85,7 @@
 **/
 import { canBeParent } from '/imports/api/parenting/parenting.js';
 import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 import { some } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/components/tree/TreeNodeList.vue b/app/imports/client/ui/components/tree/TreeNodeList.vue
similarity index 98%
rename from app/imports/ui/components/tree/TreeNodeList.vue
rename to app/imports/client/ui/components/tree/TreeNodeList.vue
index 1ea59678..71925cac 100644
--- a/app/imports/ui/components/tree/TreeNodeList.vue
+++ b/app/imports/client/ui/components/tree/TreeNodeList.vue
@@ -34,7 +34,7 @@
 
 <script lang="js">
 import draggable from 'vuedraggable';
-import TreeNode from '/imports/ui/components/tree/TreeNode.vue';
+import TreeNode from '/imports/client/ui/components/tree/TreeNode.vue';
 import { isParentAllowed } from '/imports/api/parenting/parenting.js';
 
 export default {
diff --git a/app/imports/ui/components/tree/TreeSearchInput.vue b/app/imports/client/ui/components/tree/TreeSearchInput.vue
similarity index 100%
rename from app/imports/ui/components/tree/TreeSearchInput.vue
rename to app/imports/client/ui/components/tree/TreeSearchInput.vue
diff --git a/app/imports/ui/creature/CreatureForm.vue b/app/imports/client/ui/creature/CreatureForm.vue
similarity index 98%
rename from app/imports/ui/creature/CreatureForm.vue
rename to app/imports/client/ui/creature/CreatureForm.vue
index 1fdc4073..d0752e73 100644
--- a/app/imports/ui/creature/CreatureForm.vue
+++ b/app/imports/client/ui/creature/CreatureForm.vue
@@ -126,8 +126,8 @@
 
 <script lang="js">
 import { union, without, debounce } from 'lodash';
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import LibraryList from '/imports/ui/library/LibraryList.vue';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import LibraryList from '/imports/client/ui/library/LibraryList.vue';
 import LibraryCollections from '/imports/api/library/LibraryCollections.js';
 import { changeAllowedLibraries, toggleAllUserLibraries } from '/imports/api/creature/creatures/methods/changeAllowedLibraries.js';
 
diff --git a/app/imports/ui/creature/CreatureFormDialog.vue b/app/imports/client/ui/creature/CreatureFormDialog.vue
similarity index 89%
rename from app/imports/ui/creature/CreatureFormDialog.vue
rename to app/imports/client/ui/creature/CreatureFormDialog.vue
index 04fa4d19..f3f3a058 100644
--- a/app/imports/ui/creature/CreatureFormDialog.vue
+++ b/app/imports/client/ui/creature/CreatureFormDialog.vue
@@ -34,10 +34,10 @@
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import updateCreature from '/imports/api/creature/creatures/methods/updateCreature.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import CreatureForm from '/imports/ui/creature/CreatureForm.vue'
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import CreatureForm from '/imports/client/ui/creature/CreatureForm.vue'
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/RestButton.vue b/app/imports/client/ui/creature/RestButton.vue
similarity index 100%
rename from app/imports/ui/creature/RestButton.vue
rename to app/imports/client/ui/creature/RestButton.vue
diff --git a/app/imports/ui/creature/archive/ArchiveDialog.vue b/app/imports/client/ui/creature/archive/ArchiveDialog.vue
similarity index 95%
rename from app/imports/ui/creature/archive/ArchiveDialog.vue
rename to app/imports/client/ui/creature/archive/ArchiveDialog.vue
index 5d5b041d..bfdd60a8 100644
--- a/app/imports/ui/creature/archive/ArchiveDialog.vue
+++ b/app/imports/client/ui/creature/archive/ArchiveDialog.vue
@@ -57,14 +57,14 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
-import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
+import CreatureFolderList from '/imports/client/ui/creature/creatureList/CreatureFolderList.vue';
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import archiveCreatureToFile from '/imports/api/creature/archive/methods/archiveCreatureToFile.js';
 import restoreCreatureFromFile from '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { uniq, flatten } from 'lodash';
 import { characterSlotsRemaining } from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNode.vue b/app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
similarity index 95%
rename from app/imports/ui/creature/buildTree/BuildTreeNode.vue
rename to app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
index ca359bf2..853d79cf 100644
--- a/app/imports/ui/creature/buildTree/BuildTreeNode.vue
+++ b/app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
@@ -123,13 +123,13 @@
 * the tree view shows off the full character structure, and where each part of
 * character comes from.
 **/
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import FillSlotButton from '/imports/client/ui/creature/buildTree/FillSlotButton.vue';
 import { some } from 'lodash';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
 import restoreProperty from '/imports/api/creature/creatureProperties/methods/restoreProperty.js';
-import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
 
 export default {
   name: 'BuildTreeNode',
diff --git a/app/imports/ui/creature/buildTree/BuildTreeNodeList.vue b/app/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue
similarity index 87%
rename from app/imports/ui/creature/buildTree/BuildTreeNodeList.vue
rename to app/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue
index 852de655..9a8aa35b 100644
--- a/app/imports/ui/creature/buildTree/BuildTreeNodeList.vue
+++ b/app/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import BuildTreeNode from '/imports/ui/creature/buildTree/BuildTreeNode.vue';
+import BuildTreeNode from '/imports/client/ui/creature/buildTree/BuildTreeNode.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/buildTree/FillSlotButton.vue b/app/imports/client/ui/creature/buildTree/FillSlotButton.vue
similarity index 100%
rename from app/imports/ui/creature/buildTree/FillSlotButton.vue
rename to app/imports/client/ui/creature/buildTree/FillSlotButton.vue
diff --git a/app/imports/ui/creature/character/CharacterCreationDialog.vue b/app/imports/client/ui/creature/character/CharacterCreationDialog.vue
similarity index 96%
rename from app/imports/ui/creature/character/CharacterCreationDialog.vue
rename to app/imports/client/ui/creature/character/CharacterCreationDialog.vue
index 17fca049..001f8a64 100644
--- a/app/imports/ui/creature/character/CharacterCreationDialog.vue
+++ b/app/imports/client/ui/creature/character/CharacterCreationDialog.vue
@@ -110,11 +110,11 @@
 </template>
 
 <script lang="js">
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { defer, union, without } from 'lodash';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import insertCreature from '/imports/api/creature/creatures/methods/insertCreature.js';
-import LibraryList from '/imports/ui/library/LibraryList.vue';
+import LibraryList from '/imports/client/ui/library/LibraryList.vue';
 import LibraryCollections from '/imports/api/library/LibraryCollections.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/CharacterDeleteDialog.vue b/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
similarity index 91%
rename from app/imports/ui/creature/character/CharacterDeleteDialog.vue
rename to app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
index 7021d2a7..774d6e57 100644
--- a/app/imports/ui/creature/character/CharacterDeleteDialog.vue
+++ b/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
@@ -32,9 +32,9 @@
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import removeCreature from '/imports/api/creature/creatures/methods/removeCreature.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/CharacterSheet.vue b/app/imports/client/ui/creature/character/CharacterSheet.vue
similarity index 85%
rename from app/imports/ui/creature/character/CharacterSheet.vue
rename to app/imports/client/ui/creature/character/CharacterSheet.vue
index e2e225cc..c9658c6d 100644
--- a/app/imports/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheet.vue
@@ -75,16 +75,16 @@
 //TODO add a "no character found" screen if shown on a false address
 // or on a character the user does not have permission to view
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import StatsTab from '/imports/ui/creature/character/characterSheetTabs/StatsTab.vue';
-import FeaturesTab from '/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue';
-import InventoryTab from '/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue';
-import SpellsTab from '/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue';
-import CharacterTab from '/imports/ui/creature/character/characterSheetTabs/JournalTab.vue';
-import BuildTab from '/imports/ui/creature/character/characterSheetTabs/BuildTab.vue';
-import TreeTab from '/imports/ui/creature/character/characterSheetTabs/TreeTab.vue';
+import StatsTab from '/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue';
+import FeaturesTab from '/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue';
+import InventoryTab from '/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue';
+import SpellsTab from '/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue';
+import CharacterTab from '/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue';
+import BuildTab from '/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue';
+import TreeTab from '/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/CharacterSheetFab.vue b/app/imports/client/ui/creature/character/CharacterSheetFab.vue
similarity index 98%
rename from app/imports/ui/creature/character/CharacterSheetFab.vue
rename to app/imports/client/ui/creature/character/CharacterSheetFab.vue
index 5af7abd0..8381cab7 100644
--- a/app/imports/ui/creature/character/CharacterSheetFab.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetFab.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="js">
-  import LabeledFab from '/imports/ui/components/LabeledFab.vue';
+  import LabeledFab from '/imports/client/ui/components/LabeledFab.vue';
   import { getHighestOrder } from '/imports/api/parenting/order.js';
   import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
   import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
diff --git a/app/imports/ui/creature/character/CharacterSheetRightDrawer.vue b/app/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue
similarity index 88%
rename from app/imports/ui/creature/character/CharacterSheetRightDrawer.vue
rename to app/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue
index bb2056e4..4957bcb4 100644
--- a/app/imports/ui/creature/character/CharacterSheetRightDrawer.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-import CharacterLog from '/imports/ui/log/CharacterLog.vue';
+import CharacterLog from '/imports/client/ui/log/CharacterLog.vue';
 export default {
   components: {
     CharacterLog,
diff --git a/app/imports/ui/creature/character/CharacterSheetToolbar.vue b/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
similarity index 95%
rename from app/imports/ui/creature/character/CharacterSheetToolbar.vue
rename to app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
index 0fb36161..7b81f6cd 100644
--- a/app/imports/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
@@ -133,10 +133,10 @@ import removeCreature from '/imports/api/creature/creatures/methods/removeCreatu
 import { mapMutations } from 'vuex';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { updateUserSharePermissions } from '/imports/api/sharing/sharing.js';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import CharacterSheetFab from '/imports/ui/creature/character/CharacterSheetFab.vue';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import CharacterSheetFab from '/imports/client/ui/creature/character/CharacterSheetFab.vue';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/CreatureRootDialog.vue b/app/imports/client/ui/creature/character/CreatureRootDialog.vue
similarity index 91%
rename from app/imports/ui/creature/character/CreatureRootDialog.vue
rename to app/imports/client/ui/creature/character/CreatureRootDialog.vue
index 9d9ecffe..18cdd730 100644
--- a/app/imports/ui/creature/character/CreatureRootDialog.vue
+++ b/app/imports/client/ui/creature/character/CreatureRootDialog.vue
@@ -65,12 +65,12 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
-import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
+import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { getHighestOrder } from '/imports/api/parenting/order.js';
 import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
diff --git a/app/imports/ui/creature/character/CreatureSummary.vue b/app/imports/client/ui/creature/character/CreatureSummary.vue
similarity index 92%
rename from app/imports/ui/creature/character/CreatureSummary.vue
rename to app/imports/client/ui/creature/character/CreatureSummary.vue
index 4ec23aa3..f4899884 100644
--- a/app/imports/ui/creature/character/CreatureSummary.vue
+++ b/app/imports/client/ui/creature/character/CreatureSummary.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/MiniCharacterSheet.vue b/app/imports/client/ui/creature/character/MiniCharacterSheet.vue
similarity index 100%
rename from app/imports/ui/creature/character/MiniCharacterSheet.vue
rename to app/imports/client/ui/creature/character/MiniCharacterSheet.vue
diff --git a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
similarity index 95%
rename from app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
index b4e4d9a4..8e6881e5 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -182,14 +182,14 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
-import BuildTreeNodeList from '/imports/ui/creature/buildTree/BuildTreeNodeList.vue';
-import SlotCardsToFill from '/imports/ui/creature/slots/SlotCardsToFill.vue';
-import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
+import BuildTreeNodeList from '/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue';
+import SlotCardsToFill from '/imports/client/ui/creature/slots/SlotCardsToFill.vue';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import CharacterErrors from '/imports/ui/creature/character/errors/CharacterErrors.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import CharacterErrors from '/imports/client/ui/creature/character/errors/CharacterErrors.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
-import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
 
 function traverse(tree, callback, parents = []){
   tree.forEach(node => {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
similarity index 87%
rename from app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
index c1bfc215..8630a938 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/FeaturesTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
@@ -17,8 +17,8 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import FeatureCard from '/imports/ui/properties/components/features/FeatureCard.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import FeatureCard from '/imports/client/ui/properties/components/features/FeatureCard.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
similarity index 92%
rename from app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
index ea77fddd..b78e0d73 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -92,15 +92,15 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import ContainerCard from '/imports/ui/properties/components/inventory/ContainerCard.vue';
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import ItemList from '/imports/ui/properties/components/inventory/ItemList.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import ContainerCard from '/imports/client/ui/properties/components/inventory/ContainerCard.vue';
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import ItemList from '/imports/client/ui/properties/components/inventory/ItemList.vue';
 import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
 import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
-import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables';
+import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
similarity index 80%
rename from app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
index f37e7b5b..4bc52058 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -17,10 +17,10 @@
 </template>
 
 <script lang="js">
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import NoteCard from '/imports/ui/properties/components/persona/NoteCard.vue';
-import CreatureSummary from '/imports/ui/creature/character/CreatureSummary.vue';
+import NoteCard from '/imports/client/ui/properties/components/persona/NoteCard.vue';
+import CreatureSummary from '/imports/client/ui/creature/character/CreatureSummary.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
similarity index 89%
rename from app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
index a5e307cc..14a5ff5c 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -23,10 +23,10 @@
 </template>
 
 <script lang="js">
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import SpellListCard from '/imports/ui/properties/components/spells/SpellListCard.vue';
-import SpellList from '/imports/ui/properties/components/spells/SpellList.vue';
+import SpellListCard from '/imports/client/ui/properties/components/spells/SpellListCard.vue';
+import SpellList from '/imports/client/ui/properties/components/spells/SpellList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
similarity index 91%
rename from app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index ac9b3711..259001b7 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -1,6 +1,6 @@
 <template lang="html">
   <div class="stats-tab ma-2">
-    HMR TEST 2
+    HMR TEST 3
     <div
       v-if="healthBars.length"
       class="px-2 pt-2"
@@ -358,24 +358,24 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
-import AttributeCard from '/imports/ui/properties/components/attributes/AttributeCard.vue';
-import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import DamageMultiplierCard from '/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue';
-import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.vue';
-import SkillListTile from '/imports/ui/properties/components/skills/SkillListTile.vue';
-import ResourceCard from '/imports/ui/properties/components/attributes/ResourceCard.vue';
-import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
-import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
-import RestButton from '/imports/ui/creature/RestButton.vue';
+import HealthBar from '/imports/client/ui/properties/components/attributes/HealthBar.vue';
+import AttributeCard from '/imports/client/ui/properties/components/attributes/AttributeCard.vue';
+import AbilityListTile from '/imports/client/ui/properties/components/attributes/AbilityListTile.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import DamageMultiplierCard from '/imports/client/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue';
+import HitDiceListTile from '/imports/client/ui/properties/components/attributes/HitDiceListTile.vue';
+import SkillListTile from '/imports/client/ui/properties/components/skills/SkillListTile.vue';
+import ResourceCard from '/imports/client/ui/properties/components/attributes/ResourceCard.vue';
+import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
+import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
+import RestButton from '/imports/client/ui/creature/RestButton.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ToggleCard from '/imports/ui/properties/components/toggles/ToggleCard.vue';
-import BuffListItem from '/imports/ui/properties/components/buffs/BuffListItem.vue';
+import ToggleCard from '/imports/client/ui/properties/components/toggles/ToggleCard.vue';
+import BuffListItem from '/imports/client/ui/properties/components/buffs/BuffListItem.vue';
 import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
-import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import FolderGroupCard from '/imports/ui/properties/components/folders/FolderGroupCard.vue';
+import EventButton from '/imports/client/ui/properties/components/actions/EventButton.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import FolderGroupCard from '/imports/client/ui/properties/components/folders/FolderGroupCard.vue';
 import { uniqBy } from 'lodash';
 
 const getProperties = function (creature, folderIds, filter, options = {
diff --git a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
similarity index 89%
rename from app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
rename to app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
index ae2988fc..4d92e0b1 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/TreeTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/TreeTab.vue
@@ -54,10 +54,10 @@
 </template>
 
 <script lang="js">
-  import TreeDetailLayout from '/imports/ui/components/TreeDetailLayout.vue';
-  import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
-  import CreaturePropertyDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
-  import TreeSearchInput from '/imports/ui/components/tree/TreeSearchInput.vue';
+  import TreeDetailLayout from '/imports/client/ui/components/TreeDetailLayout.vue';
+  import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+  import CreaturePropertyDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
+  import TreeSearchInput from '/imports/client/ui/components/tree/TreeSearchInput.vue';
   import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
   import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/creature/character/errors/CharacterErrors.vue b/app/imports/client/ui/creature/character/errors/CharacterErrors.vue
similarity index 95%
rename from app/imports/ui/creature/character/errors/CharacterErrors.vue
rename to app/imports/client/ui/creature/character/errors/CharacterErrors.vue
index d15963a9..130144f3 100644
--- a/app/imports/ui/creature/character/errors/CharacterErrors.vue
+++ b/app/imports/client/ui/creature/character/errors/CharacterErrors.vue
@@ -52,7 +52,7 @@
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import DependencyLoopError from '/imports/ui/creature/character/errors/DependencyLoopError.vue';
+import DependencyLoopError from '/imports/client/ui/creature/character/errors/DependencyLoopError.vue';
 import updateCreature from '/imports/api/creature/creatures/methods/updateCreature.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/errors/DependencyLoopError.vue b/app/imports/client/ui/creature/character/errors/DependencyLoopError.vue
similarity index 96%
rename from app/imports/ui/creature/character/errors/DependencyLoopError.vue
rename to app/imports/client/ui/creature/character/errors/DependencyLoopError.vue
index d8e7d632..b324a74c 100644
--- a/app/imports/ui/creature/character/errors/DependencyLoopError.vue
+++ b/app/imports/client/ui/creature/character/errors/DependencyLoopError.vue
@@ -47,7 +47,7 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 import { reverse } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
similarity index 96%
rename from app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
index 5a4c5b53..9fe2bec8 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
@@ -78,9 +78,9 @@
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import PrintedStats from '/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue';
-import PrintedInventory from '/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue';
-import PrintedSpells from '/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue';
+import PrintedStats from '/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue';
+import PrintedInventory from '/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue';
+import PrintedSpells from '/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import QrcodeVue from 'qrcode.vue'
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
similarity index 94%
rename from app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
index 53694a81..1e87f3f4 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
@@ -86,13 +86,13 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js';
 import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
-import PrintedItem from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue';
-import PrintedContainer from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue';
+import PrintedItem from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue';
+import PrintedContainer from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue';
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
similarity index 89%
rename from app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
index 1d60374b..a8094314 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
@@ -38,10 +38,10 @@
 </template>
 
 <script lang="js">
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import PrintedSpell from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue';
-import PrintedSpellList from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue';
+import PrintedSpell from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue';
+import PrintedSpellList from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
similarity index 95%
rename from app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
index e3bad2a4..c307f7ea 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedStats.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
@@ -368,13 +368,13 @@
 
 <script lang="js">
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
-import PrintedAction from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import PrintedAction from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import PrintedSkill from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue';
-import PrintedDamageMultipliers from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import PrintedSkill from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue';
+import PrintedDamageMultipliers from '/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 const getProperties = function (creature, filter, options = {
   sort: { order: 1 }
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
similarity index 91%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
index 5f1adf07..abfbfeef 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue
@@ -78,12 +78,12 @@
 
 <script lang="js">
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import AttributeConsumedView from '/imports/ui/properties/components/actions/AttributeConsumedView.vue';
-import ItemConsumedView from '/imports/ui/properties/components/actions/ItemConsumedView.vue';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import numberToSignedString from '../../../../../../api/utility/numberToSignedString.js';
+import AttributeConsumedView from '/imports/client/ui/properties/components/actions/AttributeConsumedView.vue';
+import ItemConsumedView from '/imports/client/ui/properties/components/actions/ItemConsumedView.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { some } from 'lodash';
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
similarity index 91%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
index a15ed8c8..2bb4adb9 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
@@ -97,10 +97,10 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
similarity index 100%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
similarity index 93%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
index ccc5b85d..4be30e77 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue
@@ -102,10 +102,10 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 
 export default {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
similarity index 91%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
index 2920634c..404da2aa 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue
@@ -46,8 +46,8 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+import numberToSignedString from '../../../../../../api/utility/numberToSignedString.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
similarity index 94%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
index 8367c2a0..bc1fbc75 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script lang="js">
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 const levelText = [
   'cantrip', '1st-level', '2nd-level', '3rd-level', '4th-level', '5th-level',
diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
similarity index 89%
rename from app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
rename to app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
index e158000f..4dbf8d14 100644
--- a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script lang="js">
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/ArchiveButton.vue b/app/imports/client/ui/creature/creatureList/ArchiveButton.vue
similarity index 100%
rename from app/imports/ui/creature/creatureList/ArchiveButton.vue
rename to app/imports/client/ui/creature/creatureList/ArchiveButton.vue
diff --git a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
similarity index 56%
rename from app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
rename to app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
index df427b85..1dfb7105 100644
--- a/app/imports/ui/creature/creatureList/CharacterListToolbarItems.vue
+++ b/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -6,8 +6,8 @@
 </template>
 
 <script lang="js">
-import CreatureStorageStats from '/imports/ui/creature/creatureList/CreatureStorageStats.vue';
-import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
+import CreatureStorageStats from '/imports/client/ui/creature/creatureList/CreatureStorageStats.vue';
+import ArchiveButton from '/imports/client/ui/creature/creatureList/ArchiveButton.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
similarity index 96%
rename from app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
rename to app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
index 3f826f6f..1b22dcdc 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderHeader.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
@@ -52,7 +52,7 @@
   import Vue from 'vue';
   import updateCreatureFolderName from '/imports/api/creature/creatureFolders/methods.js/updateCreatureFolderName.js';
   import removeCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/removeCreatureFolder.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+  import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
   export default {
     props: {
diff --git a/app/imports/ui/creature/creatureList/CreatureFolderList.vue b/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
similarity index 89%
rename from app/imports/ui/creature/creatureList/CreatureFolderList.vue
rename to app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
index 8310e939..783e968d 100644
--- a/app/imports/ui/creature/creatureList/CreatureFolderList.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
@@ -37,8 +37,8 @@
 </template>
 
 <script lang="js">
-import CreatureFolderHeader from '/imports/ui/creature/creatureList/CreatureFolderHeader.vue';
-import CreatureList from '/imports/ui/creature/creatureList/CreatureList.vue';
+import CreatureFolderHeader from '/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue';
+import CreatureList from '/imports/client/ui/creature/creatureList/CreatureList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureList.vue b/app/imports/client/ui/creature/creatureList/CreatureList.vue
similarity index 93%
rename from app/imports/ui/creature/creatureList/CreatureList.vue
rename to app/imports/client/ui/creature/creatureList/CreatureList.vue
index dac86161..dac17440 100644
--- a/app/imports/ui/creature/creatureList/CreatureList.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureList.vue
@@ -26,10 +26,10 @@
 </template>
 
 <script lang="js">
-  import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
+  import CreatureListTile from '/imports/client/ui/creature/creatureList/CreatureListTile.vue';
   import draggable from 'vuedraggable';
   import moveCreatureToFolder from '/imports/api/creature/creatureFolders/methods.js/moveCreatureToFolder.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+  import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
   export default {
     components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureListTile.vue b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
similarity index 95%
rename from app/imports/ui/creature/creatureList/CreatureListTile.vue
rename to app/imports/client/ui/creature/creatureList/CreatureListTile.vue
index 2bb28101..ee9a7d95 100644
--- a/app/imports/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
@@ -51,7 +51,7 @@
 </template>
 
 <script lang="js">
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureList/CreatureStorageStats.vue b/app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue
similarity index 100%
rename from app/imports/ui/creature/creatureList/CreatureStorageStats.vue
rename to app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue
diff --git a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue b/app/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
similarity index 92%
rename from app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
index 60eea258..32ae0e01 100644
--- a/app/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue
@@ -180,17 +180,17 @@
 
 <script lang="js">
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import PROPERTIES, { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import LibraryNodeExpansionContent from '/imports/client/ui/library/LibraryNodeExpansionContent.vue';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import PropertySelector from '/imports/ui/properties/shared/PropertySelector.vue';
-import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import PropertySelector from '/imports/client/ui/properties/shared/PropertySelector.vue';
+import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue b/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
similarity index 97%
rename from app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
rename to app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
index 9896a758..228e47f2 100644
--- a/app/imports/ui/creature/creatureProperties/Breadcrumbs.vue
+++ b/app/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue
@@ -51,7 +51,7 @@
 
 <script lang="js">
   import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
-  import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+  import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue
similarity index 96%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue
index 8cc185f2..bb8df6f2 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue
@@ -15,7 +15,7 @@
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import nodesToTree from '/imports/api/parenting/nodesToTree.js'
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { organizeDoc, reorderDoc } from '/imports/api/parenting/organizeMethods.js';
 
 export default {
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
similarity index 80%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
index db6ceb72..3738ae12 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script lang="js">
-import SelectablePropertyDialog from '/imports/ui/properties/shared/SelectablePropertyDialog.vue';
-import CreaturePropertyInsertForm from '/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue';
+import SelectablePropertyDialog from '/imports/client/ui/properties/shared/SelectablePropertyDialog.vue';
+import CreaturePropertyInsertForm from '/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
similarity index 90%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
index da516221..3fa48041 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue
@@ -118,23 +118,23 @@ import restoreProperty from '/imports/api/creature/creatureProperties/methods/re
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import duplicateProperty from '/imports/api/creature/creatureProperties/methods/duplicateProperty.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
-import CreaturePropertiesTree from '/imports/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
-import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
+import CreaturePropertiesTree from '/imports/client/ui/creature/creatureProperties/CreaturePropertiesTree.vue';
+import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { get, findLast } from 'lodash';
 import equipItem from '/imports/api/creature/creatureProperties/methods/equipItem.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { getHighestOrder } from '/imports/api/parenting/order.js';
 import insertProperty from '/imports/api/creature/creatureProperties/methods/insertProperty.js';
-import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
+import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
+import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
 
 let formIndex = {};
 for (let key in propertyFormIndex){
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
similarity index 82%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
index 72d0e8da..79495671 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue
@@ -23,8 +23,8 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
 export default {
   components: {
     DialogBase,
diff --git a/app/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
similarity index 84%
rename from app/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
rename to app/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
index 951bbc13..e2deb0bd 100644
--- a/app/imports/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
+++ b/app/imports/client/ui/creature/creatureProperties/CreaturePropertyInsertForm.vue
@@ -40,10 +40,10 @@
 
 <script lang="js">
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/experiences/ExperienceForm.vue b/app/imports/client/ui/creature/experiences/ExperienceForm.vue
similarity index 93%
rename from app/imports/ui/creature/experiences/ExperienceForm.vue
rename to app/imports/client/ui/creature/experiences/ExperienceForm.vue
index e80040aa..19272387 100644
--- a/app/imports/ui/creature/experiences/ExperienceForm.vue
+++ b/app/imports/client/ui/creature/experiences/ExperienceForm.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue b/app/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue
similarity index 86%
rename from app/imports/ui/creature/experiences/ExperienceInsertDialog.vue
rename to app/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue
index 9b9ecc72..ffde78df 100644
--- a/app/imports/ui/creature/experiences/ExperienceInsertDialog.vue
+++ b/app/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue
@@ -27,10 +27,10 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import ExperienceForm from '/imports/ui/creature/experiences/ExperienceForm.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import ExperienceForm from '/imports/client/ui/creature/experiences/ExperienceForm.vue';
 import { ExperienceSchema, insertExperience } from '/imports/api/creature/experience/Experiences.js';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/experiences/ExperienceListDialog.vue b/app/imports/client/ui/creature/experiences/ExperienceListDialog.vue
similarity index 98%
rename from app/imports/ui/creature/experiences/ExperienceListDialog.vue
rename to app/imports/client/ui/creature/experiences/ExperienceListDialog.vue
index b90450f7..05dc6333 100644
--- a/app/imports/ui/creature/experiences/ExperienceListDialog.vue
+++ b/app/imports/client/ui/creature/experiences/ExperienceListDialog.vue
@@ -86,7 +86,7 @@
 
 <script lang="js">
 import { format } from 'date-fns';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Experiences, { removeExperience, recomputeExperiences } from '/imports/api/creature/experience/Experiences.js';
 
 export default {
diff --git a/app/imports/ui/creature/slots/LevelUpDialog.vue b/app/imports/client/ui/creature/slots/LevelUpDialog.vue
similarity index 96%
rename from app/imports/ui/creature/slots/LevelUpDialog.vue
rename to app/imports/client/ui/creature/slots/LevelUpDialog.vue
index 4503a96e..460e2ec5 100644
--- a/app/imports/ui/creature/slots/LevelUpDialog.vue
+++ b/app/imports/client/ui/creature/slots/LevelUpDialog.vue
@@ -182,16 +182,16 @@
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue'
 import resolve, { toString } from '/imports/parser/resolve.js';
 import { prettifyParseError, parse } from '/imports/parser/parser.js';
 // import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
 import Libraries from '/imports/api/library/Libraries.js';
-import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
-import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
+import LibraryNodeExpansionContent from '/imports/client/ui/library/LibraryNodeExpansionContent.vue';
+import PropertyTags from '/imports/client/ui/properties/viewers/shared/PropertyTags.vue';
 import { clone } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/creature/slots/SlotCard.vue b/app/imports/client/ui/creature/slots/SlotCard.vue
similarity index 88%
rename from app/imports/ui/creature/slots/SlotCard.vue
rename to app/imports/client/ui/creature/slots/SlotCard.vue
index 44f6ab76..41140419 100644
--- a/app/imports/ui/creature/slots/SlotCard.vue
+++ b/app/imports/client/ui/creature/slots/SlotCard.vue
@@ -37,8 +37,8 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/slots/SlotCardsToFill.vue b/app/imports/client/ui/creature/slots/SlotCardsToFill.vue
similarity index 91%
rename from app/imports/ui/creature/slots/SlotCardsToFill.vue
rename to app/imports/client/ui/creature/slots/SlotCardsToFill.vue
index 043489e7..f188306b 100644
--- a/app/imports/ui/creature/slots/SlotCardsToFill.vue
+++ b/app/imports/client/ui/creature/slots/SlotCardsToFill.vue
@@ -35,12 +35,12 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import SlotCard from '/imports/ui/creature/slots/SlotCard.vue';
-import PointBuyCard from '/imports/ui/properties/components/pointBuy/PointBuyCard.vue';
-import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
+import SlotCard from '/imports/client/ui/creature/slots/SlotCard.vue';
+import PointBuyCard from '/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue';
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/creature/slots/SlotFillDialog.vue b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
similarity index 96%
rename from app/imports/ui/creature/slots/SlotFillDialog.vue
rename to app/imports/client/ui/creature/slots/SlotFillDialog.vue
index cbad8fb9..8b2d24f0 100644
--- a/app/imports/ui/creature/slots/SlotFillDialog.vue
+++ b/app/imports/client/ui/creature/slots/SlotFillDialog.vue
@@ -183,16 +183,16 @@
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue'
 import resolve, { toString } from '/imports/parser/resolve.js';
 import { prettifyParseError, parse } from '/imports/parser/parser.js';
 // import evaluateString from '/imports/api/creature/computation/afterComputation/evaluateString.js';
 import getSlotFillFilter from '/imports/api/creature/creatureProperties/methods/getSlotFillFilter.js'
 import Libraries from '/imports/api/library/Libraries.js';
-import LibraryNodeExpansionContent from '/imports/ui/library/LibraryNodeExpansionContent.vue';
-import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
+import LibraryNodeExpansionContent from '/imports/client/ui/library/LibraryNodeExpansionContent.vue';
+import PropertyTags from '/imports/client/ui/properties/viewers/shared/PropertyTags.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import { clone } from 'lodash';
 
diff --git a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue b/app/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue
similarity index 95%
rename from app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
rename to app/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue
index c8b76735..71fbd4ba 100644
--- a/app/imports/ui/dialogStack/DeleteConfirmationDialog.vue
+++ b/app/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/dialogStack/DialogBase.vue b/app/imports/client/ui/dialogStack/DialogBase.vue
similarity index 93%
rename from app/imports/ui/dialogStack/DialogBase.vue
rename to app/imports/client/ui/dialogStack/DialogBase.vue
index 4fcdd912..84517e52 100644
--- a/app/imports/ui/dialogStack/DialogBase.vue
+++ b/app/imports/client/ui/dialogStack/DialogBase.vue
@@ -50,8 +50,8 @@
 </template>
 
 <script lang="js">
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
 
 export default {
   props: {
diff --git a/app/imports/client/ui/dialogStack/DialogComponentIndex.js b/app/imports/client/ui/dialogStack/DialogComponentIndex.js
new file mode 100644
index 00000000..87530412
--- /dev/null
+++ b/app/imports/client/ui/dialogStack/DialogComponentIndex.js
@@ -0,0 +1,66 @@
+// Load commonly used dialogs immediately
+import AddCreaturePropertyDialog from '/imports/client/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue';
+import CharacterCreationDialog from '/imports/client/ui/creature/character/CharacterCreationDialog.vue';
+import CastSpellWithSlotDialog from '/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue';
+import CreatureFormDialog from '/imports/client/ui/creature/CreatureFormDialog.vue';
+import CreaturePropertyCreationDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue';
+import CreaturePropertyDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
+import CreaturePropertyFromLibraryDialog from '/imports/client/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue';
+import CreatureRootDialog from '/imports/client/ui/creature/character/CreatureRootDialog.vue';
+import DeleteConfirmationDialog from '/imports/client/ui/dialogStack/DeleteConfirmationDialog.vue';
+import ExperienceInsertDialog from  '/imports/client/ui/creature/experiences/ExperienceInsertDialog.vue';
+import ExperienceListDialog from  '/imports/client/ui/creature/experiences/ExperienceListDialog.vue';
+import HelpDialog from  '/imports/client/ui/dialogStack/HelpDialog.vue';
+import LevelUpDialog from '/imports/client/ui/creature/slots/LevelUpDialog.vue';
+import SelectLibraryNodeDialog from '/imports/client/ui/library/SelectLibraryNodeDialog.vue';
+import SlotFillDialog from '/imports/client/ui/creature/slots/SlotFillDialog.vue';
+import TierTooLowDialog from '/imports/client/ui/user/TierTooLowDialog.vue';
+import TransferOwnershipDialog from '/imports/client/ui/sharing/TransferOwnershipDialog.vue';
+
+// Lazily load less common dialogs
+const ArchiveDialog = () => import('/imports/client/ui/creature/archive/ArchiveDialog.vue');
+const DeleteUserAccountDialog = () => import('/imports/client/ui/user/DeleteUserAccountDialog.vue');
+const InviteDialog = () => import('/imports/client/ui/user/InviteDialog.vue');
+const LibraryCollectionCreationDialog = () => import('/imports/client/ui/library/LibraryCollectionCreationDialog.vue');
+const LibraryCollectionEditDialog = () => import('/imports/client/ui/library/LibraryCollectionEditDialog.vue');
+const LibraryCreationDialog = () => import('/imports/client/ui/library/LibraryCreationDialog.vue');
+const LibraryEditDialog = () => import('/imports/client/ui/library/LibraryEditDialog.vue');
+const LibraryNodeCreationDialog = () => import('/imports/client/ui/library/LibraryNodeCreationDialog.vue');
+const LibraryNodeDialog = () => import('/imports/client/ui/library/LibraryNodeDialog.vue');
+const MoveLibraryNodeDialog = () => import('/imports/client/ui/library/MoveLibraryNodeDialog.vue');
+const SelectCreaturesDialog = () => import('/imports/client/ui/tabletop/SelectCreaturesDialog.vue');
+const ShareDialog = () => import('/imports/client/ui/sharing/ShareDialog.vue');
+const UsernameDialog = () => import('/imports/client/ui/user/UsernameDialog.vue');
+
+export default {
+  AddCreaturePropertyDialog,
+  ArchiveDialog,
+  CastSpellWithSlotDialog,
+  CharacterCreationDialog,
+  CreatureFormDialog,
+  CreaturePropertyCreationDialog,
+  CreaturePropertyDialog,
+  CreaturePropertyFromLibraryDialog,
+  CreatureRootDialog,
+  DeleteConfirmationDialog,
+  DeleteUserAccountDialog,
+  ExperienceInsertDialog,
+  ExperienceListDialog,
+  HelpDialog,
+  InviteDialog,
+  LevelUpDialog,
+  LibraryCollectionCreationDialog,
+  LibraryCollectionEditDialog,
+  LibraryCreationDialog,
+  LibraryEditDialog,
+  LibraryNodeCreationDialog,
+  LibraryNodeDialog,
+  MoveLibraryNodeDialog,
+  SelectCreaturesDialog,
+  SelectLibraryNodeDialog,
+  ShareDialog,
+  SlotFillDialog,
+  TierTooLowDialog,
+  TransferOwnershipDialog,
+  UsernameDialog,
+};
diff --git a/app/imports/ui/dialogStack/DialogStack.vue b/app/imports/client/ui/dialogStack/DialogStack.vue
similarity index 97%
rename from app/imports/ui/dialogStack/DialogStack.vue
rename to app/imports/client/ui/dialogStack/DialogStack.vue
index 94e398a0..1bf88109 100644
--- a/app/imports/ui/dialogStack/DialogStack.vue
+++ b/app/imports/client/ui/dialogStack/DialogStack.vue
@@ -42,9 +42,9 @@
 </template>
 
 <script lang="js">
-  import '/imports/ui/dialogStack/dialogStackWindowEvents.js';
-  import mockElement from '/imports/ui/dialogStack/mockElement.js';
-  import DialogComponentIndex from '/imports/ui/dialogStack/DialogComponentIndex.js';
+  import '/imports/client/ui/dialogStack/dialogStackWindowEvents.js';
+  import mockElement from '/imports/client/ui/dialogStack/mockElement.js';
+  import DialogComponentIndex from '/imports/client/ui/dialogStack/DialogComponentIndex.js';
 
   const OFFSET = 16;
   const MOCK_DURATION = 400; // Keep in sync with css transition of .dialog
diff --git a/app/imports/ui/dialogStack/HelpDialog.vue b/app/imports/client/ui/dialogStack/HelpDialog.vue
similarity index 93%
rename from app/imports/ui/dialogStack/HelpDialog.vue
rename to app/imports/client/ui/dialogStack/HelpDialog.vue
index 9fe700b2..b4a97ead 100644
--- a/app/imports/ui/dialogStack/HelpDialog.vue
+++ b/app/imports/client/ui/dialogStack/HelpDialog.vue
@@ -37,9 +37,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { propsByDocsPath } from '/imports/constants/PROPERTIES.js';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 import Docs from '/imports/api/docs/Docs.js';
 
 export default {
diff --git a/app/imports/ui/dialogStack/dialogStackStore.js b/app/imports/client/ui/dialogStack/dialogStackStore.js
similarity index 78%
rename from app/imports/ui/dialogStack/dialogStackStore.js
rename to app/imports/client/ui/dialogStack/dialogStackStore.js
index 113bae96..32e66ba1 100644
--- a/app/imports/ui/dialogStack/dialogStackStore.js
+++ b/app/imports/client/ui/dialogStack/dialogStackStore.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { clone } from 'lodash';
 
 let dialogStack = {};
 dialogStack.dialogs = [];
@@ -10,7 +11,7 @@ const dialogStackStore = {
     currentReturnElement: null,
   },
   mutations: {
-    pushDialogStack(state, {component, data, elementId, callback}){
+    pushDialogStack(state, { component, data, elementId, callback }) {
       // Generate a new _id so that Vue knows how to shuffle the array
       const _id = Random.id();
       state.dialogs.push({
@@ -22,8 +23,8 @@ const dialogStackStore = {
       });
       updateHistory();
     },
-    replaceDialog(state, {component, data}){
-      if (!state.dialogs.length){
+    replaceDialog(state, { component, data }) {
+      if (!state.dialogs.length) {
         throw new Meteor.Error('can\'t replace dialog if no dialogs are open');
       }
       let currentDialog = state.dialogs[state.dialogs.length - 1]
@@ -35,43 +36,43 @@ const dialogStackStore = {
         callback: currentDialog.callback,
       });
     },
-    popDialogStackMutation (state, result){
+    popDialogStackMutation(state, result) {
       const dialog = state.dialogs.pop();
       state.currentResult = null;
       updateHistory();
       if (!dialog) return;
-      if (dialog.callback){
+      if (dialog.callback) {
         let returnElementId = dialog.callback(result);
         state.currentReturnElement = returnElementId;
       } else {
         state.currentReturnElement = null;
       }
     },
-    setCurrentResult (state, result){
+    setCurrentResult(state, result) {
       state.currentResult = result;
     },
   },
   actions: {
-    popDialogStack(context, result){
-      if (history && history.state && history.state.openDialogs){
+    popDialogStack(context, result) {
+      if (history && history.state && history.state.openDialogs) {
         context.commit('setCurrentResult', result);
         history.back();
       } else {
         context.commit('popDialogStackMutation', result);
       }
     },
-    popDialogStacks(context, quantity){
+    popDialogStacks(context, quantity) {
       if (quantity <= 0) return;
       let iterationsLeft = quantity;
       let intervalId = setInterval(() => {
-        if (history && history.state && history.state.openDialogs){
+        if (history && history.state && history.state.openDialogs) {
           context.commit('setCurrentResult');
           history.back();
         } else {
           context.commit('popDialogStackMutation');
         }
         iterationsLeft -= 1;
-        if (iterationsLeft === 0){
+        if (iterationsLeft === 0) {
           clearInterval(intervalId);
         }
       }, 150);
@@ -81,7 +82,7 @@ const dialogStackStore = {
 
 export default dialogStackStore;
 
-const updateHistory = function(){
+const updateHistory = function () {
   // history should looks like: [{openDialogs: 0}, {openDialogs: n}] where
   // n is the number of open dialogs
 
@@ -89,8 +90,8 @@ const updateHistory = function(){
   if (!history) return;
   // Make sure that there is a state tracking open dialogs
   // replace the state without bashing it in the process
-  if (!history.state || !_.isFinite(history.state.openDialogs)){
-    let newState = _.clone(history.state)  || {};
+  if (!history.state || !Number.isFinite(history.state.openDialogs)) {
+    let newState = clone(history.state) || {};
     newState.openDialogs = 0;
     history.replaceState(newState, '');
   }
@@ -102,24 +103,24 @@ const updateHistory = function(){
   // anything
   if (numDialogs === stateDialogs) return;
 
-  if (stateDialogs > 0){
+  if (stateDialogs > 0) {
     // On a dialog count
-    if (numDialogs === 0){
+    if (numDialogs === 0) {
       // but shouldn't be
       history.back();
     } else {
       // but should replace with correct count
-      let newState = _.clone(history.state) || {};
+      let newState = clone(history.state) || {};
       newState.openDialogs = dialogStackStore.state.dialogs.length;
       history.replaceState(newState, '');
     }
-  } else if (numDialogs > 0 && stateDialogs === 0){
+  } else if (numDialogs > 0 && stateDialogs === 0) {
     // On the zero state, push a dialog count
-    history.pushState({openDialogs: numDialogs}, '');
+    history.pushState({ openDialogs: numDialogs }, '');
   } else {
     console.warn(
       'History could not be updated correctly, unexpected case',
-      {stateDialogs, numDialogs},
+      { stateDialogs, numDialogs },
     )
   }
 };
diff --git a/app/imports/ui/dialogStack/dialogStackWindowEvents.js b/app/imports/client/ui/dialogStack/dialogStackWindowEvents.js
similarity index 50%
rename from app/imports/ui/dialogStack/dialogStackWindowEvents.js
rename to app/imports/client/ui/dialogStack/dialogStackWindowEvents.js
index 5cdcd375..caf9fbee 100644
--- a/app/imports/ui/dialogStack/dialogStackWindowEvents.js
+++ b/app/imports/client/ui/dialogStack/dialogStackWindowEvents.js
@@ -1,10 +1,10 @@
-import store from '/imports/ui/vuexStore.js';
+import store from '/imports/client/ui/vuexStore.js';
 
-if (window){
-  window.onpopstate = function(event){
+if (window) {
+  window.onpopstate = function (event) {
     let state = event.state;
     let numDialogs = store.state.dialogStack.dialogs.length;
-    if (_.isFinite(state.openDialogs) && numDialogs > state.openDialogs){
+    if (Number.isFinite(state.openDialogs) && numDialogs > state.openDialogs) {
       store.commit('popDialogStackMutation', store.state.dialogStack.currentResult);
     }
   };
diff --git a/app/imports/ui/dialogStack/mockElement.js b/app/imports/client/ui/dialogStack/mockElement.js
similarity index 100%
rename from app/imports/ui/dialogStack/mockElement.js
rename to app/imports/client/ui/dialogStack/mockElement.js
diff --git a/app/imports/ui/files/ArchiveFileCard.vue b/app/imports/client/ui/files/ArchiveFileCard.vue
similarity index 96%
rename from app/imports/ui/files/ArchiveFileCard.vue
rename to app/imports/client/ui/files/ArchiveFileCard.vue
index d8ec1f25..f1de6d3b 100644
--- a/app/imports/ui/files/ArchiveFileCard.vue
+++ b/app/imports/client/ui/files/ArchiveFileCard.vue
@@ -33,7 +33,7 @@
 
 <script lang="js">
 import restoreCreatureFromFile from '/imports/api/creature/archive/methods/restoreCreatureFromFile.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { characterSlotsRemaining } from '/imports/api/creature/creatures/methods/assertHasCharacterSlots.js';
 import removeArchiveCreature from '/imports/api/creature/archive/methods/removeArchiveCreature.js';
 
diff --git a/app/imports/ui/files/FileStorageStats.vue b/app/imports/client/ui/files/FileStorageStats.vue
similarity index 94%
rename from app/imports/ui/files/FileStorageStats.vue
rename to app/imports/client/ui/files/FileStorageStats.vue
index c4ad854b..3551f9c2 100644
--- a/app/imports/ui/files/FileStorageStats.vue
+++ b/app/imports/client/ui/files/FileStorageStats.vue
@@ -29,7 +29,7 @@
 
 <script lang="js">
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import updateFileStorageUsed from '/imports/api/users/methods/updateFileStorageUsed.js';
 import prettyBytes from 'pretty-bytes';
 
diff --git a/app/imports/ui/files/UserImageCard.vue b/app/imports/client/ui/files/UserImageCard.vue
similarity index 100%
rename from app/imports/ui/files/UserImageCard.vue
rename to app/imports/client/ui/files/UserImageCard.vue
diff --git a/app/imports/ui/icons/IconAdmin.vue b/app/imports/client/ui/icons/IconAdmin.vue
similarity index 88%
rename from app/imports/ui/icons/IconAdmin.vue
rename to app/imports/client/ui/icons/IconAdmin.vue
index 3219be83..c8cf2c07 100644
--- a/app/imports/ui/icons/IconAdmin.vue
+++ b/app/imports/client/ui/icons/IconAdmin.vue
@@ -27,8 +27,8 @@
 </template>
 
 <script lang="js">
-  import {importIcons, importIconMetadata} from '/imports/ui/icons/importIcons.js';
-  import IconPicker from '/imports/ui/components/global/IconPicker.vue';
+  import {importIcons, importIconMetadata} from '/imports/client/ui/icons/importIcons.js';
+  import IconPicker from '/imports/client/ui/components/global/IconPicker.vue';
   import UploadButton from 'vuetify-upload-button';
 
   export default {
diff --git a/app/imports/ui/icons/SvgIconByName.vue b/app/imports/client/ui/icons/SvgIconByName.vue
similarity index 84%
rename from app/imports/ui/icons/SvgIconByName.vue
rename to app/imports/client/ui/icons/SvgIconByName.vue
index edbf1457..b750f7cc 100644
--- a/app/imports/ui/icons/SvgIconByName.vue
+++ b/app/imports/client/ui/icons/SvgIconByName.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="js">
-import SvgIcon from '/imports/ui/components/global/SvgIcon.vue'
+import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue'
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
 
 export default {
diff --git a/app/imports/ui/icons/importIcons.js b/app/imports/client/ui/icons/importIcons.js
similarity index 100%
rename from app/imports/ui/icons/importIcons.js
rename to app/imports/client/ui/icons/importIcons.js
diff --git a/app/imports/ui/layouts/AppLayout.vue b/app/imports/client/ui/layouts/AppLayout.vue
similarity index 91%
rename from app/imports/ui/layouts/AppLayout.vue
rename to app/imports/client/ui/layouts/AppLayout.vue
index 99469969..97e0e9d0 100644
--- a/app/imports/ui/layouts/AppLayout.vue
+++ b/app/imports/client/ui/layouts/AppLayout.vue
@@ -54,10 +54,10 @@
 
 <script lang="js">
 import '/imports/api/users/Users.js';
-import Sidebar from '/imports/ui/layouts/Sidebar.vue';
-import DialogStack from '/imports/ui/dialogStack/DialogStack.vue';
+import Sidebar from '/imports/client/ui/layouts/Sidebar.vue';
+import DialogStack from '/imports/client/ui/dialogStack/DialogStack.vue';
 import { mapMutations } from 'vuex';
-import SnackbarQueue from '/imports/ui/components/snackbars/SnackbarQueue.vue';
+import SnackbarQueue from '/imports/client/ui/components/snackbars/SnackbarQueue.vue';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 
 export default {
diff --git a/app/imports/client/ui/layouts/Sidebar.vue b/app/imports/client/ui/layouts/Sidebar.vue
new file mode 100644
index 00000000..01cbc7ce
--- /dev/null
+++ b/app/imports/client/ui/layouts/Sidebar.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="sidebar">
+    <v-layout
+      v-if="!signedIn"
+      justify-center
+    >
+      <v-btn
+        text
+        to="/sign-in"
+      >
+        Sign in
+      </v-btn>
+    </v-layout>
+    <v-list>
+      <v-list-item v-if="signedIn">
+        <v-list-item-content>
+          <v-list-item-title>
+            {{ userName }}
+          </v-list-item-title>
+        </v-list-item-content>
+        <v-list-item-action>
+          <v-tooltip bottom>
+            <template #activator="{ on }">
+              <v-btn
+                icon
+                to="/account"
+                v-on="on"
+              >
+                <v-icon>mdi-cog</v-icon>
+              </v-btn>
+            </template>
+            <span>Account Settings</span>
+          </v-tooltip>
+        </v-list-item-action>
+      </v-list-item>
+
+      <v-list-item
+        v-for="(link, i) in links"
+        :key="i"
+        :to="link.to"
+        :href="link.href"
+      >
+        <v-list-item-action>
+          <v-icon>{{ link.icon }}</v-icon>
+        </v-list-item-action>
+        <v-list-item-title>
+          {{ link.title }}
+        </v-list-item-title>
+        <v-icon v-if="link.href">
+          mdi-open-in-new
+        </v-icon>
+      </v-list-item>
+      <v-divider />
+    </v-list>
+    <creature-folder-list
+      dense
+      :creatures="CreaturesWithNoParty"
+      :folders="folders"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
+import CreatureFolderList from '/imports/client/ui/creature/creatureList/CreatureFolderList.vue';
+import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
+import { uniq, flatten } from 'lodash';
+
+const characterTransform = function (char) {
+  char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
+  char.initial = char.name && char.name[0] || '?';
+  return char;
+};
+export default {
+  components: {
+    CreatureFolderList
+  },
+  meteor: {
+    $subscribe: {
+      'characterList': [],
+    },
+    signedIn() {
+      return Meteor.userId();
+    },
+    userName() {
+      let user = Meteor.user();
+      return user && user.username || user && user._id;
+    },
+    links() {
+      let isLoggedIn = !!Meteor.userId();
+      let links = [
+        { title: 'Home', icon: 'mdi-home', to: '/' },
+        { title: 'Characters', icon: 'mdi-account-group', to: '/characterList', requireLogin: true },
+        { title: 'Library', icon: 'mdi-library-shelves', to: '/library', requireLogin: true },
+        //{title: 'Tabletops', icon: 'api', to: '/tabletops', requireLogin: true},
+        //{title: 'Friends', icon: 'people', to: '/friends', requireLogin: true},
+        { title: 'Files', icon: 'mdi-file-multiple', to: '/my-files' },
+        { title: 'Feedback', icon: 'mdi-bug', to: '/feedback' },
+        { title: 'About', icon: 'mdi-sign-text', to: '/about' },
+        { title: 'Documentation', icon: 'mdi-book-open-variant', to: '/docs' },
+        { title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud' },
+        { title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2' },
+      ];
+      return links.filter(link => !link.requireLogin || isLoggedIn);
+    },
+    folders() {
+      const userId = Meteor.userId();
+      let folders = CreatureFolders.find(
+        { owner: userId, archived: { $ne: true } },
+        { sort: { order: 1 } },
+      ).map(folder => {
+        folder.creatures = Creatures.find(
+          {
+            _id: { $in: folder.creatures || [] },
+            $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
+          }, {
+          sort: { name: 1 },
+        }
+        ).map(characterTransform);
+        return folder;
+      });
+      folders = folders.filter(folder => !!folder.creatures.length);
+      return folders;
+    },
+    CreaturesWithNoParty() {
+      var userId = Meteor.userId();
+      var charArrays = CreatureFolders.find({ owner: userId }).map(p => p.creatures);
+      var folderChars = uniq(flatten(charArrays));
+      return Creatures.find(
+        {
+          _id: { $nin: folderChars },
+          $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
+        },
+        { sort: { name: 1 } }
+      ).map(characterTransform);
+    },
+  },
+};
+</script>
diff --git a/app/imports/ui/layouts/SingleCardLayout.vue b/app/imports/client/ui/layouts/SingleCardLayout.vue
similarity index 100%
rename from app/imports/ui/layouts/SingleCardLayout.vue
rename to app/imports/client/ui/layouts/SingleCardLayout.vue
diff --git a/app/imports/ui/library/InsertLibraryNodeButton.vue b/app/imports/client/ui/library/InsertLibraryNodeButton.vue
similarity index 100%
rename from app/imports/ui/library/InsertLibraryNodeButton.vue
rename to app/imports/client/ui/library/InsertLibraryNodeButton.vue
diff --git a/app/imports/ui/library/LibraryAndNode.vue b/app/imports/client/ui/library/LibraryAndNode.vue
similarity index 87%
rename from app/imports/ui/library/LibraryAndNode.vue
rename to app/imports/client/ui/library/LibraryAndNode.vue
index aa6601db..781fcac8 100644
--- a/app/imports/ui/library/LibraryAndNode.vue
+++ b/app/imports/client/ui/library/LibraryAndNode.vue
@@ -80,18 +80,18 @@
 </template>
 
 <script lang="js">
-import TreeDetailLayout from '/imports/ui/components/TreeDetailLayout.vue';
-import LibraryBrowser from '/imports/ui/library/LibraryBrowser.vue';
-import LibraryNodeDialog from '/imports/ui/library/LibraryNodeDialog.vue';
+import TreeDetailLayout from '/imports/client/ui/components/TreeDetailLayout.vue';
+import LibraryBrowser from '/imports/client/ui/library/LibraryBrowser.vue';
+import LibraryNodeDialog from '/imports/client/ui/library/LibraryNodeDialog.vue';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import LibraryContentsContainer from '/imports/ui/library/LibraryContentsContainer.vue';
-import InsertLibraryNodeButton from '/imports/ui/library/InsertLibraryNodeButton.vue';
+import LibraryContentsContainer from '/imports/client/ui/library/LibraryContentsContainer.vue';
+import InsertLibraryNodeButton from '/imports/client/ui/library/InsertLibraryNodeButton.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import getThemeColor from '/imports/ui/utility/getThemeColor.js';
-import TreeSearchInput from '/imports/ui/components/tree/TreeSearchInput.vue';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import TreeSearchInput from '/imports/client/ui/components/tree/TreeSearchInput.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryBrowser.vue b/app/imports/client/ui/library/LibraryBrowser.vue
similarity index 95%
rename from app/imports/ui/library/LibraryBrowser.vue
rename to app/imports/client/ui/library/LibraryBrowser.vue
index 8d7cd84f..91d3c332 100644
--- a/app/imports/ui/library/LibraryBrowser.vue
+++ b/app/imports/client/ui/library/LibraryBrowser.vue
@@ -70,11 +70,11 @@
 </template>
 
 <script lang="js">
-import LibraryContentsContainer from '/imports/ui/library/LibraryContentsContainer.vue';
+import LibraryContentsContainer from '/imports/client/ui/library/LibraryContentsContainer.vue';
 import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import { assertEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import InsertLibraryNodeButton from '/imports/ui/library/InsertLibraryNodeButton.vue';
+import InsertLibraryNodeButton from '/imports/client/ui/library/InsertLibraryNodeButton.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryCollectionCreationDialog.vue b/app/imports/client/ui/library/LibraryCollectionCreationDialog.vue
similarity index 96%
rename from app/imports/ui/library/LibraryCollectionCreationDialog.vue
rename to app/imports/client/ui/library/LibraryCollectionCreationDialog.vue
index ed764930..5e4caa59 100644
--- a/app/imports/ui/library/LibraryCollectionCreationDialog.vue
+++ b/app/imports/client/ui/library/LibraryCollectionCreationDialog.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Libraries from '/imports/api/library/Libraries.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryCollectionEditDialog.vue b/app/imports/client/ui/library/LibraryCollectionEditDialog.vue
similarity index 95%
rename from app/imports/ui/library/LibraryCollectionEditDialog.vue
rename to app/imports/client/ui/library/LibraryCollectionEditDialog.vue
index cccce61a..4170cdce 100644
--- a/app/imports/ui/library/LibraryCollectionEditDialog.vue
+++ b/app/imports/client/ui/library/LibraryCollectionEditDialog.vue
@@ -57,9 +57,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import LibraryCollections, { updateLibraryCollection, removeLibraryCollection } from '/imports/api/library/LibraryCollections.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import Libraries from '/imports/api/library/Libraries.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryCollectionHeader.vue b/app/imports/client/ui/library/LibraryCollectionHeader.vue
similarity index 96%
rename from app/imports/ui/library/LibraryCollectionHeader.vue
rename to app/imports/client/ui/library/LibraryCollectionHeader.vue
index 39713450..8ad8b0b2 100644
--- a/app/imports/ui/library/LibraryCollectionHeader.vue
+++ b/app/imports/client/ui/library/LibraryCollectionHeader.vue
@@ -53,7 +53,7 @@
 
 <script lang="js">
 import { assertDocEditPermission } from '/imports/api/sharing/sharingPermissions.js';
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryCollectionToolbar.vue b/app/imports/client/ui/library/LibraryCollectionToolbar.vue
similarity index 100%
rename from app/imports/ui/library/LibraryCollectionToolbar.vue
rename to app/imports/client/ui/library/LibraryCollectionToolbar.vue
diff --git a/app/imports/ui/library/LibraryContentsContainer.vue b/app/imports/client/ui/library/LibraryContentsContainer.vue
similarity index 97%
rename from app/imports/ui/library/LibraryContentsContainer.vue
rename to app/imports/client/ui/library/LibraryContentsContainer.vue
index 1e70fa07..77d83bfb 100644
--- a/app/imports/ui/library/LibraryContentsContainer.vue
+++ b/app/imports/client/ui/library/LibraryContentsContainer.vue
@@ -28,7 +28,7 @@
 import Libraries from '/imports/api/library/Libraries.js';
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
 import nodesToTree from '/imports/api/parenting/nodesToTree.js';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { organizeDoc, reorderDoc } from '/imports/api/parenting/organizeMethods.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryCreationDialog.vue b/app/imports/client/ui/library/LibraryCreationDialog.vue
similarity index 94%
rename from app/imports/ui/library/LibraryCreationDialog.vue
rename to app/imports/client/ui/library/LibraryCreationDialog.vue
index fe71d5fa..8c0425f1 100644
--- a/app/imports/ui/library/LibraryCreationDialog.vue
+++ b/app/imports/client/ui/library/LibraryCreationDialog.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryEditDialog.vue b/app/imports/client/ui/library/LibraryEditDialog.vue
similarity index 94%
rename from app/imports/ui/library/LibraryEditDialog.vue
rename to app/imports/client/ui/library/LibraryEditDialog.vue
index 6586b649..36decbbc 100644
--- a/app/imports/ui/library/LibraryEditDialog.vue
+++ b/app/imports/client/ui/library/LibraryEditDialog.vue
@@ -75,11 +75,11 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Libraries, { updateLibraryName, updateLibraryDescription, removeLibrary } from '/imports/api/library/Libraries.js';
 import LibraryNodes, { restoreLibraryNode } from '/imports/api/library/LibraryNodes.js';
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryList.vue b/app/imports/client/ui/library/LibraryList.vue
similarity index 95%
rename from app/imports/ui/library/LibraryList.vue
rename to app/imports/client/ui/library/LibraryList.vue
index c850ddd7..cb9d09d1 100644
--- a/app/imports/ui/library/LibraryList.vue
+++ b/app/imports/client/ui/library/LibraryList.vue
@@ -63,11 +63,11 @@
 
 <script lang="js">
 import { union } from 'lodash';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import LibraryCollections, { insertLibraryCollection } from '/imports/api/library/LibraryCollections.js';
 import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
-import LibraryListTile from '/imports/ui/library/LibraryListTile.vue'
-import LibraryCollectionHeader from '/imports/ui/library/LibraryCollectionHeader.vue';
+import LibraryListTile from '/imports/client/ui/library/LibraryListTile.vue'
+import LibraryCollectionHeader from '/imports/client/ui/library/LibraryCollectionHeader.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryListTile.vue b/app/imports/client/ui/library/LibraryListTile.vue
similarity index 94%
rename from app/imports/ui/library/LibraryListTile.vue
rename to app/imports/client/ui/library/LibraryListTile.vue
index d2a9fa7f..06ce9087 100644
--- a/app/imports/ui/library/LibraryListTile.vue
+++ b/app/imports/client/ui/library/LibraryListTile.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="js" functional>
-import SharedIcon from '/imports/ui/components/SharedIcon.vue';
+import SharedIcon from '/imports/client/ui/components/SharedIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryNodeCreationDialog.vue b/app/imports/client/ui/library/LibraryNodeCreationDialog.vue
similarity index 74%
rename from app/imports/ui/library/LibraryNodeCreationDialog.vue
rename to app/imports/client/ui/library/LibraryNodeCreationDialog.vue
index 2f4ff67d..b4748be7 100644
--- a/app/imports/ui/library/LibraryNodeCreationDialog.vue
+++ b/app/imports/client/ui/library/LibraryNodeCreationDialog.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script lang="js">
-import SelectablePropertyDialog from '/imports/ui/properties/shared/SelectablePropertyDialog.vue';
-import LibraryNodeInsertForm from '/imports/ui/library/LibraryNodeInsertForm.vue';
+import SelectablePropertyDialog from '/imports/client/ui/properties/shared/SelectablePropertyDialog.vue';
+import LibraryNodeInsertForm from '/imports/client/ui/library/LibraryNodeInsertForm.vue';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/library/LibraryNodeDialog.vue b/app/imports/client/ui/library/LibraryNodeDialog.vue
similarity index 92%
rename from app/imports/ui/library/LibraryNodeDialog.vue
rename to app/imports/client/ui/library/LibraryNodeDialog.vue
index 977f3906..67cd16dd 100644
--- a/app/imports/ui/library/LibraryNodeDialog.vue
+++ b/app/imports/client/ui/library/LibraryNodeDialog.vue
@@ -89,19 +89,19 @@
     restoreLibraryNode,
   } from '/imports/api/library/LibraryNodes.js';
   import duplicateLibraryNode from '/imports/api/library/methods/duplicateLibraryNode.js';
-  import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-  import PropertyToolbar from '/imports/ui/components/propertyToolbar.vue';
+  import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+  import PropertyToolbar from '/imports/client/ui/components/propertyToolbar.vue';
   import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-  import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-  import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-  import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
+  import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+  import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+  import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
   import { get } from 'lodash';
   import {
     assertDocEditPermission, assertDocCopyPermission
   } from '/imports/api/sharing/sharingPermissions.js';
   import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
-  import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-  import getPropertyTitle from '/imports/ui/properties/shared/getPropertyTitle.js';
+  import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+  import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
   import copyLibraryNodeTo from '/imports/api/library/methods/copyLibraryNodeTo.js';
 
   let formIndex = {};
diff --git a/app/imports/ui/library/LibraryNodeExpansionContent.vue b/app/imports/client/ui/library/LibraryNodeExpansionContent.vue
similarity index 87%
rename from app/imports/ui/library/LibraryNodeExpansionContent.vue
rename to app/imports/client/ui/library/LibraryNodeExpansionContent.vue
index 30e614db..1067d4a5 100644
--- a/app/imports/ui/library/LibraryNodeExpansionContent.vue
+++ b/app/imports/client/ui/library/LibraryNodeExpansionContent.vue
@@ -17,8 +17,8 @@
 <script lang="js">
 import nodesToTree from '/imports/api/parenting/nodesToTree.js'
 import LibraryNodes from '/imports/api/library/LibraryNodes.js';
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/library/LibraryNodeInsertForm.vue b/app/imports/client/ui/library/LibraryNodeInsertForm.vue
similarity index 87%
rename from app/imports/ui/library/LibraryNodeInsertForm.vue
rename to app/imports/client/ui/library/LibraryNodeInsertForm.vue
index c006dde6..3263558e 100644
--- a/app/imports/ui/library/LibraryNodeInsertForm.vue
+++ b/app/imports/client/ui/library/LibraryNodeInsertForm.vue
@@ -46,10 +46,10 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import propertyFormIndex from '/imports/ui/properties/forms/shared/propertyFormIndex.js';
-import schemaFormMixin from '/imports/ui/properties/forms/shared/schemaFormMixin.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import propertyFormIndex from '/imports/client/ui/properties/forms/shared/propertyFormIndex.js';
+import schemaFormMixin from '/imports/client/ui/properties/forms/shared/schemaFormMixin.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
 import propertySchemasIndex from '/imports/api/properties/propertySchemasIndex.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/library/MoveLibraryNodeDialog.vue b/app/imports/client/ui/library/MoveLibraryNodeDialog.vue
similarity index 83%
rename from app/imports/ui/library/MoveLibraryNodeDialog.vue
rename to app/imports/client/ui/library/MoveLibraryNodeDialog.vue
index f0d22101..7151391d 100644
--- a/app/imports/ui/library/MoveLibraryNodeDialog.vue
+++ b/app/imports/client/ui/library/MoveLibraryNodeDialog.vue
@@ -23,8 +23,8 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
 export default {
   components: {
     DialogBase,
diff --git a/app/imports/ui/library/SelectLibraryNodeDialog.vue b/app/imports/client/ui/library/SelectLibraryNodeDialog.vue
similarity index 84%
rename from app/imports/ui/library/SelectLibraryNodeDialog.vue
rename to app/imports/client/ui/library/SelectLibraryNodeDialog.vue
index 114a194e..39d1b77d 100644
--- a/app/imports/ui/library/SelectLibraryNodeDialog.vue
+++ b/app/imports/client/ui/library/SelectLibraryNodeDialog.vue
@@ -30,8 +30,8 @@
 </template>
 
 <script lang="js">
-  import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-  import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+  import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+  import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
   export default {
     components: {
       DialogBase,
diff --git a/app/imports/ui/library/SingleLibraryToolbar.vue b/app/imports/client/ui/library/SingleLibraryToolbar.vue
similarity index 100%
rename from app/imports/ui/library/SingleLibraryToolbar.vue
rename to app/imports/client/ui/library/SingleLibraryToolbar.vue
diff --git a/app/imports/ui/log/CharacterLog.vue b/app/imports/client/ui/log/CharacterLog.vue
similarity index 98%
rename from app/imports/ui/log/CharacterLog.vue
rename to app/imports/client/ui/log/CharacterLog.vue
index 4cfdcdab..41941b52 100644
--- a/app/imports/ui/log/CharacterLog.vue
+++ b/app/imports/client/ui/log/CharacterLog.vue
@@ -39,7 +39,7 @@ import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import { parse, prettifyParseError } from '/imports/parser/parser.js';
 import resolve, { toString } from '/imports/parser/resolve.js';
-import LogEntry from '/imports/ui/log/LogEntry.vue';
+import LogEntry from '/imports/client/ui/log/LogEntry.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/log/LogContent.vue b/app/imports/client/ui/log/LogContent.vue
similarity index 92%
rename from app/imports/ui/log/LogContent.vue
rename to app/imports/client/ui/log/LogContent.vue
index 8c109c23..8de93e87 100644
--- a/app/imports/ui/log/LogContent.vue
+++ b/app/imports/client/ui/log/LogContent.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="js">
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/log/LogEntry.vue b/app/imports/client/ui/log/LogEntry.vue
similarity index 86%
rename from app/imports/ui/log/LogEntry.vue
rename to app/imports/client/ui/log/LogEntry.vue
index 90f7087f..63b37c56 100644
--- a/app/imports/ui/log/LogEntry.vue
+++ b/app/imports/client/ui/log/LogEntry.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import LogContent from '/imports/ui/log/LogContent.vue';
+import LogContent from '/imports/client/ui/log/LogContent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/markdownCofig.js b/app/imports/client/ui/markdownCofig.js
similarity index 100%
rename from app/imports/ui/markdownCofig.js
rename to app/imports/client/ui/markdownCofig.js
diff --git a/app/imports/ui/pages/About.vue b/app/imports/client/ui/pages/About.vue
similarity index 100%
rename from app/imports/ui/pages/About.vue
rename to app/imports/client/ui/pages/About.vue
diff --git a/app/imports/ui/pages/Account.vue b/app/imports/client/ui/pages/Account.vue
similarity index 97%
rename from app/imports/ui/pages/Account.vue
rename to app/imports/client/ui/pages/Account.vue
index 1deea14a..5f196ce8 100644
--- a/app/imports/ui/pages/Account.vue
+++ b/app/imports/client/ui/pages/Account.vue
@@ -226,15 +226,15 @@
 </template>
 
 <script lang="js">
-  import router from '/imports/ui/router.js';
+  import router from '/imports/client/ui/router.js';
   import getEntitledCents from '/imports/api/users/patreon/getEntitledCents.js';
   import Invites from '/imports/api/users/Invites.js';
   import linkWithPatreon from '/imports/api/users/methods/linkWithPatreon.js'
   import { getUserTier } from '/imports/api/users/patreon/tiers.js';
   import addEmail from '/imports/api/users/methods/addEmail.js';
   import removeEmail from '/imports/api/users/methods/removeEmail.js';
-  import CreatureStorageStats from '/imports/ui/creature/creatureList/CreatureStorageStats.vue';
-  import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
+  import CreatureStorageStats from '/imports/client/ui/creature/creatureList/CreatureStorageStats.vue';
+  import FileStorageStats from '/imports/client/ui/files/FileStorageStats.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/pages/Admin.vue b/app/imports/client/ui/pages/Admin.vue
similarity index 100%
rename from app/imports/ui/pages/Admin.vue
rename to app/imports/client/ui/pages/Admin.vue
diff --git a/app/imports/ui/pages/CharacterList.vue b/app/imports/client/ui/pages/CharacterList.vue
similarity index 76%
rename from app/imports/ui/pages/CharacterList.vue
rename to app/imports/client/ui/pages/CharacterList.vue
index 3a675911..20290aee 100644
--- a/app/imports/ui/pages/CharacterList.vue
+++ b/app/imports/client/ui/pages/CharacterList.vue
@@ -40,7 +40,7 @@
               </v-icon>
             </v-btn>
           </v-alert>
-          <v-card :class="{'mb-4': folders && folders.length}">
+          <v-card :class="{ 'mb-4': folders && folders.length }">
             <creature-folder-list
               :creatures="CreaturesWithNoParty"
               :folders="folders"
@@ -78,12 +78,13 @@ import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
 import insertCreatureFolder from '/imports/api/creature/creatureFolders/methods.js/insertCreatureFolder.js';
-import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
-import ArchiveButton from '/imports/ui/creature/creatureList/ArchiveButton.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import CreatureFolderList from '/imports/client/ui/creature/creatureList/CreatureFolderList.vue';
+import ArchiveButton from '/imports/client/ui/creature/creatureList/ArchiveButton.vue';
 import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
+import { uniq, flatten } from 'lodash';
 
-const characterTransform = function(char){
+const characterTransform = function (char) {
   char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
   char.initial = char.name && char.name[0] || '?';
   return char;
@@ -93,28 +94,30 @@ export default {
     CreatureFolderList,
     ArchiveButton,
   },
-  data(){ return{
-    fab: false,
-    loadingInsertFolder: false,
-    renamingFolder: undefined,
-  }},
+  data() {
+    return {
+      fab: false,
+      loadingInsertFolder: false,
+      renamingFolder: undefined,
+    }
+  },
   meteor: {
     $subscribe: {
       'characterList': [],
     },
-    folders(){
+    folders() {
       const userId = Meteor.userId();
-      let folders =  CreatureFolders.find(
-        {owner: userId, archived: {$ne: true}},
-        {sort: {order: 1}},
+      let folders = CreatureFolders.find(
+        { owner: userId, archived: { $ne: true } },
+        { sort: { order: 1 } },
       ).map(folder => {
         folder.creatures = Creatures.find(
           {
-            _id: {$in: folder.creatures || []},
-            $or: [{readers: userId}, {writers: userId}, {owner: userId}],
+            _id: { $in: folder.creatures || [] },
+            $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
           }, {
-            sort: {name: 1},
-          }
+          sort: { name: 1 },
+        }
         ).map(characterTransform);
         return folder;
       });
@@ -122,35 +125,35 @@ export default {
     },
     CreaturesWithNoParty() {
       var userId = Meteor.userId();
-      var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
-      var folderChars = _.uniq(_.flatten(charArrays));
+      var charArrays = CreatureFolders.find({ owner: userId }).map(p => p.creatures);
+      var folderChars = uniq(flatten(charArrays));
       return Creatures.find(
         {
-          _id: {$nin: folderChars},
-          $or: [{readers: userId}, {writers: userId}, {owner: userId}],
+          _id: { $nin: folderChars },
+          $or: [{ readers: userId }, { writers: userId }, { owner: userId }],
         },
-        {sort: {name: 1}}
+        { sort: { name: 1 } }
       ).map(characterTransform);
     },
-    creatureCount(){
+    creatureCount() {
       let userId = Meteor.userId();
       return Creatures.find({
         owner: userId,
       }, {
-        fields: {_id: 1},
+        fields: { _id: 1 },
       }).count();
     },
-    tier(){
+    tier() {
       let userId = Meteor.userId();
       return getUserTier(userId);
     },
-    characterSpaceLeft(){
+    characterSpaceLeft() {
       let tier = this.tier;
       let currentCharacterCount = this.creatureCount;
       if (tier.characterSlots === -1) return Number.POSITIVE_INFINITY;
       return tier.characterSlots - currentCharacterCount
     },
-    exceededCharacterSpace(){
+    exceededCharacterSpace() {
       let tier = this.tier;
       let currentCharacterCount = this.creatureCount;
       return tier.characterSlots !== -1 && currentCharacterCount > tier.characterSlots
@@ -165,7 +168,7 @@ export default {
         callback: creatureId => creatureId,
       });
     },
-    insertFolder(){
+    insertFolder() {
       this.loadingInsertFolder = true;
       insertCreatureFolder.call(error => {
         this.loadingInsertFolder = false;
diff --git a/app/imports/ui/pages/CharacterSheetPage.vue b/app/imports/client/ui/pages/CharacterSheetPage.vue
similarity index 69%
rename from app/imports/ui/pages/CharacterSheetPage.vue
rename to app/imports/client/ui/pages/CharacterSheetPage.vue
index a2346e36..26865fde 100644
--- a/app/imports/ui/pages/CharacterSheetPage.vue
+++ b/app/imports/client/ui/pages/CharacterSheetPage.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="js">
-import CharacterSheet from '/imports/ui/creature/character/CharacterSheet.vue';
+import CharacterSheet from '/imports/client/ui/creature/character/CharacterSheet.vue';
 export default {
   components: {
     CharacterSheet,
diff --git a/app/imports/ui/pages/Documentation.vue b/app/imports/client/ui/pages/Documentation.vue
similarity index 96%
rename from app/imports/ui/pages/Documentation.vue
rename to app/imports/client/ui/pages/Documentation.vue
index d8c83c53..0147de1a 100644
--- a/app/imports/ui/pages/Documentation.vue
+++ b/app/imports/client/ui/pages/Documentation.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script lang="js">
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 import Docs from '/imports/api/docs/Docs.js';
 import { propsByDocsPath } from '/imports/constants/PROPERTIES.js';
 
diff --git a/app/imports/ui/pages/EmailVerificationError.vue b/app/imports/client/ui/pages/EmailVerificationError.vue
similarity index 100%
rename from app/imports/ui/pages/EmailVerificationError.vue
rename to app/imports/client/ui/pages/EmailVerificationError.vue
diff --git a/app/imports/ui/pages/EmailVerificationSuccess.vue b/app/imports/client/ui/pages/EmailVerificationSuccess.vue
similarity index 100%
rename from app/imports/ui/pages/EmailVerificationSuccess.vue
rename to app/imports/client/ui/pages/EmailVerificationSuccess.vue
diff --git a/app/imports/ui/pages/Feedback.vue b/app/imports/client/ui/pages/Feedback.vue
similarity index 100%
rename from app/imports/ui/pages/Feedback.vue
rename to app/imports/client/ui/pages/Feedback.vue
diff --git a/app/imports/ui/pages/Files.vue b/app/imports/client/ui/pages/Files.vue
similarity index 94%
rename from app/imports/ui/pages/Files.vue
rename to app/imports/client/ui/pages/Files.vue
index b30856e7..d9af57ec 100644
--- a/app/imports/ui/pages/Files.vue
+++ b/app/imports/client/ui/pages/Files.vue
@@ -101,11 +101,11 @@
 import ArchiveCreatureFiles from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 import UserImages from '/imports/api/files/UserImages.js';
 import prettyBytes from 'pretty-bytes';
-import ArchiveFileCard from '/imports/ui/files/ArchiveFileCard.vue';
-import FileStorageStats from '/imports/ui/files/FileStorageStats.vue';
-import ImageUploadInput from '/imports/ui/components/ImageUploadInput.vue';
-import UserImageCard from '/imports/ui/files/UserImageCard.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import ArchiveFileCard from '/imports/client/ui/files/ArchiveFileCard.vue';
+import FileStorageStats from '/imports/client/ui/files/FileStorageStats.vue';
+import ImageUploadInput from '/imports/client/ui/components/ImageUploadInput.vue';
+import UserImageCard from '/imports/client/ui/files/UserImageCard.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import { archiveSchema } from '/imports/api/creature/archive/ArchiveCreatureFiles.js';
 
 export default {
diff --git a/app/imports/ui/pages/Friends.vue b/app/imports/client/ui/pages/Friends.vue
similarity index 100%
rename from app/imports/ui/pages/Friends.vue
rename to app/imports/client/ui/pages/Friends.vue
diff --git a/app/imports/ui/pages/FunctionReference.vue b/app/imports/client/ui/pages/FunctionReference.vue
similarity index 100%
rename from app/imports/ui/pages/FunctionReference.vue
rename to app/imports/client/ui/pages/FunctionReference.vue
diff --git a/app/imports/ui/pages/Home.vue b/app/imports/client/ui/pages/Home.vue
similarity index 100%
rename from app/imports/ui/pages/Home.vue
rename to app/imports/client/ui/pages/Home.vue
diff --git a/app/imports/ui/pages/InviteError.vue b/app/imports/client/ui/pages/InviteError.vue
similarity index 100%
rename from app/imports/ui/pages/InviteError.vue
rename to app/imports/client/ui/pages/InviteError.vue
diff --git a/app/imports/ui/pages/InviteSuccess.vue b/app/imports/client/ui/pages/InviteSuccess.vue
similarity index 100%
rename from app/imports/ui/pages/InviteSuccess.vue
rename to app/imports/client/ui/pages/InviteSuccess.vue
diff --git a/app/imports/ui/pages/LaunchCountdown.vue b/app/imports/client/ui/pages/LaunchCountdown.vue
similarity index 100%
rename from app/imports/ui/pages/LaunchCountdown.vue
rename to app/imports/client/ui/pages/LaunchCountdown.vue
diff --git a/app/imports/ui/pages/Library.vue b/app/imports/client/ui/pages/Library.vue
similarity index 97%
rename from app/imports/ui/pages/Library.vue
rename to app/imports/client/ui/pages/Library.vue
index 65a2d18f..87eaacd7 100644
--- a/app/imports/ui/pages/Library.vue
+++ b/app/imports/client/ui/pages/Library.vue
@@ -58,10 +58,10 @@
 <script lang="js">
 import { union } from 'lodash';
 import { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import LibraryCollections, { insertLibraryCollection } from '/imports/api/library/LibraryCollections.js';
 import Libraries, { insertLibrary } from '/imports/api/library/Libraries.js';
-import LibraryList from '/imports/ui/library/LibraryList.vue';
+import LibraryList from '/imports/client/ui/library/LibraryList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/pages/LibraryCollection.vue b/app/imports/client/ui/pages/LibraryCollection.vue
similarity index 95%
rename from app/imports/ui/pages/LibraryCollection.vue
rename to app/imports/client/ui/pages/LibraryCollection.vue
index 414e2320..b436387a 100644
--- a/app/imports/ui/pages/LibraryCollection.vue
+++ b/app/imports/client/ui/pages/LibraryCollection.vue
@@ -46,7 +46,7 @@
 <script lang="js">
 import LibraryCollections from '/imports/api/library/LibraryCollections.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/pages/Maintenance.vue b/app/imports/client/ui/pages/Maintenance.vue
similarity index 100%
rename from app/imports/ui/pages/Maintenance.vue
rename to app/imports/client/ui/pages/Maintenance.vue
diff --git a/app/imports/ui/pages/NotFound.vue b/app/imports/client/ui/pages/NotFound.vue
similarity index 100%
rename from app/imports/ui/pages/NotFound.vue
rename to app/imports/client/ui/pages/NotFound.vue
diff --git a/app/imports/ui/pages/NotImplemented.vue b/app/imports/client/ui/pages/NotImplemented.vue
similarity index 100%
rename from app/imports/ui/pages/NotImplemented.vue
rename to app/imports/client/ui/pages/NotImplemented.vue
diff --git a/app/imports/ui/pages/PatreonLevelTooLow.vue b/app/imports/client/ui/pages/PatreonLevelTooLow.vue
similarity index 100%
rename from app/imports/ui/pages/PatreonLevelTooLow.vue
rename to app/imports/client/ui/pages/PatreonLevelTooLow.vue
diff --git a/app/imports/ui/pages/Register.vue b/app/imports/client/ui/pages/Register.vue
similarity index 100%
rename from app/imports/ui/pages/Register.vue
rename to app/imports/client/ui/pages/Register.vue
diff --git a/app/imports/ui/pages/ResetPassword.vue b/app/imports/client/ui/pages/ResetPassword.vue
similarity index 100%
rename from app/imports/ui/pages/ResetPassword.vue
rename to app/imports/client/ui/pages/ResetPassword.vue
diff --git a/app/imports/ui/pages/SignIn.vue b/app/imports/client/ui/pages/SignIn.vue
similarity index 100%
rename from app/imports/ui/pages/SignIn.vue
rename to app/imports/client/ui/pages/SignIn.vue
diff --git a/app/imports/ui/pages/SingleLibrary.vue b/app/imports/client/ui/pages/SingleLibrary.vue
similarity index 82%
rename from app/imports/ui/pages/SingleLibrary.vue
rename to app/imports/client/ui/pages/SingleLibrary.vue
index 4faa0452..d997de56 100644
--- a/app/imports/ui/pages/SingleLibrary.vue
+++ b/app/imports/client/ui/pages/SingleLibrary.vue
@@ -7,8 +7,8 @@
 </template>
 
 <script lang="js">
-import SingleCardLayout from '/imports/ui/layouts/SingleCardLayout.vue';
-import LibraryAndNode from '/imports/ui/library/LibraryAndNode.vue';
+import SingleCardLayout from '/imports/client/ui/layouts/SingleCardLayout.vue';
+import LibraryAndNode from '/imports/client/ui/library/LibraryAndNode.vue';
 import Libraries from '/imports/api/library/Libraries.js';
 
 export default {
diff --git a/app/imports/ui/pages/Tabletop.vue b/app/imports/client/ui/pages/Tabletop.vue
similarity index 92%
rename from app/imports/ui/pages/Tabletop.vue
rename to app/imports/client/ui/pages/Tabletop.vue
index fd1f17ac..bb3c54fb 100644
--- a/app/imports/ui/pages/Tabletop.vue
+++ b/app/imports/client/ui/pages/Tabletop.vue
@@ -39,7 +39,7 @@
 
 <script lang="js">
 import Tabletops from '/imports/api/tabletop/Tabletops.js';
-import TabletopComponent from '/imports/ui/tabletop/TabletopComponent.vue';
+import TabletopComponent from '/imports/client/ui/tabletop/TabletopComponent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/pages/Tabletops.vue b/app/imports/client/ui/pages/Tabletops.vue
similarity index 89%
rename from app/imports/ui/pages/Tabletops.vue
rename to app/imports/client/ui/pages/Tabletops.vue
index 5417feb4..1f03b42b 100644
--- a/app/imports/ui/pages/Tabletops.vue
+++ b/app/imports/client/ui/pages/Tabletops.vue
@@ -34,10 +34,10 @@
 </template>
 
 <script lang="js">
-import SingleCardLayout from '/imports/ui/layouts/SingleCardLayout.vue'
+import SingleCardLayout from '/imports/client/ui/layouts/SingleCardLayout.vue'
 import Tabletops from '/imports/api/tabletop/Tabletops.js';
 import insertTabletop from '/imports/api/tabletop/methods/insertTabletop.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/actions/ActionCard.vue b/app/imports/client/ui/properties/components/actions/ActionCard.vue
similarity index 90%
rename from app/imports/ui/properties/components/actions/ActionCard.vue
rename to app/imports/client/ui/properties/components/actions/ActionCard.vue
index 040009c9..b2c67042 100644
--- a/app/imports/ui/properties/components/actions/ActionCard.vue
+++ b/app/imports/client/ui/properties/components/actions/ActionCard.vue
@@ -101,16 +101,16 @@
 
 <script lang="js">
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
 import doAction from '/imports/api/engine/actions/doAction.js';
-import AttributeConsumedView from '/imports/ui/properties/components/actions/AttributeConsumedView.vue';
-import ItemConsumedView from '/imports/ui/properties/components/actions/ItemConsumedView.vue';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-import TreeNodeList from '/imports/ui/components/tree/TreeNodeList.vue';
+import AttributeConsumedView from '/imports/client/ui/properties/components/actions/AttributeConsumedView.vue';
+import ItemConsumedView from '/imports/client/ui/properties/components/actions/ItemConsumedView.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+import TreeNodeList from '/imports/client/ui/components/tree/TreeNodeList.vue';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { some } from 'lodash';
diff --git a/app/imports/ui/properties/components/actions/AttributeConsumedView.vue b/app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue
similarity index 100%
rename from app/imports/ui/properties/components/actions/AttributeConsumedView.vue
rename to app/imports/client/ui/properties/components/actions/AttributeConsumedView.vue
diff --git a/app/imports/ui/properties/components/actions/EventButton.vue b/app/imports/client/ui/properties/components/actions/EventButton.vue
similarity index 89%
rename from app/imports/ui/properties/components/actions/EventButton.vue
rename to app/imports/client/ui/properties/components/actions/EventButton.vue
index 29bdb0c6..27773e04 100644
--- a/app/imports/ui/properties/components/actions/EventButton.vue
+++ b/app/imports/client/ui/properties/components/actions/EventButton.vue
@@ -22,8 +22,8 @@
 
 <script lang="js">
 import doAction from '/imports/api/engine/actions/doAction.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/actions/ItemConsumedView.vue b/app/imports/client/ui/properties/components/actions/ItemConsumedView.vue
similarity index 96%
rename from app/imports/ui/properties/components/actions/ItemConsumedView.vue
rename to app/imports/client/ui/properties/components/actions/ItemConsumedView.vue
index 3363c5a4..f0eae75a 100644
--- a/app/imports/ui/properties/components/actions/ItemConsumedView.vue
+++ b/app/imports/client/ui/properties/components/actions/ItemConsumedView.vue
@@ -83,7 +83,7 @@
 </template>
 
 <script lang="js">
-import SelectItemToConsume from '/imports/ui/properties/components/actions/SelectItemToConsume.vue';
+import SelectItemToConsume from '/imports/client/ui/properties/components/actions/SelectItemToConsume.vue';
 export default {
   components: {
     SelectItemToConsume,
diff --git a/app/imports/ui/properties/components/actions/SelectItemToConsume.vue b/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue
similarity index 94%
rename from app/imports/ui/properties/components/actions/SelectItemToConsume.vue
rename to app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue
index 1e1538a3..5634958e 100644
--- a/app/imports/ui/properties/components/actions/SelectItemToConsume.vue
+++ b/app/imports/client/ui/properties/components/actions/SelectItemToConsume.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script lang="js">
-import ItemTreeNode from '/imports/ui/properties/treeNodeViews/ItemTreeNode.vue';
+import ItemTreeNode from '/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import selectAmmoItem from '/imports/api/creature/creatureProperties/methods/selectAmmoItem.js';
 import { findIndex } from 'lodash';
diff --git a/app/imports/ui/properties/components/attributes/AbilityListTile.vue b/app/imports/client/ui/properties/components/attributes/AbilityListTile.vue
similarity index 92%
rename from app/imports/ui/properties/components/attributes/AbilityListTile.vue
rename to app/imports/client/ui/properties/components/attributes/AbilityListTile.vue
index 46d36bb8..2cc2eb95 100644
--- a/app/imports/ui/properties/components/attributes/AbilityListTile.vue
+++ b/app/imports/client/ui/properties/components/attributes/AbilityListTile.vue
@@ -52,10 +52,10 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import doCheck from '/imports/api/engine/actions/doCheck.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/AttributeCard.vue b/app/imports/client/ui/properties/components/attributes/AttributeCard.vue
similarity index 81%
rename from app/imports/ui/properties/components/attributes/AttributeCard.vue
rename to app/imports/client/ui/properties/components/attributes/AttributeCard.vue
index f1fd03f9..2f96dd5f 100644
--- a/app/imports/ui/properties/components/attributes/AttributeCard.vue
+++ b/app/imports/client/ui/properties/components/attributes/AttributeCard.vue
@@ -11,8 +11,8 @@
 </template>
 
 <script lang="js">
-  import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-  import AttributeCardContent from '/imports/ui/properties/components/attributes/AttributeCardContent.vue';
+  import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+  import AttributeCardContent from '/imports/client/ui/properties/components/attributes/AttributeCardContent.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/components/attributes/AttributeCardContent.vue b/app/imports/client/ui/properties/components/attributes/AttributeCardContent.vue
similarity index 89%
rename from app/imports/ui/properties/components/attributes/AttributeCardContent.vue
rename to app/imports/client/ui/properties/components/attributes/AttributeCardContent.vue
index 439ad70f..c1976688 100644
--- a/app/imports/ui/properties/components/attributes/AttributeCardContent.vue
+++ b/app/imports/client/ui/properties/components/attributes/AttributeCardContent.vue
@@ -35,10 +35,10 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import doCheck from '/imports/api/engine/actions/doCheck.js';
-import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/AttributeEffect.vue b/app/imports/client/ui/properties/components/attributes/AttributeEffect.vue
similarity index 96%
rename from app/imports/ui/properties/components/attributes/AttributeEffect.vue
rename to app/imports/client/ui/properties/components/attributes/AttributeEffect.vue
index 5725a3ef..43f4e212 100644
--- a/app/imports/ui/properties/components/attributes/AttributeEffect.vue
+++ b/app/imports/client/ui/properties/components/attributes/AttributeEffect.vue
@@ -41,8 +41,8 @@
 </template>
 
 <script lang="js">
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
-import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
+import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { isFinite } from 'lodash';
 
diff --git a/app/imports/ui/properties/components/attributes/HealthBar.vue b/app/imports/client/ui/properties/components/attributes/HealthBar.vue
similarity index 97%
rename from app/imports/ui/properties/components/attributes/HealthBar.vue
rename to app/imports/client/ui/properties/components/attributes/HealthBar.vue
index cc83302b..8a8732ff 100644
--- a/app/imports/ui/properties/components/attributes/HealthBar.vue
+++ b/app/imports/client/ui/properties/components/attributes/HealthBar.vue
@@ -83,8 +83,8 @@
 </template>
 
 <script lang="js">
-import IncrementMenu from '/imports/ui/components/IncrementMenu.vue';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
+import IncrementMenu from '/imports/client/ui/components/IncrementMenu.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
 import chroma from 'chroma-js';
 
 export default {
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCard.vue b/app/imports/client/ui/properties/components/attributes/HealthBarCard.vue
similarity index 84%
rename from app/imports/ui/properties/components/attributes/HealthBarCard.vue
rename to app/imports/client/ui/properties/components/attributes/HealthBarCard.vue
index 48b4b89a..54d82d48 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCard.vue
+++ b/app/imports/client/ui/properties/components/attributes/HealthBarCard.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang="js">
-import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
+import HealthBar from '/imports/client/ui/properties/components/attributes/HealthBar.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue b/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue
similarity index 94%
rename from app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
rename to app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue
index db3b9c66..d4ee6bd7 100644
--- a/app/imports/ui/properties/components/attributes/HealthBarCardContainer.vue
+++ b/app/imports/client/ui/properties/components/attributes/HealthBarCardContainer.vue
@@ -15,7 +15,7 @@
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 
-import HealthBarCard from '/imports/ui/properties/components/attributes/HealthBarCard.vue';
+import HealthBarCard from '/imports/client/ui/properties/components/attributes/HealthBarCard.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue b/app/imports/client/ui/properties/components/attributes/HitDiceListTile.vue
similarity index 96%
rename from app/imports/ui/properties/components/attributes/HitDiceListTile.vue
rename to app/imports/client/ui/properties/components/attributes/HitDiceListTile.vue
index 7cfff667..f7f86554 100644
--- a/app/imports/ui/properties/components/attributes/HitDiceListTile.vue
+++ b/app/imports/client/ui/properties/components/attributes/HitDiceListTile.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
 export default {
   inject: {
     context: { default: {} }
diff --git a/app/imports/ui/properties/components/attributes/ResourceCard.vue b/app/imports/client/ui/properties/components/attributes/ResourceCard.vue
similarity index 81%
rename from app/imports/ui/properties/components/attributes/ResourceCard.vue
rename to app/imports/client/ui/properties/components/attributes/ResourceCard.vue
index 1ebd7c91..a46cede2 100644
--- a/app/imports/ui/properties/components/attributes/ResourceCard.vue
+++ b/app/imports/client/ui/properties/components/attributes/ResourceCard.vue
@@ -16,8 +16,8 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
-import ResourceCardContent from '/imports/ui/properties/components/attributes/ResourceCardContent.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+import ResourceCardContent from '/imports/client/ui/properties/components/attributes/ResourceCardContent.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/attributes/ResourceCardContent.vue b/app/imports/client/ui/properties/components/attributes/ResourceCardContent.vue
similarity index 100%
rename from app/imports/ui/properties/components/attributes/ResourceCardContent.vue
rename to app/imports/client/ui/properties/components/attributes/ResourceCardContent.vue
diff --git a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue b/app/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue
similarity index 96%
rename from app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
rename to app/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue
index f4a00384..26b5b4da 100644
--- a/app/imports/ui/properties/components/attributes/SpellSlotListTile.vue
+++ b/app/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
 export default {
   props: {
     model: {
diff --git a/app/imports/ui/properties/components/attributes/SplitListLayout.vue b/app/imports/client/ui/properties/components/attributes/SplitListLayout.vue
similarity index 100%
rename from app/imports/ui/properties/components/attributes/SplitListLayout.vue
rename to app/imports/client/ui/properties/components/attributes/SplitListLayout.vue
diff --git a/app/imports/ui/properties/components/buffs/BuffListItem.vue b/app/imports/client/ui/properties/components/buffs/BuffListItem.vue
similarity index 100%
rename from app/imports/ui/properties/components/buffs/BuffListItem.vue
rename to app/imports/client/ui/properties/components/buffs/BuffListItem.vue
diff --git a/app/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue b/app/imports/client/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue
similarity index 100%
rename from app/imports/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue
rename to app/imports/client/ui/properties/components/damageMultipliers/DamageMultiplierCard.vue
diff --git a/app/imports/ui/properties/components/effects/InlineEffect.vue b/app/imports/client/ui/properties/components/effects/InlineEffect.vue
similarity index 97%
rename from app/imports/ui/properties/components/effects/InlineEffect.vue
rename to app/imports/client/ui/properties/components/effects/InlineEffect.vue
index 9ac97e38..611ada43 100644
--- a/app/imports/ui/properties/components/effects/InlineEffect.vue
+++ b/app/imports/client/ui/properties/components/effects/InlineEffect.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script lang="js">
-  import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+  import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
   import { isFinite } from 'lodash';
 
   export default {
diff --git a/app/imports/ui/properties/components/features/FeatureCard.vue b/app/imports/client/ui/properties/components/features/FeatureCard.vue
similarity index 83%
rename from app/imports/ui/properties/components/features/FeatureCard.vue
rename to app/imports/client/ui/properties/components/features/FeatureCard.vue
index 860e11de..a8096891 100644
--- a/app/imports/ui/properties/components/features/FeatureCard.vue
+++ b/app/imports/client/ui/properties/components/features/FeatureCard.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script lang="js">
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue'
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/folders/FolderGroupCard.vue b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
similarity index 94%
rename from app/imports/ui/properties/components/folders/FolderGroupCard.vue
rename to app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
index a216c8a6..7729cd9c 100644
--- a/app/imports/ui/properties/components/folders/FolderGroupCard.vue
+++ b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
@@ -24,7 +24,7 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import propComponents from '/imports/ui/properties/components/folders/propertyComponentIndex.js';
+import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue b/app/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
similarity index 72%
rename from app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
rename to app/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
index 7bcb81da..acf0d8d5 100644
--- a/app/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
+++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue
@@ -17,8 +17,8 @@
 </template>
 
 <script lang="js">
-import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
-import EventButton from '/imports/ui/properties/components/actions/EventButton.vue';
+import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
+import EventButton from '/imports/client/ui/properties/components/actions/EventButton.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue b/app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
similarity index 73%
rename from app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
rename to app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
index 30677f39..a2ef661d 100644
--- a/app/imports/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
+++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
@@ -43,13 +43,13 @@
 </template>
 
 <script lang="js">
-import AbilityListTile from '/imports/ui/properties/components/attributes/AbilityListTile.vue';
-import HitDiceListTile from '/imports/ui/properties/components/attributes/HitDiceListTile.vue';
-import HealthBar from '/imports/ui/properties/components/attributes/HealthBar.vue';
-import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
-import ResourceCardContent from '/imports/ui/properties/components/attributes/ResourceCardContent.vue';
-import AttributeCardContent from '/imports/ui/properties/components/attributes/AttributeCardContent.vue';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import AbilityListTile from '/imports/client/ui/properties/components/attributes/AbilityListTile.vue';
+import HitDiceListTile from '/imports/client/ui/properties/components/attributes/HitDiceListTile.vue';
+import HealthBar from '/imports/client/ui/properties/components/attributes/HealthBar.vue';
+import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
+import ResourceCardContent from '/imports/client/ui/properties/components/attributes/ResourceCardContent.vue';
+import AttributeCardContent from '/imports/client/ui/properties/components/attributes/AttributeCardContent.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 
diff --git a/app/imports/ui/properties/components/folders/propertyComponentIndex.js b/app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
similarity index 59%
rename from app/imports/ui/properties/components/folders/propertyComponentIndex.js
rename to app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
index b61d0181..de9ce052 100644
--- a/app/imports/ui/properties/components/folders/propertyComponentIndex.js
+++ b/app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
@@ -1,31 +1,31 @@
-import action from '/imports/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue';
+import action from '/imports/client/ui/properties/components/folders/folderGroupComponents/ActionGroupComponent.vue';
 //import adjustment from '';
 import attribute from './folderGroupComponents/AttributeGroupComponent.vue';
-import buff from '/imports/ui/properties/components/buffs/BuffListItem.vue';
+import buff from '/imports/client/ui/properties/components/buffs/BuffListItem.vue';
 //import buffRemover from '';
 //import branch from '';
 //import constant from '';
-import container from '/imports/ui/properties/components/inventory/ContainerCard.vue';
+import container from '/imports/client/ui/properties/components/inventory/ContainerCard.vue';
 //import classComponent from '';
 //import classLevel from '';
 //import damage from '';
 //import damageMultiplier from '';
 //import effect from '';
-import feature from '/imports/ui/properties/components/features/FeatureCard.vue';
+import feature from '/imports/client/ui/properties/components/features/FeatureCard.vue';
 // import folder from '';
-import item from '/imports/ui/properties/components/inventory/ItemListTile.vue';
-import note from '/imports/ui/properties/components/persona/NoteCard.vue';
+import item from '/imports/client/ui/properties/components/inventory/ItemListTile.vue';
+import note from '/imports/client/ui/properties/components/persona/NoteCard.vue';
 //import pointBuy from '';
 //import proficiency from '';
 //import propertySlot from '';
 //import reference from '';
 //import roll from '';
 //import savingThrow from '';
-import skill from '/imports/ui/properties/components/skills/SkillListTile.vue';
+import skill from '/imports/client/ui/properties/components/skills/SkillListTile.vue';
 //import slotFiller from '';
 //import spellList from '';
 //import spell from '';
-import toggle from '/imports/ui/properties/components/toggles/ToggleCard.vue';
+import toggle from '/imports/client/ui/properties/components/toggles/ToggleCard.vue';
 //import trigger from '';
 
 export default {
diff --git a/app/imports/ui/properties/components/inventory/ContainerCard.vue b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue
similarity index 91%
rename from app/imports/ui/properties/components/inventory/ContainerCard.vue
rename to app/imports/client/ui/properties/components/inventory/ContainerCard.vue
index 0843dcfd..b2d6de9f 100644
--- a/app/imports/ui/properties/components/inventory/ContainerCard.vue
+++ b/app/imports/client/ui/properties/components/inventory/ContainerCard.vue
@@ -43,10 +43,10 @@
 </template>
 
 <script lang="js">
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import ItemList from '/imports/ui/properties/components/inventory/ItemList.vue';
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import ItemList from '/imports/client/ui/properties/components/inventory/ItemList.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import CoinValue from '/imports/ui/components/CoinValue.vue';
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/inventory/ItemList.vue b/app/imports/client/ui/properties/components/inventory/ItemList.vue
similarity index 96%
rename from app/imports/ui/properties/components/inventory/ItemList.vue
rename to app/imports/client/ui/properties/components/inventory/ItemList.vue
index 28a07995..8c617ab2 100644
--- a/app/imports/ui/properties/components/inventory/ItemList.vue
+++ b/app/imports/client/ui/properties/components/inventory/ItemList.vue
@@ -28,7 +28,7 @@
 
 <script lang="js">
 import draggable from 'vuedraggable';
-import ItemListTile from '/imports/ui/properties/components/inventory/ItemListTile.vue';
+import ItemListTile from '/imports/client/ui/properties/components/inventory/ItemListTile.vue';
 import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 
diff --git a/app/imports/ui/properties/components/inventory/ItemListTile.vue b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
similarity index 91%
rename from app/imports/ui/properties/components/inventory/ItemListTile.vue
rename to app/imports/client/ui/properties/components/inventory/ItemListTile.vue
index 72fb09c6..cf252ddc 100644
--- a/app/imports/ui/properties/components/inventory/ItemListTile.vue
+++ b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
@@ -45,11 +45,11 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 import adjustQuantity from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
-import IncrementButton from '/imports/ui/components/IncrementButton.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import IncrementButton from '/imports/client/ui/components/IncrementButton.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/persona/NoteCard.vue b/app/imports/client/ui/properties/components/persona/NoteCard.vue
similarity index 83%
rename from app/imports/ui/properties/components/persona/NoteCard.vue
rename to app/imports/client/ui/properties/components/persona/NoteCard.vue
index d07afa1e..8139f9a9 100644
--- a/app/imports/ui/properties/components/persona/NoteCard.vue
+++ b/app/imports/client/ui/properties/components/persona/NoteCard.vue
@@ -26,9 +26,9 @@
 </template>
 
 <script lang="js">
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
-import isDarkColor from '/imports/ui/utility/isDarkColor.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/pointBuy/PointBuyCard.vue b/app/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue
similarity index 94%
rename from app/imports/ui/properties/components/pointBuy/PointBuyCard.vue
rename to app/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue
index cbd3f339..f102192d 100644
--- a/app/imports/ui/properties/components/pointBuy/PointBuyCard.vue
+++ b/app/imports/client/ui/properties/components/pointBuy/PointBuyCard.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script lang="js">
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/skills/SkillListTile.vue b/app/imports/client/ui/properties/components/skills/SkillListTile.vue
similarity index 90%
rename from app/imports/ui/properties/components/skills/SkillListTile.vue
rename to app/imports/client/ui/properties/components/skills/SkillListTile.vue
index bbcb773e..ec436241 100644
--- a/app/imports/ui/properties/components/skills/SkillListTile.vue
+++ b/app/imports/client/ui/properties/components/skills/SkillListTile.vue
@@ -58,11 +58,11 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import doCheck from '/imports/api/engine/actions/doCheck.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/skills/SkillProficiency.vue b/app/imports/client/ui/properties/components/skills/SkillProficiency.vue
similarity index 88%
rename from app/imports/ui/properties/components/skills/SkillProficiency.vue
rename to app/imports/client/ui/properties/components/skills/SkillProficiency.vue
index 9d55716a..66b7ed03 100644
--- a/app/imports/ui/properties/components/skills/SkillProficiency.vue
+++ b/app/imports/client/ui/properties/components/skills/SkillProficiency.vue
@@ -41,9 +41,9 @@
 </template>
 
 <script lang="js">
-  import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-  import Breadcrumbs from '/imports/ui/creature/creatureProperties/Breadcrumbs.vue';
-  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+  import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+  import Breadcrumbs from '/imports/client/ui/creature/creatureProperties/Breadcrumbs.vue';
+  import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue b/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue
similarity index 95%
rename from app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
rename to app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue
index dfdc0160..c68d81d7 100644
--- a/app/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue
+++ b/app/imports/client/ui/properties/components/spells/CastSpellWithSlotDialog.vue
@@ -186,13 +186,13 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import SplitListLayout from '/imports/ui/properties/components/attributes/SplitListLayout.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import SplitListLayout from '/imports/client/ui/properties/components/attributes/SplitListLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import spellsWithSubheaders from '/imports/ui/properties/components/spells/spellsWithSubheaders.js';
-import SpellSlotListTile from '/imports/ui/properties/components/attributes/SpellSlotListTile.vue';
-import SpellListTile from '/imports/ui/properties/components/spells/SpellListTile.vue';
-import RollPopup from '/imports/ui/components/RollPopup.vue';
+import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders.js';
+import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
+import SpellListTile from '/imports/client/ui/properties/components/spells/SpellListTile.vue';
+import RollPopup from '/imports/client/ui/components/RollPopup.vue';
 import { find } from 'lodash';
 
 const slotFilter = {
diff --git a/app/imports/ui/properties/components/spells/SpellList.vue b/app/imports/client/ui/properties/components/spells/SpellList.vue
similarity index 93%
rename from app/imports/ui/properties/components/spells/SpellList.vue
rename to app/imports/client/ui/properties/components/spells/SpellList.vue
index 50f70bfc..f9271f54 100644
--- a/app/imports/ui/properties/components/spells/SpellList.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellList.vue
@@ -39,9 +39,9 @@
 
 <script lang="js">
 import draggable from 'vuedraggable';
-import SpellListTile from '/imports/ui/properties/components/spells/SpellListTile.vue';
+import SpellListTile from '/imports/client/ui/properties/components/spells/SpellListTile.vue';
 import { organizeDoc } from '/imports/api/parenting/organizeMethods.js';
-import spellsWithSubheaders from '/imports/ui/properties/components/spells/spellsWithSubheaders.js';
+import spellsWithSubheaders from '/imports/client/ui/properties/components/spells/spellsWithSubheaders.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/components/spells/SpellListCard.vue b/app/imports/client/ui/properties/components/spells/SpellListCard.vue
similarity index 95%
rename from app/imports/ui/properties/components/spells/SpellListCard.vue
rename to app/imports/client/ui/properties/components/spells/SpellListCard.vue
index 4dd5edc4..4474d606 100644
--- a/app/imports/ui/properties/components/spells/SpellListCard.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellListCard.vue
@@ -58,8 +58,8 @@
 </template>
 
 <script lang="js">
-import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-import SpellList from '/imports/ui/properties/components/spells/SpellList.vue';
+import ToolbarCard from '/imports/client/ui/components/ToolbarCard.vue';
+import SpellList from '/imports/client/ui/properties/components/spells/SpellList.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/spells/SpellListTile.vue b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
similarity index 96%
rename from app/imports/ui/properties/components/spells/SpellListTile.vue
rename to app/imports/client/ui/properties/components/spells/SpellListTile.vue
index 20122630..6c47536f 100644
--- a/app/imports/ui/properties/components/spells/SpellListTile.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 
 export default {
diff --git a/app/imports/ui/properties/components/spells/spellsWithSubheaders.js b/app/imports/client/ui/properties/components/spells/spellsWithSubheaders.js
similarity index 100%
rename from app/imports/ui/properties/components/spells/spellsWithSubheaders.js
rename to app/imports/client/ui/properties/components/spells/spellsWithSubheaders.js
diff --git a/app/imports/ui/properties/components/toggles/ToggleCard.vue b/app/imports/client/ui/properties/components/toggles/ToggleCard.vue
similarity index 96%
rename from app/imports/ui/properties/components/toggles/ToggleCard.vue
rename to app/imports/client/ui/properties/components/toggles/ToggleCard.vue
index 207783d8..87b8baca 100644
--- a/app/imports/ui/properties/components/toggles/ToggleCard.vue
+++ b/app/imports/client/ui/properties/components/toggles/ToggleCard.vue
@@ -26,7 +26,7 @@
 
 <script lang="js">
 import flipToggle from '/imports/api/creature/creatureProperties/methods/flipToggle.js';
-import CardHighlight from '/imports/ui/components/CardHighlight.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/forms/ActionForm.vue b/app/imports/client/ui/properties/forms/ActionForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/ActionForm.vue
rename to app/imports/client/ui/properties/forms/ActionForm.vue
index 3f2e5497..d20c14dd 100644
--- a/app/imports/ui/properties/forms/ActionForm.vue
+++ b/app/imports/client/ui/properties/forms/ActionForm.vue
@@ -177,10 +177,10 @@
 </template>
 
 <script lang="js">
-import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
-import ResetSelector from '/imports/ui/components/ResetSelector.vue';
+import ResourcesForm from '/imports/client/ui/properties/forms/ResourcesForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import IconColorMenu from '/imports/client/ui/properties/forms/shared/IconColorMenu.vue';
+import ResetSelector from '/imports/client/ui/components/ResetSelector.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/AdjustmentForm.vue b/app/imports/client/ui/properties/forms/AdjustmentForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/AdjustmentForm.vue
rename to app/imports/client/ui/properties/forms/AdjustmentForm.vue
index 31712722..353d4fab 100644
--- a/app/imports/ui/properties/forms/AdjustmentForm.vue
+++ b/app/imports/client/ui/properties/forms/AdjustmentForm.vue
@@ -76,8 +76,8 @@
 </template>
 
 <script lang="js">
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin, attributeListMixin],
diff --git a/app/imports/ui/properties/forms/AttributeConsumedForm.vue b/app/imports/client/ui/properties/forms/AttributeConsumedForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/AttributeConsumedForm.vue
rename to app/imports/client/ui/properties/forms/AttributeConsumedForm.vue
index b7f0421c..87781806 100644
--- a/app/imports/ui/properties/forms/AttributeConsumedForm.vue
+++ b/app/imports/client/ui/properties/forms/AttributeConsumedForm.vue
@@ -31,8 +31,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
 
 export default {
   mixins: [propertyFormMixin, attributeListMixin],
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/client/ui/properties/forms/AttributeForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/AttributeForm.vue
rename to app/imports/client/ui/properties/forms/AttributeForm.vue
index 8569e69b..77e66af1 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/client/ui/properties/forms/AttributeForm.vue
@@ -264,11 +264,11 @@
 </template>
 
 <script lang="js">
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import FormSections from '/imports/ui/properties/forms/shared/FormSections.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import ColorPicker from '/imports/ui/components/ColorPicker.vue';
-import ResetSelector from '/imports/ui/components/ResetSelector.vue';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import FormSections from '/imports/client/ui/properties/forms/shared/FormSections.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
+import ResetSelector from '/imports/client/ui/components/ResetSelector.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/AttributesConsumedListForm.vue b/app/imports/client/ui/properties/forms/AttributesConsumedListForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/AttributesConsumedListForm.vue
rename to app/imports/client/ui/properties/forms/AttributesConsumedListForm.vue
index 97ff2d81..6d07a538 100644
--- a/app/imports/ui/properties/forms/AttributesConsumedListForm.vue
+++ b/app/imports/client/ui/properties/forms/AttributesConsumedListForm.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script lang="js">
-import AttributeConsumedForm from '/imports/ui/properties/forms/AttributeConsumedForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import AttributeConsumedForm from '/imports/client/ui/properties/forms/AttributeConsumedForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/BranchForm.vue b/app/imports/client/ui/properties/forms/BranchForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/BranchForm.vue
rename to app/imports/client/ui/properties/forms/BranchForm.vue
index 1ad49fb4..8893f57d 100644
--- a/app/imports/ui/properties/forms/BranchForm.vue
+++ b/app/imports/client/ui/properties/forms/BranchForm.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/BuffForm.vue b/app/imports/client/ui/properties/forms/BuffForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/BuffForm.vue
rename to app/imports/client/ui/properties/forms/BuffForm.vue
index ade759e4..965f5810 100644
--- a/app/imports/ui/properties/forms/BuffForm.vue
+++ b/app/imports/client/ui/properties/forms/BuffForm.vue
@@ -98,7 +98,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/BuffRemoverForm.vue b/app/imports/client/ui/properties/forms/BuffRemoverForm.vue
similarity index 98%
rename from app/imports/ui/properties/forms/BuffRemoverForm.vue
rename to app/imports/client/ui/properties/forms/BuffRemoverForm.vue
index ed5845af..abd05c62 100644
--- a/app/imports/ui/properties/forms/BuffRemoverForm.vue
+++ b/app/imports/client/ui/properties/forms/BuffRemoverForm.vue
@@ -135,7 +135,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import {
   BuffRemoverSchema
 } from '/imports/api/properties/BuffRemovers.js';
diff --git a/app/imports/ui/properties/forms/ClassForm.vue b/app/imports/client/ui/properties/forms/ClassForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/ClassForm.vue
rename to app/imports/client/ui/properties/forms/ClassForm.vue
index f4bd101e..bb715706 100644
--- a/app/imports/ui/properties/forms/ClassForm.vue
+++ b/app/imports/client/ui/properties/forms/ClassForm.vue
@@ -126,8 +126,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 import { SlotSchema } from '/imports/api/properties/Slots.js';
 
diff --git a/app/imports/ui/properties/forms/ClassLevelForm.vue b/app/imports/client/ui/properties/forms/ClassLevelForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/ClassLevelForm.vue
rename to app/imports/client/ui/properties/forms/ClassLevelForm.vue
index 854380e2..15be3ac0 100644
--- a/app/imports/ui/properties/forms/ClassLevelForm.vue
+++ b/app/imports/client/ui/properties/forms/ClassLevelForm.vue
@@ -66,7 +66,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/ConstantForm.vue b/app/imports/client/ui/properties/forms/ConstantForm.vue
similarity index 88%
rename from app/imports/ui/properties/forms/ConstantForm.vue
rename to app/imports/client/ui/properties/forms/ConstantForm.vue
index 27817bf3..c6c5e07a 100644
--- a/app/imports/ui/properties/forms/ConstantForm.vue
+++ b/app/imports/client/ui/properties/forms/ConstantForm.vue
@@ -35,8 +35,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 import { ConstantSchema } from '/imports/api/properties/Constants.js';
 
 export default {
diff --git a/app/imports/ui/properties/forms/ContainerForm.vue b/app/imports/client/ui/properties/forms/ContainerForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/ContainerForm.vue
rename to app/imports/client/ui/properties/forms/ContainerForm.vue
index 58f127e0..5cef5978 100644
--- a/app/imports/ui/properties/forms/ContainerForm.vue
+++ b/app/imports/client/ui/properties/forms/ContainerForm.vue
@@ -89,8 +89,8 @@
 </template>
 
 <script lang="js">
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/DamageForm.vue b/app/imports/client/ui/properties/forms/DamageForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/DamageForm.vue
rename to app/imports/client/ui/properties/forms/DamageForm.vue
index 1faa66f3..23d00ad8 100644
--- a/app/imports/ui/properties/forms/DamageForm.vue
+++ b/app/imports/client/ui/properties/forms/DamageForm.vue
@@ -71,7 +71,7 @@
 
 <script lang="js">
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
 export default {
diff --git a/app/imports/ui/properties/forms/DamageMultiplierForm.vue b/app/imports/client/ui/properties/forms/DamageMultiplierForm.vue
similarity index 94%
rename from app/imports/ui/properties/forms/DamageMultiplierForm.vue
rename to app/imports/client/ui/properties/forms/DamageMultiplierForm.vue
index 551f1514..130fbc85 100644
--- a/app/imports/ui/properties/forms/DamageMultiplierForm.vue
+++ b/app/imports/client/ui/properties/forms/DamageMultiplierForm.vue
@@ -88,8 +88,8 @@
 </template>
 
 <script lang="js">
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 import DAMAGE_TYPES from '/imports/constants/DAMAGE_TYPES.js';
 
diff --git a/app/imports/ui/properties/forms/EffectForm.vue b/app/imports/client/ui/properties/forms/EffectForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/EffectForm.vue
rename to app/imports/client/ui/properties/forms/EffectForm.vue
index 694db21d..1d386bf8 100644
--- a/app/imports/ui/properties/forms/EffectForm.vue
+++ b/app/imports/client/ui/properties/forms/EffectForm.vue
@@ -181,11 +181,11 @@
 </template>
 
 <script lang="js">
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
 import { EffectSchema } from '/imports/api/properties/Effects.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 
 const ICON_SPIN_DURATION = 300;
 export default {
diff --git a/app/imports/ui/properties/forms/FeatureForm.vue b/app/imports/client/ui/properties/forms/FeatureForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/FeatureForm.vue
rename to app/imports/client/ui/properties/forms/FeatureForm.vue
index c3f85735..10aa74fd 100644
--- a/app/imports/ui/properties/forms/FeatureForm.vue
+++ b/app/imports/client/ui/properties/forms/FeatureForm.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/FolderForm.vue b/app/imports/client/ui/properties/forms/FolderForm.vue
similarity index 86%
rename from app/imports/ui/properties/forms/FolderForm.vue
rename to app/imports/client/ui/properties/forms/FolderForm.vue
index b616505e..d12a7439 100644
--- a/app/imports/ui/properties/forms/FolderForm.vue
+++ b/app/imports/client/ui/properties/forms/FolderForm.vue
@@ -39,8 +39,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ItemConsumedForm.vue b/app/imports/client/ui/properties/forms/ItemConsumedForm.vue
similarity index 89%
rename from app/imports/ui/properties/forms/ItemConsumedForm.vue
rename to app/imports/client/ui/properties/forms/ItemConsumedForm.vue
index d65fd6bc..dad6139b 100644
--- a/app/imports/ui/properties/forms/ItemConsumedForm.vue
+++ b/app/imports/client/ui/properties/forms/ItemConsumedForm.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/ItemForm.vue b/app/imports/client/ui/properties/forms/ItemForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/ItemForm.vue
rename to app/imports/client/ui/properties/forms/ItemForm.vue
index d8097daa..45ef9e5c 100644
--- a/app/imports/ui/properties/forms/ItemForm.vue
+++ b/app/imports/client/ui/properties/forms/ItemForm.vue
@@ -154,8 +154,8 @@
 </template>
 
 <script lang="js">
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ItemsConsumedListForm.vue b/app/imports/client/ui/properties/forms/ItemsConsumedListForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/ItemsConsumedListForm.vue
rename to app/imports/client/ui/properties/forms/ItemsConsumedListForm.vue
index 97531ec6..5ccea76d 100644
--- a/app/imports/ui/properties/forms/ItemsConsumedListForm.vue
+++ b/app/imports/client/ui/properties/forms/ItemsConsumedListForm.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script lang="js">
-import ItemConsumedForm from '/imports/ui/properties/forms/ItemConsumedForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import ItemConsumedForm from '/imports/client/ui/properties/forms/ItemConsumedForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/NoteForm.vue b/app/imports/client/ui/properties/forms/NoteForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/NoteForm.vue
rename to app/imports/client/ui/properties/forms/NoteForm.vue
index ba9eeafd..36d693bb 100644
--- a/app/imports/ui/properties/forms/NoteForm.vue
+++ b/app/imports/client/ui/properties/forms/NoteForm.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/PointBuyForm.vue b/app/imports/client/ui/properties/forms/PointBuyForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/PointBuyForm.vue
rename to app/imports/client/ui/properties/forms/PointBuyForm.vue
index 41426acb..4698559d 100644
--- a/app/imports/ui/properties/forms/PointBuyForm.vue
+++ b/app/imports/client/ui/properties/forms/PointBuyForm.vue
@@ -176,11 +176,11 @@
 </template>
 
 <script lang="js">
-import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import attributeListMixin from '/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import { PointBuySchema } from '/imports/api/properties/PointBuys.js';
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
-import PointBuySpendForm from '/imports/ui/properties/forms/PointBuySpendForm.vue';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
+import PointBuySpendForm from '/imports/client/ui/properties/forms/PointBuySpendForm.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/PointBuySpendForm.vue b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
similarity index 92%
rename from app/imports/ui/properties/forms/PointBuySpendForm.vue
rename to app/imports/client/ui/properties/forms/PointBuySpendForm.vue
index 403cd927..5103a69b 100644
--- a/app/imports/ui/properties/forms/PointBuySpendForm.vue
+++ b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
@@ -88,8 +88,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ProficiencyForm.vue b/app/imports/client/ui/properties/forms/ProficiencyForm.vue
similarity index 82%
rename from app/imports/ui/properties/forms/ProficiencyForm.vue
rename to app/imports/client/ui/properties/forms/ProficiencyForm.vue
index 4fcf2825..a8a18d09 100644
--- a/app/imports/ui/properties/forms/ProficiencyForm.vue
+++ b/app/imports/client/ui/properties/forms/ProficiencyForm.vue
@@ -48,9 +48,9 @@
 </template>
 
 <script lang="js">
-import ProficiencySelect from '/imports/ui/properties/forms/shared/ProficiencySelect.vue';
-import skillListMixin from '/imports/ui/properties/forms/shared/lists/skillListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import ProficiencySelect from '/imports/client/ui/properties/forms/shared/ProficiencySelect.vue';
+import skillListMixin from '/imports/client/ui/properties/forms/shared/lists/skillListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/ReferenceForm.vue b/app/imports/client/ui/properties/forms/ReferenceForm.vue
similarity index 88%
rename from app/imports/ui/properties/forms/ReferenceForm.vue
rename to app/imports/client/ui/properties/forms/ReferenceForm.vue
index 8c580322..88032c03 100644
--- a/app/imports/ui/properties/forms/ReferenceForm.vue
+++ b/app/imports/client/ui/properties/forms/ReferenceForm.vue
@@ -33,10 +33,10 @@
 </template>
 
 <script lang="js">
-  import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
-  import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+  import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
+  import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
   import updateReferenceNode from '/imports/api/library/methods/updateReferenceNode.js';
-  import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
+  import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/forms/ResourcesForm.vue b/app/imports/client/ui/properties/forms/ResourcesForm.vue
similarity index 90%
rename from app/imports/ui/properties/forms/ResourcesForm.vue
rename to app/imports/client/ui/properties/forms/ResourcesForm.vue
index e3fc0dcb..a5d80f35 100644
--- a/app/imports/ui/properties/forms/ResourcesForm.vue
+++ b/app/imports/client/ui/properties/forms/ResourcesForm.vue
@@ -55,9 +55,9 @@
 </template>
 
 <script lang="js">
-import AttributesConsumedListForm from '/imports/ui/properties/forms/AttributesConsumedListForm.vue';
-import ItemsConsumedListForm from '/imports/ui/properties/forms/ItemsConsumedListForm.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import AttributesConsumedListForm from '/imports/client/ui/properties/forms/AttributesConsumedListForm.vue';
+import ItemsConsumedListForm from '/imports/client/ui/properties/forms/ItemsConsumedListForm.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/RollForm.vue b/app/imports/client/ui/properties/forms/RollForm.vue
similarity index 92%
rename from app/imports/ui/properties/forms/RollForm.vue
rename to app/imports/client/ui/properties/forms/RollForm.vue
index c06ceaa6..87b4664a 100644
--- a/app/imports/ui/properties/forms/RollForm.vue
+++ b/app/imports/client/ui/properties/forms/RollForm.vue
@@ -72,8 +72,8 @@
 </template>
 
 <script lang="js">
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/SavingThrowForm.vue b/app/imports/client/ui/properties/forms/SavingThrowForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/SavingThrowForm.vue
rename to app/imports/client/ui/properties/forms/SavingThrowForm.vue
index 8e0c5540..b2bd4cf5 100644
--- a/app/imports/ui/properties/forms/SavingThrowForm.vue
+++ b/app/imports/client/ui/properties/forms/SavingThrowForm.vue
@@ -82,8 +82,8 @@
 </template>
 
 <script lang="js">
-import saveListMixin from '/imports/ui/properties/forms/shared/lists/saveListMixin.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import saveListMixin from '/imports/client/ui/properties/forms/shared/lists/saveListMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [saveListMixin, propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/SkillForm.vue b/app/imports/client/ui/properties/forms/SkillForm.vue
similarity index 91%
rename from app/imports/ui/properties/forms/SkillForm.vue
rename to app/imports/client/ui/properties/forms/SkillForm.vue
index 91d30970..e7c2ab54 100644
--- a/app/imports/ui/properties/forms/SkillForm.vue
+++ b/app/imports/client/ui/properties/forms/SkillForm.vue
@@ -85,10 +85,10 @@
 </template>
 
 <script lang="js">
-import ProficiencySelect from '/imports/ui/properties/forms/shared/ProficiencySelect.vue';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import ProficiencySelect from '/imports/client/ui/properties/forms/shared/ProficiencySelect.vue';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/client/ui/properties/forms/SlotFillerForm.vue
similarity index 96%
rename from app/imports/ui/properties/forms/SlotFillerForm.vue
rename to app/imports/client/ui/properties/forms/SlotFillerForm.vue
index 28890a30..88e0f350 100644
--- a/app/imports/ui/properties/forms/SlotFillerForm.vue
+++ b/app/imports/client/ui/properties/forms/SlotFillerForm.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/client/ui/properties/forms/SlotForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/SlotForm.vue
rename to app/imports/client/ui/properties/forms/SlotForm.vue
index f2dc7c9b..e973932b 100644
--- a/app/imports/ui/properties/forms/SlotForm.vue
+++ b/app/imports/client/ui/properties/forms/SlotForm.vue
@@ -200,8 +200,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 import { SlotSchema } from '/imports/api/properties/Slots.js';
 
diff --git a/app/imports/ui/properties/forms/SpellForm.vue b/app/imports/client/ui/properties/forms/SpellForm.vue
similarity index 95%
rename from app/imports/ui/properties/forms/SpellForm.vue
rename to app/imports/client/ui/properties/forms/SpellForm.vue
index ee03d9ba..14c06817 100644
--- a/app/imports/ui/properties/forms/SpellForm.vue
+++ b/app/imports/client/ui/properties/forms/SpellForm.vue
@@ -309,11 +309,11 @@
 </template>
 
 <script lang="js">
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import IconColorMenu from '/imports/ui/properties/forms/shared/IconColorMenu.vue';
-import ResourcesForm from '/imports/ui/properties/forms/ResourcesForm.vue';
-import ResetSelector from '/imports/ui/components/ResetSelector.vue';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import IconColorMenu from '/imports/client/ui/properties/forms/shared/IconColorMenu.vue';
+import ResourcesForm from '/imports/client/ui/properties/forms/ResourcesForm.vue';
+import ResetSelector from '/imports/client/ui/components/ResetSelector.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/SpellListForm.vue b/app/imports/client/ui/properties/forms/SpellListForm.vue
similarity index 93%
rename from app/imports/ui/properties/forms/SpellListForm.vue
rename to app/imports/client/ui/properties/forms/SpellListForm.vue
index 3855b78a..182a599e 100644
--- a/app/imports/ui/properties/forms/SpellListForm.vue
+++ b/app/imports/client/ui/properties/forms/SpellListForm.vue
@@ -75,8 +75,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/ToggleForm.vue b/app/imports/client/ui/properties/forms/ToggleForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/ToggleForm.vue
rename to app/imports/client/ui/properties/forms/ToggleForm.vue
index 5f98729c..3a9f80fe 100644
--- a/app/imports/ui/properties/forms/ToggleForm.vue
+++ b/app/imports/client/ui/properties/forms/ToggleForm.vue
@@ -94,7 +94,7 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 
 export default {
   mixins: [propertyFormMixin],
diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/client/ui/properties/forms/TriggerForm.vue
similarity index 97%
rename from app/imports/ui/properties/forms/TriggerForm.vue
rename to app/imports/client/ui/properties/forms/TriggerForm.vue
index d48932a7..c8dcc4af 100644
--- a/app/imports/ui/properties/forms/TriggerForm.vue
+++ b/app/imports/client/ui/properties/forms/TriggerForm.vue
@@ -152,8 +152,8 @@
 </template>
 
 <script lang="js">
-import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
+import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
+import FormSection from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 import {
   TriggerSchema, eventOptions, timingOptions, actionPropertyTypeOptions
 } from '/imports/api/properties/Triggers.js';
diff --git a/app/imports/ui/properties/forms/shared/CalculationErrorList.vue b/app/imports/client/ui/properties/forms/shared/CalculationErrorList.vue
similarity index 100%
rename from app/imports/ui/properties/forms/shared/CalculationErrorList.vue
rename to app/imports/client/ui/properties/forms/shared/CalculationErrorList.vue
diff --git a/app/imports/ui/properties/forms/shared/ComputedField.vue b/app/imports/client/ui/properties/forms/shared/ComputedField.vue
similarity index 91%
rename from app/imports/ui/properties/forms/shared/ComputedField.vue
rename to app/imports/client/ui/properties/forms/shared/ComputedField.vue
index 9d3ac194..85bfc0d8 100644
--- a/app/imports/ui/properties/forms/shared/ComputedField.vue
+++ b/app/imports/client/ui/properties/forms/shared/ComputedField.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/shared/FormSection.vue b/app/imports/client/ui/properties/forms/shared/FormSection.vue
similarity index 89%
rename from app/imports/ui/properties/forms/shared/FormSection.vue
rename to app/imports/client/ui/properties/forms/shared/FormSection.vue
index 88c8c279..378024f5 100644
--- a/app/imports/ui/properties/forms/shared/FormSection.vue
+++ b/app/imports/client/ui/properties/forms/shared/FormSection.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="js">
-import FormSections from '/imports/ui/properties/forms/shared/FormSections.vue';
+import FormSections from '/imports/client/ui/properties/forms/shared/FormSections.vue';
 export default {
   components: {
     FormSections,
diff --git a/app/imports/ui/properties/forms/shared/FormSections.vue b/app/imports/client/ui/properties/forms/shared/FormSections.vue
similarity index 100%
rename from app/imports/ui/properties/forms/shared/FormSections.vue
rename to app/imports/client/ui/properties/forms/shared/FormSections.vue
diff --git a/app/imports/ui/properties/forms/shared/IconColorMenu.vue b/app/imports/client/ui/properties/forms/shared/IconColorMenu.vue
similarity index 83%
rename from app/imports/ui/properties/forms/shared/IconColorMenu.vue
rename to app/imports/client/ui/properties/forms/shared/IconColorMenu.vue
index 820cd3a6..aa58ed16 100644
--- a/app/imports/ui/properties/forms/shared/IconColorMenu.vue
+++ b/app/imports/client/ui/properties/forms/shared/IconColorMenu.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script lang="js">
-  import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
-  import ColorPicker from '/imports/ui/components/ColorPicker.vue';
+  import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
+  import ColorPicker from '/imports/client/ui/components/ColorPicker.vue';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/forms/shared/InlineComputationField.vue b/app/imports/client/ui/properties/forms/shared/InlineComputationField.vue
similarity index 91%
rename from app/imports/ui/properties/forms/shared/InlineComputationField.vue
rename to app/imports/client/ui/properties/forms/shared/InlineComputationField.vue
index bbd88d8f..def4fb0b 100644
--- a/app/imports/ui/properties/forms/shared/InlineComputationField.vue
+++ b/app/imports/client/ui/properties/forms/shared/InlineComputationField.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="js">
-import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
+import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue b/app/imports/client/ui/properties/forms/shared/ProficiencySelect.vue
similarity index 95%
rename from app/imports/ui/properties/forms/shared/ProficiencySelect.vue
rename to app/imports/client/ui/properties/forms/shared/ProficiencySelect.vue
index 1af7095a..a806602a 100644
--- a/app/imports/ui/properties/forms/shared/ProficiencySelect.vue
+++ b/app/imports/client/ui/properties/forms/shared/ProficiencySelect.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="js">
-  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+  import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
 
   const ICON_SPIN_DURATION = 300;
 
diff --git a/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js b/app/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js
similarity index 62%
rename from app/imports/ui/properties/forms/shared/lists/attributeListMixin.js
rename to app/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js
index 3ae537ba..22453e21 100644
--- a/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/lists/attributeListMixin.js
@@ -1,4 +1,4 @@
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js';
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js';
 
 const attributeListMixin = {
   meteor: {
diff --git a/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js b/app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js
similarity index 100%
rename from app/imports/ui/properties/forms/shared/lists/createListOfProperties.js
rename to app/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js
diff --git a/app/imports/ui/properties/forms/shared/lists/saveListMixin.js b/app/imports/client/ui/properties/forms/shared/lists/saveListMixin.js
similarity index 60%
rename from app/imports/ui/properties/forms/shared/lists/saveListMixin.js
rename to app/imports/client/ui/properties/forms/shared/lists/saveListMixin.js
index 035817f6..99d96d45 100644
--- a/app/imports/ui/properties/forms/shared/lists/saveListMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/lists/saveListMixin.js
@@ -1,4 +1,4 @@
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js'
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js'
 
 const saveListMixin = {
   meteor: {
diff --git a/app/imports/ui/properties/forms/shared/lists/skillListMixin.js b/app/imports/client/ui/properties/forms/shared/lists/skillListMixin.js
similarity index 58%
rename from app/imports/ui/properties/forms/shared/lists/skillListMixin.js
rename to app/imports/client/ui/properties/forms/shared/lists/skillListMixin.js
index 69d12256..2c90ff87 100644
--- a/app/imports/ui/properties/forms/shared/lists/skillListMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/lists/skillListMixin.js
@@ -1,4 +1,4 @@
-import createListOfProperties from '/imports/ui/properties/forms/shared/lists/createListOfProperties.js'
+import createListOfProperties from '/imports/client/ui/properties/forms/shared/lists/createListOfProperties.js'
 
 const skillListMixin = {
   meteor: {
diff --git a/app/imports/client/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/client/ui/properties/forms/shared/propertyFormIndex.js
new file mode 100644
index 00000000..28cf4172
--- /dev/null
+++ b/app/imports/client/ui/properties/forms/shared/propertyFormIndex.js
@@ -0,0 +1,61 @@
+import ActionForm from '/imports/client/ui/properties/forms/ActionForm.vue';
+import AdjustmentForm from '/imports/client/ui/properties/forms/AdjustmentForm.vue';
+import AttributeForm from '/imports/client/ui/properties/forms/AttributeForm.vue';
+import BuffForm from '/imports/client/ui/properties/forms/BuffForm.vue';
+import BuffRemoverForm from '/imports/client/ui/properties/forms/BuffRemoverForm.vue';
+import BranchForm from '/imports/client/ui/properties/forms/BranchForm.vue';
+import ClassForm from '/imports/client/ui/properties/forms/ClassForm.vue';
+import ClassLevelForm from '/imports/client/ui/properties/forms/ClassLevelForm.vue';
+import ConstantForm from '/imports/client/ui/properties/forms/ConstantForm.vue';
+import ContainerForm from '/imports/client/ui/properties/forms/ContainerForm.vue';
+import DamageForm from '/imports/client/ui/properties/forms/DamageForm.vue';
+import DamageMultiplierForm from '/imports/client/ui/properties/forms/DamageMultiplierForm.vue';
+import EffectForm from '/imports/client/ui/properties/forms/EffectForm.vue';
+import FeatureForm from '/imports/client/ui/properties/forms/FeatureForm.vue';
+import FolderForm from '/imports/client/ui/properties/forms/FolderForm.vue';
+import ItemForm from '/imports/client/ui/properties/forms/ItemForm.vue';
+import NoteForm from '/imports/client/ui/properties/forms/NoteForm.vue';
+import PointBuyForm from '/imports/client/ui/properties/forms/PointBuyForm.vue';
+import ProficiencyForm from '/imports/client/ui/properties/forms/ProficiencyForm.vue';
+import ReferenceForm from '/imports/client/ui/properties/forms/ReferenceForm.vue';
+import RollForm from '/imports/client/ui/properties/forms/RollForm.vue';
+import SavingThrowForm from '/imports/client/ui/properties/forms/SavingThrowForm.vue';
+import SkillForm from '/imports/client/ui/properties/forms/SkillForm.vue';
+import SlotForm from '/imports/client/ui/properties/forms/SlotForm.vue';
+import SlotFillerForm from '/imports/client/ui/properties/forms/SlotFillerForm.vue';
+import SpellListForm from '/imports/client/ui/properties/forms/SpellListForm.vue';
+import SpellForm from '/imports/client/ui/properties/forms/SpellForm.vue';
+import ToggleForm from '/imports/client/ui/properties/forms/ToggleForm.vue';
+import TriggerForm from '/imports/client/ui/properties/forms/TriggerForm.vue';
+
+export default {
+  action: ActionForm,
+  adjustment: AdjustmentForm,
+  attribute: AttributeForm,
+  buff: BuffForm,
+  buffRemover: BuffRemoverForm,
+  branch: BranchForm,
+  constant: ConstantForm,
+  container: ContainerForm,
+  class: ClassForm,
+  classLevel: ClassLevelForm,
+  damage: DamageForm,
+  damageMultiplier: DamageMultiplierForm,
+  effect: EffectForm,
+  feature: FeatureForm,
+  folder: FolderForm,
+  item: ItemForm,
+  note: NoteForm,
+  pointBuy: PointBuyForm,
+  proficiency: ProficiencyForm,
+  propertySlot: SlotForm,
+  reference: ReferenceForm,
+  roll: RollForm,
+  savingThrow: SavingThrowForm,
+  skill: SkillForm,
+  slotFiller: SlotFillerForm,
+  spellList: SpellListForm,
+  spell: SpellForm,
+  toggle: ToggleForm,
+  trigger: TriggerForm,
+};
diff --git a/app/imports/ui/properties/forms/shared/propertyFormMixin.js b/app/imports/client/ui/properties/forms/shared/propertyFormMixin.js
similarity index 70%
rename from app/imports/ui/properties/forms/shared/propertyFormMixin.js
rename to app/imports/client/ui/properties/forms/shared/propertyFormMixin.js
index 172db58f..58c3ec28 100644
--- a/app/imports/ui/properties/forms/shared/propertyFormMixin.js
+++ b/app/imports/client/ui/properties/forms/shared/propertyFormMixin.js
@@ -1,6 +1,6 @@
-import ComputedField from '/imports/ui/properties/forms/shared/ComputedField.vue';
-import InlineComputationField from '/imports/ui/properties/forms/shared/InlineComputationField.vue';
-import FormSection, { FormSections } from '/imports/ui/properties/forms/shared/FormSection.vue';
+import ComputedField from '/imports/client/ui/properties/forms/shared/ComputedField.vue';
+import InlineComputationField from '/imports/client/ui/properties/forms/shared/InlineComputationField.vue';
+import FormSection, { FormSections } from '/imports/client/ui/properties/forms/shared/FormSection.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/forms/shared/schemaFormMixin.js b/app/imports/client/ui/properties/forms/shared/schemaFormMixin.js
similarity index 100%
rename from app/imports/ui/properties/forms/shared/schemaFormMixin.js
rename to app/imports/client/ui/properties/forms/shared/schemaFormMixin.js
diff --git a/app/imports/ui/properties/shared/ProficiencyIcon.vue b/app/imports/client/ui/properties/shared/ProficiencyIcon.vue
similarity index 79%
rename from app/imports/ui/properties/shared/ProficiencyIcon.vue
rename to app/imports/client/ui/properties/shared/ProficiencyIcon.vue
index 223ef725..fc2c1620 100644
--- a/app/imports/ui/properties/shared/ProficiencyIcon.vue
+++ b/app/imports/client/ui/properties/shared/ProficiencyIcon.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="js">
-import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
+import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
 
 export default {
   props: {
diff --git a/app/imports/ui/properties/shared/PropertyIcon.vue b/app/imports/client/ui/properties/shared/PropertyIcon.vue
similarity index 100%
rename from app/imports/ui/properties/shared/PropertyIcon.vue
rename to app/imports/client/ui/properties/shared/PropertyIcon.vue
diff --git a/app/imports/ui/properties/shared/PropertySelectCard.vue b/app/imports/client/ui/properties/shared/PropertySelectCard.vue
similarity index 100%
rename from app/imports/ui/properties/shared/PropertySelectCard.vue
rename to app/imports/client/ui/properties/shared/PropertySelectCard.vue
diff --git a/app/imports/ui/properties/shared/PropertySelector.vue b/app/imports/client/ui/properties/shared/PropertySelector.vue
similarity index 96%
rename from app/imports/ui/properties/shared/PropertySelector.vue
rename to app/imports/client/ui/properties/shared/PropertySelector.vue
index 8fc32b7e..5104a6c8 100644
--- a/app/imports/ui/properties/shared/PropertySelector.vue
+++ b/app/imports/client/ui/properties/shared/PropertySelector.vue
@@ -57,7 +57,7 @@
 
 <script lang="js">
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import PropertySelectCard from '/imports/ui/properties/shared/PropertySelectCard.vue';
+import PropertySelectCard from '/imports/client/ui/properties/shared/PropertySelectCard.vue';
 export default {
   components: {
     PropertySelectCard,
diff --git a/app/imports/ui/properties/shared/PropertyViewer.vue b/app/imports/client/ui/properties/shared/PropertyViewer.vue
similarity index 82%
rename from app/imports/ui/properties/shared/PropertyViewer.vue
rename to app/imports/client/ui/properties/shared/PropertyViewer.vue
index 78b3c4d7..20a3aeed 100644
--- a/app/imports/ui/properties/shared/PropertyViewer.vue
+++ b/app/imports/client/ui/properties/shared/PropertyViewer.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerIndex from '/imports/ui/properties/viewers/shared/propertyViewerIndex.js';
+import propertyViewerIndex from '/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js';
 export default {
   components: {
     ...propertyViewerIndex,
diff --git a/app/imports/ui/properties/shared/SelectablePropertyDialog.vue b/app/imports/client/ui/properties/shared/SelectablePropertyDialog.vue
similarity index 88%
rename from app/imports/ui/properties/shared/SelectablePropertyDialog.vue
rename to app/imports/client/ui/properties/shared/SelectablePropertyDialog.vue
index e5b7d28d..a8a34386 100644
--- a/app/imports/ui/properties/shared/SelectablePropertyDialog.vue
+++ b/app/imports/client/ui/properties/shared/SelectablePropertyDialog.vue
@@ -37,9 +37,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import PropertySelector from '/imports/ui/properties/shared/PropertySelector.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
+import PropertySelector from '/imports/client/ui/properties/shared/PropertySelector.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/shared/getPropertyTitle.js b/app/imports/client/ui/properties/shared/getPropertyTitle.js
similarity index 100%
rename from app/imports/ui/properties/shared/getPropertyTitle.js
rename to app/imports/client/ui/properties/shared/getPropertyTitle.js
diff --git a/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
similarity index 91%
rename from app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
index d29333d2..fcfaadf5 100644
--- a/app/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/BranchTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue
similarity index 90%
rename from app/imports/ui/properties/treeNodeViews/BranchTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue
index 65f488b5..3fe77bfc 100644
--- a/app/imports/ui/properties/treeNodeViews/BranchTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
similarity index 81%
rename from app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
index ddb49eb0..29163b87 100644
--- a/app/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue
similarity index 89%
rename from app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue
index 9c3ce1d1..3ae28644 100644
--- a/app/imports/ui/properties/treeNodeViews/DamageTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import { getPropertyIcon } from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue
similarity index 80%
rename from app/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue
index 1f35c7b9..d7a7045f 100644
--- a/app/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue
similarity index 93%
rename from app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue
index 60d22b14..bbca7ad0 100644
--- a/app/imports/ui/properties/treeNodeViews/EffectTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue
@@ -36,8 +36,8 @@
 
 <script lang="js">
 // Most of this was copied from EffectViewer and should probably be generalised
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
 
 export default {
   mixins: [treeNodeViewMixin],
diff --git a/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue
similarity index 92%
rename from app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue
index e28ba0e9..86a01b3c 100644
--- a/app/imports/ui/properties/treeNodeViews/ItemTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
similarity index 79%
rename from app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
index b47828b5..c3142760 100644
--- a/app/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue
@@ -20,8 +20,8 @@
 
 <script lang="js">
 // Most of this was copied from EffectViewer and should probably be generalised
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue
similarity index 75%
rename from app/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue
index 05579e0d..98b21aba 100644
--- a/app/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue
@@ -21,13 +21,13 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 
 export default {
   name: 'ReferenceTreeNode',
   mixins: [treeNodeViewMixin],
   beforeCreate () {
-    this.$options.components.TreeNodeView = require('/imports/ui/properties/treeNodeViews/TreeNodeView.vue').default
+    this.$options.components.TreeNodeView = require('/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue').default
   },
 }
 </script>
diff --git a/app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue b/app/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
similarity index 89%
rename from app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
rename to app/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
index 10767f99..63bbdbe5 100644
--- a/app/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewMixin from '/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js';
+import treeNodeViewMixin from '/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js';
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 export default {
diff --git a/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue b/app/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue
similarity index 86%
rename from app/imports/ui/properties/treeNodeViews/TreeNodeView.vue
rename to app/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue
index 65a18e0e..0da1e0ce 100644
--- a/app/imports/ui/properties/treeNodeViews/TreeNodeView.vue
+++ b/app/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script lang="js">
-import treeNodeViewIndex from '/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js';
+import treeNodeViewIndex from '/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js';
 
 export default {
   name: 'TreeNodeView',
diff --git a/app/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js
new file mode 100644
index 00000000..00cbc42d
--- /dev/null
+++ b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewIndex.js
@@ -0,0 +1,23 @@
+import DefaultTreeNode from '/imports/client/ui/properties/treeNodeViews/DefaultTreeNode.vue';
+import AdjustmentTreeNode from '/imports/client/ui/properties/treeNodeViews/AdjustmentTreeNode.vue';
+import BranchTreeNode from '/imports/client/ui/properties/treeNodeViews/BranchTreeNode.vue';
+import ItemTreeNode from '/imports/client/ui/properties/treeNodeViews/ItemTreeNode.vue';
+import DamageTreeNode from '/imports/client/ui/properties/treeNodeViews/DamageTreeNode.vue';
+import EffectTreeNode from '/imports/client/ui/properties/treeNodeViews/EffectTreeNode.vue';
+import ClassLevelTreeNode from '/imports/client/ui/properties/treeNodeViews/ClassLevelTreeNode.vue';
+import ProficiencyTreeNode from '/imports/client/ui/properties/treeNodeViews/ProficiencyTreeNode.vue';
+import ReferenceTreeNode from '/imports/client/ui/properties/treeNodeViews/ReferenceTreeNode.vue';
+import SavingThrowTreeNode from '/imports/client/ui/properties/treeNodeViews/SavingThrowTreeNode.vue';
+
+export default {
+  default: DefaultTreeNode,
+  adjustment: AdjustmentTreeNode,
+  branch: BranchTreeNode,
+  classLevel: ClassLevelTreeNode,
+  damage: DamageTreeNode,
+  effect: EffectTreeNode,
+  item: ItemTreeNode,
+  proficiency: ProficiencyTreeNode,
+  reference: ReferenceTreeNode,
+  savingThrow: SavingThrowTreeNode,
+}
diff --git a/app/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js
similarity index 84%
rename from app/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js
rename to app/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js
index 6716510b..3a3132ba 100644
--- a/app/imports/ui/properties/treeNodeViews/treeNodeViewMixin.js
+++ b/app/imports/client/ui/properties/treeNodeViews/treeNodeViewMixin.js
@@ -1,5 +1,5 @@
 import PROPERTIES from '/imports/constants/PROPERTIES.js';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/ActionViewer.vue b/app/imports/client/ui/properties/viewers/ActionViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/ActionViewer.vue
rename to app/imports/client/ui/properties/viewers/ActionViewer.vue
index e9f49f6b..b76c1b4c 100644
--- a/app/imports/ui/properties/viewers/ActionViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ActionViewer.vue
@@ -105,14 +105,14 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import doAction from '/imports/api/engine/actions/doAction.js';
-import AttributeConsumedView from '/imports/ui/properties/components/actions/AttributeConsumedView.vue';
-import ItemConsumedView from '/imports/ui/properties/components/actions/ItemConsumedView.vue';
-import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
+import AttributeConsumedView from '/imports/client/ui/properties/components/actions/AttributeConsumedView.vue';
+import ItemConsumedView from '/imports/client/ui/properties/components/actions/ItemConsumedView.vue';
+import PropertyIcon from '/imports/client/ui/properties/shared/PropertyIcon.vue';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/AdjustmentViewer.vue b/app/imports/client/ui/properties/viewers/AdjustmentViewer.vue
similarity index 90%
rename from app/imports/ui/properties/viewers/AdjustmentViewer.vue
rename to app/imports/client/ui/properties/viewers/AdjustmentViewer.vue
index d5fd2694..9ae163d1 100644
--- a/app/imports/ui/properties/viewers/AdjustmentViewer.vue
+++ b/app/imports/client/ui/properties/viewers/AdjustmentViewer.vue
@@ -26,8 +26,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/AttributeViewer.vue b/app/imports/client/ui/properties/viewers/AttributeViewer.vue
similarity index 90%
rename from app/imports/ui/properties/viewers/AttributeViewer.vue
rename to app/imports/client/ui/properties/viewers/AttributeViewer.vue
index b36e5184..a4e339c7 100644
--- a/app/imports/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/client/ui/properties/viewers/AttributeViewer.vue
@@ -127,14 +127,14 @@
 </template>
 
 <script lang="js">
-  import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-  import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-  import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
+  import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
+  import AttributeEffect from '/imports/client/ui/properties/components/attributes/AttributeEffect.vue';
   import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
-  import IncrementButton from '/imports/ui/components/IncrementButton.vue';
-  import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
-  import {snackbar} from '/imports/ui/components/snackbars/SnackbarQueue.js';
-  import sortEffects from '/imports/ui/utility/sortEffects.js';
+  import IncrementButton from '/imports/client/ui/components/IncrementButton.vue';
+  import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
+  import {snackbar} from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+  import sortEffects from '/imports/client/ui/utility/sortEffects.js';
 
   export default {
     components: {
diff --git a/app/imports/ui/properties/viewers/BranchViewer.vue b/app/imports/client/ui/properties/viewers/BranchViewer.vue
similarity index 87%
rename from app/imports/ui/properties/viewers/BranchViewer.vue
rename to app/imports/client/ui/properties/viewers/BranchViewer.vue
index 8220c83a..4ce98e52 100644
--- a/app/imports/ui/properties/viewers/BranchViewer.vue
+++ b/app/imports/client/ui/properties/viewers/BranchViewer.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/BuffRemoverViewer.vue b/app/imports/client/ui/properties/viewers/BuffRemoverViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/BuffRemoverViewer.vue
rename to app/imports/client/ui/properties/viewers/BuffRemoverViewer.vue
index 89097b7e..11512a20 100644
--- a/app/imports/ui/properties/viewers/BuffRemoverViewer.vue
+++ b/app/imports/client/ui/properties/viewers/BuffRemoverViewer.vue
@@ -54,8 +54,8 @@
 </template>
 
 <script lang="js">
-  import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-  import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+  import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+  import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 
   export default {
     mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/BuffViewer.vue b/app/imports/client/ui/properties/viewers/BuffViewer.vue
similarity index 86%
rename from app/imports/ui/properties/viewers/BuffViewer.vue
rename to app/imports/client/ui/properties/viewers/BuffViewer.vue
index 214f33f2..08d72fe6 100644
--- a/app/imports/ui/properties/viewers/BuffViewer.vue
+++ b/app/imports/client/ui/properties/viewers/BuffViewer.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/ClassLevelViewer.vue b/app/imports/client/ui/properties/viewers/ClassLevelViewer.vue
similarity index 88%
rename from app/imports/ui/properties/viewers/ClassLevelViewer.vue
rename to app/imports/client/ui/properties/viewers/ClassLevelViewer.vue
index e2464b62..b892d3aa 100644
--- a/app/imports/ui/properties/viewers/ClassLevelViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ClassLevelViewer.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/ClassViewer.vue b/app/imports/client/ui/properties/viewers/ClassViewer.vue
similarity index 96%
rename from app/imports/ui/properties/viewers/ClassViewer.vue
rename to app/imports/client/ui/properties/viewers/ClassViewer.vue
index a03d3431..2e485260 100644
--- a/app/imports/ui/properties/viewers/ClassViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ClassViewer.vue
@@ -73,7 +73,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
 
 export default {
diff --git a/app/imports/ui/properties/viewers/ConstantViewer.vue b/app/imports/client/ui/properties/viewers/ConstantViewer.vue
similarity index 79%
rename from app/imports/ui/properties/viewers/ConstantViewer.vue
rename to app/imports/client/ui/properties/viewers/ConstantViewer.vue
index 3b13b3ad..a635cbdd 100644
--- a/app/imports/ui/properties/viewers/ConstantViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ConstantViewer.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/ContainerViewer.vue b/app/imports/client/ui/properties/viewers/ContainerViewer.vue
similarity index 94%
rename from app/imports/ui/properties/viewers/ContainerViewer.vue
rename to app/imports/client/ui/properties/viewers/ContainerViewer.vue
index 0d2a7ab0..5b5bdc84 100644
--- a/app/imports/ui/properties/viewers/ContainerViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ContainerViewer.vue
@@ -100,8 +100,8 @@
 </template>
 
 <script lang="js">
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   components: {
     CoinValue,
diff --git a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue b/app/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue
similarity index 94%
rename from app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
rename to app/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue
index cde9cba9..f7cbd413 100644
--- a/app/imports/ui/properties/viewers/DamageMultiplierViewer.vue
+++ b/app/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
   computed: {
diff --git a/app/imports/ui/properties/viewers/DamageViewer.vue b/app/imports/client/ui/properties/viewers/DamageViewer.vue
similarity index 87%
rename from app/imports/ui/properties/viewers/DamageViewer.vue
rename to app/imports/client/ui/properties/viewers/DamageViewer.vue
index 8862e10c..af8f2829 100644
--- a/app/imports/ui/properties/viewers/DamageViewer.vue
+++ b/app/imports/client/ui/properties/viewers/DamageViewer.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/EffectViewer.vue b/app/imports/client/ui/properties/viewers/EffectViewer.vue
similarity index 95%
rename from app/imports/ui/properties/viewers/EffectViewer.vue
rename to app/imports/client/ui/properties/viewers/EffectViewer.vue
index 5880fc10..db389971 100644
--- a/app/imports/ui/properties/viewers/EffectViewer.vue
+++ b/app/imports/client/ui/properties/viewers/EffectViewer.vue
@@ -75,8 +75,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import getEffectIcon from '/imports/client/ui/utility/getEffectIcon.js';
 import { isFinite } from 'lodash';
 
 export default {
diff --git a/app/imports/ui/properties/viewers/FeatureViewer.vue b/app/imports/client/ui/properties/viewers/FeatureViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/FeatureViewer.vue
rename to app/imports/client/ui/properties/viewers/FeatureViewer.vue
index ae5c405b..746e1280 100644
--- a/app/imports/ui/properties/viewers/FeatureViewer.vue
+++ b/app/imports/client/ui/properties/viewers/FeatureViewer.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/FolderViewer.vue b/app/imports/client/ui/properties/viewers/FolderViewer.vue
similarity index 64%
rename from app/imports/ui/properties/viewers/FolderViewer.vue
rename to app/imports/client/ui/properties/viewers/FolderViewer.vue
index 51a51a76..91e24a6d 100644
--- a/app/imports/ui/properties/viewers/FolderViewer.vue
+++ b/app/imports/client/ui/properties/viewers/FolderViewer.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/ItemViewer.vue b/app/imports/client/ui/properties/viewers/ItemViewer.vue
similarity index 93%
rename from app/imports/ui/properties/viewers/ItemViewer.vue
rename to app/imports/client/ui/properties/viewers/ItemViewer.vue
index 0db65ce7..8f5b38fa 100644
--- a/app/imports/ui/properties/viewers/ItemViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ItemViewer.vue
@@ -136,12 +136,12 @@
 
 <script lang="js">
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import CoinValue from '/imports/ui/components/CoinValue.vue';
-import IncrementButton from '/imports/ui/components/IncrementButton.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import CoinValue from '/imports/client/ui/components/CoinValue.vue';
+import IncrementButton from '/imports/client/ui/components/IncrementButton.vue';
 import adjustQuantity from '/imports/api/creature/creatureProperties/methods/adjustQuantity.js';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/NoteViewer.vue b/app/imports/client/ui/properties/viewers/NoteViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/NoteViewer.vue
rename to app/imports/client/ui/properties/viewers/NoteViewer.vue
index a5c8a27a..789bed8d 100644
--- a/app/imports/ui/properties/viewers/NoteViewer.vue
+++ b/app/imports/client/ui/properties/viewers/NoteViewer.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/PointBuyViewer.vue b/app/imports/client/ui/properties/viewers/PointBuyViewer.vue
similarity index 91%
rename from app/imports/ui/properties/viewers/PointBuyViewer.vue
rename to app/imports/client/ui/properties/viewers/PointBuyViewer.vue
index 760b87ab..20ef8fe3 100644
--- a/app/imports/ui/properties/viewers/PointBuyViewer.vue
+++ b/app/imports/client/ui/properties/viewers/PointBuyViewer.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import { timingOptions, eventOptions, actionPropertyTypeOptions } from '/imports/api/properties/Triggers.js';
 
diff --git a/app/imports/ui/properties/viewers/ProficiencyViewer.vue b/app/imports/client/ui/properties/viewers/ProficiencyViewer.vue
similarity index 83%
rename from app/imports/ui/properties/viewers/ProficiencyViewer.vue
rename to app/imports/client/ui/properties/viewers/ProficiencyViewer.vue
index 0ee43e14..54eed6fa 100644
--- a/app/imports/ui/properties/viewers/ProficiencyViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ProficiencyViewer.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import ProficiencyIcon from '/imports/ui/properties/shared/ProficiencyIcon.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import ProficiencyIcon from '/imports/client/ui/properties/shared/ProficiencyIcon.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/ReferenceViewer.vue b/app/imports/client/ui/properties/viewers/ReferenceViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/ReferenceViewer.vue
rename to app/imports/client/ui/properties/viewers/ReferenceViewer.vue
index 3806984a..570ee0c0 100644
--- a/app/imports/ui/properties/viewers/ReferenceViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ReferenceViewer.vue
@@ -24,8 +24,8 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-import TreeNodeView from '/imports/ui/properties/treeNodeViews/TreeNodeView.vue';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
+import TreeNodeView from '/imports/client/ui/properties/treeNodeViews/TreeNodeView.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/RollViewer.vue b/app/imports/client/ui/properties/viewers/RollViewer.vue
similarity index 80%
rename from app/imports/ui/properties/viewers/RollViewer.vue
rename to app/imports/client/ui/properties/viewers/RollViewer.vue
index 31e87bbf..3a41e1ed 100644
--- a/app/imports/ui/properties/viewers/RollViewer.vue
+++ b/app/imports/client/ui/properties/viewers/RollViewer.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/SavingThrowViewer.vue b/app/imports/client/ui/properties/viewers/SavingThrowViewer.vue
similarity index 83%
rename from app/imports/ui/properties/viewers/SavingThrowViewer.vue
rename to app/imports/client/ui/properties/viewers/SavingThrowViewer.vue
index 59feea7a..973533ce 100644
--- a/app/imports/ui/properties/viewers/SavingThrowViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SavingThrowViewer.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/SkillViewer.vue b/app/imports/client/ui/properties/viewers/SkillViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/SkillViewer.vue
rename to app/imports/client/ui/properties/viewers/SkillViewer.vue
index db6609c5..fdbf34cb 100644
--- a/app/imports/ui/properties/viewers/SkillViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SkillViewer.vue
@@ -119,14 +119,14 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
+import numberToSignedString from '../../../../api/utility/numberToSignedString.js';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import AttributeEffect from '/imports/ui/properties/components/attributes/AttributeEffect.vue';
-import SkillProficiency from '/imports/ui/properties/components/skills/SkillProficiency.vue';
+import AttributeEffect from '/imports/client/ui/properties/components/attributes/AttributeEffect.vue';
+import SkillProficiency from '/imports/client/ui/properties/components/skills/SkillProficiency.vue';
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
-import getProficiencyIcon from '/imports/ui/utility/getProficiencyIcon.js';
-import sortEffects from '/imports/ui/utility/sortEffects.js';
+import getProficiencyIcon from '/imports/client/ui/utility/getProficiencyIcon.js';
+import sortEffects from '/imports/client/ui/utility/sortEffects.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/SlotFillerViewer.vue b/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
similarity index 87%
rename from app/imports/ui/properties/viewers/SlotFillerViewer.vue
rename to app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
index d3cb60c5..fc53aec7 100644
--- a/app/imports/ui/properties/viewers/SlotFillerViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SlotFillerViewer.vue
@@ -39,9 +39,9 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/SlotViewer.vue b/app/imports/client/ui/properties/viewers/SlotViewer.vue
similarity index 92%
rename from app/imports/ui/properties/viewers/SlotViewer.vue
rename to app/imports/client/ui/properties/viewers/SlotViewer.vue
index 55ceeb8d..53b82f50 100644
--- a/app/imports/ui/properties/viewers/SlotViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SlotViewer.vue
@@ -60,9 +60,9 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+import FillSlotButton from '/imports/client/ui/creature/buildTree/FillSlotButton.vue';
 
 const uniqueText = {
   uniqueInSlot: 'Each property inside this slot should be unique',
diff --git a/app/imports/ui/properties/viewers/SpellListViewer.vue b/app/imports/client/ui/properties/viewers/SpellListViewer.vue
similarity index 91%
rename from app/imports/ui/properties/viewers/SpellListViewer.vue
rename to app/imports/client/ui/properties/viewers/SpellListViewer.vue
index 6aae147e..0040f82e 100644
--- a/app/imports/ui/properties/viewers/SpellListViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SpellListViewer.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 export default {
   mixins: [propertyViewerMixin],
 }
diff --git a/app/imports/ui/properties/viewers/SpellViewer.vue b/app/imports/client/ui/properties/viewers/SpellViewer.vue
similarity index 93%
rename from app/imports/ui/properties/viewers/SpellViewer.vue
rename to app/imports/client/ui/properties/viewers/SpellViewer.vue
index ee8085b2..8058e754 100644
--- a/app/imports/ui/properties/viewers/SpellViewer.vue
+++ b/app/imports/client/ui/properties/viewers/SpellViewer.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js';
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js';
 import ActionViewer from './ActionViewer.vue';
 
 const levelText = [
diff --git a/app/imports/ui/properties/viewers/ToggleViewer.vue b/app/imports/client/ui/properties/viewers/ToggleViewer.vue
similarity index 85%
rename from app/imports/ui/properties/viewers/ToggleViewer.vue
rename to app/imports/client/ui/properties/viewers/ToggleViewer.vue
index f2b9037a..6f4ce02d 100644
--- a/app/imports/ui/properties/viewers/ToggleViewer.vue
+++ b/app/imports/client/ui/properties/viewers/ToggleViewer.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 
 export default {
   mixins: [propertyViewerMixin],
diff --git a/app/imports/ui/properties/viewers/TriggerViewer.vue b/app/imports/client/ui/properties/viewers/TriggerViewer.vue
similarity index 94%
rename from app/imports/ui/properties/viewers/TriggerViewer.vue
rename to app/imports/client/ui/properties/viewers/TriggerViewer.vue
index ce7e1f44..71dcdc3b 100644
--- a/app/imports/ui/properties/viewers/TriggerViewer.vue
+++ b/app/imports/client/ui/properties/viewers/TriggerViewer.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script lang="js">
-import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import propertyViewerMixin from '/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js'
 import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 import { timingOptions, eventOptions, actionPropertyTypeOptions } from '/imports/api/properties/Triggers.js';
 
diff --git a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue b/app/imports/client/ui/properties/viewers/shared/PropertyDescription.vue
similarity index 85%
rename from app/imports/ui/properties/viewers/shared/PropertyDescription.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyDescription.vue
index 884bbdd8..67701bf1 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
+++ b/app/imports/client/ui/properties/viewers/shared/PropertyDescription.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script lang="js">
-import MarkdownText from '/imports/ui/components/MarkdownText.vue';
-import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/shared/PropertyField.vue b/app/imports/client/ui/properties/viewers/shared/PropertyField.vue
similarity index 96%
rename from app/imports/ui/properties/viewers/shared/PropertyField.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyField.vue
index b37685d7..f72a91a5 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyField.vue
+++ b/app/imports/client/ui/properties/viewers/shared/PropertyField.vue
@@ -77,8 +77,8 @@
 </template>
 
 <script lang="js">
-import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
-import InlineEffect from '/imports/ui/properties/components/effects/InlineEffect.vue';
+import numberToSignedString from '../../../../../api/utility/numberToSignedString.js';
+import InlineEffect from '/imports/client/ui/properties/components/effects/InlineEffect.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/properties/viewers/shared/PropertyName.vue b/app/imports/client/ui/properties/viewers/shared/PropertyName.vue
similarity index 100%
rename from app/imports/ui/properties/viewers/shared/PropertyName.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyName.vue
diff --git a/app/imports/ui/properties/viewers/shared/PropertyTags.vue b/app/imports/client/ui/properties/viewers/shared/PropertyTags.vue
similarity index 100%
rename from app/imports/ui/properties/viewers/shared/PropertyTags.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyTags.vue
diff --git a/app/imports/ui/properties/viewers/shared/PropertyVariableName.vue b/app/imports/client/ui/properties/viewers/shared/PropertyVariableName.vue
similarity index 100%
rename from app/imports/ui/properties/viewers/shared/PropertyVariableName.vue
rename to app/imports/client/ui/properties/viewers/shared/PropertyVariableName.vue
diff --git a/app/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js
new file mode 100644
index 00000000..456bdbf5
--- /dev/null
+++ b/app/imports/client/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -0,0 +1,61 @@
+import ActionViewer from '/imports/client/ui/properties/viewers/ActionViewer.vue';
+import AdjustmentViewer from '/imports/client/ui/properties/viewers/AdjustmentViewer.vue';
+import AttributeViewer from '/imports/client/ui/properties/viewers/AttributeViewer.vue';
+import BuffViewer from '/imports/client/ui/properties/viewers/BuffViewer.vue';
+import BuffRemoverViewer from '/imports/client/ui/properties/viewers/BuffRemoverViewer.vue';
+import BranchViewer from '/imports/client/ui/properties/viewers/BranchViewer.vue';
+import ContainerViewer from '/imports/client/ui/properties/viewers/ContainerViewer.vue';
+import ClassViewer from '/imports/client/ui/properties/viewers/ClassViewer.vue';
+import ClassLevelViewer from '/imports/client/ui/properties/viewers/ClassLevelViewer.vue';
+import ConstantViewer from '/imports/client/ui/properties/viewers/ConstantViewer.vue';
+import DamageViewer from '/imports/client/ui/properties/viewers/DamageViewer.vue';
+import DamageMultiplierViewer from '/imports/client/ui/properties/viewers/DamageMultiplierViewer.vue';
+import EffectViewer from '/imports/client/ui/properties/viewers/EffectViewer.vue';
+import FeatureViewer from '/imports/client/ui/properties/viewers/FeatureViewer.vue';
+import FolderViewer from '/imports/client/ui/properties/viewers/FolderViewer.vue';
+import ItemViewer from '/imports/client/ui/properties/viewers/ItemViewer.vue';
+import NoteViewer from '/imports/client/ui/properties/viewers/NoteViewer.vue';
+import PointBuyViewer from '/imports/client/ui/properties/viewers/PointBuyViewer.vue';
+import ProficiencyViewer from '/imports/client/ui/properties/viewers/ProficiencyViewer.vue';
+import ReferenceViewer from '/imports/client/ui/properties/viewers/ReferenceViewer.vue';
+import RollViewer from '/imports/client/ui/properties/viewers/RollViewer.vue';
+import SkillViewer from '/imports/client/ui/properties/viewers/SkillViewer.vue';
+import SavingThrowViewer from '/imports/client/ui/properties/viewers/SavingThrowViewer.vue';
+import SlotViewer from '/imports/client/ui/properties/viewers/SlotViewer.vue';
+import SlotFillerViewer from '/imports/client/ui/properties/viewers/SlotFillerViewer.vue';
+import SpellListViewer from '/imports/client/ui/properties/viewers/SpellListViewer.vue';
+import SpellViewer from '/imports/client/ui/properties/viewers/SpellViewer.vue';
+import ToggleViewer from '/imports/client/ui/properties/viewers/ToggleViewer.vue';
+import TriggerViewer from '/imports/client/ui/properties/viewers/TriggerViewer.vue';
+
+export default {
+  action: ActionViewer,
+  adjustment: AdjustmentViewer,
+  attribute: AttributeViewer,
+  buff: BuffViewer,
+  buffRemover: BuffRemoverViewer,
+  branch: BranchViewer,
+  container: ContainerViewer,
+  class: ClassViewer,
+  classLevel: ClassLevelViewer,
+  constant: ConstantViewer,
+  damage: DamageViewer,
+  damageMultiplier: DamageMultiplierViewer,
+  effect: EffectViewer,
+  feature: FeatureViewer,
+  folder: FolderViewer,
+  item: ItemViewer,
+  note: NoteViewer,
+  pointBuy: PointBuyViewer,
+  proficiency: ProficiencyViewer,
+  propertySlot: SlotViewer,
+  roll: RollViewer,
+  reference: ReferenceViewer,
+  savingThrow: SavingThrowViewer,
+  slotFiller: SlotFillerViewer,
+  skill: SkillViewer,
+  spellList: SpellListViewer,
+  spell: SpellViewer,
+  toggle: ToggleViewer,
+  trigger: TriggerViewer,
+};
diff --git a/app/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js b/app/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js
new file mode 100644
index 00000000..4bec5f4e
--- /dev/null
+++ b/app/imports/client/ui/properties/viewers/shared/propertyViewerMixin.js
@@ -0,0 +1,23 @@
+import PropertyName from '/imports/client/ui/properties/viewers/shared/PropertyName.vue';
+import PropertyVariableName from '/imports/client/ui/properties/viewers/shared/PropertyVariableName.vue';
+import PropertyField from '/imports/client/ui/properties/viewers/shared/PropertyField.vue';
+import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
+import PropertyTags from '/imports/client/ui/properties/viewers/shared/PropertyTags.vue';
+
+const propertyViewerMixin = {
+  components: {
+    PropertyName,
+    PropertyVariableName,
+    PropertyField,
+    PropertyDescription,
+    PropertyTags,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+};
+
+export default propertyViewerMixin;
diff --git a/app/imports/ui/router.js b/app/imports/client/ui/router.js
similarity index 71%
rename from app/imports/ui/router.js
rename to app/imports/client/ui/router.js
index bb8dc307..a822afe1 100644
--- a/app/imports/ui/router.js
+++ b/app/imports/client/ui/router.js
@@ -2,44 +2,44 @@ import { RouterFactory, nativeScrollBehavior } from 'meteor/akryum:vue-router2';
 import { acceptInviteToken } from '/imports/api/users/Invites.js';
 import MAINTENANCE_MODE from '/imports/constants/MAINTENANCE_MODE.js';
 // Components
-const Home = () => import('/imports/ui/pages/Home.vue');
-const About = () => import('/imports/ui/pages/About.vue');
-const CharacterList = () => import('/imports/ui/pages/CharacterList.vue');
-const CharacterListToolbarItems = () => import('/imports/ui/creature/creatureList/CharacterListToolbarItems.vue');
-const Library = () => import('/imports/ui/pages/Library.vue');
-const LibraryCollection = () => import('/imports/ui/pages/LibraryCollection.vue');
-const LibraryCollectionToolbar = () => import('/imports/ui/library/LibraryCollectionToolbar.vue');
-const CharacterSheetPage = () => import('/imports/ui/pages/CharacterSheetPage.vue');
-const CharacterSheetToolbar = () => import('/imports/ui/creature/character/CharacterSheetToolbar.vue');
-const CharacterSheetRightDrawer = () => import('/imports/ui/creature/character/CharacterSheetRightDrawer.vue');
-const CharacterSheetPrinted = () => import('/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue');
-const SignIn = () => import('/imports/ui/pages/SignIn.vue');
-const Register = () => import('/imports/ui/pages/Register.vue');
-const IconAdmin = () => import('/imports/ui/icons/IconAdmin.vue');
-//const Friends = () => import('/imports/ui/pages/Friends.vue' );
-const Feedback = () => import('/imports/ui/pages/Feedback.vue');
-const FunctionReference = () => import('/imports/ui/pages/FunctionReference.vue');
-const Account = () => import('/imports/ui/pages/Account.vue');
-const InviteSuccess = () => import('/imports/ui/pages/InviteSuccess.vue');
-const InviteError = () => import('/imports/ui/pages/InviteError.vue');
-const EmailVerificationSuccess = () => import('/imports/ui/pages/EmailVerificationSuccess.vue');
-const EmailVerificationError = () => import('/imports/ui/pages/EmailVerificationError.vue');
-const ResetPassword = () => import('/imports/ui/pages/ResetPassword.vue');
-const NotImplemented = () => import('/imports/ui/pages/NotImplemented.vue');
-const PatreonLevelTooLow = () => import('/imports/ui/pages/PatreonLevelTooLow.vue');
-const SingleLibrary = () => import('/imports/ui/pages/SingleLibrary.vue');
-const SingleLibraryToolbar = () => import('/imports/ui/library/SingleLibraryToolbar.vue');
-const Tabletops = () => import('/imports/ui/pages/Tabletops.vue');
-const Tabletop = () => import('/imports/ui/pages/Tabletop.vue');
-const TabletopToolbar = () => import('/imports/ui/tabletop/TabletopToolbar.vue');
-const TabletopRightDrawer = () => import('/imports/ui/tabletop/TabletopRightDrawer.vue');
-const Admin = () => import('/imports/ui/pages/Admin.vue');
-const Maintenance = () => import('/imports/ui/pages/Maintenance.vue');
-const Files = () => import('/imports/ui/pages/Files.vue');
-const Documentation = () => import('/imports/ui/pages/Documentation.vue');
+const Home = () => import('/imports/client/ui/pages/Home.vue');
+const About = () => import('/imports/client/ui/pages/About.vue');
+const CharacterList = () => import('/imports/client/ui/pages/CharacterList.vue');
+const CharacterListToolbarItems = () => import('/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue');
+const Library = () => import('/imports/client/ui/pages/Library.vue');
+const LibraryCollection = () => import('/imports/client/ui/pages/LibraryCollection.vue');
+const LibraryCollectionToolbar = () => import('/imports/client/ui/library/LibraryCollectionToolbar.vue');
+const CharacterSheetPage = () => import('/imports/client/ui/pages/CharacterSheetPage.vue');
+const CharacterSheetToolbar = () => import('/imports/client/ui/creature/character/CharacterSheetToolbar.vue');
+const CharacterSheetRightDrawer = () => import('/imports/client/ui/creature/character/CharacterSheetRightDrawer.vue');
+const CharacterSheetPrinted = () => import('/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue');
+const SignIn = () => import('/imports/client/ui/pages/SignIn.vue');
+const Register = () => import('/imports/client/ui/pages/Register.vue');
+const IconAdmin = () => import('/imports/client/ui/icons/IconAdmin.vue');
+//const Friends = () => import('/imports/client/ui/pages/Friends.vue' );
+const Feedback = () => import('/imports/client/ui/pages/Feedback.vue');
+const FunctionReference = () => import('/imports/client/ui/pages/FunctionReference.vue');
+const Account = () => import('/imports/client/ui/pages/Account.vue');
+const InviteSuccess = () => import('/imports/client/ui/pages/InviteSuccess.vue');
+const InviteError = () => import('/imports/client/ui/pages/InviteError.vue');
+const EmailVerificationSuccess = () => import('/imports/client/ui/pages/EmailVerificationSuccess.vue');
+const EmailVerificationError = () => import('/imports/client/ui/pages/EmailVerificationError.vue');
+const ResetPassword = () => import('/imports/client/ui/pages/ResetPassword.vue');
+const NotImplemented = () => import('/imports/client/ui/pages/NotImplemented.vue');
+const PatreonLevelTooLow = () => import('/imports/client/ui/pages/PatreonLevelTooLow.vue');
+const SingleLibrary = () => import('/imports/client/ui/pages/SingleLibrary.vue');
+const SingleLibraryToolbar = () => import('/imports/client/ui/library/SingleLibraryToolbar.vue');
+const Tabletops = () => import('/imports/client/ui/pages/Tabletops.vue');
+const Tabletop = () => import('/imports/client/ui/pages/Tabletop.vue');
+const TabletopToolbar = () => import('/imports/client/ui/tabletop/TabletopToolbar.vue');
+const TabletopRightDrawer = () => import('/imports/client/ui/tabletop/TabletopRightDrawer.vue');
+const Admin = () => import('/imports/client/ui/pages/Admin.vue');
+const Maintenance = () => import('/imports/client/ui/pages/Maintenance.vue');
+const Files = () => import('/imports/client/ui/pages/Files.vue');
+const Documentation = () => import('/imports/client/ui/pages/Documentation.vue');
 
 // Not found
-const NotFound = () => import('/imports/ui/pages/NotFound.vue');
+const NotFound = () => import('/imports/client/ui/pages/NotFound.vue');
 
 let userSubscription = Meteor.subscribe('user');
 
diff --git a/app/imports/ui/sharing/ShareDialog.vue b/app/imports/client/ui/sharing/ShareDialog.vue
similarity index 99%
rename from app/imports/ui/sharing/ShareDialog.vue
rename to app/imports/client/ui/sharing/ShareDialog.vue
index 27d8318f..7db4aa24 100644
--- a/app/imports/ui/sharing/ShareDialog.vue
+++ b/app/imports/client/ui/sharing/ShareDialog.vue
@@ -141,7 +141,7 @@ import {
   updateUserSharePermissions
 } from '/imports/api/sharing/sharing.js';
 import fetchDocByRef from '/imports/api/parenting/fetchDocByRef.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/sharing/TransferOwnershipDialog.vue b/app/imports/client/ui/sharing/TransferOwnershipDialog.vue
similarity index 95%
rename from app/imports/ui/sharing/TransferOwnershipDialog.vue
rename to app/imports/client/ui/sharing/TransferOwnershipDialog.vue
index aa8f35f0..425ef1b3 100644
--- a/app/imports/ui/sharing/TransferOwnershipDialog.vue
+++ b/app/imports/client/ui/sharing/TransferOwnershipDialog.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import { transferOwnership } from '/imports/api/sharing/sharing.js';
 
 export default {
diff --git a/app/imports/ui/styles/cardColors.css b/app/imports/client/ui/styles/cardColors.css
similarity index 100%
rename from app/imports/ui/styles/cardColors.css
rename to app/imports/client/ui/styles/cardColors.css
diff --git a/app/imports/ui/styles/cardTitles.css b/app/imports/client/ui/styles/cardTitles.css
similarity index 100%
rename from app/imports/ui/styles/cardTitles.css
rename to app/imports/client/ui/styles/cardTitles.css
diff --git a/app/imports/ui/styles/centeredInputs.css b/app/imports/client/ui/styles/centeredInputs.css
similarity index 100%
rename from app/imports/ui/styles/centeredInputs.css
rename to app/imports/client/ui/styles/centeredInputs.css
diff --git a/app/imports/ui/styles/denseLists.css b/app/imports/client/ui/styles/denseLists.css
similarity index 100%
rename from app/imports/ui/styles/denseLists.css
rename to app/imports/client/ui/styles/denseLists.css
diff --git a/app/imports/ui/styles/fitAvatars.css b/app/imports/client/ui/styles/fitAvatars.css
similarity index 100%
rename from app/imports/ui/styles/fitAvatars.css
rename to app/imports/client/ui/styles/fitAvatars.css
diff --git a/app/imports/ui/styles/inheritBackgrounds.css b/app/imports/client/ui/styles/inheritBackgrounds.css
similarity index 100%
rename from app/imports/ui/styles/inheritBackgrounds.css
rename to app/imports/client/ui/styles/inheritBackgrounds.css
diff --git a/app/imports/ui/styles/largeFormatInputs.css b/app/imports/client/ui/styles/largeFormatInputs.css
similarity index 100%
rename from app/imports/ui/styles/largeFormatInputs.css
rename to app/imports/client/ui/styles/largeFormatInputs.css
diff --git a/app/imports/ui/styles/lineClamp.css b/app/imports/client/ui/styles/lineClamp.css
similarity index 100%
rename from app/imports/ui/styles/lineClamp.css
rename to app/imports/client/ui/styles/lineClamp.css
diff --git a/app/imports/ui/styles/markdown.css b/app/imports/client/ui/styles/markdown.css
similarity index 100%
rename from app/imports/ui/styles/markdown.css
rename to app/imports/client/ui/styles/markdown.css
diff --git a/app/imports/ui/styles/speedDial.css b/app/imports/client/ui/styles/speedDial.css
similarity index 100%
rename from app/imports/ui/styles/speedDial.css
rename to app/imports/client/ui/styles/speedDial.css
diff --git a/app/imports/ui/styles/stylesIndex.js b/app/imports/client/ui/styles/stylesIndex.js
similarity index 100%
rename from app/imports/ui/styles/stylesIndex.js
rename to app/imports/client/ui/styles/stylesIndex.js
diff --git a/app/imports/ui/styles/toolbarFlex.css b/app/imports/client/ui/styles/toolbarFlex.css
similarity index 100%
rename from app/imports/ui/styles/toolbarFlex.css
rename to app/imports/client/ui/styles/toolbarFlex.css
diff --git a/app/imports/ui/tabletop/SelectCreaturesDialog.vue b/app/imports/client/ui/tabletop/SelectCreaturesDialog.vue
similarity index 89%
rename from app/imports/ui/tabletop/SelectCreaturesDialog.vue
rename to app/imports/client/ui/tabletop/SelectCreaturesDialog.vue
index 939b0d27..daf886e7 100644
--- a/app/imports/ui/tabletop/SelectCreaturesDialog.vue
+++ b/app/imports/client/ui/tabletop/SelectCreaturesDialog.vue
@@ -30,9 +30,9 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
+import CreatureListTile from '/imports/client/ui/creature/creatureList/CreatureListTile.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/tabletop/TabletopActionCards.vue b/app/imports/client/ui/tabletop/TabletopActionCards.vue
similarity index 91%
rename from app/imports/ui/tabletop/TabletopActionCards.vue
rename to app/imports/client/ui/tabletop/TabletopActionCards.vue
index 2e732f15..bd488f40 100644
--- a/app/imports/ui/tabletop/TabletopActionCards.vue
+++ b/app/imports/client/ui/tabletop/TabletopActionCards.vue
@@ -10,7 +10,7 @@
 
 <script lang="js">
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
-import ActionCard from '/imports/ui/properties/components/actions/ActionCard.vue';
+import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
 
 function getProperties(ancestorId, type){
   if (!ancestorId) return [];
diff --git a/app/imports/ui/tabletop/TabletopComponent.vue b/app/imports/client/ui/tabletop/TabletopComponent.vue
similarity index 84%
rename from app/imports/ui/tabletop/TabletopComponent.vue
rename to app/imports/client/ui/tabletop/TabletopComponent.vue
index ee3b8a58..2e602706 100644
--- a/app/imports/ui/tabletop/TabletopComponent.vue
+++ b/app/imports/client/ui/tabletop/TabletopComponent.vue
@@ -38,12 +38,12 @@
 
 <script lang="js">
 import addCreaturesToTabletop from '/imports/api/tabletop/methods/addCreaturesToTabletop.js';
-import TabletopCreatureCard from '/imports/ui/tabletop/TabletopCreatureCard.vue';
-import TabletopMap from '/imports/ui/tabletop/TabletopMap.vue';
+import TabletopCreatureCard from '/imports/client/ui/tabletop/TabletopCreatureCard.vue';
+import TabletopMap from '/imports/client/ui/tabletop/TabletopMap.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-import TabletopActionCards from '/imports/ui/tabletop/TabletopActionCards.vue';
-import MiniCharacterSheet from '/imports/ui/creature/character/MiniCharacterSheet.vue';
-import { snackbar } from '/imports/ui/components/snackbars/SnackbarQueue.js';
+import TabletopActionCards from '/imports/client/ui/tabletop/TabletopActionCards.vue';
+import MiniCharacterSheet from '/imports/client/ui/creature/character/MiniCharacterSheet.vue';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 
 export default {
   components: {
diff --git a/app/imports/ui/tabletop/TabletopCreatureCard.vue b/app/imports/client/ui/tabletop/TabletopCreatureCard.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopCreatureCard.vue
rename to app/imports/client/ui/tabletop/TabletopCreatureCard.vue
diff --git a/app/imports/ui/tabletop/TabletopLog.vue b/app/imports/client/ui/tabletop/TabletopLog.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopLog.vue
rename to app/imports/client/ui/tabletop/TabletopLog.vue
diff --git a/app/imports/ui/tabletop/TabletopMap.vue b/app/imports/client/ui/tabletop/TabletopMap.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopMap.vue
rename to app/imports/client/ui/tabletop/TabletopMap.vue
diff --git a/app/imports/ui/tabletop/TabletopRightDrawer.vue b/app/imports/client/ui/tabletop/TabletopRightDrawer.vue
similarity index 87%
rename from app/imports/ui/tabletop/TabletopRightDrawer.vue
rename to app/imports/client/ui/tabletop/TabletopRightDrawer.vue
index 9d5fc55f..4a82217d 100644
--- a/app/imports/ui/tabletop/TabletopRightDrawer.vue
+++ b/app/imports/client/ui/tabletop/TabletopRightDrawer.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script lang="js">
-import TabletopLog from '/imports/ui/tabletop/TabletopLog.vue';
+import TabletopLog from '/imports/client/ui/tabletop/TabletopLog.vue';
 export default {
   components: {
     TabletopLog,
diff --git a/app/imports/ui/tabletop/TabletopToolbar.vue b/app/imports/client/ui/tabletop/TabletopToolbar.vue
similarity index 100%
rename from app/imports/ui/tabletop/TabletopToolbar.vue
rename to app/imports/client/ui/tabletop/TabletopToolbar.vue
diff --git a/app/imports/ui/themes.js b/app/imports/client/ui/themes.js
similarity index 100%
rename from app/imports/ui/themes.js
rename to app/imports/client/ui/themes.js
diff --git a/app/imports/ui/user/DeleteUserAccountDialog.vue b/app/imports/client/ui/user/DeleteUserAccountDialog.vue
similarity index 95%
rename from app/imports/ui/user/DeleteUserAccountDialog.vue
rename to app/imports/client/ui/user/DeleteUserAccountDialog.vue
index a5a2d5ac..45dc28b7 100644
--- a/app/imports/ui/user/DeleteUserAccountDialog.vue
+++ b/app/imports/client/ui/user/DeleteUserAccountDialog.vue
@@ -89,10 +89,10 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import Libraries from '/imports/api/library/Libraries.js';
-import CreatureListTile from '/imports/ui/creature/creatureList/CreatureListTile.vue';
+import CreatureListTile from '/imports/client/ui/creature/creatureList/CreatureListTile.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/user/InviteDialog.vue b/app/imports/client/ui/user/InviteDialog.vue
similarity index 96%
rename from app/imports/ui/user/InviteDialog.vue
rename to app/imports/client/ui/user/InviteDialog.vue
index c633025c..7230d6dd 100644
--- a/app/imports/ui/user/InviteDialog.vue
+++ b/app/imports/client/ui/user/InviteDialog.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import Invites, { getInviteToken, revokeInvite } from '/imports/api/users/Invites.js';
 
 export default {
diff --git a/app/imports/ui/user/TierTooLowDialog.vue b/app/imports/client/ui/user/TierTooLowDialog.vue
similarity index 96%
rename from app/imports/ui/user/TierTooLowDialog.vue
rename to app/imports/client/ui/user/TierTooLowDialog.vue
index bd6eeb9a..3f28175e 100644
--- a/app/imports/ui/user/TierTooLowDialog.vue
+++ b/app/imports/client/ui/user/TierTooLowDialog.vue
@@ -47,7 +47,7 @@
 
 <script lang="js">
 import TIERS, { getUserTier } from '/imports/api/users/patreon/tiers.js';
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 import linkWithPatreon from '/imports/api/users/methods/linkWithPatreon.js'
 
 export default {
diff --git a/app/imports/ui/user/UsernameDialog.vue b/app/imports/client/ui/user/UsernameDialog.vue
similarity index 95%
rename from app/imports/ui/user/UsernameDialog.vue
rename to app/imports/client/ui/user/UsernameDialog.vue
index 8980d6bc..f565c9e5 100644
--- a/app/imports/ui/user/UsernameDialog.vue
+++ b/app/imports/client/ui/user/UsernameDialog.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="js">
-import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
+import DialogBase from '/imports/client/ui/dialogStack/DialogBase.vue';
 
 export default {
   components: {
diff --git a/app/imports/ui/utility/escapeRegex.js b/app/imports/client/ui/utility/escapeRegex.js
similarity index 100%
rename from app/imports/ui/utility/escapeRegex.js
rename to app/imports/client/ui/utility/escapeRegex.js
diff --git a/app/imports/ui/utility/getEffectIcon.js b/app/imports/client/ui/utility/getEffectIcon.js
similarity index 100%
rename from app/imports/ui/utility/getEffectIcon.js
rename to app/imports/client/ui/utility/getEffectIcon.js
diff --git a/app/imports/ui/utility/getProficiencyIcon.js b/app/imports/client/ui/utility/getProficiencyIcon.js
similarity index 100%
rename from app/imports/ui/utility/getProficiencyIcon.js
rename to app/imports/client/ui/utility/getProficiencyIcon.js
diff --git a/app/imports/ui/utility/getThemeColor.js b/app/imports/client/ui/utility/getThemeColor.js
similarity index 76%
rename from app/imports/ui/utility/getThemeColor.js
rename to app/imports/client/ui/utility/getThemeColor.js
index f53596f9..ce818e63 100644
--- a/app/imports/ui/utility/getThemeColor.js
+++ b/app/imports/client/ui/utility/getThemeColor.js
@@ -1,4 +1,4 @@
-import vuetify from '/imports/ui/vuetify.js';
+import vuetify from '/imports/client/ui/vuetify.js';
 
 export default function(color){
   return vuetify.framework.theme.dark ?
diff --git a/app/imports/ui/utility/isDarkColor.js b/app/imports/client/ui/utility/isDarkColor.js
similarity index 100%
rename from app/imports/ui/utility/isDarkColor.js
rename to app/imports/client/ui/utility/isDarkColor.js
diff --git a/app/imports/ui/utility/sortEffects.js b/app/imports/client/ui/utility/sortEffects.js
similarity index 100%
rename from app/imports/ui/utility/sortEffects.js
rename to app/imports/client/ui/utility/sortEffects.js
diff --git a/app/imports/ui/utility/swapCase.js b/app/imports/client/ui/utility/swapCase.js
similarity index 100%
rename from app/imports/ui/utility/swapCase.js
rename to app/imports/client/ui/utility/swapCase.js
diff --git a/app/imports/ui/utility/valueToCoins.js b/app/imports/client/ui/utility/valueToCoins.js
similarity index 100%
rename from app/imports/ui/utility/valueToCoins.js
rename to app/imports/client/ui/utility/valueToCoins.js
diff --git a/app/imports/ui/vueSetup.js b/app/imports/client/ui/vueSetup.js
similarity index 61%
rename from app/imports/ui/vueSetup.js
rename to app/imports/client/ui/vueSetup.js
index 6b6fb590..a0d32007 100644
--- a/app/imports/ui/vueSetup.js
+++ b/app/imports/client/ui/vueSetup.js
@@ -1,13 +1,13 @@
 import Vue from 'vue';
-import store from '/imports/ui/vuexStore.js';
+import store from '/imports/client/ui/vuexStore.js';
 import VueMeteorTracker from 'vue-meteor-tracker';
-import AppLayout from '/imports/ui/layouts/AppLayout.vue';
+import AppLayout from '/imports/client/ui/layouts/AppLayout.vue';
 import ReactiveProvide from 'vue-reactive-provide';
 import VueObserverUtils from '@tozd/vue-observer-utils';
-import router from '/imports/ui/router.js';
-import '/imports/ui/components/global/globalIndex.js';
-import '/imports/ui/markdownCofig.js';
-import vuetify from '/imports/ui/vuetify.js';
+import router from '/imports/client/ui/router.js';
+import '/imports/client/ui/components/global/globalIndex.js';
+import '/imports/client/ui/markdownCofig.js';
+import vuetify from '/imports/client/ui/vuetify.js';
 
 Vue.use(VueMeteorTracker);
 Vue.config.meteor.freeze = true;
diff --git a/app/imports/ui/vuetify.js b/app/imports/client/ui/vuetify.js
similarity index 86%
rename from app/imports/ui/vuetify.js
rename to app/imports/client/ui/vuetify.js
index 34acac19..f4d31024 100644
--- a/app/imports/ui/vuetify.js
+++ b/app/imports/client/ui/vuetify.js
@@ -3,8 +3,8 @@ import Vue from 'vue';
 import Vuetify from 'vuetify/lib/framework';
 import { Scroll, Ripple } from 'vuetify/lib/directives';
 import SVG_ICONS from '/imports/constants/SVG_ICONS.js';
-import SvgIconByName from '/imports/ui/icons/SvgIconByName.vue';
-import themes from '/imports/ui/themes.js';
+import SvgIconByName from '/imports/client/ui/icons/SvgIconByName.vue';
+import themes from '/imports/client/ui/themes.js';
 import minifyTheme from 'minify-css-string';
 
 Vue.use(Vuetify, {
diff --git a/app/imports/ui/vuexStore.js b/app/imports/client/ui/vuexStore.js
similarity index 95%
rename from app/imports/ui/vuexStore.js
rename to app/imports/client/ui/vuexStore.js
index 173e276b..4c301190 100644
--- a/app/imports/ui/vuexStore.js
+++ b/app/imports/client/ui/vuexStore.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
-import dialogStackStore from '/imports/ui/dialogStack/dialogStackStore.js';
+import dialogStackStore from '/imports/client/ui/dialogStack/dialogStackStore.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
 const tabs = ['stats', 'features', 'inventory', 'spells', 'journal', 'build', 'tree'];
 const tabsWithoutSpells = ['stats', 'features', 'inventory', 'journal', 'build', 'tree'];
diff --git a/app/imports/ui/components/global/globalIndex.js b/app/imports/ui/components/global/globalIndex.js
deleted file mode 100644
index 84c28bbe..00000000
--- a/app/imports/ui/components/global/globalIndex.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Vue from 'vue';
-// Global components
-import DatePicker from '/imports/ui/components/global/DatePicker.vue';
-import IconPicker from '/imports/ui/components/global/IconPicker.vue';
-import TextField from '/imports/ui/components/global/TextField.vue';
-import TextArea from '/imports/ui/components/global/TextArea.vue';
-import SmartSelect from '/imports/ui/components/global/SmartSelect.vue';
-import SmartBtn from '/imports/ui/components/global/SmartBtn.vue';
-import SmartCombobox from '/imports/ui/components/global/SmartCombobox.vue';
-import SmartCheckbox from '/imports/ui/components/global/SmartCheckbox.vue';
-import SmartSwitch from '/imports/ui/components/global/SmartSwitch.vue';
-import SvgIcon from '/imports/ui/components/global/SvgIcon.vue';
-import SmartSlider from '/imports/ui/components/global/SmartSlider.vue';
-
-Vue.component('DatePicker', DatePicker);
-Vue.component('IconPicker', IconPicker);
-Vue.component('TextField', TextField);
-Vue.component('TextArea', TextArea);
-Vue.component('SmartSelect', SmartSelect);
-Vue.component('SmartBtn', SmartBtn);
-Vue.component('SmartCombobox', SmartCombobox);
-Vue.component('SmartCheckbox', SmartCheckbox);
-Vue.component('SmartSlider', SmartSlider);
-Vue.component('SmartSwitch', SmartSwitch);
-Vue.component('SvgIcon', SvgIcon);
diff --git a/app/imports/ui/dialogStack/DialogComponentIndex.js b/app/imports/ui/dialogStack/DialogComponentIndex.js
deleted file mode 100644
index ef89fc6a..00000000
--- a/app/imports/ui/dialogStack/DialogComponentIndex.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Load commonly used dialogs immediately
-import AddCreaturePropertyDialog from '/imports/ui/creature/creatureProperties/AddCreaturePropertyDialog.vue';
-import CharacterCreationDialog from '/imports/ui/creature/character/CharacterCreationDialog.vue';
-import CastSpellWithSlotDialog from '/imports/ui/properties/components/spells/CastSpellWithSlotDialog.vue';
-import CreatureFormDialog from '/imports/ui/creature/CreatureFormDialog.vue';
-import CreaturePropertyCreationDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyCreationDialog.vue';
-import CreaturePropertyDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyDialog.vue';
-import CreaturePropertyFromLibraryDialog from '/imports/ui/creature/creatureProperties/CreaturePropertyFromLibraryDialog.vue';
-import CreatureRootDialog from '/imports/ui/creature/character/CreatureRootDialog.vue';
-import DeleteConfirmationDialog from '/imports/ui/dialogStack/DeleteConfirmationDialog.vue';
-import ExperienceInsertDialog from  '/imports/ui/creature/experiences/ExperienceInsertDialog.vue';
-import ExperienceListDialog from  '/imports/ui/creature/experiences/ExperienceListDialog.vue';
-import HelpDialog from  '/imports/ui/dialogStack/HelpDialog.vue';
-import LevelUpDialog from '/imports/ui/creature/slots/LevelUpDialog.vue';
-import SelectLibraryNodeDialog from '/imports/ui/library/SelectLibraryNodeDialog.vue';
-import SlotFillDialog from '/imports/ui/creature/slots/SlotFillDialog.vue';
-import TierTooLowDialog from '/imports/ui/user/TierTooLowDialog.vue';
-import TransferOwnershipDialog from '/imports/ui/sharing/TransferOwnershipDialog.vue';
-
-// Lazily load less common dialogs
-const ArchiveDialog = () => import('/imports/ui/creature/archive/ArchiveDialog.vue');
-const DeleteUserAccountDialog = () => import('/imports/ui/user/DeleteUserAccountDialog.vue');
-const InviteDialog = () => import('/imports/ui/user/InviteDialog.vue');
-const LibraryCollectionCreationDialog = () => import('/imports/ui/library/LibraryCollectionCreationDialog.vue');
-const LibraryCollectionEditDialog = () => import('/imports/ui/library/LibraryCollectionEditDialog.vue');
-const LibraryCreationDialog = () => import('/imports/ui/library/LibraryCreationDialog.vue');
-const LibraryEditDialog = () => import('/imports/ui/library/LibraryEditDialog.vue');
-const LibraryNodeCreationDialog = () => import('/imports/ui/library/LibraryNodeCreationDialog.vue');
-const LibraryNodeDialog = () => import('/imports/ui/library/LibraryNodeDialog.vue');
-const MoveLibraryNodeDialog = () => import('/imports/ui/library/MoveLibraryNodeDialog.vue');
-const SelectCreaturesDialog = () => import('/imports/ui/tabletop/SelectCreaturesDialog.vue');
-const ShareDialog = () => import('/imports/ui/sharing/ShareDialog.vue');
-const UsernameDialog = () => import('/imports/ui/user/UsernameDialog.vue');
-
-export default {
-  AddCreaturePropertyDialog,
-  ArchiveDialog,
-  CastSpellWithSlotDialog,
-  CharacterCreationDialog,
-  CreatureFormDialog,
-  CreaturePropertyCreationDialog,
-  CreaturePropertyDialog,
-  CreaturePropertyFromLibraryDialog,
-  CreatureRootDialog,
-  DeleteConfirmationDialog,
-  DeleteUserAccountDialog,
-  ExperienceInsertDialog,
-  ExperienceListDialog,
-  HelpDialog,
-  InviteDialog,
-  LevelUpDialog,
-  LibraryCollectionCreationDialog,
-  LibraryCollectionEditDialog,
-  LibraryCreationDialog,
-  LibraryEditDialog,
-  LibraryNodeCreationDialog,
-  LibraryNodeDialog,
-  MoveLibraryNodeDialog,
-  SelectCreaturesDialog,
-  SelectLibraryNodeDialog,
-  ShareDialog,
-  SlotFillDialog,
-  TierTooLowDialog,
-  TransferOwnershipDialog,
-  UsernameDialog,
-};
diff --git a/app/imports/ui/layouts/Sidebar.vue b/app/imports/ui/layouts/Sidebar.vue
deleted file mode 100644
index 31b5fa60..00000000
--- a/app/imports/ui/layouts/Sidebar.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <div class="sidebar">
-    <v-layout
-      v-if="!signedIn"
-      justify-center
-    >
-      <v-btn
-        text
-        to="/sign-in"
-      >
-        Sign in
-      </v-btn>
-    </v-layout>
-    <v-list>
-      <v-list-item v-if="signedIn">
-        <v-list-item-content>
-          <v-list-item-title>
-            {{ userName }}
-          </v-list-item-title>
-        </v-list-item-content>
-        <v-list-item-action>
-          <v-tooltip bottom>
-            <template
-              #activator="{ on }"
-            >
-              <v-btn
-                icon
-                to="/account"
-                v-on="on"
-              >
-                <v-icon>mdi-cog</v-icon>
-              </v-btn>
-            </template>
-            <span>Account Settings</span>
-          </v-tooltip>
-        </v-list-item-action>
-      </v-list-item>
-
-      <v-list-item
-        v-for="(link, i) in links"
-        :key="i"
-        :to="link.to"
-        :href="link.href"
-      >
-        <v-list-item-action>
-          <v-icon>{{ link.icon }}</v-icon>
-        </v-list-item-action>
-        <v-list-item-title>
-          {{ link.title }}
-        </v-list-item-title>
-        <v-icon v-if="link.href">
-          mdi-open-in-new
-        </v-icon>
-      </v-list-item>
-      <v-divider />
-    </v-list>
-    <creature-folder-list
-      dense
-      :creatures="CreaturesWithNoParty"
-      :folders="folders"
-    />
-  </div>
-</template>
-
-<script lang="js">
-  import Creatures from '/imports/api/creature/creatures/Creatures.js';
-  import CreatureFolders from '/imports/api/creature/creatureFolders/CreatureFolders.js';
-  import CreatureFolderList from '/imports/ui/creature/creatureList/CreatureFolderList.vue';
-  import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
-
-  const characterTransform = function(char){
-    char.url = `/character/${char._id}/${getCreatureUrlName(char)}`;
-    char.initial = char.name && char.name[0] || '?';
-    return char;
-  };
-  export default {
-    components: {
-      CreatureFolderList
-    },
-    meteor: {
-      $subscribe: {
-        'characterList': [],
-      },
-      signedIn(){
-        return Meteor.userId();
-      },
-      userName(){
-        let user = Meteor.user();
-        return user && user.username || user && user._id;
-      },
-      links(){
-        let isLoggedIn = !!Meteor.userId();
-        let links = [
-          {title: 'Home', icon: 'mdi-home', to: '/'},
-          {title: 'Characters', icon: 'mdi-account-group', to: '/characterList', requireLogin: true},
-          {title: 'Library', icon: 'mdi-library-shelves', to: '/library', requireLogin: true},
-          //{title: 'Tabletops', icon: 'api', to: '/tabletops', requireLogin: true},
-          //{title: 'Friends', icon: 'people', to: '/friends', requireLogin: true},
-          {title: 'Files', icon: 'mdi-file-multiple', to: '/my-files'},
-          {title: 'Feedback', icon: 'mdi-bug', to: '/feedback'},
-          {title: 'About', icon: 'mdi-sign-text', to: '/about'},
-          {title: 'Documentation', icon: 'mdi-book-open-variant', to: '/docs'},
-          {title: 'Patreon', icon: 'mdi-patreon', href: 'https://www.patreon.com/dicecloud'},
-          {title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/tree/version-2'},
-        ];
-        return links.filter(link => !link.requireLogin || isLoggedIn);
-      },
-      folders(){
-        const userId = Meteor.userId();
-        let folders =  CreatureFolders.find(
-          {owner: userId, archived: {$ne: true}},
-          {sort: {order: 1}},
-        ).map(folder => {
-          folder.creatures = Creatures.find(
-            {
-              _id: {$in: folder.creatures || []},
-              $or: [{readers: userId}, {writers: userId}, {owner: userId}],
-            }, {
-              sort: {name: 1},
-            }
-          ).map(characterTransform);
-          return folder;
-        });
-        folders = folders.filter(folder => !!folder.creatures.length);
-        return folders;
-      },
-      CreaturesWithNoParty() {
-        var userId = Meteor.userId();
-        var charArrays = CreatureFolders.find({owner: userId}).map(p => p.creatures);
-        var folderChars = _.uniq(_.flatten(charArrays));
-        return Creatures.find(
-          {
-            _id: {$nin: folderChars},
-            $or: [{readers: userId}, {writers: userId}, {owner: userId}],
-          },
-          {sort: {name: 1}}
-        ).map(characterTransform);
-      },
-    },
-  };
-</script>
diff --git a/app/imports/ui/properties/forms/shared/propertyFormIndex.js b/app/imports/ui/properties/forms/shared/propertyFormIndex.js
deleted file mode 100644
index ef29ea2d..00000000
--- a/app/imports/ui/properties/forms/shared/propertyFormIndex.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import ActionForm from '/imports/ui/properties/forms/ActionForm.vue';
-import AdjustmentForm from '/imports/ui/properties/forms/AdjustmentForm.vue';
-import AttributeForm from '/imports/ui/properties/forms/AttributeForm.vue';
-import BuffForm from '/imports/ui/properties/forms/BuffForm.vue';
-import BuffRemoverForm from '/imports/ui/properties/forms/BuffRemoverForm.vue';
-import BranchForm from '/imports/ui/properties/forms/BranchForm.vue';
-import ClassForm from '/imports/ui/properties/forms/ClassForm.vue';
-import ClassLevelForm from '/imports/ui/properties/forms/ClassLevelForm.vue';
-import ConstantForm from '/imports/ui/properties/forms/ConstantForm.vue';
-import ContainerForm from '/imports/ui/properties/forms/ContainerForm.vue';
-import DamageForm from '/imports/ui/properties/forms/DamageForm.vue';
-import DamageMultiplierForm from '/imports/ui/properties/forms/DamageMultiplierForm.vue';
-import EffectForm from '/imports/ui/properties/forms/EffectForm.vue';
-import FeatureForm from '/imports/ui/properties/forms/FeatureForm.vue';
-import FolderForm from '/imports/ui/properties/forms/FolderForm.vue';
-import ItemForm from '/imports/ui/properties/forms/ItemForm.vue';
-import NoteForm from '/imports/ui/properties/forms/NoteForm.vue';
-import PointBuyForm from '/imports/ui/properties/forms/PointBuyForm.vue';
-import ProficiencyForm from '/imports/ui/properties/forms/ProficiencyForm.vue';
-import ReferenceForm from '/imports/ui/properties/forms/ReferenceForm.vue';
-import RollForm from '/imports/ui/properties/forms/RollForm.vue';
-import SavingThrowForm from '/imports/ui/properties/forms/SavingThrowForm.vue';
-import SkillForm from '/imports/ui/properties/forms/SkillForm.vue';
-import SlotForm from '/imports/ui/properties/forms/SlotForm.vue';
-import SlotFillerForm from '/imports/ui/properties/forms/SlotFillerForm.vue';
-import SpellListForm from '/imports/ui/properties/forms/SpellListForm.vue';
-import SpellForm from '/imports/ui/properties/forms/SpellForm.vue';
-import ToggleForm from '/imports/ui/properties/forms/ToggleForm.vue';
-import TriggerForm from '/imports/ui/properties/forms/TriggerForm.vue';
-
-export default {
-  action: ActionForm,
-  adjustment: AdjustmentForm,
-  attribute: AttributeForm,
-  buff: BuffForm,
-  buffRemover: BuffRemoverForm,
-  branch: BranchForm,
-  constant: ConstantForm,
-  container: ContainerForm,
-  class: ClassForm,
-  classLevel: ClassLevelForm,
-  damage: DamageForm,
-  damageMultiplier: DamageMultiplierForm,
-  effect: EffectForm,
-  feature: FeatureForm,
-  folder: FolderForm,
-  item: ItemForm,
-  note: NoteForm,
-  pointBuy: PointBuyForm,
-  proficiency: ProficiencyForm,
-  propertySlot: SlotForm,
-  reference: ReferenceForm,
-  roll: RollForm,
-  savingThrow: SavingThrowForm,
-  skill: SkillForm,
-  slotFiller: SlotFillerForm,
-  spellList: SpellListForm,
-  spell: SpellForm,
-  toggle: ToggleForm,
-  trigger: TriggerForm,
-};
diff --git a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js b/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
deleted file mode 100644
index 1f9772e8..00000000
--- a/app/imports/ui/properties/treeNodeViews/treeNodeViewIndex.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import DefaultTreeNode from '/imports/ui/properties/treeNodeViews/DefaultTreeNode.vue';
-import AdjustmentTreeNode from '/imports/ui/properties/treeNodeViews/AdjustmentTreeNode.vue';
-import BranchTreeNode from '/imports/ui/properties/treeNodeViews/BranchTreeNode.vue';
-import ItemTreeNode from '/imports/ui/properties/treeNodeViews/ItemTreeNode.vue';
-import DamageTreeNode from '/imports/ui/properties/treeNodeViews/DamageTreeNode.vue';
-import EffectTreeNode from '/imports/ui/properties/treeNodeViews/EffectTreeNode.vue';
-import ClassLevelTreeNode from '/imports/ui/properties/treeNodeViews/ClassLevelTreeNode.vue';
-import ProficiencyTreeNode from '/imports/ui/properties/treeNodeViews/ProficiencyTreeNode.vue';
-import ReferenceTreeNode from '/imports/ui/properties/treeNodeViews/ReferenceTreeNode.vue';
-import SavingThrowTreeNode from '/imports/ui/properties/treeNodeViews/SavingThrowTreeNode.vue';
-
-export default {
-  default: DefaultTreeNode,
-  adjustment: AdjustmentTreeNode,
-  branch: BranchTreeNode,
-  classLevel: ClassLevelTreeNode,
-  damage: DamageTreeNode,
-  effect: EffectTreeNode,
-  item: ItemTreeNode,
-  proficiency: ProficiencyTreeNode,
-  reference: ReferenceTreeNode,
-  savingThrow: SavingThrowTreeNode,
-}
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
deleted file mode 100644
index 70151b48..00000000
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import ActionViewer from '/imports/ui/properties/viewers/ActionViewer.vue';
-import AdjustmentViewer from '/imports/ui/properties/viewers/AdjustmentViewer.vue';
-import AttributeViewer from '/imports/ui/properties/viewers/AttributeViewer.vue';
-import BuffViewer from '/imports/ui/properties/viewers/BuffViewer.vue';
-import BuffRemoverViewer from '/imports/ui/properties/viewers/BuffRemoverViewer.vue';
-import BranchViewer from '/imports/ui/properties/viewers/BranchViewer.vue';
-import ContainerViewer from '/imports/ui/properties/viewers/ContainerViewer.vue';
-import ClassViewer from '/imports/ui/properties/viewers/ClassViewer.vue';
-import ClassLevelViewer from '/imports/ui/properties/viewers/ClassLevelViewer.vue';
-import ConstantViewer from '/imports/ui/properties/viewers/ConstantViewer.vue';
-import DamageViewer from '/imports/ui/properties/viewers/DamageViewer.vue';
-import DamageMultiplierViewer from '/imports/ui/properties/viewers/DamageMultiplierViewer.vue';
-import EffectViewer from '/imports/ui/properties/viewers/EffectViewer.vue';
-import FeatureViewer from '/imports/ui/properties/viewers/FeatureViewer.vue';
-import FolderViewer from '/imports/ui/properties/viewers/FolderViewer.vue';
-import ItemViewer from '/imports/ui/properties/viewers/ItemViewer.vue';
-import NoteViewer from '/imports/ui/properties/viewers/NoteViewer.vue';
-import PointBuyViewer from '/imports/ui/properties/viewers/PointBuyViewer.vue';
-import ProficiencyViewer from '/imports/ui/properties/viewers/ProficiencyViewer.vue';
-import ReferenceViewer from '/imports/ui/properties/viewers/ReferenceViewer.vue';
-import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue';
-import SkillViewer from '/imports/ui/properties/viewers/SkillViewer.vue';
-import SavingThrowViewer from '/imports/ui/properties/viewers/SavingThrowViewer.vue';
-import SlotViewer from '/imports/ui/properties/viewers/SlotViewer.vue';
-import SlotFillerViewer from '/imports/ui/properties/viewers/SlotFillerViewer.vue';
-import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue';
-import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue';
-import ToggleViewer from '/imports/ui/properties/viewers/ToggleViewer.vue';
-import TriggerViewer from '/imports/ui/properties/viewers/TriggerViewer.vue';
-
-export default {
-  action: ActionViewer,
-  adjustment: AdjustmentViewer,
-  attribute: AttributeViewer,
-  buff: BuffViewer,
-  buffRemover: BuffRemoverViewer,
-  branch: BranchViewer,
-  container: ContainerViewer,
-  class: ClassViewer,
-  classLevel: ClassLevelViewer,
-  constant: ConstantViewer,
-  damage: DamageViewer,
-  damageMultiplier: DamageMultiplierViewer,
-  effect: EffectViewer,
-  feature: FeatureViewer,
-  folder: FolderViewer,
-  item: ItemViewer,
-  note: NoteViewer,
-  pointBuy: PointBuyViewer,
-  proficiency: ProficiencyViewer,
-  propertySlot: SlotViewer,
-  roll: RollViewer,
-  reference: ReferenceViewer,
-  savingThrow: SavingThrowViewer,
-  slotFiller: SlotFillerViewer,
-  skill: SkillViewer,
-  spellList: SpellListViewer,
-  spell: SpellViewer,
-  toggle: ToggleViewer,
-  trigger: TriggerViewer,
-};
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerMixin.js b/app/imports/ui/properties/viewers/shared/propertyViewerMixin.js
deleted file mode 100644
index de4278f2..00000000
--- a/app/imports/ui/properties/viewers/shared/propertyViewerMixin.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import PropertyName from '/imports/ui/properties/viewers/shared/PropertyName.vue';
-import PropertyVariableName from '/imports/ui/properties/viewers/shared/PropertyVariableName.vue';
-import PropertyField from '/imports/ui/properties/viewers/shared/PropertyField.vue';
-import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue';
-import PropertyTags from '/imports/ui/properties/viewers/shared/PropertyTags.vue';
-
-const propertyViewerMixin = {
-  components: {
-    PropertyName,
-    PropertyVariableName,
-    PropertyField,
-    PropertyDescription,
-    PropertyTags,
-  },
-  props: {
-    model: {
-      type: Object,
-      required: true,
-    },
-  },
-};
-
-export default propertyViewerMixin;

From 428aeef6352351259854dacd5e9d539d192dcf32 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 17:56:36 +0200
Subject: [PATCH 23/46] Removed HMR test text

---
 .../client/ui/creature/character/characterSheetTabs/StatsTab.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index 259001b7..50b880ee 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -1,6 +1,5 @@
 <template lang="html">
   <div class="stats-tab ma-2">
-    HMR TEST 3
     <div
       v-if="healthBars.length"
       class="px-2 pt-2"

From b6b0cfbb9b6a61183cbce83aabf08b3bd709a12e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 18:12:51 +0200
Subject: [PATCH 24/46] Fixed triggers on attribute reset on rest

---
 .../methods/damageProperty.js                 |  4 +-
 .../creatures/methods/restCreature.js         | 60 ++++++++-----------
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/app/imports/api/creature/creatureProperties/methods/damageProperty.js b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
index 507d82bd..f129a562 100644
--- a/app/imports/api/creature/creatureProperties/methods/damageProperty.js
+++ b/app/imports/api/creature/creatureProperties/methods/damageProperty.js
@@ -59,7 +59,7 @@ const damageProperty = new ValidatedMethod({
   },
 });
 
-export function damagePropertyWork({ prop, operation, value, actionContext }) {
+export function damagePropertyWork({ prop, operation, value, actionContext, logFunction }) {
 
   // Save the value to the scope before applying the before triggers
   if (operation === 'increment') {
@@ -105,6 +105,7 @@ export function damagePropertyWork({ prop, operation, value, actionContext }) {
     // Also write it straight to the prop so that it is updated in the actionContext
     prop.damage = damage;
     prop.value = newValue;
+    logFunction?.(newValue);
   } else if (operation === 'increment') {
     let currentValue = prop.value || 0;
     let currentDamage = prop.damage || 0;
@@ -125,6 +126,7 @@ export function damagePropertyWork({ prop, operation, value, actionContext }) {
     // Also write it straight to the prop so that it is updated in the actionContext
     prop.damage += increment;
     prop.value -= increment;
+    logFunction?.(increment);
   }
 
   applyTriggers(actionContext.triggers?.damageProperty?.after, prop, actionContext);
diff --git a/app/imports/api/creature/creatures/methods/restCreature.js b/app/imports/api/creature/creatures/methods/restCreature.js
index 7ca7c16c..7e7edb1e 100644
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -6,6 +6,7 @@ import { assertEditPermission } from '/imports/api/creature/creatures/creaturePe
 import { union } from 'lodash';
 import ActionContext from '/imports/api/engine/actions/ActionContext.js';
 import { applyTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import { damagePropertyWork } from '/imports/api/creature/creatureProperties/methods/damageProperty.js';
 
 const restCreature = new ValidatedMethod({
   name: 'creature.methods.rest',
@@ -84,23 +85,20 @@ export function resetProperties(creatureId, resetFilter, actionContext) {
     type: 'attribute',
     damage: { $ne: 0 },
   }
-  CreatureProperties.find(attributeFilter, {
-    fields: { name: 1, damage: 1 }
-  }).forEach(prop => {
-    actionContext.addLog({
-      name: prop.name,
-      value: prop.damage >= 0 ? `Restored ${prop.damage}` : `Removed ${-prop.damage}`
+  CreatureProperties.find(attributeFilter).forEach(prop => {
+    damagePropertyWork({
+      prop,
+      operation: 'increment',
+      value: -prop.damage,
+      actionContext,
+      logFunction(increment) {
+        actionContext.addLog({
+          name: prop.name,
+          value: increment < 0 ? `Restored ${-increment}` : `Removed ${-increment}`
+        });
+      }
     });
   });
-  CreatureProperties.update(attributeFilter, {
-    $set: {
-      damage: 0,
-      dirty: true,
-    }
-  }, {
-    selector: { type: 'attribute' },
-    multi: true,
-  });
   // Update all action-like properties' usesUsed
   const actionFilter = {
     ...filter,
@@ -135,13 +133,6 @@ function resetHitDice(creatureId, actionContext) {
     attributeType: 'hitDice',
     removed: { $ne: true },
     inactive: { $ne: true },
-  }, {
-    fields: {
-      name: 1,
-      hitDiceSize: 1,
-      damage: 1,
-      total: 1,
-    }
   }).fetch();
   // Use a collator to do sorting in natural order
   let collator = new Intl.Collator('en', {
@@ -155,24 +146,23 @@ function resetHitDice(creatureId, actionContext) {
   let resetMultiplier = actionContext.creature.settings.hitDiceResetMultiplier || 0.5;
   let recoverableHd = Math.max(Math.floor(totalHd * resetMultiplier), 1);
   // recover each hit dice in turn until the recoverable amount is used up
-  let amountToRecover, resultingDamage;
+  let amountToRecover;
   hitDice.forEach(hd => {
     if (!recoverableHd) return;
-    amountToRecover = Math.min(recoverableHd, hd.damage || 0);
+    amountToRecover = Math.min(recoverableHd, hd.damage ?? 0);
     if (!amountToRecover) return;
     recoverableHd -= amountToRecover;
-    resultingDamage = hd.damage - amountToRecover;
-    actionContext.addLog({
-      name: hd.name,
-      value: amountToRecover >= 0 ? `Restored ${amountToRecover} hit dice` : `Removed ${-amountToRecover} hit dice`
-    });
-    CreatureProperties.update(hd._id, {
-      $set: {
-        damage: resultingDamage,
-        dirty: true,
+    damagePropertyWork({
+      prop: hd,
+      operation: 'increment',
+      value: -amountToRecover,
+      actionContext,
+      logFunction(increment) {
+        actionContext.addLog({
+          name: hd.name,
+          value: increment < 0 ? `Restored ${-increment} hit dice` : `Removed ${increment} hit dice`
+        });
       }
-    }, {
-      selector: { type: 'attribute' },
     });
   });
 }

From cea63e6a8e17b3f6591e08cbbb20155f25118641 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 18:34:52 +0200
Subject: [PATCH 25/46] Moved dev file storage to inside meteor app folder
 Prevented verbose logging of file storage

---
 app/.gitignore                                           | 1 +
 app/imports/api/creature/archive/ArchiveCreatureFiles.js | 4 ++--
 app/imports/api/files/UserImages.js                      | 2 +-
 app/imports/api/files/s3FileStorage.js                   | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/.gitignore b/app/.gitignore
index da83c4f3..e4ba5ce6 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -3,6 +3,7 @@
 .demeteorized
 .cache
 .vscode
+fileStorage
 settings.json
 public/components
 public/_imports.html
diff --git a/app/imports/api/creature/archive/ArchiveCreatureFiles.js b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
index 1b699c0b..c0d1094e 100644
--- a/app/imports/api/creature/archive/ArchiveCreatureFiles.js
+++ b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
@@ -6,13 +6,13 @@ import { CreatureSchema } from '/imports/api/creature/creatures/Creatures.js';
 
 const ArchiveCreatureFiles = createS3FilesCollection({
   collectionName: 'archiveCreatureFiles',
-  storagePath: Meteor.isDevelopment ? '/DiceCloud/archiveCreatures/' : 'assets/app/archiveCreatures',
+  storagePath: Meteor.isDevelopment ? '../../../../../fileStorage/archiveCreatures' : 'assets/app/archiveCreatures',
   onBeforeUpload(file) {
     // Allow upload files under 10MB, and only in json format
     if (file.size > 10485760) {
       return 'Please upload with size equal or less than 10MB';
     }
-    if (!/json/i.test(file.extension)){
+    if (!/json/i.test(file.extension)) {
       return 'Please upload only a JSON file';
     }
     return true;
diff --git a/app/imports/api/files/UserImages.js b/app/imports/api/files/UserImages.js
index fad4576b..9638d2f0 100644
--- a/app/imports/api/files/UserImages.js
+++ b/app/imports/api/files/UserImages.js
@@ -2,7 +2,7 @@ import { createS3FilesCollection } from '/imports/api/files/s3FileStorage.js';
 
 const UserImages = createS3FilesCollection({
   collectionName: 'userImages',
-  storagePath: Meteor.isDevelopment ? '/DiceCloud/userImages/' : 'assets/app/userImages',
+  storagePath: Meteor.isDevelopment ? '../../../../../fileStorage/userImages' : 'assets/app/userImages',
   onBeforeUpload(file) {
     // Allow upload files under 10MB
     if (file.size > 10485760) {
diff --git a/app/imports/api/files/s3FileStorage.js b/app/imports/api/files/s3FileStorage.js
index 7103d044..1ef22730 100644
--- a/app/imports/api/files/s3FileStorage.js
+++ b/app/imports/api/files/s3FileStorage.js
@@ -50,7 +50,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     storagePath,
     onBeforeUpload,
     onAfterUpload,
-    debug = !Meteor.isProduction,
+    debug,// = !Meteor.isProduction,
     allowClientCode = false,
   }) {
     const collection = new FilesCollection({
@@ -224,7 +224,7 @@ if (Meteor.isServer && Meteor.settings.useS3) {
     storagePath,
     onBeforeUpload,
     onAfterUpload,
-    debug = !Meteor.isProduction,
+    debug,// = !Meteor.isProduction,
     allowClientCode = false,
   }) {
     const collection = new FilesCollection({

From a568cdfb1e34e4855f77e353867373321a10dd68 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 18:57:26 +0200
Subject: [PATCH 26/46] Fixed NaNing of skills that have rolled effects

---
 .../computeByType/computeVariable/aggregate/aggregateEffect.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js
index ae609923..4bbf2e3e 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEffect.js
@@ -45,7 +45,8 @@ export default function aggregateEffect({ node, linkedNode, link }) {
   // get a shorter reference to the aggregator document
   const aggregator = node.data.effectAggregator;
   // Get the result of the effect
-  const result = linkedNode.data.amount?.value;
+  let result = linkedNode.data.amount?.value;
+  if (typeof result !== 'number') result = undefined;
 
   // Aggregate the effect based on its operation
   switch (linkedNode.data.operation) {

From dcfb380e571a66b0a979c003deb1c93e34fab7a9 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 19:15:53 +0200
Subject: [PATCH 27/46] Fixed saving throw tag targeted effects They will now
 roll dice effects before saving

---
 .../actions/applyPropertyByType/applySavingThrow.js      | 9 +++++++--
 app/imports/api/engine/actions/doCheck.js                | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
index 22de7aa7..ca760d7a 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applySavingThrow.js
@@ -3,6 +3,7 @@ import recalculateCalculation from './shared/recalculateCalculation.js';
 import applyProperty from '../applyProperty.js';
 import numberToSignedString from '/imports/api/utility/numberToSignedString.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import { applyUnresolvedEffects } from '/imports/api/engine/actions/doCheck.js';
 
 export default function applySavingThrow(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
@@ -59,7 +60,11 @@ export default function applySavingThrow(node, actionContext) {
       return applyChildren();
     }
 
-    const rollModifierText = numberToSignedString(save.value, true);
+    let rollModifierText = numberToSignedString(save.value, true);
+    let rollModifier = save.value
+    const { effectBonus, effectString } = applyUnresolvedEffects(save, scope)
+    rollModifierText += effectString;
+    rollModifier += effectBonus;
 
     let value, values, resultPrefix;
     if (save.advantage === 1) {
@@ -86,7 +91,7 @@ export default function applySavingThrow(node, actionContext) {
       resultPrefix = `1d20 [ ${value} ] ${rollModifierText}`
     }
     scope['$saveDiceRoll'] = { value };
-    const result = value + save.value || 0;
+    const result = value + rollModifier || 0;
     scope['$saveRoll'] = { value: result };
     const saveSuccess = result >= dc;
     if (saveSuccess) {
diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js
index 8e9789a6..3673356b 100644
--- a/app/imports/api/engine/actions/doCheck.js
+++ b/app/imports/api/engine/actions/doCheck.js
@@ -115,7 +115,7 @@ function rollCheck(prop, actionContext) {
   });
 }
 
-function applyUnresolvedEffects(prop, scope) {
+export function applyUnresolvedEffects(prop, scope) {
   let effectBonus = 0;
   let effectString = '';
   if (!prop.effects) {

From f3deadb3f1db03cbb1c98411d67c00d4d483829c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 19:25:51 +0200
Subject: [PATCH 28/46] Fixed buff descriptions not calced before logged

---
 .../engine/actions/applyPropertyByType/applyBuff.js    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
index 4e68eabe..4ee2cd92 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyBuff.js
@@ -14,6 +14,7 @@ import { insertCreatureLog } from '/imports/api/creature/log/CreatureLogs.js';
 import cyrb53 from '/imports/api/engine/computation/utility/cyrb53.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
 import INLINE_CALCULATION_REGEX from '/imports/constants/INLINE_CALCULTION_REGEX.js';
+import recalculateInlineCalculations from './shared/recalculateInlineCalculations.js';
 
 export default function applyBuff(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
@@ -46,12 +47,17 @@ export default function applyBuff(node, actionContext) {
     copyNodeListToTarget(propList, target, oldParent);
 
     //Log the buff
+    let logValue = prop.description?.value
+    if (prop.description?.text) {
+      recalculateInlineCalculations(prop.description, actionContext);
+      logValue = prop.description?.value;
+    }
     if ((prop.name || prop.description?.value) && !prop.silent) {
       if (target._id === actionContext.creature._id) {
         // Targeting self
         actionContext.addLog({
           name: prop.name,
-          value: prop.description?.value,
+          value: logValue,
         });
       } else {
         // Targeting other
@@ -60,7 +66,7 @@ export default function applyBuff(node, actionContext) {
             creatureId: target._id,
             content: [{
               name: prop.name,
-              value: prop.description?.value,
+              value: logValue,
             }],
           }
         });

From cc7dc257fb7888687d5845bccf387cc2fa24c6d6 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 19:35:46 +0200
Subject: [PATCH 29/46] Fixed attributes not showing base value in lib

---
 .../ui/properties/viewers/AttributeViewer.vue | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/imports/client/ui/properties/viewers/AttributeViewer.vue b/app/imports/client/ui/properties/viewers/AttributeViewer.vue
index a4e339c7..a6230491 100644
--- a/app/imports/client/ui/properties/viewers/AttributeViewer.vue
+++ b/app/imports/client/ui/properties/viewers/AttributeViewer.vue
@@ -7,21 +7,31 @@
       justify-sm="start"
     >
       <property-field
+        v-if="model.value !== undefined ||
+          fallbackValue !== undefined"
         :name="model.damage !== undefined ? 'Value / Total': 'Value'"
         center
       >
         <v-spacer />
-        <div
-          class="text-h4 mr-3"
-        >
+        <div class="mr-3">
           <div
             v-if="model.damage !== undefined"
+            class="text-h4 mr-3"
           >
             {{ model.value }} / {{ model.total }}
           </div>
-          <div v-else>
+          <div
+            v-if="model.value !== undefined"
+            class="text-h4 mr-3"
+          >
             {{ model.value }}
           </div>
+          <div
+            v-else
+            class="mono"
+          >
+            {{ fallbackValue }}
+          </div>
         </div>
         <v-spacer />
         <increment-button
@@ -181,6 +191,9 @@
       effects() {
         return sortEffects(this.model.effects);
       },
+      fallbackValue() {
+        return this.model.baseValue?.value ?? this.model.baseValue?.calculation;
+      },
     },
     methods: {
       numberToSignedString,
@@ -222,4 +235,7 @@
   .attribute-value {
     text-align: center;
   }
+  .mono {
+    font-family: monospace !important;
+  }
 </style>

From e06d2befc421eebe9f1751647a6d01f24f71276a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 23:24:11 +0200
Subject: [PATCH 30/46] Fixed damage multipliers not using implicit tags

---
 .../api/engine/actions/applyPropertyByType/applyDamage.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
index f1c0c832..83ad5074 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
@@ -9,6 +9,7 @@ import {
   getPropertiesOfType
 } from '/imports/api/engine/loadCreatures.js';
 import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
+import getEffectivePropTags from '/imports/api/engine/computation/utility/getEffectivePropTags.js';
 
 export default function applyDamage(node, actionContext) {
   applyNodeTriggers(node, 'before', actionContext);
@@ -173,14 +174,15 @@ function applyDamageMultipliers({ target, damage, damageProp, logValue }) {
 function multiplierAppliesTo(damageProp, multiplierType) {
   return multiplier => {
     // Apply the default 'ignore x' tags
-    if (includes(damageProp.tags, `ignore ${multiplierType}`)) return false;
+    const effectiveTags = getEffectivePropTags(damageProp);
+    if (includes(effectiveTags, `ignore ${multiplierType}`)) return false;
 
     const hasRequiredTags = difference(
-      multiplier.includeTags, damageProp.tags
+      multiplier.includeTags, effectiveTags
     ).length === 0;
 
     const hasNoExcludedTags = intersection(
-      multiplier.excludeTags, damageProp.tags
+      multiplier.excludeTags, effectiveTags
     ).length === 0;
 
     return hasRequiredTags && hasNoExcludedTags;

From a9b389023e9d78fe0ac9f4af87504bba6b29e1ab Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sat, 19 Nov 2022 23:44:02 +0200
Subject: [PATCH 31/46] added todo

---
 .../buildComputation/linkCalculationDependencies.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/imports/api/engine/computation/buildComputation/linkCalculationDependencies.js b/app/imports/api/engine/computation/buildComputation/linkCalculationDependencies.js
index 67e4452e..68a19951 100644
--- a/app/imports/api/engine/computation/buildComputation/linkCalculationDependencies.js
+++ b/app/imports/api/engine/computation/buildComputation/linkCalculationDependencies.js
@@ -1,7 +1,7 @@
 import findAncestorByType from '/imports/api/engine/computation/utility/findAncestorByType.js';
 import { traverse } from '/imports/parser/resolve.js';
 
-export default function linkCalculationDependencies(dependencyGraph, prop, {propsById}){
+export default function linkCalculationDependencies(dependencyGraph, prop, { propsById }) {
   prop._computationDetails.calculations.forEach(calcObj => {
     // Store resolved ancestors
     const memo = {
@@ -16,12 +16,13 @@ export default function linkCalculationDependencies(dependencyGraph, prop, {prop
       // Skip nodes that aren't symbols or accessors
       if (node.parseType !== 'symbol' && node.parseType !== 'accessor') return;
       // Link ancestor references as direct property dependencies
-      if (node.name[0] === '#'){
+      if (node.name[0] === '#') {
         let ancestorProp = getAncestorProp(
           node.name.slice(1), memo, prop, propsById
         );
         if (!ancestorProp) return;
         // Link the ancestor prop as a direct dependency
+        // TODO: we might be referencing a calculation sub-field, depend on that instead
         dependencyGraph.addLink(
           calcNodeId, ancestorProp._id, 'ancestorReference'
         );
@@ -34,16 +35,16 @@ export default function linkCalculationDependencies(dependencyGraph, prop, {prop
     });
     // Store the resolved ancestors in this calculation's local scope
     if (memo.ancestors) {
-      calcObj._localScope = { ...calcObj._localScope, ...memo.ancestors};
+      calcObj._localScope = { ...calcObj._localScope, ...memo.ancestors };
     }
   });
 }
 
-function getAncestorProp(type, memo, prop, propsById){
-  if (memo.ancestors && memo.ancestors['#' + type]){
+function getAncestorProp(type, memo, prop, propsById) {
+  if (memo.ancestors && memo.ancestors['#' + type]) {
     return memo.ancestors['#' + type];
   } else {
-    var ancestorProp = findAncestorByType( prop, type, propsById );
+    var ancestorProp = findAncestorByType(prop, type, propsById);
     if (!memo.ancestors) memo.ancestors = {};
     memo.ancestors['#' + type] = ancestorProp;
     return ancestorProp;

From 5108b326247ad21ca5baf13f8f49a2ebdcec4abe Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 20 Nov 2022 00:19:41 +0200
Subject: [PATCH 32/46] Added line breaks in parser strings Actual line breaks
 and \n both work

---
 app/imports/parser/grammar.js | 6 +++---
 app/imports/parser/grammar.ne | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/imports/parser/grammar.js b/app/imports/parser/grammar.js
index ec217527..43f5b70f 100644
--- a/app/imports/parser/grammar.js
+++ b/app/imports/parser/grammar.js
@@ -1,4 +1,4 @@
-// Generated automatically by nearley, version 2.16.0
+// Generated automatically by nearley, version 2.20.1
 // http://github.com/Hardmath123/nearley
 function id(x) { return x[0]; }
 
@@ -9,8 +9,8 @@ function id(x) { return x[0]; }
   const lexer = moo.compile({
     number: /[0-9]+(?:\.[0-9]+)?/,
     string: {
-      match: /'.*?'|".*?"/,
-      value: s => s.slice(1, -1),
+      match: /'[^']*'|"[^"]*"/,
+      value: s => s.slice(1, -1).replace('\\n', '\n'),
     },
     name: {
       match: /[a-zA-Z_#$]*[a-ce-zA-Z_#$][a-zA-Z0-9_#$]*/,
diff --git a/app/imports/parser/grammar.ne b/app/imports/parser/grammar.ne
index 51d1ece2..3ebdba75 100644
--- a/app/imports/parser/grammar.ne
+++ b/app/imports/parser/grammar.ne
@@ -7,8 +7,8 @@
   const lexer = moo.compile({
     number: /[0-9]+(?:\.[0-9]+)?/,
     string: {
-      match: /'.*?'|".*?"/,
-      value: s => s.slice(1, -1),
+      match: /'[^']*'|"[^"]*"/,
+      value: s => s.slice(1, -1).replace('\\n', '\n'),
     },
     name: {
       match: /[a-zA-Z_#$]*[a-ce-zA-Z_#$][a-zA-Z0-9_#$]*/,

From e619734ee19bb23c237ee53c99395b311648498d Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Nov 2022 13:16:54 +0200
Subject: [PATCH 33/46] Fixed checks not having access to `#skill`

---
 app/imports/api/engine/actions/doCheck.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/imports/api/engine/actions/doCheck.js b/app/imports/api/engine/actions/doCheck.js
index 3673356b..5d9b4164 100644
--- a/app/imports/api/engine/actions/doCheck.js
+++ b/app/imports/api/engine/actions/doCheck.js
@@ -28,6 +28,7 @@ const doCheck = new ValidatedMethod({
     const creatureId = prop.ancestors[0].id;
     const actionContext = new ActionContext(creatureId, [creatureId], this);
     Object.assign(actionContext.scope, scope);
+    actionContext.scope[`#${prop.type}`] = prop;
 
     // Check permissions
     assertEditPermission(actionContext.creature, this.userId);

From d2649fd66e873661f9c1f42bf86dbff91ae5777a Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 21 Nov 2022 18:22:49 +0200
Subject: [PATCH 34/46] Overhauled how documentation works

---
 app/imports/api/docs/Docs.js                  | 277 +++++++++++++++++-
 .../client/ui/components/global/SmartBtn.vue  |  12 +-
 app/imports/client/ui/docs/DocBreadcrumbs.vue |  44 +++
 app/imports/client/ui/docs/DocCard.vue        |  57 ++++
 app/imports/client/ui/docs/DocEditForm.vue    | 213 ++++++++++++++
 app/imports/client/ui/docs/DocListItem.vue    |  30 ++
 app/imports/client/ui/docs/DocToolbar.vue     |  55 ++++
 app/imports/client/ui/docs/DocViewer.vue      | 135 +++++++++
 app/imports/client/ui/docs/getDocLink.js      |   9 +
 app/imports/client/ui/pages/DocsPage.vue      | 150 ++++++++++
 app/imports/client/ui/router.js               |  16 +-
 app/imports/server/publications/docs.js       |  42 +--
 12 files changed, 995 insertions(+), 45 deletions(-)
 create mode 100644 app/imports/client/ui/docs/DocBreadcrumbs.vue
 create mode 100644 app/imports/client/ui/docs/DocCard.vue
 create mode 100644 app/imports/client/ui/docs/DocEditForm.vue
 create mode 100644 app/imports/client/ui/docs/DocListItem.vue
 create mode 100644 app/imports/client/ui/docs/DocToolbar.vue
 create mode 100644 app/imports/client/ui/docs/DocViewer.vue
 create mode 100644 app/imports/client/ui/docs/getDocLink.js
 create mode 100644 app/imports/client/ui/pages/DocsPage.vue

diff --git a/app/imports/api/docs/Docs.js b/app/imports/api/docs/Docs.js
index 91961b16..6f97d27d 100644
--- a/app/imports/api/docs/Docs.js
+++ b/app/imports/api/docs/Docs.js
@@ -1,3 +1,278 @@
-if (Meteor.isServer) throw 'Client side only collection, don\'t import on server';
+import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
+import { ValidatedMethod } from 'meteor/mdg:validated-method';
+import { RateLimiterMixin } from 'ddp-rate-limiter-mixin';
+import SimpleSchema from 'simpl-schema';
+import { softRemove } from '/imports/api/parenting/softRemove.js';
+import SoftRemovableSchema from '/imports/api/parenting/SoftRemovableSchema.js';
+import { storedIconsSchema } from '/imports/api/icons/Icons.js';
+import '/imports/api/library/methods/index.js';
+import STORAGE_LIMITS from '/imports/constants/STORAGE_LIMITS.js';
+import { restore } from '/imports/api/parenting/softRemove.js';
+import { reorderDocs } from '/imports/api/parenting/order.js';
+import { getAncestry } from '/imports/api/parenting/parenting.js';
+
 const Docs = new Mongo.Collection('docs');
+
+const RefSchema = new SimpleSchema({
+  id: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+    index: 1
+  },
+  collection: {
+    type: String,
+    max: STORAGE_LIMITS.collectionName,
+  },
+  urlName: {
+    type: String,
+    regEx: /[a-z]+(?:[a-z]|-)+/,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
+    optional: true,
+  },
+  name: {
+    type: String,
+    max: STORAGE_LIMITS.description,
+    optional: true,
+  },
+});
+
+let ChildSchema = new SimpleSchema({
+  order: {
+    type: Number,
+  },
+  parent: {
+    type: RefSchema,
+    optional: true,
+  },
+  ancestors: {
+    type: Array,
+    defaultValue: [],
+    maxCount: STORAGE_LIMITS.ancestorCount,
+  },
+  'ancestors.$': {
+    type: RefSchema,
+  },
+});
+
+let DocSchema = new SimpleSchema({
+  _id: {
+    type: String,
+    regEx: SimpleSchema.RegEx.Id,
+  },
+  name: {
+    type: String,
+    max: STORAGE_LIMITS.description,
+  },
+  urlName: {
+    type: String,
+    regEx: /[a-z]+(?:[a-z]|-)+/,
+    min: 2,
+    max: STORAGE_LIMITS.variableName,
+  },
+  href: {
+    type: String,
+  },
+  description: {
+    type: String,
+    optional: true,
+  },
+  published: {
+    type: Boolean,
+    optional: true,
+  },
+  icon: {
+    type: storedIconsSchema,
+    optional: true,
+    max: STORAGE_LIMITS.icon,
+  },
+});
+
+let schema = new SimpleSchema({});
+schema.extend(DocSchema);
+schema.extend(ChildSchema);
+schema.extend(SoftRemovableSchema);
+Docs.attachSchema(schema);
+
+function assertDocsEditPermission(userId) {
+  if (!userId || typeof userId !== 'string') throw new Meteor.Error('No user id provided');
+  const user = Meteor.users.findOne(userId);
+  if (!user) throw new Meteor.Error('User does not exist');
+  if (!user?.roles?.includes?.('docsWriter')) throw ('Permission denied')
+}
+
+function getDocLink(doc, urlName) {
+  if (!urlName) urlName = doc.urlName;
+  const address = ['/docs'];
+  doc.ancestors?.forEach(a => {
+    address.push(a.urlName);
+  });
+  address.push(urlName);
+  return address.join('/');
+}
+
+const insertDoc = new ValidatedMethod({
+  name: 'docs.insert',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ doc, parentRef }) {
+    delete doc._id;
+    assertDocsEditPermission(this.userId);
+    // get the new ancestry for the properties
+    if (parentRef) {
+      var { ancestors } = getAncestry({
+        parentRef,
+        inheritedFields: { name: 1, urlName: 1 },
+      });
+    }
+    doc.parent = parentRef;
+    doc.ancestors = ancestors;
+
+    const lastOrder = Docs.find({}, { sort: { order: -1 } }).fetch()[0]?.order || 0;
+    doc.order = lastOrder + 1;
+    doc.urlName = 'new-doc-' + (lastOrder + 1);
+
+    doc.href = getDocLink(doc);
+    if (Docs.findOne({ href: doc.href })) {
+      throw new Meteor.Error('Link collision', 'A document with the same URL already exists');
+    }
+
+    const docId = Docs.insert(doc);
+    reorderDocs({
+      collection: Docs,
+      ancestorId: 'root',
+    });
+    return docId;
+  },
+});
+
+const updateDoc = new ValidatedMethod({
+  name: 'docs.update',
+  validate({ _id, path }) {
+    if (!_id) return false;
+    // We cannot change these fields with a simple update
+    switch (path[0]) {
+      case '_is':
+        return false;
+    }
+  },
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ _id, path, value }) {
+    assertDocsEditPermission(this.userId);
+    let pathString = path.join('.');
+    let modifier;
+    // unset empty values
+    if (value === null || value === undefined) {
+      modifier = { $unset: { [pathString]: 1 } };
+    } else {
+      modifier = { $set: { [pathString]: value } };
+    }
+    if (pathString === 'urlName') {
+      const doc = Docs.findOne(_id);
+      const newLink = getDocLink(doc, value);
+      if (Docs.findOne({ href: newLink })) {
+        throw new Meteor.Error('Link collision', 'A document with the same URL already exists');
+      }
+      modifier.$set = modifier.$set || {};
+      modifier.$set.href = newLink;
+    }
+    reorderDocs({
+      collection: Docs,
+      ancestorId: 'root',
+    });
+    return Docs.update(_id, modifier);
+  },
+});
+
+const pushToDoc = new ValidatedMethod({
+  name: 'docs.push',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ _id, path, value }) {
+    assertDocsEditPermission(this.userId);
+    return Docs.update(_id, {
+      $push: { [path.join('.')]: value },
+    });
+  }
+});
+
+const pullFromDoc = new ValidatedMethod({
+  name: 'docs.pull',
+  validate: null,
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ _id, path, itemId }) {
+    assertDocsEditPermission(this.userId);
+    return Docs.update(_id, {
+      $pull: { [path.join('.')]: { _id: itemId } },
+    });
+  }
+});
+
+const softRemoveDoc = new ValidatedMethod({
+  name: 'docs.softRemove',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ _id }) {
+    assertDocsEditPermission(this.userId);
+    softRemove({ _id, collection: Docs });
+    reorderDocs({
+      collection: Docs,
+      ancestorId: 'root',
+    });
+  }
+});
+
+const restoreDoc = new ValidatedMethod({
+  name: 'docs.restore',
+  validate: new SimpleSchema({
+    _id: SimpleSchema.RegEx.Id
+  }).validator(),
+  mixins: [RateLimiterMixin],
+  rateLimit: {
+    numRequests: 5,
+    timeInterval: 5000,
+  },
+  run({ _id }) {
+    assertDocsEditPermission(this.userId);
+    restore({ _id, collection: Docs });
+    reorderDocs({
+      collection: Docs,
+      ancestorId: 'root',
+    });
+  }
+});
+
+export {
+  DocSchema,
+  insertDoc,
+  updateDoc,
+  pushToDoc,
+  pullFromDoc,
+  softRemoveDoc,
+  restoreDoc,
+};
+
 export default Docs;
diff --git a/app/imports/client/ui/components/global/SmartBtn.vue b/app/imports/client/ui/components/global/SmartBtn.vue
index 219824ff..30e82c52 100644
--- a/app/imports/client/ui/components/global/SmartBtn.vue
+++ b/app/imports/client/ui/components/global/SmartBtn.vue
@@ -23,6 +23,7 @@ export default {
       type: Number,
       default: undefined,
     },
+    singleClick: Boolean,
   },
   data() {
     return {
@@ -52,18 +53,23 @@ export default {
   },
   methods: {
     click() {
-      this.timesClicked += 1;
-      this.debounceClicks();
+      if (this.singleClick) {
+        this.loading = true;
+      } else {
+        this.timesClicked += 1;
+        this.debounceClicks();
+      }
       this.$emit('click', this.acknowledgeChange);
     },
     clicks() {
-      this.$emit('clicks', this.timesClicked, this.acknowledgeChange);
       this.loading = true;
+      this.$emit('clicks', this.timesClicked, this.acknowledgeChange);
       this.timesClicked = 0;
     },
     acknowledgeChange(error){
       this.loading = false;
       if (error) {
+        console.error(error)
         snackbar({ text: error.reason || error.message || error.toString() });
       }
     },
diff --git a/app/imports/client/ui/docs/DocBreadcrumbs.vue b/app/imports/client/ui/docs/DocBreadcrumbs.vue
new file mode 100644
index 00000000..c7bde66f
--- /dev/null
+++ b/app/imports/client/ui/docs/DocBreadcrumbs.vue
@@ -0,0 +1,44 @@
+<template>
+  <v-breadcrumbs
+    :items="items"
+    divider=">"
+  />
+</template>
+
+<script lang="js">
+
+export default {
+  props: {
+    doc: {
+      type: Object,
+      default: undefined,
+    },
+  },
+  computed: {
+    items() {
+      const items = [{
+        text: 'Home',
+        to: '/docs',
+        exact: true,
+      }];
+      if (!this.doc?.ancestors) return items;
+      const address = ['/docs']
+      this.doc.ancestors?.forEach(a => {
+        address.push(a.urlName);
+        items.push({
+          text: a.name,
+          to: address.join('/'),
+          exact: true,
+        });
+      });
+      address.push(this.doc.urlName);
+      items.push({
+        text: this.doc.name,
+        to: address.join('/'),
+        exact: true,
+      });
+      return items;
+    }
+  },
+}
+</script>
\ No newline at end of file
diff --git a/app/imports/client/ui/docs/DocCard.vue b/app/imports/client/ui/docs/DocCard.vue
new file mode 100644
index 00000000..7ad6c8bd
--- /dev/null
+++ b/app/imports/client/ui/docs/DocCard.vue
@@ -0,0 +1,57 @@
+<template>
+  <v-card
+    :to="doc.href"
+    class="d-flex flex-column"
+    @mouseover="hovering = true"
+    @mouseleave="hovering = false"
+  >
+    <v-card-title>
+      <svg-icon
+        v-if="doc && doc.icon"
+        :shape="doc.icon.shape"
+        class="mr-2"
+      />
+      {{ doc.name }}
+    </v-card-title>
+    <v-card-text v-if="doc.description">
+      <markdown-text
+        v-if="doc"
+        :markdown="doc.description"
+      />
+    </v-card-text>
+    <card-highlight :active="hovering" />
+  </v-card>
+</template>
+
+<script lang="js">
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
+  
+export default {
+  components: {
+    MarkdownText,
+    CardHighlight,
+  },
+  props: { 
+    doc: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {return {
+    hovering: false,
+  }},
+}
+</script>
+
+<style scoped>
+  .v-card {
+    height: 240px;
+  }
+  .v-card__text{
+    overflow: hidden;
+    -webkit-mask-image: linear-gradient(to bottom, black 75%, transparent 95%);
+    mask-image: linear-gradient(to bottom, black 75%, transparent 95%);
+    pointer-events: none;
+  }
+</style>
\ No newline at end of file
diff --git a/app/imports/client/ui/docs/DocEditForm.vue b/app/imports/client/ui/docs/DocEditForm.vue
new file mode 100644
index 00000000..42d1ae54
--- /dev/null
+++ b/app/imports/client/ui/docs/DocEditForm.vue
@@ -0,0 +1,213 @@
+<template>
+  <v-row justify="center">
+    <template v-if="doc">
+      <v-col
+        cols="12"
+        lg="8"
+      >
+        <v-row dense>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <text-field
+              label="Title"
+              :value="doc.name"
+              @change="(value, ack) => change({path: ['name'], value, ack})"
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+            class="d-flex"
+          >
+            <text-field
+              label="URL title"
+              :value="doc.urlName"
+              hint="Only letters, numbers, and dashes"
+              @change="(value, ack) => change({path: ['urlName'], value, ack})"
+            />
+            <v-menu
+              bottom
+              left
+              transition="slide-y-transition"
+            >
+              <template #activator="{ on }">
+                <v-btn
+                  icon
+                  style="height: 56px; width: 56px;"
+                  v-on="on"
+                >
+                  <v-icon>mdi-dots-vertical</v-icon>
+                </v-btn>
+              </template>
+              <v-list>
+                <v-list-item
+                  @click="remove()"
+                >
+                  <v-list-item-content>
+                    <v-list-item-title>
+                      Delete
+                    </v-list-item-title>
+                  </v-list-item-content>
+                  <v-list-item-action>
+                    <v-icon>mdi-delete</v-icon>
+                  </v-list-item-action>
+                </v-list-item>
+              </v-list>
+            </v-menu>
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+          >
+            <smart-switch
+              label="Published"
+              :value="doc.published"
+              @change="(value, ack) => change({path: ['published'], value, ack})"
+            />
+          </v-col>
+          <v-col
+            cols="12"
+            md="6"
+            class="d-flex align-center"
+          >
+            <icon-picker
+              label="Icon"
+              :value="doc.icon"
+              @change="(value, ack) => change({path: ['icon'], value, ack})"
+            />
+          </v-col>
+          <v-col
+            cols="12"
+          >
+            <text-area
+              auto-grow
+              label="Body"
+              :value="doc.description"
+              @change="(value, ack) => change({path: ['description'], value, ack})"
+            />
+          </v-col>
+        </v-row>
+      </v-col>
+    </template>
+    <v-col
+      cols="12"
+      lg="8"
+    >
+      <v-row>
+        <v-col
+          v-for="child in childDocs"
+          :key="child._id"
+          cols="12"
+          sm="6"
+          md="4"
+          xl="3"
+        >
+          <doc-card :doc="child" />
+        </v-col>
+        <v-col
+          cols="12"
+          sm="6"
+          md="4"
+          xl="3"
+        >
+          <smart-btn
+            single-click
+            outlined
+            color="accent"
+            style="width: 100%; height: 240px;"
+            @click="ack => add({ ack })"
+          >
+            Add child
+          </smart-btn>
+        </v-col>
+      </v-row>
+    </v-col>
+  </v-row>
+</template>
+
+<script lang="js">
+import Docs, {
+  insertDoc,
+  pullFromDoc,
+  pushToDoc,
+  restoreDoc,
+  softRemoveDoc,
+  updateDoc,
+} from '/imports/api/docs/Docs.js';
+import { get } from 'lodash';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import DocCard from '/imports/client/ui/docs/DocCard.vue';
+import getDocLink from '/imports/client/ui/docs/getDocLink.js';
+
+export default {
+  components: {
+    DocCard
+  },
+  props: {
+    doc: {
+      type: Object,
+      default: undefined,
+    },
+    childDocs: {
+      type: Array,
+      required: true,
+    },
+  },
+  computed: {
+    docId() {
+      return this.doc?._id;
+    },
+  },
+  methods: {
+    change({ path, value, ack }) {
+      updateDoc.call({ _id: this.docId, path, value }, ack);
+      if (path[0] === 'urlName' && path.length === 1 && value) {
+        this.$router.push(getDocLink(this.doc, value));
+      }
+    },
+    push({ path, value, ack }) {
+      pushToDoc.call({ _id: this.docId, path, value }, ack);
+    },
+    pull({ path, ack }) {
+      let itemId = get(this.model, path)._id;
+      path.pop();
+      pullFromDoc.call({ _id: this.docId, path, itemId }, ack);
+    },
+    add({ ack }) {
+      insertDoc.call({
+        doc: {
+          name: 'New Doc',
+        },
+        parentRef: this.doc && {
+          id: this.docId,
+          collection: 'docs',
+        },
+      }, ack);
+    },
+    remove({ ack } = {}) {
+      const _id = this.docId;
+      const docName = this.doc.name;
+      let parentHref = '/docs';
+      if (this.doc.parent) {
+        const parent = Docs.findOne({ _id: this.doc.parent.id });
+        parentHref = parent?.href || parentHref;
+      }
+      softRemoveDoc.call({ _id }, (error) => {
+        ack?.(error);
+        if (!error) {
+          snackbar({
+            text: `Deleted ${docName}`,
+            callbackName: 'undo',
+            callback() {
+              restoreDoc.call({ _id });
+            },
+          });
+        }
+      });
+      this.$router.push(parentHref);
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/app/imports/client/ui/docs/DocListItem.vue b/app/imports/client/ui/docs/DocListItem.vue
new file mode 100644
index 00000000..3b7f1675
--- /dev/null
+++ b/app/imports/client/ui/docs/DocListItem.vue
@@ -0,0 +1,30 @@
+<template>
+  <v-list-item
+    :to="doc.href"
+    style="min-width: 180px;"
+  >
+    <v-list-item-avatar v-if="icon">
+      <svg-icon
+        v-if="doc && doc.icon"
+        :shape="doc.icon.shape"
+      />
+    </v-list-item-avatar>
+    <v-list-item-content>
+      <v-list-item-title>
+        {{ doc.name }}
+      </v-list-item-title>
+    </v-list-item-content>
+  </v-list-item>
+</template>
+
+<script lang="js">
+export default {
+  props: { 
+    doc: {
+      type: Object,
+      required: true,
+    },
+    icon: Boolean,
+  },
+}
+</script>
diff --git a/app/imports/client/ui/docs/DocToolbar.vue b/app/imports/client/ui/docs/DocToolbar.vue
new file mode 100644
index 00000000..56c77859
--- /dev/null
+++ b/app/imports/client/ui/docs/DocToolbar.vue
@@ -0,0 +1,55 @@
+<template lang="html">
+  <v-app-bar
+    app
+    color="secondary"
+    dark
+    tabs
+    extended
+    dense
+  >
+    <v-app-bar-nav-icon @click="toggleDrawer" />
+    <v-toolbar-title>
+      Documentation
+    </v-toolbar-title>
+    <v-spacer />
+    <v-btn
+      v-if="canEdit"
+      icon
+      @click="toggleEdit"
+    >
+      <v-icon v-if="editing">
+        mdi-check
+      </v-icon>
+      <v-icon v-else>
+        mdi-pencil
+      </v-icon>
+    </v-btn>
+  </v-app-bar>
+</template>
+
+<script lang="js">
+import { mapMutations } from 'vuex';
+import { Session } from 'meteor/session';
+
+export default {
+  meteor: {
+    editing() {
+      return Session.get('editingDocs');
+    },
+    canEdit() {
+      const user = Meteor.user();
+      if (!user) return false;
+      return user.roles?.includes('docsWriter');
+    }
+  },
+  methods: {
+    ...mapMutations([
+      'toggleDrawer',
+    ]),
+    toggleEdit() {
+      if (!this.canEdit) return;
+      Session.set('editingDocs', !Session.get('editingDocs'));
+    },
+  },
+}
+</script>
diff --git a/app/imports/client/ui/docs/DocViewer.vue b/app/imports/client/ui/docs/DocViewer.vue
new file mode 100644
index 00000000..f49de442
--- /dev/null
+++ b/app/imports/client/ui/docs/DocViewer.vue
@@ -0,0 +1,135 @@
+<template>
+  <v-row justify="center">
+    <v-col
+      cols="12"
+      lg="8"
+    >
+      <v-card
+        style="float: right; z-index: 5;"
+        class="ma-4"
+      >
+        <v-fade-transition mode="out-in">
+          <v-list
+            v-if="siblingDocs.length > 1"
+          >
+            <doc-list-item
+              v-for="sibling in siblingDocs"
+              :key="sibling._id"
+              :doc="sibling"
+              :icon="siblingHasIcon"
+            />
+          </v-list>
+        </v-fade-transition>
+      </v-card>
+      <v-fade-transition mode="out-in">
+        <div
+          :key="doc && doc.name || 'Documentation Home'"
+          class="d-flex align-center mb-4"
+        >
+          <v-avatar
+            v-if="(doc && doc.icon) || (!doc)"
+            size="56"
+          >
+            <svg-icon
+              v-if="doc && doc.icon"
+              large
+              :shape="doc.icon.shape"
+            />
+            <v-icon
+              v-else-if="!doc"
+              large
+            >
+              mdi-home
+            </v-icon>
+          </v-avatar>
+          <h1
+            v-if="doc"
+          >
+            {{ doc.name }}
+          </h1>
+          <h1
+            v-else
+          >
+            Documentation
+          </h1>
+        </div>
+      </v-fade-transition>
+      <v-fade-transition mode="out-in">
+        <markdown-text
+          v-if="doc"
+          :key="doc._id"
+          :markdown="doc.description"
+          @click="mdClick"
+        />
+      </v-fade-transition>
+    </v-col>
+    <v-col 
+      cols="12"
+      lg="8"
+    >
+      <v-fade-transition
+        mode="out-in"
+        leave-absolute
+        hide-on-leave
+      >
+        <v-row :key="doc && doc._id">
+          <v-col
+            v-for="child in childDocs"
+            :key="child._id"
+            cols="12"
+            sm="6"
+            md="4"
+            xl="3"
+          >
+            <doc-card :doc="child" />
+          </v-col>
+        </v-row>
+      </v-fade-transition>
+    </v-col>
+  </v-row>
+</template>
+
+<script lang="js">
+import MarkdownText from '/imports/client/ui/components/MarkdownText.vue';
+import DocCard from '/imports/client/ui/docs/DocCard.vue';
+import DocListItem from '/imports/client/ui/docs/DocListItem.vue';
+import { find } from 'lodash';
+
+export default {
+  components: {
+    DocListItem,
+    MarkdownText,
+    DocCard,
+  },
+  props: {
+    doc: {
+      type: Object,
+      default: undefined,
+    },
+    childDocs: {
+      type: Array,
+      required: true,
+    },
+    siblingDocs: {
+      type: Array,
+      required: true,
+    },
+  },
+  computed: {
+    siblingHasIcon() {
+      return !!find(this.siblingDocs, doc => doc.icon);
+    }
+  },
+  methods: {
+    mdClick(e) {
+      const target = e.target || e.srcElement;
+      const href = target && target.href;
+      if (!href) return;
+      const path = href.split('/docs/')[1];
+      if (!path) return;
+      e.preventDefault();
+      this.$router.push('/docs/' + path);
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/app/imports/client/ui/docs/getDocLink.js b/app/imports/client/ui/docs/getDocLink.js
new file mode 100644
index 00000000..0d3be2cb
--- /dev/null
+++ b/app/imports/client/ui/docs/getDocLink.js
@@ -0,0 +1,9 @@
+export default function getDocLink(doc, urlName) {
+  if (!urlName) urlName = doc.urlName;
+  const address = ['/docs'];
+  doc.ancestors?.forEach(a => {
+    address.push(a.urlName);
+  });
+  address.push(urlName);
+  return address.join('/');
+}
\ No newline at end of file
diff --git a/app/imports/client/ui/pages/DocsPage.vue b/app/imports/client/ui/pages/DocsPage.vue
new file mode 100644
index 00000000..875af5d1
--- /dev/null
+++ b/app/imports/client/ui/pages/DocsPage.vue
@@ -0,0 +1,150 @@
+<template>
+  <v-container class="documentation">
+    <v-row
+      justify="center"
+    >
+      <v-col
+        cols="12"
+        md="8"
+      >
+        <doc-breadcrumbs :doc="doc" />
+      </v-col>
+    </v-row>
+    <v-fade-transition mode="out-in">
+      <v-progress-circular
+        v-if="!$subReady.docs"
+        key="loading"
+        indeterminate
+        color="primary"
+        size="32"
+      />
+      <v-row
+        v-else-if="docNotFound"
+        key="failed"
+        justify="center"
+      >
+        <v-col
+          cols="12"
+          md="8"
+        >
+          <h1>Documentation not found</h1>
+        </v-col>
+      </v-row>
+      <doc-edit-form
+        v-else-if="editing"
+        key="editing"
+        :doc="doc"
+        :child-docs="childDocs"
+      />
+      <doc-viewer
+        v-else
+        key="viewing"
+        :doc="doc"
+        :child-docs="childDocs"
+        :sibling-docs="siblingDocs"
+      />
+    </v-fade-transition>
+  </v-container>
+</template>
+
+<script lang="js">
+import Docs from '/imports/api/docs/Docs.js';
+import DocEditForm from '/imports/client/ui/docs/DocEditForm.vue';
+import DocViewer from '/imports/client/ui/docs/DocViewer.vue';
+import DocBreadcrumbs from '/imports/client/ui/docs/DocBreadcrumbs.vue';
+import { Session } from 'meteor/session';
+
+export default {
+  components: {
+    DocBreadcrumbs,
+    DocViewer,
+    DocEditForm,
+  },
+  data() { return {
+    docNotFound: false,
+  }},
+  computed: {
+    path() {
+      return this.$route.params.docPath;
+    },
+    doc() {
+      if (!this.docs?.length) return;
+      return this.docs[this.docs.length - 1];
+    },
+    title() {
+      if (this.doc) {
+        return this.doc.name;
+      } else if (this.docNotFound) {
+        return 'Doc not found';
+      } else {
+        return 'Documentation'
+      }
+    },
+    root() {
+      return !this.path;
+    }
+  },
+  meteor: {
+    $subscribe: {
+      'docs': [],
+    },
+    docs() {
+      const docs = [];
+      this.docNotFound = false;
+      if (this.root) {
+        return docs;
+      }
+      let currentDoc = undefined;
+      this.path.split('/').forEach(urlName => {
+        currentDoc = Docs.findOne({
+          urlName, 'parent.id': currentDoc?._id,
+          removed: { $ne: true },
+        })
+        if (currentDoc) {
+          docs.push(currentDoc);
+        } else {
+          this.docNotFound = true;
+        }
+      });
+      return docs;
+    },
+    childDocs() {
+      if (!this.doc) return Docs.find({
+        'parent': undefined,
+        removed: { $ne: true },
+      });
+      return Docs.find({
+        'parent.id': this.doc._id,
+        removed: { $ne: true },
+      })
+    },
+    siblingDocs() {
+      if (!this.doc) return [];
+      return Docs.find({
+        'parent.id': this.doc.parent?.id,
+        removed: { $ne: true },
+      });
+    },
+    editing() {
+      return Session.get('editingDocs');
+    },
+  },
+  watch: {
+    title: {
+      immediate: true,
+      handler(value) {
+        this.$store.commit('setPageTitle', value);
+      }
+    }
+  },
+}
+</script>
+
+<style>
+.documentation .fade-transition-enter-active {
+  transition: all .25s linear !important;
+}
+.documentation .fade-transition-leave-active {
+  transition: all .1s linear !important;
+}
+</style>
\ No newline at end of file
diff --git a/app/imports/client/ui/router.js b/app/imports/client/ui/router.js
index a822afe1..f26f720d 100644
--- a/app/imports/client/ui/router.js
+++ b/app/imports/client/ui/router.js
@@ -36,7 +36,8 @@ const TabletopRightDrawer = () => import('/imports/client/ui/tabletop/TabletopRi
 const Admin = () => import('/imports/client/ui/pages/Admin.vue');
 const Maintenance = () => import('/imports/client/ui/pages/Maintenance.vue');
 const Files = () => import('/imports/client/ui/pages/Files.vue');
-const Documentation = () => import('/imports/client/ui/pages/Documentation.vue');
+const DocsPage = () => import('/imports/client/ui/pages/DocsPage.vue');
+const DocToolbar = () => import('/imports/client/ui/docs/DocToolbar.vue');
 
 // Not found
 const NotFound = () => import('/imports/client/ui/pages/NotFound.vue');
@@ -264,17 +265,10 @@ RouterFactory.configure(router => {
       title: 'Functions',
     },
   }, {
-    path: '/docs/:docPath([^/]+.*)',
+    path: '/docs/:docPath([^/]+.*)?',
     components: {
-      default: Documentation,
-    },
-    meta: {
-      title: 'Documentation',
-    },
-  }, {
-    path: '/docs',
-    components: {
-      default: Documentation,
+      default: DocsPage,
+      toolbar: DocToolbar,
     },
     meta: {
       title: 'Documentation',
diff --git a/app/imports/server/publications/docs.js b/app/imports/server/publications/docs.js
index 2bc3a7b4..ed1afb09 100644
--- a/app/imports/server/publications/docs.js
+++ b/app/imports/server/publications/docs.js
@@ -1,35 +1,17 @@
-import { propsByDocsPath } from '/imports/constants/PROPERTIES.js';
+import Docs from '/imports/api/docs/Docs.js';
 
-
-// Manual doc paths
-const docPaths = [
-  'computed-fields',
-  'inline-calculations',
-  'dependency-loops',
-  'docs',
-  'tags',
-  'walkthroughs/create-a-class',
-];
-const docs = new Map();
-docPaths.forEach(path => {
-  docs.set(path, Assets.getText(`docs/${path}.md`))
-});
-
-// Doc paths for properties
-propsByDocsPath.forEach(prop => {
-  docs.set(prop.docsPath, Assets.getText(`docs/${prop.docsPath}.md`));
-});
-
-Meteor.publish('docs', function (path) {
-  if (!path) {
-    docs.forEach((text, path) => {
-      this.added('docs', path, { text });
+Meteor.publish('docs', function () {
+  const filter = { published: true, removed: { $ne: true } };
+  if (this.userId) {
+    const user = Meteor.users.findOne(this.userId, {
+      fields: {
+        'roles': 1,
+      }
     });
-  } else {
-    const text = docs.get(path);
-    if (text) {
-      this.added('docs', path, { text });
+    if (user?.roles?.includes('docsWriter')) {
+      delete filter.published;
+      delete filter.removed
     }
   }
-  this.ready();
+  return Docs.find(filter);
 });

From a3355dd98875180afdf01d52cc920703ee33a51f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 00:56:10 +0200
Subject: [PATCH 35/46] stat grouping is now everywhere This lead to a complete
 refactor of the stats page Some things might break

---
 app/imports/api/parenting/nodesToTree.js      |  30 +-
 app/imports/api/properties/Folders.js         |  18 +
 .../character/characterSheetTabs/BuildTab.vue |  44 ++-
 .../characterSheetTabs/FeaturesTab.vue        |  23 ++
 .../characterSheetTabs/InventoryTab.vue       |  30 +-
 .../characterSheetTabs/JournalTab.vue         |  23 ++
 .../characterSheetTabs/SpellsTab.vue          |  28 +-
 .../character/characterSheetTabs/StatsTab.vue | 317 ++++++++++--------
 .../components/folders/tabFoldersMixin.js     |  53 +++
 .../client/ui/properties/forms/FolderForm.vue |  71 +++-
 10 files changed, 461 insertions(+), 176 deletions(-)
 create mode 100644 app/imports/client/ui/properties/components/folders/tabFoldersMixin.js

diff --git a/app/imports/api/parenting/nodesToTree.js b/app/imports/api/parenting/nodesToTree.js
index b8589967..3e4b5733 100644
--- a/app/imports/api/parenting/nodesToTree.js
+++ b/app/imports/api/parenting/nodesToTree.js
@@ -1,10 +1,10 @@
 import { union, difference, sortBy, findLast } from 'lodash';
 
-export function nodeArrayToTree(nodes){
+export function nodeArrayToTree(nodes) {
   // Store a dict and list of all the nodes
   let nodeIndex = {};
   let nodeList = [];
-  nodes.forEach( node => {
+  nodes.forEach(node => {
     let treeNode = {
       node: node,
       children: [],
@@ -20,7 +20,7 @@ export function nodeArrayToTree(nodes){
       treeNode.node.ancestors,
       ancestor => !!nodeIndex[ancestor.id]
     );
-    if (ancestorInForest){
+    if (ancestorInForest) {
       nodeIndex[ancestorInForest.id].children.push(treeNode);
     } else {
       forest.push(treeNode);
@@ -33,13 +33,13 @@ export function nodeArrayToTree(nodes){
 export default function nodesToTree({
   collection, ancestorId, filter, options = {},
   includeFilteredDocAncestors = false, includeFilteredDocDescendants = false
-}){
+}) {
   // Setup the filter
   let collectionFilter = {
     'ancestors.id': ancestorId,
-    'removed': {$ne: true},
+    'removed': { $ne: true },
   };
-  if (filter){
+  if (filter) {
     collectionFilter = {
       ...collectionFilter,
       ...filter,
@@ -49,7 +49,7 @@ export default function nodesToTree({
   let collectionSort = {
     order: 1
   };
-  if (options && options.sort){
+  if (options && options.sort) {
     collectionSort = {
       ...collectionSort,
       ...options.sort,
@@ -58,7 +58,7 @@ export default function nodesToTree({
   let collectionOptions = {
     sort: collectionSort,
   }
-  if (options){
+  if (options) {
     collectionOptions = {
       ...collectionOptions,
       ...options,
@@ -74,10 +74,10 @@ export default function nodesToTree({
   let ancestors = [];
   let ancestorIds = [];
   let docIds = [];
-  if (filter && (includeFilteredDocAncestors || includeFilteredDocDescendants)){
+  if (filter && (includeFilteredDocAncestors || includeFilteredDocDescendants)) {
     docIds = docs.map(doc => doc._id)
   }
-  if (filter && includeFilteredDocAncestors){
+  if (filter && includeFilteredDocAncestors) {
     // Add all ancestor ids to an array
     docs.forEach(doc => {
       ancestorIds = union(ancestorIds, doc.ancestors.map(ref => ref.id));
@@ -86,19 +86,19 @@ export default function nodesToTree({
     ancestorIds = difference(ancestorIds, docIds);
     // Get the docs from the collection, don't worry about `removed` docs,
     // if their descendant was not removed, neither are they
-    ancestors = collection.find({_id: {$in: ancestorIds}}).map(doc => {
+    ancestors = collection.find({ _id: { $in: ancestorIds } }).map(doc => {
       // Mark that the nodes are ancestors of the found nodes
       doc._ancestorOfMatchedDocument = true;
       return doc;
     });
   }
   let descendants = [];
-  if (filter && includeFilteredDocDescendants){
+  if (filter && includeFilteredDocDescendants) {
     let exludeIds = union(ancestorIds, docIds);
     descendants = collection.find({
-      '_id': {$nin: exludeIds},
-      'ancestors.id': {$in: docIds},
-      'removed': {$ne: true},
+      '_id': { $nin: exludeIds },
+      'ancestors.id': { $in: docIds },
+      'removed': { $ne: true },
     }).map(doc => {
       // Mark that the nodes are descendants of the found nodes
       doc._descendantOfMatchedDocument = true;
diff --git a/app/imports/api/properties/Folders.js b/app/imports/api/properties/Folders.js
index aa68e56f..605975b3 100644
--- a/app/imports/api/properties/Folders.js
+++ b/app/imports/api/properties/Folders.js
@@ -13,6 +13,24 @@ let FolderSchema = new createPropertySchema({
     type: Boolean,
     optional: true,
   },
+  hideStatsGroup: {
+    type: Boolean,
+    optional: true,
+  },
+  tab: {
+    type: String,
+    optional: true,
+    allowedValues: [
+      'stats', 'features', 'inventory', 'spells', 'journal', 'build'
+    ],
+  },
+  location: {
+    type: String,
+    optional: true,
+    allowedValues: [
+      'start', 'events', 'stats', 'skills', 'actions', 'proficiencies', 'end'
+    ],
+  },
 });
 
 const ComputedOnlyFolderSchema = new createPropertySchema({});
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
index 8e6881e5..1f4cd4bb 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -13,9 +13,19 @@
     </v-row>
     <v-row dense>
       <v-col
-        cols="12"
-        md="8"
-        lg="6"
+        v-for="folder in startFolders"
+        :key="folder._id"
+        v-bind="cols"
+      >
+        <folder-group-card
+          :model="folder"
+          @click-property="clickProperty"
+          @sub-click="_id => clickTreeProperty({_id})"
+          @remove="softRemove"
+        />
+      </v-col>
+      <v-col
+        v-bind="cols"
       >
         <v-card class="pb-4">
           <v-card-title style="height: 68px;">
@@ -81,9 +91,7 @@
         </v-card>
       </v-col>
       <v-col
-        cols="12"
-        md="4"
-        lg="6"
+        v-bind="cols"
       >
         <v-card class="class-details mb-2">
           <v-card-title
@@ -174,6 +182,18 @@
           </v-list>
         </v-card>
       </v-col>
+      <v-col
+        v-for="folder in endFolders"
+        :key="folder._id"
+        v-bind="cols"
+      >
+        <folder-group-card
+          :model="folder"
+          @click-property="clickProperty"
+          @sub-click="_id => clickTreeProperty({_id})"
+          @remove="softRemove"
+        />
+      </v-col>
     </v-row>
   </v-container>
 </template>
@@ -190,6 +210,7 @@ import CharacterErrors from '/imports/client/ui/creature/character/errors/Charac
 import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';
 import getPropertyTitle from '/imports/client/ui/properties/shared/getPropertyTitle.js';
+import tabFoldersMixin from '/imports/client/ui/properties/components/folders/tabFoldersMixin.js';
 
 function traverse(tree, callback, parents = []){
   tree.forEach(node => {
@@ -204,12 +225,23 @@ export default {
     BuildTreeNodeList,
     SlotCardsToFill,
   },
+  mixins: [tabFoldersMixin],
   props: {
     creatureId: {
       type: String,
       required: true,
     },
   },
+  data() {
+    return {
+      tabName: 'build',
+      cols: {
+        cols: '12',
+        md: '6',
+        xl: '4',
+      }
+    };
+  },
   computed: {
     highestLevels(){
       let highestLevels = {};
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
index 8630a938..11144684 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
@@ -1,6 +1,14 @@
 <template lang="html">
   <div class="features">
     <column-layout wide-columns>
+      <folder-group-card
+        v-for="folder in startFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
       <div
         v-for="feature in features"
         :key="feature._id"
@@ -11,6 +19,14 @@
           @click="featureClicked(feature)"
         />
       </div>
+      <folder-group-card
+        v-for="folder in endFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
     </column-layout>
   </div>
 </template>
@@ -19,18 +35,25 @@
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import FeatureCard from '/imports/client/ui/properties/components/features/FeatureCard.vue';
+import tabFoldersMixin from '/imports/client/ui/properties/components/folders/tabFoldersMixin.js';
 
 export default {
   components: {
     ColumnLayout,
     FeatureCard,
   },
+  mixins: [tabFoldersMixin],
   props: {
     creatureId: {
       type: String,
       required: true,
     },
   },
+  data() {
+    return {
+      tabName: 'features',
+    };
+  },
   meteor: {
     features() {
       return CreatureProperties.find({
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
index b78e0d73..89c4d59b 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -1,6 +1,14 @@
 <template lang="html">
   <div class="inventory">
     <column-layout wide-columns>
+      <folder-group-card
+        v-for="folder in startFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
       <div>
         <v-card>
           <v-list>
@@ -85,6 +93,14 @@
       >
         <container-card :model="container" />
       </div>
+      <folder-group-card
+        v-for="folder in endFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
     </column-layout>
   </div>
 </template>
@@ -101,6 +117,7 @@ import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js';
 import CoinValue from '/imports/client/ui/components/CoinValue.vue';
 import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js';
 import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js';
+import tabFoldersMixin from '/imports/client/ui/properties/components/folders/tabFoldersMixin.js';
 
 export default {
   components: {
@@ -110,6 +127,7 @@ export default {
     ItemList,
     CoinValue,
   },
+  mixins: [tabFoldersMixin],
   props: {
     creatureId: {
       type: String,
@@ -119,7 +137,8 @@ export default {
   data() {
     return {
       organize: false,
-    }
+      tabName: 'inventory',
+    };
   },
   meteor: {
     containers() {
@@ -216,15 +235,6 @@ export default {
       );
     },
   },
-  methods: {
-    clickProperty(_id) {
-      this.$store.commit('pushDialogStack', {
-        component: 'creature-property-dialog',
-        elementId: `tree-node-${_id}`,
-        data: { _id },
-      });
-    },
-  },
 }
 </script>
 
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
index 4bc52058..2679265a 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -1,6 +1,14 @@
 <template>
   <div class="build-tab">
     <column-layout wide-columns>
+      <folder-group-card
+        v-for="folder in startFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
       <div>
         <creature-summary :creature="creature" />
       </div>
@@ -12,6 +20,14 @@
           :model="note"
         />
       </div>
+      <folder-group-card
+        v-for="folder in endFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
     </column-layout>
   </div>
 </template>
@@ -22,6 +38,7 @@ import Creatures from '/imports/api/creature/creatures/Creatures.js';
 import NoteCard from '/imports/client/ui/properties/components/persona/NoteCard.vue';
 import CreatureSummary from '/imports/client/ui/creature/character/CreatureSummary.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import tabFoldersMixin from '/imports/client/ui/properties/components/folders/tabFoldersMixin.js';
 
 export default {
   components: {
@@ -29,12 +46,18 @@ export default {
     CreatureSummary,
     NoteCard,
   },
+  mixins: [tabFoldersMixin],
   props: {
     creatureId: {
       type: String,
       required: true,
     },
   },
+  data() {
+    return {
+      tabName: 'journal',
+    };
+  },
   meteor: {
     notes(){
       return CreatureProperties.find({
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
index 14a5ff5c..12c65775 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -1,6 +1,14 @@
 <template lang="html">
   <div class="spells">
     <column-layout wide-columns>
+      <folder-group-card
+        v-for="folder in startFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
       <div v-if="spellsWithoutList.length">
         <v-card>
           <spell-list
@@ -18,6 +26,14 @@
           :organize="organize"
         />
       </div>
+      <folder-group-card
+        v-for="folder in endFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
     </column-layout>
   </div>
 </template>
@@ -27,6 +43,7 @@ import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import SpellListCard from '/imports/client/ui/properties/components/spells/SpellListCard.vue';
 import SpellList from '/imports/client/ui/properties/components/spells/SpellList.vue';
+import tabFoldersMixin from '/imports/client/ui/properties/components/folders/tabFoldersMixin.js';
 
 export default {
   components: {
@@ -34,6 +51,7 @@ export default {
     SpellList,
     SpellListCard,
   },
+  mixins: [tabFoldersMixin],
   props: {
     creatureId: {
       type: String,
@@ -43,6 +61,7 @@ export default {
   data() {
     return {
       organize: false,
+      tabName: 'spells',
     }
   },
   meteor: {
@@ -92,15 +111,6 @@ export default {
       return this.spellLists.map(spellList => spellList._id);
     },
   },
-  methods: {
-    clickProperty(_id) {
-      this.$store.commit('pushDialogStack', {
-        component: 'creature-property-dialog',
-        elementId: `spell-list-tile-${_id}`,
-        data: { _id },
-      });
-    },
-  },
 }
 </script>
 
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index 50b880ee..2da6dfb5 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -1,12 +1,15 @@
 <template lang="html">
-  <div class="stats-tab ma-2">
+  <div
+    v-if="properties"
+    class="stats-tab ma-2"
+  >
     <div
-      v-if="healthBars.length"
+      v-if="properties.attribute.healthBar && properties.attribute.healthBar.length"
       class="px-2 pt-2"
     >
       <v-card class="pa-2">
         <health-bar
-          v-for="healthBar in healthBars"
+          v-for="healthBar in properties.attribute.healthBar"
           :key="healthBar._id"
           :model="healthBar"
           @change="({ type, value }) => incrementChange(healthBar._id, { type, value: -value })"
@@ -17,7 +20,7 @@
 
     <column-layout>
       <folder-group-card
-        v-for="folder in folders"
+        v-for="folder in properties.folder.start"
         :key="folder._id"
         :model="folder"
         @click-property="clickProperty"
@@ -25,7 +28,7 @@
         @remove="softRemove"
       />
       <div
-        v-if="!creature.settings.hideRestButtons || (events && events.length)"
+        v-if="!creature.settings.hideRestButtons || (properties.action.event && properties.action.event.length)"
         class="character-buttons"
       >
         <v-card>
@@ -43,7 +46,7 @@
               class="ma-1"
             />
             <event-button
-              v-for="event in events"
+              v-for="event in properties.event"
               :key="event._id"
               :model="event"
               class="ma-1"
@@ -52,21 +55,30 @@
         </v-card>
       </div>
 
+      <folder-group-card
+        v-for="folder in properties.folder.events"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
+
       <damage-multiplier-card
-        v-if="multipliers && multipliers.length"
-        :multipliers="multipliers"
+        v-if="properties.multiplier && properties.multiplier.length"
+        :multipliers="properties.multiplier"
         @click-multiplier="clickProperty"
       />
 
       <div
-        v-if="appliedBuffs.length"
+        v-if="properties.buff && properties.buff.length"
         class="buffs"
       >
         <v-card>
           <v-list>
             <v-subheader>Buffs and conditions</v-subheader>
             <buff-list-item
-              v-for="buff in appliedBuffs"
+              v-for="buff in properties.buff"
               :key="buff._id"
               :data-id="buff._id"
               :model="buff"
@@ -78,12 +90,12 @@
       </div>
 
       <div
-        v-if="abilities.length"
+        v-if="properties.attribute.ability && properties.attribute.ability.length"
         class="ability-scores"
       >
         <v-card>
           <v-list>
-            <template v-for="(ability, index) in abilities">
+            <template v-for="(ability, index) in properties.attribute.ability">
               <v-divider
                 v-if="index !== 0"
                 :key="index"
@@ -100,7 +112,7 @@
       </div>
 
       <div
-        v-for="toggle in toggles"
+        v-for="toggle in properties.toggle"
         :key="toggle._id"
         class="toggle"
       >
@@ -112,7 +124,7 @@
       </div>
 
       <div
-        v-for="stat in stats"
+        v-for="stat in properties.attribute.stat"
         :key="stat._id"
         class="stat"
       >
@@ -124,7 +136,7 @@
       </div>
 
       <div
-        v-for="modifier in modifiers"
+        v-for="modifier in properties.attribute.modifier"
         :key="modifier._id"
         class="modifier"
       >
@@ -136,7 +148,7 @@
       </div>
 
       <div
-        v-for="check in checks"
+        v-for="check in properties.skill.check"
         :key="check._id"
         class="check"
       >
@@ -149,7 +161,7 @@
       </div>
 
       <div
-        v-if="hitDice.length"
+        v-if="properties.hitDice && properties.hitDice.length"
         class="hit-dice"
       >
         <v-card>
@@ -173,7 +185,7 @@
       </div>
 
       <div
-        v-for="resource in resources"
+        v-for="resource in properties.attribute.resource"
         :key="resource._id"
         class="resource"
       >
@@ -186,18 +198,18 @@
       </div>
 
       <div
-        v-if="spellSlots && spellSlots.length || hasSpells"
+        v-if="properties.attribute.spellSlot && properties.attribute.spellSlot.length || hasSpells"
         class="spell-slots"
       >
         <v-card data-id="spell-slot-card">
           <v-list
-            v-if="spellSlots && spellSlots.length"
+            v-if="properties.attribute.spellSlot && properties.attribute.spellSlot.length"
             two-line
             subheader
           >
             <v-subheader>Spell Slots</v-subheader>
             <spell-slot-list-tile
-              v-for="spellSlot in spellSlots"
+              v-for="spellSlot in properties.attribute.spellSlot"
               :key="spellSlot._id"
               :model="spellSlot"
               :data-id="spellSlot._id"
@@ -220,15 +232,24 @@
         </v-card>
       </div>
 
+      <folder-group-card
+        v-for="folder in properties.folder.stats"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
+
       <div
-        v-if="savingThrows.length"
+        v-if="properties.skill.save && properties.skill.save.length"
         class="saving-throws"
       >
         <v-card>
           <v-list>
             <v-subheader>Saving Throws</v-subheader>
             <skill-list-tile
-              v-for="save in savingThrows"
+              v-for="save in properties.skill.save"
               :key="save._id"
               :model="save"
               :data-id="save._id"
@@ -239,14 +260,14 @@
       </div>
 
       <div
-        v-if="skills.length"
+        v-if="properties.skill.skill && properties.skill.skill.length"
         class="skills"
       >
         <v-card>
           <v-list>
             <v-subheader>Skills</v-subheader>
             <skill-list-tile
-              v-for="skill in skills"
+              v-for="skill in properties.skill.skill"
               :key="skill._id"
               :model="skill"
               :data-id="skill._id"
@@ -256,8 +277,17 @@
         </v-card>
       </div>
 
+      <folder-group-card
+        v-for="folder in properties.folder.skills"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
+
       <div
-        v-for="action in actions"
+        v-for="action in properties.action"
         :key="action._id"
         class="action"
       >
@@ -269,8 +299,17 @@
         />
       </div>
 
+      <folder-group-card
+        v-for="folder in properties.folder.actions"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
+
       <div
-        v-if="weapons && weapons.length"
+        v-if="properties.skill.weapon && properties.skill.weapon.length"
         class="weapon-proficiencies"
       >
         <v-card>
@@ -279,7 +318,7 @@
               Weapons
             </v-subheader>
             <skill-list-tile
-              v-for="weapon in weapons"
+              v-for="weapon in properties.skill.weapon"
               :key="weapon._id"
               hide-modifier
               :model="weapon"
@@ -290,7 +329,7 @@
         </v-card>
       </div>
       <div
-        v-if="armors && armors.length"
+        v-if="properties.skill.armor && properties.skill.armor.length"
         class="armor-proficiencies"
       >
         <v-card>
@@ -299,7 +338,7 @@
               Armor
             </v-subheader>
             <skill-list-tile
-              v-for="armor in armors"
+              v-for="armor in properties.skill.armor"
               :key="armor._id"
               hide-modifier
               :model="armor"
@@ -310,7 +349,7 @@
         </v-card>
       </div>
       <div
-        v-if="tools && tools.length"
+        v-if="properties.skill.tool && properties.skill.tool.length"
         class="tool-proficiencies"
       >
         <v-card>
@@ -319,7 +358,7 @@
               Tools
             </v-subheader>
             <skill-list-tile
-              v-for="tool in tools"
+              v-for="tool in properties.skill.tool"
               :key="tool._id"
               hide-modifier
               :model="tool"
@@ -330,7 +369,7 @@
         </v-card>
       </div>
       <div
-        v-if="languages && languages.length"
+        v-if="properties.skill.language && properties.skill.language.length"
         class="language-proficiencies"
       >
         <v-card>
@@ -339,7 +378,7 @@
               Languages
             </v-subheader>
             <skill-list-tile
-              v-for="language in languages"
+              v-for="language in properties.skill.language"
               :key="language._id"
               hide-modifier
               :model="language"
@@ -349,6 +388,24 @@
           </v-list>
         </v-card>
       </div>
+
+      <folder-group-card
+        v-for="folder in properties.folder.proficiencies"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
+
+      <folder-group-card
+        v-for="folder in properties.folder.end"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
     </column-layout>
   </div>
 </template>
@@ -375,40 +432,63 @@ import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
 import EventButton from '/imports/client/ui/properties/components/actions/EventButton.vue';
 import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import FolderGroupCard from '/imports/client/ui/properties/components/folders/FolderGroupCard.vue';
-import { uniqBy } from 'lodash';
+import { get, set } from 'lodash';
+import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js'
 
-const getProperties = function (creature, folderIds, filter, options = {
-  sort: { order: 1 }
-}) {
-  if (!creature) return;
-  if (creature.settings.hideUnusedStats) {
-    filter.hide = { $ne: true };
+function walkDown(forest, callback){
+  let stack = [...forest];
+  while(stack.length){
+    let node = stack.pop();
+    const { skipChildren } = callback(node) ?? { skipChildren: false };
+    if (!skipChildren) {
+      stack.push(...node.children);
+    }
   }
-  filter['ancestors.id'] = creature._id;
-  filter['parent.id'] = {$nin: folderIds},
-  filter.removed = { $ne: true };
-  filter.inactive = { $ne: true };
-  filter.overridden = { $ne: true };
-  filter.$nor = [
-    { hideWhenTotalZero: true, total: 0 },
-    { hideWhenValueZero: true, value: 0 },
-  ];
+}
 
-  return CreatureProperties.find(filter, options);
-};
-
-const getAttributeOfType = function (creature, folderIds, type) {
-  return getProperties(creature, folderIds, {
-    type: 'attribute',
-    attributeType: type,
-  });
-};
-
-const getSkillOfType = function (creature, folderIds, type) {
-  return getProperties(creature, folderIds, {
-    type: 'skill',
-    skillType: type,
-  });
+const propertyHandlers = {
+  folder(prop) {
+    let skipChildren;
+    let propPath = null;
+    if (prop.hideStatsGroup) {
+      return { skipChildren: true}
+    }
+    if (prop.tab === 'stats') {
+      propPath = ['folder', prop.location]
+    }
+    return { skipChildren, propPath }
+  },
+  attribute(prop) {
+    if (
+      prop.attributeType === 'utility' ||
+      prop.overridden ||
+      (prop.hideWhenTotalZero && prop.total === 0) ||
+      (prop.hideWhenValueZero && prop.value === 0)
+    ) return { propPath: null };
+    return {
+      propPath: ['attribute', prop.attributeType],
+    }
+  },
+  skill(prop) {
+    if (
+      prop.skillType === 'utility'
+    ) return { propPath: null };
+    return {
+      propPath: ['skill', prop.skillType],
+    }
+  },
+  toggle(prop) {
+    if (
+      prop.deactivatedByAncestor || !prop.showUI
+    ) return { propPath: null };
+    return { propPath: 'toggle' };
+  },
+  action(prop) {
+    if (prop.actionType === 'event') {
+      return { propPath: 'event' };
+    }
+    return { propPath: 'action' };
+  },
 }
 
 export default {
@@ -441,30 +521,50 @@ export default {
     }
   },
   meteor: {
+    properties() {
+      const creature = this.creature;
+      if (!creature) return;
+      const filter = {
+        'ancestors.id': this.creatureId,
+        $or: [
+          { inactive: { $ne: true } },
+          { type: 'toggle' },
+        ],
+        removed: { $ne: true },
+      };
+      if (creature.settings.hideUnusedStats) {
+        filter.hide = { $ne: true };
+      }
+      const allProps = CreatureProperties.find(filter);
+      const forest = nodeArrayToTree(allProps);
+      const properties = { folder: {}, attribute: {}, skill: {} };
+      walkDown(forest, node => {
+        const prop = node.node;
+        const { propPath, skipChildren } = propertyHandlers[prop.type]?.(prop) ||
+          { propPath: prop.type };
+        if (propPath) {
+          let propArray = get(properties, propPath);
+          if (!propArray) {
+            propArray = [];
+            set(properties, propPath, propArray);
+          }
+          if (!propArray?.push) {
+            console.log({propArray});
+          }
+          propArray.push(prop);
+        }
+        return { skipChildren };
+      });
+      return properties;
+    },
     creature() {
       return Creatures.findOne(this.creatureId, { fields: { settings: 1 } });
     },
     
-    folders() {
-      return getProperties(this.creature, [], { type: 'folder', groupStats: true });
-    },
-    folderIds() {
-      return this.folders.map(f => f._id);
-    },
-    healthBars() {
-      return getAttributeOfType(this.creature, this.folderIds, 'healthBar');
-    },
-    abilities() {
-      return getAttributeOfType(this.creature, this.folderIds, 'ability');
-    },
-    stats() {
-      return getAttributeOfType(this.creature, this.folderIds, 'stat');
-    },
     toggles() {
       return CreatureProperties.find({
         type: 'toggle',
         'ancestors.id': this.creatureId,
-        'parent.id': { $nin: this.folderIds },
         removed: { $ne: true },
         deactivatedByAncestor: { $ne: true },
         showUI: true,
@@ -472,61 +572,8 @@ export default {
         sort: { order: 1 }
       });
     },
-    modifiers() {
-      return getAttributeOfType(this.creature, this.folderIds, 'modifier');
-    },
-    resources() {
-      return getAttributeOfType(this.creature, this.folderIds, 'resource');
-    },
-    spellSlots() {
-      return getAttributeOfType(this.creature, this.folderIds, 'spellSlot');
-    },
     hasSpells() {
-      const cursor = getProperties(this.creature, this.folderIds, {
-        type: 'spell',
-      })
-      return cursor && cursor.count();
-    },
-    hitDice() {
-      return getAttributeOfType(this.creature, this.folderIds, 'hitDice');
-    },
-    checks() {
-      return getSkillOfType(this.creature, this.folderIds, 'check');
-    },
-    savingThrows() {
-      return getSkillOfType(this.creature, this.folderIds, 'save');
-    },
-    skills() {
-      return getSkillOfType(this.creature, this.folderIds, 'skill');
-    },
-    tools() {
-      return getSkillOfType(this.creature, this.folderIds, 'tool');
-    },
-    weapons() {
-      return getSkillOfType(this.creature, this.folderIds, 'weapon');
-    },
-    armors() {
-      return getSkillOfType(this.creature, this.folderIds, 'armor');
-    },
-    languages() {
-      return getSkillOfType(this.creature, this.folderIds, 'language');
-    },
-    events() {
-      const events = getProperties(this.creature, this.folderIds, { type: 'action', actionType: 'event' });
-      return uniqBy(events.fetch(), e => e.variableName);
-    },
-    actions() {
-      return getProperties(this.creature, this.folderIds, { type: 'action', actionType: { $ne: 'event' } });
-    },
-    appliedBuffs() {
-      return getProperties(this.creature, this.folderIds, { type: 'buff' });
-    },
-    multipliers() {
-      return getProperties(this.creature, this.folderIds, {
-        type: 'damageMultiplier'
-      }, {
-        sort: { value: 1, order: 1 }
-      });
+      return this.properties?.spell?.length
     },
   },
   methods: {
diff --git a/app/imports/client/ui/properties/components/folders/tabFoldersMixin.js b/app/imports/client/ui/properties/components/folders/tabFoldersMixin.js
new file mode 100644
index 00000000..5097143e
--- /dev/null
+++ b/app/imports/client/ui/properties/components/folders/tabFoldersMixin.js
@@ -0,0 +1,53 @@
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js'
+import FolderGroupCard from '/imports/client/ui/properties/components/folders/FolderGroupCard.vue';
+import softRemoveProperty from '/imports/api/creature/creatureProperties/methods/softRemoveProperty.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+
+function getFolders(creatureId, tab, location) {
+  return CreatureProperties.find({
+    'ancestors.id': creatureId,
+    groupStats: true,
+    inactive: { $ne: true },
+    removed: { $ne: true },
+    tab,
+    location,
+  });
+}
+
+export default {
+  components: {
+    FolderGroupCard,
+  },
+  meteor: {
+    startFolders() {
+      return getFolders(this.creatureId, this.tabName, 'start');
+    },
+    endFolders() {
+      return getFolders(this.creatureId, this.tabName, 'end');
+    },
+  },
+  methods: {
+    clickProperty({ _id }) {
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `${_id}`,
+        data: { _id },
+      });
+    },
+    clickTreeProperty({ _id }) {
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `tree-node-${_id}`,
+        data: { _id },
+      });
+    },
+    softRemove(_id) {
+      softRemoveProperty.call({ _id }, error => {
+        if (error) {
+          snackbar({ text: error.reason || error.message || error.toString() });
+          console.error(error);
+        }
+      });
+    },
+  }
+};
\ No newline at end of file
diff --git a/app/imports/client/ui/properties/forms/FolderForm.vue b/app/imports/client/ui/properties/forms/FolderForm.vue
index d12a7439..d337e794 100644
--- a/app/imports/client/ui/properties/forms/FolderForm.vue
+++ b/app/imports/client/ui/properties/forms/FolderForm.vue
@@ -27,11 +27,46 @@
             @change="change('tags', ...arguments)"
           />
           <smart-switch
-            label="Group children on stats tab"
+            label="Group children on a card"
             :value="model.groupStats"
             :error-messages="errors.groupStats"
             @change="change('groupStats', ...arguments)"
           />
+          <v-expand-transition>
+            <div v-if="model.groupStats">
+              <smart-switch
+                label="Hide children from stats tab"
+                :value="model.hideStatsGroup"
+                :error-messages="errors.hideStatsGroup"
+                @change="change('hideStatsGroup', ...arguments)"
+              />
+              <smart-select
+                clearable
+                label="Tab"
+                :items="[
+                  { text: 'Stats Tab', value: 'stats' },
+                  { text: 'Features Tab', value: 'features' },
+                  { text: 'Inventory Tab', value: 'inventory' },
+                  { text: 'Spells Tab', value: 'spells' },
+                  { text: 'Journal Tab', value: 'journal' },
+                  { text: 'Build Tab', value: 'build' },
+                ]"
+                :value="model.tab"
+                :error-messages="errors.tab"
+                :menu-props="{auto: true, lazy: true}"
+                @change="changeTab('tab', ...arguments)"
+              />
+              <smart-select
+                clearable
+                label="Location"
+                :items="locationItems"
+                :value="model.location"
+                :error-messages="errors.location"
+                :menu-props="{auto: true, lazy: true}"
+                @change="change('location', ...arguments)"
+              />
+            </div>
+          </v-expand-transition>
         </form-section>
       </form-sections>
     </div>
@@ -47,6 +82,40 @@ export default {
     FormSection,
   },
   mixins: [propertyFormMixin],
+  computed: {
+    locationItems() {
+      if (this.model.tab === 'stats') {
+        return [
+          { text: 'Start', value: 'start' },
+          { text: 'After events', value: 'events' },
+          { text: 'After stats', value: 'stats' },
+          { text: 'After skills', value: 'skills' },
+          { text: 'After actions', value: 'actions' },
+          { text: 'After proficiencies', value: 'proficiencies' },
+          { text: 'End', value: 'end' },
+        ];
+      } else {
+        return [
+          { text: 'Start', value: 'start' },
+          { text: 'End', value: 'end' },
+        ];
+      }
+    }
+  },
+  methods: {
+    changeTab(path, value, ack) {
+      if (!Array.isArray(path)){
+        path = [path];
+      }
+      if (
+        value !== 'stats' &&
+        (this.model.location !== 'start' && this.model.location !== 'end')
+        || (!this.model.location && value)
+      )
+      this.$emit('change', {path: ['location'], value: 'start'});
+      this.$emit('change', {path, value, ack});
+    },
+  }
 };
 </script>
 

From 063d4288efb73497de33c3d40b408b2e2dc00755 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 01:45:25 +0200
Subject: [PATCH 36/46] Point buys can now guess cost while dragging slide

---
 .../ui/components/global/SmartSlider.vue      | 17 ++++---
 .../ui/properties/forms/PointBuySpendForm.vue | 45 ++++++++++++++++++-
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/app/imports/client/ui/components/global/SmartSlider.vue b/app/imports/client/ui/components/global/SmartSlider.vue
index 5889b16d..ff9754d5 100644
--- a/app/imports/client/ui/components/global/SmartSlider.vue
+++ b/app/imports/client/ui/components/global/SmartSlider.vue
@@ -10,6 +10,9 @@
     :disabled="isDisabled"
     :outlined="!regular"
     @change="change"
+    @input="e => $emit('input', e)"
+    @end="e => $emit('end', e)"
+    @start="e => $emit('start', e)"
     @focus="focused = true"
     @blur="focused = false"
   >
@@ -23,12 +26,12 @@
 </template>
 
 <script lang="js">
-  import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
+import SmartInput from '/imports/client/ui/components/global/SmartInputMixin.js';
 
-  export default {
-    mixins: [SmartInput],
-    props: {
-      regular: Boolean,
-    },
-  };
+export default {
+  mixins: [SmartInput],
+  props: {
+    regular: Boolean,
+  },
+};
 </script>
diff --git a/app/imports/client/ui/properties/forms/PointBuySpendForm.vue b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
index 5103a69b..1eeb8ed8 100644
--- a/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
+++ b/app/imports/client/ui/properties/forms/PointBuySpendForm.vue
@@ -47,7 +47,10 @@
           :max="max(row)"
           :value="row.value"
           :error-messages="errors.values && errors.values[i] && errors.values[i].value"
-          @change="(value, ack) => $emit('change', {path: ['values', i, 'value'], value, ack})"
+          @change="(value, ack) => releaseSlider(i, value, ack)"
+          @input="value => dragSlider(row, value)"
+          @end="endSlider"
+          @start="startSlider"
         />
       </v-col>
       <v-col
@@ -78,7 +81,7 @@
           'warning--text': model.spent < (model.total && model.total.value),
         }"
       >
-        {{ model.spent }}
+        {{ estimatedCost !== undefined ? estimatedCost : model.spent }}
         <template v-if="model.total && (typeof model.total.value === 'number')">
           / {{ model.total && model.total.value }}
         </template>
@@ -90,12 +93,20 @@
 <script lang="js">
 import propertyFormMixin from '/imports/client/ui/properties/forms/shared/propertyFormMixin.js';
 import CalculationErrorList from '/imports/client/ui/properties/forms/shared/CalculationErrorList.vue';
+import evaluateCalculation from '/imports/api/engine/computation/utility/evaluateCalculation.js';
+import { Tracker } from 'meteor/tracker'
 
 export default {
   components: {
     CalculationErrorList,
   },
   mixins: [propertyFormMixin],
+  data() {
+    return {
+      estimatedCost: undefined,
+      useEstimate: false,
+    };
+  },
   methods: {
     max(row) {
       return row.max ? row.max && row.max.value : this.model.max && this.model.max.value;
@@ -103,6 +114,36 @@ export default {
     min(row) {
       return row.min ? row.min && row.min.value : this.model.min && this.model.min.value;
     },
+    dragSlider(row, value) {
+      const currentSpent = this.model.spent;
+      let newSpent = currentSpent - row.spent;
+      const costFunction = EJSON.clone(row.cost || this.model.cost);
+      if (costFunction) costFunction.parseLevel = 'reduce';
+      evaluateCalculation(costFunction, { value });
+      if (Number.isFinite(costFunction.value)) {
+        newSpent += costFunction.value;
+        if (this.useEstimate) this.estimatedCost = newSpent;
+      }
+    },
+    startSlider() {
+      this.useEstimate = true;
+    },
+    endSlider() {
+      this.useEstimate = false;
+    },
+    releaseSlider(i, value, ack) {
+      const newAck = (error, result) => {
+        Tracker.afterFlush(() => {
+          this.estimatedCost = undefined;
+        });
+        ack?.(error, result);
+      }
+      this.$emit('change', {
+        path: ['values', i, 'value'],
+        value,
+        ack: newAck
+      });
+    },
   },
 };
 </script>

From 56bd41f43574f3c4b21843b7fa7d6a557623846b Mon Sep 17 00:00:00 2001
From: Jonpot <jonathanpotter18@gmail.com>
Date: Mon, 21 Nov 2022 15:49:01 -0800
Subject: [PATCH 37/46] Fix skill.md typo

---
 app/private/docs/property/skill.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/private/docs/property/skill.md b/app/private/docs/property/skill.md
index 51185673..5b25b9ad 100644
--- a/app/private/docs/property/skill.md
+++ b/app/private/docs/property/skill.md
@@ -1,6 +1,6 @@
 # Skills
 
-Skills represent things the creature can be proficient in. Skills can have their values or behavior modifier by [effects](/docs/property/effect), and their proficiencies modified by [proficiencies](/docs/property/proficiency).
+Skills represent things the creature can be proficient in. Skills can have their values or behavior modified by [effects](/docs/property/effect), and their proficiencies modified by [proficiencies](/docs/property/proficiency).
 
 ---
 

From 9f8c3f0f3dd9f0800c9163c9005ad0ea1291f316 Mon Sep 17 00:00:00 2001
From: Jonpot <jonathanpotter18@gmail.com>
Date: Mon, 21 Nov 2022 16:20:48 -0800
Subject: [PATCH 38/46] Update applyAction.js

As per the docs, $attackDiceRoll should be the value of the d20 before modifiers, and $attackRoll should the the total value, after modifiers. Pre-patch, the former variable is never defined, and the latter variable has the wrong value.
---
 .../api/engine/actions/applyPropertyByType/applyAction.js      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
index becf0775..ab9ed8e1 100644
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
@@ -163,8 +163,9 @@ function rollAttack(attack, scope) {
     value = rollDice(1, 20)[0];
     resultPrefix = `1d20 [${value}] ${rollModifierText}`
   }
-  scope['$attackRoll'] = { value };
+  scope['$attackDiceRoll'] = { value };
   const result = value + attack.value;
+  scope['$attackRoll'] = { result };
   const { criticalHit, criticalMiss } = applyCrits(value, scope);
   return { resultPrefix, result, value, criticalHit, criticalMiss };
 }

From 254390e1c1295069e35fda1e5a2112729a595ff8 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 02:34:34 +0200
Subject: [PATCH 39/46] Added default doc seeding for new servers

---
 app/imports/api/docs/Docs.js             |  16 +
 app/imports/client/ui/docs/DocViewer.vue |   3 +-
 app/private/docs/defaultDocs.json        | 775 +++++++++++++++++++++++
 3 files changed, 793 insertions(+), 1 deletion(-)
 create mode 100644 app/private/docs/defaultDocs.json

diff --git a/app/imports/api/docs/Docs.js b/app/imports/api/docs/Docs.js
index 6f97d27d..acce3445 100644
--- a/app/imports/api/docs/Docs.js
+++ b/app/imports/api/docs/Docs.js
@@ -112,6 +112,22 @@ function getDocLink(doc, urlName) {
   return address.join('/');
 }
 
+// Add a means of seeding new servers with documentation
+if (Meteor.isClient) {
+  Docs.getJsonDocs = function () {
+    return JSON.stringify(Docs.find({}).fetch(), null, 2);
+  }
+} else if (Meteor.isServer) {
+  Meteor.startup(() => {
+    if (!Docs.findOne()) {
+      Assets.getText('docs/defaultDocs.json', (string) => {
+        const docs = JSON.parse(string)
+        docs.forEach(doc => Docs.insert(doc));
+      });
+    }
+  });
+}
+
 const insertDoc = new ValidatedMethod({
   name: 'docs.insert',
   validate: null,
diff --git a/app/imports/client/ui/docs/DocViewer.vue b/app/imports/client/ui/docs/DocViewer.vue
index f49de442..661cf158 100644
--- a/app/imports/client/ui/docs/DocViewer.vue
+++ b/app/imports/client/ui/docs/DocViewer.vue
@@ -5,12 +5,13 @@
       lg="8"
     >
       <v-card
-        style="float: right; z-index: 5;"
+        style="float: right; z-index: 4;"
         class="ma-4"
       >
         <v-fade-transition mode="out-in">
           <v-list
             v-if="siblingDocs.length > 1"
+            :dense="siblingDocs.length > 5"
           >
             <doc-list-item
               v-for="sibling in siblingDocs"
diff --git a/app/private/docs/defaultDocs.json b/app/private/docs/defaultDocs.json
new file mode 100644
index 00000000..7eaad790
--- /dev/null
+++ b/app/private/docs/defaultDocs.json
@@ -0,0 +1,775 @@
+[
+  {
+    "_id": "ioei4uvDdGTAFqZrB",
+    "name": "Properties",
+    "order": 1,
+    "urlName": "properties",
+    "tags": [],
+    "ancestors": [],
+    "href": "/docs/properties",
+    "published": true,
+    "description": "Properties are all the things you can add to a character, like ability scores, actions, spells, and items."
+  },
+  {
+    "_id": "Lt5ccP99yjDsh4oMJ",
+    "name": "Actions",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 2,
+    "urlName": "actions",
+    "tags": [],
+    "description": "Actions are things your character can do. When an action is taken, all the properties under it are applied.\n\nAdd actions to your character sheet, then add children under the action to determine what happenes when the action is applied.\n\nWhen an action is applied it will create an entry in the character's log detailing all the properties that were applied and what their results were.\n\nThe following properties can all be applied by an action: \n\n  - [Attribute Damage](/docs/property/attribute-damage)\n  - [Branches](/docs/property/branch)\n  - [Buffs](/docs/property/buff)\n  - [Buff Removers](/docs/property/remove-buff)\n  - [Damage](/docs/property/damage)\n  - [Notes](/docs/property/note)\n  - [Rolls](/docs/property/roll)\n  - [Saving Throws](/docs/property/saving-throw)\n  - Other actions\n\n---\n\n### Name\n\nThe name of the action.\n\n### Action type\n\nHow long the action takes to perform.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Attack roll\n\nA [computed field](/docs/computed-fields) which calculates the attack roll modifier. If this field is empty, no attack roll will be made. Use 0 to make an attack roll without a modifier.\n\nThe following variables may be added to the action scope when attack rolls are made:\n\n  - `$attackDiceRoll` The value of the d20 roll before any modifiers were applied.\n  - `$attackRoll` The total attack roll after modifiers.\n  - `$criticalHit` Set to `true` if the attack roll's d20 is a natural 20. If `criticalHitTarget` is set, the attack roll's d20 must instead be equal to or greater than `criticalHitTarget` for this to be set to `true`.\n  - `$criticalMiss` Set to `true` if the attack roll was not a critical hit and rolled a natural 1 on the d20 roll.\n  - `$attackHit` If the attack roll is higher than or equal to the target's AC or a critical hit this is set to `true`. Remains unset if there is no target for the attack unless the attack is a critical hit.\n  - `$attackMiss` If the attack roll is lower than the target's AC or a critical miss, this is set to `true`. Remains unset if there is no target for the attack unless the attack is a critical miss.\n\n### Summary\n\nA brief overview of what the action does. This will appear in the action card, and shows in the log when the action is applied.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Description\n\nA more detailed description of the action. The description does not show in the action card or the log when the action is applied.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Resource\n\nA resource can be any attribute that has a variable name. If the resource attribute is less than the amount required, the action can't be applied.\n\nIf you want to reduce an attribute when taking the action, but want the action to be applied regardless of the value of that attribute, consider using an [Attribute Damage](/docs/property/attribute-damage) property as a child of the action instead. Also use Attribute Damage when the amount to reduce the attribute is determined by a dice roll rather than a stable computed number.\n\n#### Resource attribute\n\nThe variable name of the attribute that will be consumed when taking this action.\n\n#### Resource quantity\n\nA [computed field](/docs/computed-fields) which determines how much of the attribute is required to apply this action. This amount will be deducted from the attribute every time the action is taken.\n\n### Ammo\n\nAmmo represents items that are requied to take the action. If an item is not selected, or there is insufficient quantity of the selected item, the action can't be appled.\n\n#### Ammo item\n\nSpecify what tag an item must have to be considered valid ammo for this action. Any item with this tag can be selected as ammo for this action.\n\n#### Ammo quantity\n\nA [computed field](/docs/computed-fields) which determines how many of the selected items are required to take this action. The quantity is deducted from the total quantity of the item when this action is applied.\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Target\n\nWho this action should apply to. The properties under the action will be applied to the Targets.\n\n- **Self** The action will apply its properties to the creature taking the action\n- **Single Target** The action will apply its properties without a target (for now)\n- **Multiple Targets** The action will apply its properties without a target (for now)\n\n### Uses\n\nA [computed field](/docs/computed-fields) which determines how many times this action can be used before it needs to be reset.\n\n### Uses used\n\nHow many of this action's uses have already been used. Should ideally be between 0 and the total uses available. This number is set to 0 when the action has uses and its uses are reset.\n\n### Don't show in log\n\nWhen this is true, the action does not show up in the log. This does not stop the action's children from appearing in the log when they are applied.\n\n### Reset\n\nIf set, the uses used field is set to 0 at the appropriate time.\n\n- **Long rest** Reset when the long rest button is pushed\n- **Short rest** Reset when either the long or short rest button is pushed",
+    "published": true,
+    "href": "/docs/properties/actions"
+  },
+  {
+    "_id": "FwpkjToybWQKCDhSr",
+    "name": "Attribute Damage",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 3,
+    "urlName": "attribute-damage",
+    "tags": [],
+    "description": "When applied, attribute damage reduces the value of the [Attribute](/docs/properties/attributes) by some amount or set the value of an attribute to some amount. Attribute damage can by applied by actions or triggers.\n\nUsing a negative value to damage an attribute will heal the attribute instead.\n\n---\n\n### Attribute\n\nThe variable name of the attribute to target.\n\n### Amount\n\nA [computed field](/docs/computed-fields) which determined the amount to damage the attribute or set the attribute's value to.\n\n### Operation\n\n- **Damage** Reduce the value of the attribute by the amount, negative values heal the attribute instead\n- **Set** Set the value of the attribute to the amount\n\n### Target\n\n- **Target** Apply the attribute damage to the same target as the action applying this property\n- **Self** Apply the attribute damage to the creature taking the action\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Don't show in log\n\nWhen this is set, the attribute damage is applied, but does not show in the log.",
+    "href": "/docs/properties/attribute-damage",
+    "published": true
+  },
+  {
+    "_id": "qdqo83AqkzQhtC2Em",
+    "name": "Attributes",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 4,
+    "urlName": "attributes",
+    "tags": [],
+    "description": "Attributes represent the numerical values of the creature.\n\nAttributes can be targeted by [effects](/docs/property/effect) which can change their total value in a non-destructive way. For example, if a class level gives you an ability score increase of +2 strength when it is taken, instead of directly editing the strength attribute, you add an effect to the class level that adds 2 to strength. The total value of strength will increase by 2 and it will show a record of that ability score increase and where it came from.\n\nAttributes, [skills](/docs/properties/skill), and [effects](/docs/property/effect) are the core properties of DiceCloud's creature engine.\n\nAttributes have the following fields that can be accessed in calculations with `variableName.field`:\n\n- `.total` The total of the attribute before being damaged\n- `.damage` the amount of damage the attribute has taken\n- `.value` The current value of the attribute including damage. `variableName` and `variableName.value` are equivalent.\n- `.modifier` If the attribute is an ability, this is its roll modifier, eg. `strength.modifier` is +2 when `strength.value` is 14\n\n---\n\n### Base value\n\nA [computed field](/docs/computed-fields) that determines the starting value of the attribute before it is modified by effects and other properties. Multiple properties can set the base value for a given variable name, when this happens the highest base value is chosen, and then all other effects are applied.\n\n### Name\n\nThe name of the attribute\n\n### Variable name\n\nThe name used to refer to the attribute in calculations and by effects. Must start with a letter and be made up of only letters and numbers without spaces, symbols, or punctiation.\n\nIf multiple attributes share a variable name, only the last attribute on the [character tree](/docs/tree) will count as the defining attribute and appear on the sheet, while other attributes with that variable name will be used as base value [effects](/docs/property/effect).\n\n### Attribute type\n\n- **Ability** Ablity scores like Strength, Dexterity, etc. Ability scores get a modifier which can be accessed in calculations as `variableName.modifier`,\n- **Stat** Any numerical value that appears on the sheet. Speed, armor class.\n- **Modifier** Any numical value that appears on the sheet with a `+` or `-` sign, eg. Proficiency bonus.\n- **Hit Dice** Hit dice let you select the appropriate hit dice size. Creatures regain half their total hit dice on long rest.\n- **Health Bar** Health bars can by made to take or ignore damage in a specified order\n- **Resource** Rages, sourcery points, things that are spent to use actions.\n- **Spell Slot** Spell slots have a specific level and are used to cast spells.\n- **Utility** Utility attributes don't show up anywhere on the sheet, but can still be used for calculations\n\n### Description\n\nA detailed description of the attribute.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Health bar settings\n\nHealth bars can take or ignore damage and healing from applied damage properties targeting a creature. A lower ordered health bar will take damage before a higher ordered one.\n\nHealth bars can also change color depending on their value. At 50%+ full they are their property color, between 50% and 0% they fade from their half-full color to their empty color.\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Allow decimal values\n\nIf this is set, the attribute will not round-down when its value has a decimal.\n\n### Can be damaged into negative values\n\nIf this is set the attribute can be damaged past zero into negative values.\n\n### Can be incremented above total\n\nIf this is set the attribute can have negative damage such that the value exceeds the total. This can be useful if you are using the attribute to count, it can start at zero and be healed upwards to keep count.\n\n### Reset\n\nIf set, the damage on this attribute is reset to 0 at the appropriate time.\n\n- **Long rest** Reset when the long rest button is pushed\n- **Short rest** Reset when either the long or short rest button is pushed",
+    "published": true,
+    "href": "/docs/properties/attributes"
+  },
+  {
+    "_id": "X5NKw8m6ruy9Srynd",
+    "name": "Branches",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 5,
+    "urlName": "branches",
+    "tags": [],
+    "published": true,
+    "description": "Branches are applied by actions, when they are applied they can control which of their immediate children are applied.\n\n---\n\n### Branch type\n\n- **If condition is true** Apply children if the condition (a [computed field](/docs/computed-fields)) resolves to `true` or a non-zero number\n- **Attack hit** Apply children if the attack roll hit the target\n- **Attack hit** Apply children if the attack roll missed the target\n- **Save failed** Apply children if target failed its saving throw\n- **Save suceeded** Apply children if target made its saving throw\n- **Apply to each target** Apply children separately to each target\n- **Random** Apply one of the immediate children at random\n- **Calculated Index** Use the index (a [computed field](/docs/computed-fields)) to choose which child to apply, starting at 1 for the first child.\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Don't show in log\n\nWhen this is set, the branch is applied, but does not show in the log. This does not prevent its children from appearing in the log.",
+    "href": "/docs/properties/branches"
+  },
+  {
+    "_id": "7KzMFHqo8DJtFtj7Q",
+    "name": "New Doc",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 6,
+    "urlName": "new-doc-6",
+    "href": "/docs/properties/new-doc-6",
+    "tags": [],
+    "removed": true,
+    "removedAt": "2022-11-21T15:45:45.975Z"
+  },
+  {
+    "_id": "aEmrQdfWwxCAWB5Jq",
+    "name": "New Doc",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 7,
+    "urlName": "new-doc-7",
+    "href": "/docs/properties/new-doc-7",
+    "tags": [],
+    "removed": true,
+    "removedAt": "2022-11-21T15:49:16.862Z"
+  },
+  {
+    "_id": "hraKfb96M3LKEfYdp",
+    "name": "Buffs",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 8,
+    "urlName": "buffs",
+    "href": "/docs/properties/buffs",
+    "tags": [],
+    "description": "Buffs are temporary changes to a character sheet that can be applied by actions. When a buff is applied, it is copied to the target character along with all of its children properties. \n\nBuffs can either be manually removed from the stats page, or be removed by an action applying a [buff remover](/docs/property/remove-buff/) property.\n\n### Variable freezing\n\nWhen a buff is applied, all the calculations in the child properties have their variables frozen to their values at the time the buff is applied. You can prevent this behavior for the whole buff by using the `don't freeze variables` option, or on an individual variable reference by prefixing the variable with the keyword `$target.`.\n\nFor example, if a character has 10 strength and 16 dexterity, and applies a buff with some child property containing the calculation `$target.strength + dexterity` the property's calculation will become `strength + 16` when it is copied to the target character.\n\n---\n\n### Name\n\nThe name of the buff.\n\n### Description\n\nDescription of the applied buff.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Target\n\n- **Target** Apply the buff to the target of the action\n- **Self** Apply the buff to the creature taking the action\n\n### Hide remove button\n\nIf this is set, the remove button next to the buff on the stats page will be hidden. Use this when you expect the buff to be removed automatically by another action.\n\n### Don't show in log\n\nIf set, the buff will not show its name and description in the log when applied.\n\n### Don't freeze variables\n\nPrevent the buff from freezing variables in child property calculations to their value at the time the buff was applied.\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "ipi8yXDwR3bpH4bbP",
+    "name": "New Doc",
+    "order": 9,
+    "urlName": "new-doc-9",
+    "href": "/docs/new-doc-9",
+    "tags": [],
+    "ancestors": [],
+    "removed": true,
+    "removedAt": "2022-11-21T15:49:40.176Z"
+  },
+  {
+    "_id": "E2DFwsCoiKy2Rc9Mz",
+    "name": "Concepts",
+    "order": 10,
+    "urlName": "concepts",
+    "href": "/docs/concepts",
+    "ancestors": [],
+    "published": true,
+    "description": "The inner workings of DiceCloud's character engine"
+  },
+  {
+    "_id": "5Fwk543djf4hfqxCc",
+    "name": "Class levels",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 11,
+    "urlName": "class-levels",
+    "href": "/docs/properties/class-levels",
+    "description": "A class level is a property that represents a single level in a class. It is generally used as a child of a [Class property](/docs/property/class).\n\nFeatures and bonuses that are given by a class level get added as children of the class level.\n\n---\n\n### Level\n\nWhich level this property represents.\n\n### Name\n\nThe name of the class or subclass this level is part of\n\n### Variable name\n\nThe same variable name of the class this level belongs to.\n\n### Description\n\nA description of the benefits gained with this level.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "yX4ZuoHQwtGv3QJXX",
+    "name": "Classes",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 12,
+    "urlName": "classes",
+    "href": "/docs/properties/classes",
+    "published": true,
+    "description": "A class is a property that expects [class levels](/docs/property/class-level) as its immediate children.\n\nLeveling up a class means choosing, or manually adding, class level properties to it. Class levels with the same variable name as the class, and that match all the required tags are found in libraries and added to the class.\n\nThe total level of the class can be accessed in calculations using `classVariableName.level`.\n\n## Making your own class\n\nSee [Create a Class](/docs/walkthroughs/create-a-class)\n\n---\n\n### Name\n\nThe name of the class\n\n### Variable name\n\nThe name used to refer to the class in calculations. Must start with a letter and be made up of only letters and numbers without spaces, symbols, or punctiation.\n\n### Description\n\nA description of the class.\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Tags required\n\nOnly class levels with the same variable name as the class, and with tags that match the tags required will be returned from libraries when leveling up this class.\n\n### Condition\n\nA [computed field](/docs/computed-fields) to determine if the class is allowed to level up. If this field results in `true` or a number that is not 0, the class can be levelled, otherwise leveling is disabled."
+  },
+  {
+    "_id": "giHu6Ej7qvsZr4zrJ",
+    "name": "Constants",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 13,
+    "urlName": "constants",
+    "href": "/docs/properties/constants",
+    "description": "Constants are properties that store some primitive value in a variable name for use in other calculations.\n\nUnlike attributes, constants can store more than just numbers:\n\n- Arrays: `[1,2,3,4]`\n- Text strings: `'I am a cat'`\n- Numbers: `3.14`\n- Boolean values: `true`, `false`\n- Dice rolls: `1d20 + 2`\n\nConstants just can't use other variables in their calculations.\n\n### Overriding constants\n\nIf multiple constants have the same variable name, only the last active constant in the [character tree](/docs/tree) will be used as the definition for that variable name.\n\nThis can be used to re-write the value of some constant by ensuring there is a new active constant later in the sheet.\n\n---\n\n### Name\n\nThe name of the constants\n\n### Variable Name\n\nThe name used to refer to the constant in calculations. Must start with a letter and be made up of only letters and numbers without spaces, symbols, or punctiation.\n\n### Value\n\nA [calculation](/docs/computed-fields) of the final value of the constant.",
+    "published": true
+  },
+  {
+    "_id": "ghEJ3rh6YHCfuBirJ",
+    "name": "Containers",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 14,
+    "urlName": "containers",
+    "href": "/docs/properties/containers",
+    "description": "Containers are things that [items](/docs/property/item) can be put inside of.\n\n---\n\n### Name\n\nThe name of the container\n\n### Carried\n\nIf this is set the weight of the container and its contents will be added to the character's weight carried.\n\n### Value\n\nThe value of the container in gold pieces. Silver pieces are worth 0.1 gp and copper pieces are worth 0.01 gp. So a container that is worth 2 gp 4 sp 7 cp will have a value of  2.47 gp.\n\n### Weight\n\nThe weight of the container in lb.\n\n### Description\n\nA description of the container. \n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Contents are weightless\n\nIf this is set and the container is carried, only the container's own weight will be added to the weight carried by the creature.",
+    "published": true
+  },
+  {
+    "_id": "B7xb4iC33np9JurzR",
+    "name": "Damage multipliers",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 15,
+    "urlName": "damage-multipliers",
+    "href": "/docs/properties/damage-multipliers",
+    "description": "Damage multipliers are used to define vulnerability, resistance, and immunity to damage types.\n\nA single multiplier can apply to multiple damage types, and choose whether or not to apply to an incoming source of damage based on the tags present on that damage.\n\n---\n\n### Name\n\nThe name of the feature that gives this damage multiplier\n\n### Value\n\n- **Immunity** The creature takes no damage from matching damage sources\n- **Resistance** Damage from matching sources is halved.\n- **Vulnerability** Damage from matching sources is doubled.\n\n### Damage types\n\nA list of damage types that this property applies to. Custom types can be used.\n\n### Damage tags required\n\nThis damage multiplier will only be applied if the incoming damage has all of these tags present.\n\n### Damage tags excluded\n\nThis damage multiplier will only apply if the incoming damage has none of these tags present.\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "oiQLbNiip7JHyGBG4",
+    "name": "Damage",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 16,
+    "urlName": "damage",
+    "href": "/docs/properties/damage",
+    "published": true,
+    "description": "Damage can be applied by an action to damage a target creature's [health bars](/docs/property/attribute). The damage will be modified by [damage multipliers](/docs/property/damage-multiplier), which apply vulnerability, resistance, and immunity before the damage is applied.\n\n---\n\n### Damage\n\nA [computed field](/docs/computed-fields) that determines how much damage to do to the target creature.\n\n### Damage type\n\nDamage type determines how the damage is treated by [damage multipliers](/docs/property/damage-multiplier). A custom type can be used, or one of the existing types can be selected.\n\nThere are two special damage types:\n\n**Extra damage** Damage with the `extra` type will take on the damage type of whatever damage was applied before it by an action. So if an action deals 12 `piercing` damage and `3` extra damage, it will instead deal 15 `piercing` damage.\n\n**Healing** Damage with the `healing` type will heal a creature instead of damaging them.\n\n### Target\n\n- **Target** Apply the damage to the target of the action\n- **Self** Apply the damage to the creature taking the action\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Don't show in log\n\nIf set, the damage will be applied but not show in the log."
+  },
+  {
+    "_id": "FHdAjYY2er9xfYsJs",
+    "name": "Effects",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 17,
+    "urlName": "effects",
+    "href": "/docs/properties/effects",
+    "description": "Effects are the core of the DiceCloud engine. Effect change the values of attributes, skills, and calculations in a way that is transparent and auditable, keeping character sheets organized and understandable, even when using intricate homebrew rules on high level characters.\n\n---\n\n### Name\n\nThe name of the feature that causes this effect.\n\n### Operation\n\nThe operation determines what the effect will do to the affected property or calcualtion.\n\n- **Base Value** Set the base value of the affected property. If a property has multiple base values, the highest is used\n- **Add** Add the value to the affected property or calculation\n- **Muliply** Multiply the affected property by the value\n- **Minimum** Prevent the affected property from having a value less than the effect value\n- **Maximum** Prevent the affected property from having a value greater than the effect value\n- **Maximum** Prevent the affected property from having a value greater than the effect value\n- **Set** Set the value affected property to the effect value\n- **Advantage** Give advantage to checks made using the affected property\n- **Disadvantage** Give disadvantage to checks made using the affected property\n- **Passive bonus** Add the effect value to the passive scores based on the affected property\n- **Fail** Checks made using the affected property automatically fail\n- **Conditional benefit** Add some text to the affected property describing the benefit recieved\n\n### Value\n\nA [computed field](/docs/computed-fields) that determines the value of the effect.\n\n### Text\n\nIf the operation is a conditional benefit, the note text that will show on affected properties.\n\n### Target stats by variable name\n\nIf selected the effect will apply to all properties that have the given variable names.\n\n### Variable names\n\nA list of variable names of properties to target with this effect.\n\n### Target properties by tags\n\nWhen targeting properties by tag, any property can be targeted with an effect. If the property is one that can usually be targeted by variable name, the effect will apply as ususal, however if the effect targets another property, it will apply to a [computed field](/docs/computed-fields) on the property instead.\n\nThese effects can be used for adding a bonus to a specific attack or damage roll, or manipulating any computed field on the creature.\n\n### Tags required\n\nOnly properties that match the required tags will be targeted by the effect.\n\n### Target field\n\nIf a property has multiple computed fields, which field should be targeted by this effect.\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "GAEPgagGYv3a2QWnE",
+    "name": "Features",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 18,
+    "urlName": "features",
+    "href": "/docs/properties/features",
+    "description": "Features appear on the features tab. Classes, backgrounds, and race can all give a creature features.\n\n---\n\n### Name\n\nThe name of the feature.\n\n### Summary\n\nA summary of the feature. This will appear on the feature card.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Description\n\nA detailed description of the feature.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "7o6sWuQeoBtiQRLdL",
+    "name": "Folders",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 19,
+    "urlName": "folders",
+    "href": "/docs/properties/folders",
+    "published": true,
+    "description": "Folders allow the [character tree](/docs/tree) to be organized.\n\n### Folders in actions\n\nWhen a folder is the child of an action, it and its children will not show on the action card, but will still appear in the detail view of the action and be applied when the action is taken.\n\n---\n\n### Name\n\nThe name of the folder.\n\n### Tags\n\nSee [Tags](/docs/tags)"
+  },
+  {
+    "_id": "5MsdJBbpALgMnYBwk",
+    "name": "Items",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 20,
+    "urlName": "items",
+    "href": "/docs/properties/items",
+    "published": true,
+    "description": "Items are shown on the Inventory tab. Items can be carried, put in containers, or equipped on a creature. The children of an item are not active unless the item is equipped.\n\n---\n\n### Icon\n\nAn icon representing the item.\n\n### Equipped\n\nIf set, the item appears in the equipment list on the inventory tab and its children become active on the creature.\n\n### Name\n\nThe name of the item.\n\n### Plural name\n\nThe name to use if the quantity of the item is higher than 1.\n\n### Value\n\nThe value of a single item in gold pieces. Silver pieces are worth 0.1 gp and copper pieces are worth 0.01 gp. So an item that is worth 2 gp 4 sp 7 cp will have a value of  2.47 gp.\n\n### Weight\n\nThe weight of a single item in lb.\n\n### Quantity\n\nNumber of items. The value and quantity will be multiplied by the quantity to get the total value and weight of this stack of items.\n\n### Description\n\nA description of the item. \n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Show increment button\n\nIf this is set, the item will show an increment button in the detail view and on the inventory tab. This button can be used to quickly adjust the quantity of the item.\n\n### Requires attunemnt\n\nIf set, the item requires attunemnt to use.\n\n### Attuned\n\nIf set, the item is attuned and counts towards the total number of attuned items for the creature.\n\nIf a child property needs to determine if its parent item is attuned it can use `#item.attuned` in calculations, see *Ancestor references* in [computed fields](/docs/computed-fields)."
+  },
+  {
+    "_id": "74utQna6D4ayYyrLp",
+    "name": "Notes",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 21,
+    "urlName": "notes",
+    "href": "/docs/properties/notes",
+    "published": true,
+    "description": "Notes are used to store text on the creature that does not have a direct mechanical impact. Notes appear on the journal tab when active on the character, or are shown in the log when applied by an [action](/docs/property/action).\n\n---\n\n### Name\n\nName of the note.\n\n### Summary\n\nA summary of the note. This will appear on the note card and in the log when applied by an [action](/docs/property/action).\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Description\n\nA detailed description of the feature.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Tags\n\nSee [Tags](/docs/tags)"
+  },
+  {
+    "_id": "cuhusZb8xYW8dj743",
+    "name": "Point buy",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 22,
+    "urlName": "point-buy",
+    "href": "/docs/properties/point-buy",
+    "published": true,
+    "description": "A point buy is a set of rows that lets the user choose a set of stats based on a cost per stat.\n\n---\n\n### Table name\n\nThe name of the point buy table.\n\n### Min\n\nThe lowest value available for each row\n\n### Max\n\nThe highest value available for each row\n\n### Cost\n\nA function that uses `value` as the value of a row and determines the cost of that value. For standard D&D 5e 27 point buy, this function is `[0, 1, 2, 3, 4, 5, 7, 9][value - 7]`\n\n### Total available points\n\nA [computed field](/docs/computed-fields) that determines how many points are available to spend in total\n\n## Rows\n\nUp to 32 rows can be added to a point buy table\n\n### Row name\n\nThe name of the row that will appear in the table\n\n### Row variable name\n\nThe variable name of the row that can be used in calculations. Must start with a letter and be made up of only letters and numbers without spaces, symbols, or punctiation.\n\nIf the variable name matches an attribute with the same variable name, the row's value will be used as a base value for that attribute."
+  },
+  {
+    "_id": "Jh92aYezHsEbSkriy",
+    "name": "Proficiencies",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 23,
+    "urlName": "proficiencies",
+    "href": "/docs/properties/proficiencies",
+    "description": "Proficiencies add proficiency to an existing skill on the creature. If you need to add a tool or language proficiency to a creature, use a [Skill](/docs/property/skill) instead.\n\n---\n\n### Name\n\nName of the feature that is adding this proficiency\n\n### Skills\n\nA list of variable names of the skills to add proficiency to.\n\n### Proficiency\n\nHow much proficiency to add to the skill. If a skill has multiple proficiencies added to it, the highest one will be used.\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "Nik9WERFxgjnp4cpE",
+    "name": "Remove Buff",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 24,
+    "urlName": "remove-buff",
+    "href": "/docs/properties/remove-buff",
+    "published": true,
+    "description": "This property can remove a specific buff from a targeted creature.\n\n### Name\n\nThe name of the property. This shows in the log when the property is applied.\n\n### Remove parent buff\n\nWhen this is set and the property is applied, the property will remove the nearest parent buff. If this property is not the child of any buffs, it will log an error.\n\n### Remove all\n\nWhen this is set, all buffs that match the target tags will be removed from the targeted creature. If not set, only the first buff found with the matching tags will be removed.\n\n### Target\n\n- **Target** Matching buffs will be removed from the targeted creature\n- **Self** Matching buffs will be removed from the creature that applied the action\n\n### Tags required\n\nAny buff that has all of the required tags will be removed when the property is applied.\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Don't show in log\n\nWhen this is set, the property is applied, but does not show in the log."
+  },
+  {
+    "_id": "8e67Pmq7RvggHp4pX",
+    "name": "Rolls",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 25,
+    "urlName": "rolls",
+    "href": "/docs/properties/rolls",
+    "published": true,
+    "description": "Rolls are properties that store the result of a calculation to a variable name when applied by an [action](/docs/property/action). The variable name only exists for the duration of that particalar action.\n\nRolls can be useful if you need to deal the same damage to multiple targets, or if damage needs to be rolled then halved by succeeding on a saving throw.\n\n---\n\n### Name\n\nName of the roll. This will be shown in the log when the roll is applied.\n\n### Variable name\n\nThe variable name to store the result of the roll for the duration of the action. Must start with a letter and be made up of only letters and numbers without spaces, symbols, or punctiation.\n\n### Roll\n\nA [computed field](/docs/computed-fields) that is computed when the roll is applied by an action.\n\n### Don't show in log\n\nIf set, the roll will be applied and store its result in the variable name, but not be shown in the log.\n\n### Tags\n\nSee [Tags](/docs/tags)"
+  },
+  {
+    "_id": "Ecc7oWEtoJgXaYLtS",
+    "name": "Saving throws",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 26,
+    "urlName": "saving-throws",
+    "href": "/docs/properties/saving-throws",
+    "description": "Saving throws are properties that cause the target to make a saving throw when applied. If you want to add a type of saving throw like Strength Save to a creature, use a [skill](/docs/property/skill) instead.\n\nWhen a saving throw is applied, the following variables are added to the scope of that action:\n\n- `$saveFailed` Set to `true` if the target failed its saving throw or there are no targets for the saving throw\n- `$saveSucceeded` Set to `true` if the target made its saving throw or there are no targets for the saving throw\n- `$saveDiceRoll` The unmodified d20 roll the target made to save\n- `$saveRoll` The final value of the saving throw roll after modifiers\n\n### Name\n\nThe name of the saving throw. Usually the ability saving throw targeted: \"Strength Save\".\n\n### DC\n\nThe DC of the saving throw that the target needs to meet\n\n### Save\n\nThe variable name of the skill that will be used to make the saving throw.\n\n### Target\n\n- **Target** Apply the saving throw to the targets of the action. Each target will make the saving throw in turn. Child properties will be applied to each target separately with the results of their individual saving throw. If a value like damage needs to be shared between targets, it should be calculated in a [Roll](/docs/property/roll) before the saving throw.\n- **Self** Apply the saving throw to the creature taking the action. The creature taking the action will become the target for all child properties.\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Don't show in log\n\nIf set, the saving throw will not show in the log when applied, but will still be rolled and apply its children.",
+    "published": true
+  },
+  {
+    "_id": "BKW9roawHgYcP2act",
+    "name": "Skills",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 27,
+    "urlName": "skills",
+    "href": "/docs/properties/skills",
+    "description": "Skills represent things the creature can be proficient in. Skills can have their values or behavior modified by [effects](/docs/property/effect), and their proficiencies modified by [proficiencies](/docs/property/proficiency).\n\n---\n\n### Name\n\nThe name of the skill.\n\n### Variable name\n\nThe name used to refer to the skill in calculations and by effects. Must start with a letter and be made up of only letters and numbers without spaces, symbols, or punctiation.\n\n### Ability\n\nThe ability score that is the basis for checks made with this skill\n\n### Type\n\n- **Skill** Regular skills like *Athletics*, *Sleight* of Hand\n- **Save** Saving throws like *Strength*, *Charisma*\n- **Check** Checks that aren't skill like *Initiative*\n- **Tool** Tool proficiencies\n- **Weapon** Weapon proficiencies\n- **Armor** Armor proficiencies\n- **Language** Language proficiencies\n- **Utility** Skills that don't show on the charcater sheet but can be used in calculations\n\n### Description\n\nA detailed description of the skill.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Base value\n\nA [computed field](/docs/computed-fields) that determines the starting value of the skill before it is modified by effects and other properties. Multiple properties can set the base value for a given variable name, when this happens the highest base value is chosen, and then all other effects are applied.\n\n### Base proficiency\n\nThe starting proficiency of the skill.",
+    "published": true
+  },
+  {
+    "_id": "X2uArSapfWvQZ6meS",
+    "name": "Slot filler",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 28,
+    "urlName": "slot-filler",
+    "href": "/docs/properties/slot-filler",
+    "published": true,
+    "description": "A slot filler is a property that can be used to add more complex behavior to filling a [slot](/docs/property/slot) from a library.\n\n---\n\n### Name\n\nThe name of the slot filler that will show when choosing the filler from the library.\n\n### Icon\n\nIcon of the slot filler\n\n### Description\n\nA detailed description of the slot filler.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Picture URL\n\nA link to an image to use for this slot filler when being chosen from a library.\n\n### Type\n\nSlot fillers can pretend to be any type of property when a slot is being filled.\n\n### Quantity\n\nHow many spaces the slot filler will take up in a slot.\n\n### Condition\n\nA [computed field](/docs/computed-fields) that determines whether this slot filler can be added to a character.\n\n### Tags\n\nSee [Tags](/docs/tags)"
+  },
+  {
+    "_id": "bj5Bh5gsmjkLpYqA4",
+    "name": "Slots",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 29,
+    "urlName": "slots",
+    "href": "/docs/properties/slots",
+    "description": "Slots are the main way creatures interact with libraries. A slot can be filled by choosing a property from a library that fits that particular slot.\n\nIn a complete library, a creature can be built entirely by choosing which properties to fill each slot with.\n\nSlots show up on the build tab, and are highlighted when they have space that can be filled.\n\nIf you are building a creature without a library, you should either ignore slots entirely, or fill them with your own custom properties.\n\n---\n\n### Name\n\nThe name of the slot.\n\n### Type \n\nWhat kind of property this slot expects to fill it.\n\n### Tags required\n\nProperties in a library must have the required tags to fill the slot.\n\n### Quantity\n\nHow many properties are expected to fill this slot. Use 0 for allowing an unlimited number of properties.\n\n### Condition\n\nA [computed field](/docs/computed-fields) that determines whether this slot can accept new properties.\n\n### Unique\n\nThe slot can control how it deals with the uniqueness of properties that fill it.\n\n### Description\n\nA detailed description of the attribute.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Hide when full\n\nWhen set the slot will hide itself when it is filled.\n\n### Ignored\n\nWhen set the slot will not show a prompt card on the build tab.\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "h9Jw5bfSLq3D2jmeD",
+    "name": "Spell lists",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 30,
+    "urlName": "spell-lists",
+    "href": "/docs/properties/spell-lists",
+    "published": true,
+    "description": "Spell lists are collections of [spells](/docs/property/spell).\n\n---\n\n### Name\n\nThe name of the spell list.\n\n### Description\n\nA detailed description of the spell list.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Maximum prepared spells\n\nA [computed field](/docs/computed-fields) that determines how many spells can be considered ready to cast in this spell list.\n\n### Spell casting ability\n\nThe spellcasting ablity for this spell list. The variable name of the ability can be accessed using `#spellList.ability` and the ability modifier with `#spellList.abilityMod`. Setting this field will automatically update Spell save DC and Attack roll bonus if they aren't set manually.\n\n### Spell save DC\n\nA [computed field](/docs/computed-fields) that determines the DC of saving throws in this spell list. Spells can access the DC of their spell list using `#spellList.dc`\n\n### Attack roll bonus\n\nA [computed field](/docs/computed-fields) that determines the bonus to add to a d20 when making a spell attack with a spell in this spell list. Spells can access the attack roll bonus of their spell list using `#spellList.attackRollBonus`\n\n### Tags\n\nSee [Tags](/docs/tags)"
+  },
+  {
+    "_id": "Mji9Cnp2TcFHmQebt",
+    "name": "Spells",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 31,
+    "urlName": "spells",
+    "href": "/docs/properties/spells",
+    "description": "Spells work similarly to [actions](/docs/property/action). They appear on the spells tab and can be cast with or without using up spell slots.\n\n---\n\n### Always prepared\n\nA spell that is always prepared does not count towards the spell list's maximum prepared spells and is always active and ready to cast.\n\n### Prepared\n\nA prepared spell is ready to cast and counts against a spell list's maximum prepared spells.\n\n### Cast without spell slots\n\nWhen set, this spell can be cast without consuming spell slots. It will however consume its own uses and resources.\n\n### School\n\nWhat school the spell belongs to.\n\n### Casting time\n\nHow long the spell takes to Cast\n\n### Range\n\nThe range of the spell\n\n### Duration\n\nHow long the spell lasts\n\n### Components\n\nWhether the spell requires verbal, somatic, or material components and whether the spell is a ritual or requires concentration.\n\n### Target\n\nWho this spell should apply to. The properties under the spell will be applied to the targets.\n\n- **Self** The spell will apply its properties to the creature casting the spell\n- **Single Target** The spell will apply its properties without a target (for now)\n- **Multiple Targets** The spell will apply its properties without a target (for now)\n\n### Attack roll\n\nA [computed field](/docs/computed-fields) which calculates the spell attack roll modifier. If this field is empty, no attack roll will be made. Use 0 to make an attack roll without a modifier. To use the spell list's attack roll bonus use `#spellList.attackRollBonus`.\n\nThe following variables may be added to the action scope when attack rolls are made:\n\n  - `$attackDiceRoll` The value of the d20 roll before any modifiers were applied.\n  - `$attackRoll` The total attack roll after modifiers.\n  - `$criticalHit` Set to `true` if the attack roll's d20 is a natural 20. If `criticalHitTarget` is set, the attack roll's d20 must instead be equal to or greater than `criticalHitTarget` for this to be set to `true`.\n  - `$criticalMiss` Set to `true` if the attack roll was not a critical hit and rolled a natural 1 on the d20 roll.\n  - `$attackHit` If the attack roll is higher than or equal to the target's AC or a critical hit this is set to `true`. Remains unset if there is no target for the attack unless the attack is a critical hit.\n  - `$attackMiss` If the attack roll is lower than the target's AC or a critical miss, this is set to `true`. Remains unset if there is no target for the attack unless the attack is a critical miss.\n\n### Summary\n\nA brief overview of what the spell does. This will show in the log when the spell is cast.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Description\n\nA more detailed description of the spell. The description does not show in the log when the spell is cast.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Resource\n\nA resource can be any attribute that has a variable name. If the resource attribute is less than the amount required, the spell can't be cast.\n\nIf you want to reduce an attribute when casting the spell, but want the spell to be applied regardless of the value of that attribute, consider using an [Attribute Damage](/docs/property/attribute-damage) property as a child of the spell instead. Also use Attribute Damage when the amount to reduce the attribute is determined by a dice roll rather than a stable computed number.\n\n#### Resource attribute\n\nThe variable name of the attribute that will be consumed when casting this spell.\n\n#### Resource quantity\n\nA [computed field](/docs/computed-fields) which determines how much of the attribute is required to apply this spell. This amount will be deducted from the attribute every time the spell is cast\n### Ammo\n\nAmmo represents items that are requied to cast the spell. If an item is not selected, or there is insufficient quantity of the selected item, the spell can't be appled.\n\n#### Ammo item\n\nSpecify what tag an item must have to be considered valid ammo for this spell. Any item with this tag can be selected as ammo for this spell.\n\n#### Ammo quantity\n\nA [computed field](/docs/computed-fields) which determines how many of the selected items are required to cast this spell. The quantity is deducted from the total quantity of the item when this spell is applied.\n\n### Uses\n\nA [computed field](/docs/computed-fields) which determines how many times this spell can be used before it needs to be reset.\n\n### Uses used\n\nHow many of this spell's uses have already been used. Should ideally be between 0 and the total uses available. This number is set to 0 when the spell has uses and its uses are reset.\n\n### Reset\n\nIf set, the uses used field is set to 0 at the appropriate time.\n\n- **Long rest** Reset when the long rest button is pushed\n- **Short rest** Reset when either the long or short rest button is pushed\n\n\n### Tags\n\nSee [Tags](/docs/tags)",
+    "published": true
+  },
+  {
+    "_id": "AXBHkYpg8ABbyk6qz",
+    "name": "Toggles",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 32,
+    "urlName": "toggles",
+    "href": "/docs/properties/toggles",
+    "published": true,
+    "description": "Toggles are a way to turn on and off parts of a creature. When a toggle is off, none of its children will be active.\n\nCalculated toggles should be avoided if possible, because while they offer a lot of power and flexibility to the creature engine, they often create [dependency loops](/docs/dependency-loops) that can be difficult to troubleshoot, causing parts of a creature to calculate incorrectly.\n\nCalculated toggles can be applied by [actions](/docs/property/action) and will apply their children if the condition is true, but they should be avoided in favor of [conditional branches](/docs/property/branch) which can do the same, but are more efficient.\n\n---\n\n### Name\n\nThe name of the toggle.\n\n### Variable name\n\nThe name used to refer to the value of the toggle in calculations. Must start with a letter and be made up of only letters and numbers without spaces, symbols, or punctiation.\n\n### Show on character sheet\n\nIf set, the toggle with show a checkbox on the character sheet. A calculated toggle will show a disabled checkbox, filled in if the toggle's calculation returned `true` or a value that isn't 0.\n\n### State\n\n- **Enabled** The toggle and its children are active\n- **Disabled** The toggle and its children are inactive\n- **Calculated** The active status of the toggle depends on the result of the condition. Use with caution.\n\n### Condition\n\nA [computed field](/docs/computed-fields) that determines if the toggle is active. Use with caution.\n\n### Tags\n\nSee [Tags](/docs/tags)"
+  },
+  {
+    "_id": "v7eRZRdMoDPah7ZtE",
+    "name": "Triggers",
+    "parent": {
+      "id": "ioei4uvDdGTAFqZrB",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "ioei4uvDdGTAFqZrB",
+        "collection": "docs",
+        "name": "Properties",
+        "urlName": "properties"
+      }
+    ],
+    "order": 33,
+    "urlName": "triggers",
+    "href": "/docs/properties/triggers",
+    "description": "Triggers apply their children whenever their condition is met. They work like [actions](/docs/property/action) that are taken automatically.\n\n---\n\n### Name\n\nThe name of the trigger.\n\n### Timing\n\n- **Before** The trigger is applied before the triggering event takes place\n- **After** The trigger is fired after the triggering event\n\n### Event\n\n- **Do action** While the creature is doing an action, the action property specified in *Event type* is applied\n- **Roll check** The creature makes a check\n- **Attribute damaged or healed** One of the creature's attributes changed value through attribute damage or manual adjustment\n- **Short or long rest**\n- **Short rest**\n- **Long Rest**\n\n### Event type\n\nThe trigger will apply when this property type is applied by the action\n\n### Tags required\n\nIf this trigger is fired by a property, the property must match these tags for the trigger to fire.\n\n### Condition\n\nA [computed field](/docs/computed-fields) to determine if the trigger should fire. The trigger will fire if the condition field is empty or if it returns `true` or a value that isn't 0.\n\n### Description\n\nA detailed description of the trigger.\n\nAllows [inline calculations](/docs/inline-calculations).\n\n### Tags\n\nSee [Tags](/docs/tags)\n\n### Don't show in log\n\nWhen this is true, the trigger does not show up in the log. This does not stop the trigger's children from appearing in the log when they are applied.",
+    "published": true
+  },
+  {
+    "_id": "bTLn3sMpzxr7SAfD7",
+    "name": "Computed fields",
+    "parent": {
+      "id": "E2DFwsCoiKy2Rc9Mz",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "E2DFwsCoiKy2Rc9Mz",
+        "collection": "docs",
+        "name": "Concepts",
+        "urlName": "concepts"
+      }
+    ],
+    "order": 34,
+    "urlName": "computed-fields",
+    "href": "/docs/concepts/computed-fields",
+    "published": true,
+    "description": "Some fields in DiceCloud creature properties expect calculations. These fields are then computed by the DiceCloud engine.\n\nSome fields, like the value of an attirbute, resolve down to a single number, while others, like the damage to deal in an attack, only simplify their calculation as far as they can, and then resolve down to a number when applied. Avoid adding dice rolls to calculations that expect to resolve down to a number, because they will re-roll every time the creature is recalculated, causing instability in the creature's stats.\n\n## Parser\n\nThe DiceCloud parser can understand the following syntax:\n\n|  |  |\n| :- | :- |\n| **Numbers** | `13`, `3.14` |\n| **Dice rolls** | `3d6`, `(1 + 2)d4`|\n| **Strings of text** | `'Some text'`, `\"some other text\"` |\n| **Boolean values** | `true` or `false`. When DiceCloud expects a boolean, `0`, an empty string `''` and `false` are all considered false by DiceCloud's engine, every other value is considered true. |\n| **Variable names** | `variableName` |\n| **Addition and subtraction** | `1 + 2 + 3`, `12 - 6` |\n| **Multiplication** | `6 * 4`, `12 * 2` = `24` |\n| **Exponents** | `3 ^ 2` Raise 3 to the power of 2 |\n| **Modulo** | Returns the remainder of a division operation `15 % 6` = `3` |\n| **AND** | `&` or `&&`: Returns the value of the right hand side if the left side is true `true & 'cat'` = `'cat'` |\n| **OR** | `|` or `||`: Returns the left hand side if it is true, otherwise returns the right hand side `'dog' || 'cat'` = `'dog'` |\n| **NOT** | `!` returns false if the value after it is true, otherwise returns false  |\n| **Comparisons** | greater than: `>`, less than: `<`, greater than or equal to: `>=`, less than or equal to: `<=`, equal: `=` or `==` or `===`, not equal: `!=` or `!==` |\n| **If-else** | `condition ? resultIfTrue : resultIfFalse`, `level > 10 ? 'high tier' : 'low tier'` |\n| **Arrays** | lists of values `[3, 6, 9, 12]`. |\n| **Array Indexes** | A value can be chosen from an array using another set of square brackets: `[3, 6, 9, 12][2]` = `[6]` because `[2]` fetches the 2nd value in the array. Arrays start at 1 in DiceCloud so that level tables can have 20 entries and be accessed by `array[level]`. |\n| **Function calls** | `functionName(argument1, argument1)` See [Functions](/docs/functions) for a full list of available functions. |\n\n## Special variables\n\n### Built-in variables\n\nThese variables are added to the creature automatically when relevant. They can be overriden if needed by creating a property with the same variable name. They can also be targetted by effects.\n\n- `xp` A total of all the experiences with xp added to the character sheet\n- `milestoneLevels` A total of all the experiences with milestone levels added to the character sheet\n- `itemsAttuned` Number of items the creature is attuned to\n- `weightEquipment` Total weight of all equipment on the creature\n- `valueEquipment` Total value of all equipment on the creature\n- `weightTotal` Total weight of the creature's entire inventory\n- `valueTotal` Total value of the creature's entire inventory\n- `weightCarried` Total weight of all carried items and containers\n- `valueCarried` Total value of all carried items and containers\n- `level` The current level of the creature, including all class levels\n- `criticalHitTarget` Defaults to 20, the natural roll needed to consider an attack roll as a critical hit\n\n### Action variables\n\nThese variables are available during an action after the relevant property has been applied.\n\nFor Advanced users, a [Roll](/docs/property/roll) can set these variables, overriding the default behavior.\n\n#### [Actions](/docs/property/action)\n\n- `$attackDiceRoll` The value of the d20 roll before any modifiers were applied.\n- `$attackRoll` The total attack roll after modifiers.\n- `$criticalHit` Set to `true` if the attack roll's d20 is a natural 20. If `criticalHitTarget` is set, the attack roll's d20 must instead be equal to or greater than `criticalHitTarget` for this to be set to `true`.\n- `$criticalMiss` Set to `true` if the attack roll was not a critical hit and rolled a natural 1 on the d20 roll.\n- `$attackHit` If the attack roll is higher than or equal to the target's AC or a critical hit this is set to `true`. Remains unset if there is no target for the attack unless the attack is a critical hit.\n- `$attackMiss` If the attack roll is lower than the target's AC or a critical miss, this is set to `true`. Remains unset if there is no target for the attack unless the attack is a critical miss.\n\n#### [Damage](/docs/property/damage)\n\n- `$lastDamageType` The type of damage dealt last, any damage that has the `extra` type will use this damage type instead\n\n#### [Saving throws](/docs/property/saving-throw)\n\n- `$saveFailed` Set to `true` if the target failed its saving throw or there are no targets for the saving throw\n- `$saveSucceeded` Set to `true` if the target made its saving throw or there are no targets for the saving throw\n- `$saveDiceRoll` The unmodified d20 roll the target made to save\n- `$saveRoll` The final value of the saving throw roll after modifiers\n\n## Ancestor references\n\nThe ancestors of a property can be accessed directly using the `#ancestorType` syntax.\n\nFor example, a spell might need to know the save DC of the spell list that it is inside of, it can use `#spellList.dc`.\n\nTriggers and their children work differently: They don't have access to their own ancestors, but rather inherit the ancestors of the property that caused them to fire. For example, a trigger at the root of the creature's tree might be fired by a spell being cast, you can still use references to ancestors like `#spellList.attackRollBonus` inside that trigger as if it were under the spell itself."
+  },
+  {
+    "_id": "o8u2Z5gZW54ZXNeZB",
+    "name": "Dependency loops",
+    "parent": {
+      "id": "E2DFwsCoiKy2Rc9Mz",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "E2DFwsCoiKy2Rc9Mz",
+        "collection": "docs",
+        "name": "Concepts",
+        "urlName": "concepts"
+      }
+    ],
+    "order": 35,
+    "urlName": "dependency-loops",
+    "href": "/docs/concepts/dependency-loops",
+    "published": true,
+    "description": "When a variable is referenced in a calculation, that calculation can be said to depend on that variable. In order for the calculation to compute, the value of the variable needs to be known.\n\nBut consider the following property values that could be added to a creature\n\n- The creature's Strength base value is set to `dexterity + 1` so that it will always have 1 more strength than dexterity\n- The creature's Dexterity base value is set to `constitution + 1` so that it will always have 1 more dexterity than constitution\n- The creature's Constitution base value is set to `strength` so that its constitution is always equal to its strength\n\nIt is not possible to resolve these calculations, not just because no values exist which satisfy the constraints, but because strength depends on dexterity which depends on constitution which depends on strength. None can be computed before the others have finalized their values. This is a dependency loop.\n\nMost dependency loops that appear in actual DiceCloud creatures are less trivial than this example, but they cause the same result: a sheet that can't be accurately computed. In these cases, DiceCloud does its best, chooses an order to resolve the calculations arbitrarily, and continues calculating. An error will show on the Build tab to let you know that something went wrong.\n\n![dependency loop example](/images/docs/dependency-loop.png)\n\n## Toggles\n\nCalculated [Toggles](/docs/property/toggle) are the main source of dependency loops on creatures, because they create a dependency that isn't as obvious as a calculation might be. When a toggle is in calculated mode, its children do not know whether they are active or not until the calulation is resolved. Because of this, every calculation under the toggle depends on the toggles calaculation, making the chance for a loop to be formed more likely the more children are under a toggle.\n\nConsider this example\n\n- A calculated toggle that is active if `strength < 10`\n- An effect under that toggle that adds 2 to `strength`\n\nThe effect can't compute, because it does not know if it is active yet, so the toggle must compute its calculation first. The toggle needs to know if `strength` is greater than 10. Strength depends on all of the effects targeting it, it must know if the +2 effect is active or not. This creates a dependency loop, because there is no valid order in which everything can be calculated.\n\n## Troubleshooting a dependency loop\n\n- First, identify all the properties that make up the dependency loop. These are linked in the depdency loop error message. The field names in square brackets after the property name indicates which calculations on the property are directly involved.\n- Move any properties in the loop out from being children of calculated Toggles\n- Use static values in place of variables where they are not stricly needed\n- Ask for [help](/feedback)"
+  },
+  {
+    "_id": "KFkmXFLQrdPQNpJ7X",
+    "name": "Inline Calculations",
+    "parent": {
+      "id": "E2DFwsCoiKy2Rc9Mz",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "E2DFwsCoiKy2Rc9Mz",
+        "collection": "docs",
+        "name": "Concepts",
+        "urlName": "concepts"
+      }
+    ],
+    "order": 36,
+    "urlName": "inline-calculations",
+    "href": "/docs/concepts/inline-calculations",
+    "description": "Most long-format fields allow inline [calculations](/docs/computed-fields) to be included. Calculations inside of curly bracers will be computed down to numbers using the characters stats.\n\nFor example a creature's strength attribute may have the following in its description:  `Your carrying capacity is {strength * 15} lbs.`\n\nWhen the creature is calculated, if it has 8 strength, the action description will become: \"Your carrying capacity is 120 lbs.\"\n\nIf a description includes a dice roll, only the part that can be calculated to a single number should be included in the calulation bracers: `The attack does an extra {paladin.level}d8 damage`, which becomes `The attack does an extra 4d8 damage`.\n\nDo not inlclude the dice roll in the calaculation: `The attack does an extra {(paladin.level)d8} damage`, because it will become `The attack does an extra 16 damage` but the number 16 will change every time the creature recalculates.",
+    "published": true
+  },
+  {
+    "_id": "QFtqb7y5kLPDJoWXG",
+    "name": "Tags",
+    "parent": {
+      "id": "E2DFwsCoiKy2Rc9Mz",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "E2DFwsCoiKy2Rc9Mz",
+        "collection": "docs",
+        "name": "Concepts",
+        "urlName": "concepts"
+      }
+    ],
+    "order": 37,
+    "urlName": "tags",
+    "href": "/docs/concepts/tags",
+    "description": "Tags are used to reference multiple similar properties at once. A slot can require only properties from your library that has matching tags, effects and some other properties can also target properties to apply to by tags.\n\n## Built in tags\n\nProperties have specific tags automatically for use with tag-targeting. These aren't relevant for slots and finding properties in a library with specific tags.\n\n- `#type` Actions will have the `#action` tag, etc. Damage will either have the tag `#damage` or the tag `#healing` if the damage type is healing\n- `variableName` if a property has a variable name it will be included as a tag\n- The type of damage done by a [damage](/docs/property/damage) property: `bludgeoning`, `slashing`, `...` \n- The skill type of a [skill](/docs/property/skill) property: `skill`, `save`, `check`, `tool`, `weapon`, `armor`, `language`, `utility`\n- The attribute type of an [attribute](/docs/property/attribute) property: `ability`, `stat`, `modifier`, `hitDice`, `healthBar`, `resource`, `spellSlot`, `utility`\n- When the property resets: `longRest`, `shortRest`"
+  },
+  {
+    "_id": "3dkEFEnwH4ShSY2BS",
+    "name": "Functions",
+    "parent": {
+      "id": "E2DFwsCoiKy2Rc9Mz",
+      "collection": "docs"
+    },
+    "ancestors": [
+      {
+        "id": "E2DFwsCoiKy2Rc9Mz",
+        "collection": "docs",
+        "name": "Concepts",
+        "urlName": "concepts"
+      }
+    ],
+    "order": 38,
+    "urlName": "functions",
+    "href": "/docs/concepts/functions",
+    "description": "## min\nReturns the smallest of the given numbers\n`min(12, 6, 3, 168)` = `3`\n\n## round\nReturns the value of a number rounded to the nearest integer\n`round(5.95)` = `6`\n`round(5.5)` = `6`\n`round(5.05)` = `5`\n\n## floor\nRounds a number down to the next smallest integer\n`floor(5.95)` = `5`\n`floor(5.05)` = `5`\n`floor(5)` = `5`\n`floor(-5.5)` = `-6`\n\n## ceil\nRounds a number up to the next largest integer\n`ceil(5.95)` = `6`\n`ceil(5.05)` = `6`\n`ceil(5)` = `5`\n`ceil(-5.5)` = `-5`\n\n## trunc\nReturns the integer part of a number by removing any fractional digits\n`trunc(5.95)` = `5`\n`trunc(5.05)` = `5`\n`trunc(5)` = `5`\n`trunc(-5.5)` = `-5`\n\n## sign\nReturns either a positive or negative 1, indicating the sign of a number, or zero\n`sign(-3)` = `-1`\n`sign(3)` = `1`\n`sign(0)` = `0`\n\n## tableLookup\nReturns the index of the last value in the array that is less than the specified amount\n`tableLookup([100, 300, 900], 457)` = `2`\n`tableLookup([100, 300, 900], 23)` = `0`\n`tableLookup([100, 300, 900, 1200], 900)` = `3`\n`tableLookup([100, 300], 594)` = `2`\n\n## resolve\nForces the given calcultion to resolve into a number, even in calculations where it would usually keep the unknown values as is\n`resolve(someUndefinedVariable + 3 + 4)` = `7`\n`resolve(1d6)` = `4`",
+    "published": true
+  }
+]
\ No newline at end of file

From 9741d1d56cc26aff06c52ce800ba3df6c9c16988 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 03:01:59 +0200
Subject: [PATCH 40/46] Got in-dialog help working with new docs

---
 app/imports/api/docs/Docs.js                  | 32 ++++++++++++++++++-
 .../client/ui/dialogStack/HelpDialog.vue      |  4 +--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/imports/api/docs/Docs.js b/app/imports/api/docs/Docs.js
index acce3445..b9fa1e4f 100644
--- a/app/imports/api/docs/Docs.js
+++ b/app/imports/api/docs/Docs.js
@@ -112,6 +112,31 @@ function getDocLink(doc, urlName) {
   return address.join('/');
 }
 
+function rebuildDocAncestors(docId) {
+  const newDoc = Docs.findOne(docId);
+  Docs.find({ 'ancestors.id': docId }).forEach(doc => {
+    doc.ancestors.forEach((a, i) => {
+      if (a.id === docId) {
+        Docs.update(doc._id, {
+          $set: {
+            [`ancestors.${i}`]: {
+              id: newDoc._id,
+              collection: 'docs',
+              urlName: newDoc.urlName,
+              name: newDoc.name,
+            }
+          }
+        });
+      }
+    });
+    doc = Docs.findOne(doc._id);
+    const newLink = getDocLink(doc);
+    if (doc.href !== newLink) {
+      Docs.update(doc._id, { $set: { href: newLink } })
+    }
+  });
+}
+
 // Add a means of seeding new servers with documentation
 if (Meteor.isClient) {
   Docs.getJsonDocs = function () {
@@ -200,12 +225,17 @@ const updateDoc = new ValidatedMethod({
       }
       modifier.$set = modifier.$set || {};
       modifier.$set.href = newLink;
+      rebuildDocAncestors(_id);
+    }
+    const updates = Docs.update(_id, modifier);
+    if (pathString === 'name' || pathString === 'urlName') {
+      rebuildDocAncestors(_id);
     }
     reorderDocs({
       collection: Docs,
       ancestorId: 'root',
     });
-    return Docs.update(_id, modifier);
+    return updates;
   },
 });
 
diff --git a/app/imports/client/ui/dialogStack/HelpDialog.vue b/app/imports/client/ui/dialogStack/HelpDialog.vue
index b4a97ead..4c7fc5a6 100644
--- a/app/imports/client/ui/dialogStack/HelpDialog.vue
+++ b/app/imports/client/ui/dialogStack/HelpDialog.vue
@@ -78,8 +78,8 @@ export default {
       },
     },
     doc() {
-      const doc = Docs.findOne(this.path);
-      return doc && doc.text;
+      const doc = Docs.findOne({href: '/docs/' + this.path});
+      return doc && doc.description;
     },
   },
   methods: {

From 63bcf023ee8c06b858731f8d2fe9046d6a28a9b1 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 20:51:21 +0200
Subject: [PATCH 41/46] Big UI overhaul Moved tabs to bottom nav on mobile
 Added actions tab Conditional benefits on skills/saves show on stats tab

---
 app/imports/api/properties/Folders.js         |   4 +-
 .../ui/creature/character/CharacterSheet.vue  |  78 ++++++++-
 .../creature/character/CharacterSheetFab.vue  |  27 +--
 .../character/CharacterSheetToolbar.vue       |  19 +-
 .../characterSheetTabs/ActionsTab.vue         |  73 ++++++++
 .../characterSheetTabs/SpellsTab.vue          |  34 ++++
 .../character/characterSheetTabs/StatsTab.vue | 163 ++++++++----------
 .../CharacterListToolbarItems.vue             |   2 +-
 .../creatureList/CreatureStorageStats.vue     |  12 +-
 .../client/ui/dialogStack/DialogStack.vue     |   7 +-
 app/imports/client/ui/layouts/AppLayout.vue   |  11 +-
 .../ui/library/SingleLibraryToolbar.vue       |   4 +-
 .../components/attributes/SpellSlotCard.vue   |  87 ++++++++++
 .../client/ui/properties/forms/FolderForm.vue |   4 +-
 app/imports/client/ui/vuexStore.js            |  26 ++-
 15 files changed, 403 insertions(+), 148 deletions(-)
 create mode 100644 app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
 create mode 100644 app/imports/client/ui/properties/components/attributes/SpellSlotCard.vue

diff --git a/app/imports/api/properties/Folders.js b/app/imports/api/properties/Folders.js
index 605975b3..66a10355 100644
--- a/app/imports/api/properties/Folders.js
+++ b/app/imports/api/properties/Folders.js
@@ -21,14 +21,14 @@ let FolderSchema = new createPropertySchema({
     type: String,
     optional: true,
     allowedValues: [
-      'stats', 'features', 'inventory', 'spells', 'journal', 'build'
+      'stats', 'features', 'actions', 'spells', 'inventory', 'journal', 'build'
     ],
   },
   location: {
     type: String,
     optional: true,
     allowedValues: [
-      'start', 'events', 'stats', 'skills', 'actions', 'proficiencies', 'end'
+      'start', 'events', 'stats', 'skills', 'proficiencies', 'end'
     ],
   },
 });
diff --git a/app/imports/client/ui/creature/character/CharacterSheet.vue b/app/imports/client/ui/creature/character/CharacterSheet.vue
index c9658c6d..0f6099be 100644
--- a/app/imports/client/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheet.vue
@@ -51,11 +51,14 @@
             <features-tab :creature-id="creatureId" />
           </v-tab-item>
           <v-tab-item>
-            <inventory-tab :creature-id="creatureId" />
+            <actions-tab :creature-id="creatureId" />
           </v-tab-item>
           <v-tab-item v-if="!creature.settings.hideSpellsTab">
             <spells-tab :creature-id="creatureId" />
           </v-tab-item>
+          <v-tab-item>
+            <inventory-tab :creature-id="creatureId" />
+          </v-tab-item>
           <v-tab-item>
             <character-tab :creature-id="creatureId" />
           </v-tab-item>
@@ -68,6 +71,60 @@
         </v-tabs-items>
       </div>
     </v-fade-transition>
+    <character-sheet-fab
+      v-if="$vuetify.breakpoint.xsOnly"
+      direction="top"
+      fixed
+      bottom
+      right
+      class="character-sheet-bottom-fab"
+      :edit-permission="editPermission"
+    />
+    <v-bottom-navigation
+      v-if="$vuetify.breakpoint.xsOnly && creature && creature.settings"
+      app
+      shift
+      mandatory
+      class="bottom-nav-btns"
+      :value="$store.getters.tabById($route.params.id)"
+      @change="e => $store.commit(
+        'setTabForCharacterSheet',
+        {id: $route.params.id, tab: e}
+      )"
+    >
+      <v-btn>
+        <span>Stats</span>
+        <v-icon>mdi-chart-box</v-icon>
+      </v-btn>
+      <v-btn>
+        <span>Features</span>
+        <v-icon>mdi-text</v-icon>
+      </v-btn>
+      <v-btn>
+        <span>Actions</span>
+        <v-icon>mdi-lightning-bolt</v-icon>
+      </v-btn>
+      <v-btn>
+        <span v-if="!creature.settings.hideSpellsTab">Spells</span>
+        <v-icon>mdi-fire</v-icon>
+      </v-btn>
+      <v-btn>
+        <span>Inventory</span>
+        <v-icon>mdi-cube</v-icon>
+      </v-btn>
+      <v-btn>
+        <span>Journal</span>
+        <v-icon>mdi-book-open-variant</v-icon>
+      </v-btn>
+      <v-btn>
+        <span>Build</span>
+        <v-icon>mdi-wrench</v-icon>
+      </v-btn>
+      <v-btn v-if="creature.settings.showTreeTab">
+        <span>Tree</span>
+        <v-icon>mdi-file-tree</v-icon>
+      </v-btn>
+    </v-bottom-navigation>
   </div>
 </template>
 
@@ -85,16 +142,20 @@ import TreeTab from '/imports/client/ui/creature/character/characterSheetTabs/Tr
 import { assertEditPermission } from '/imports/api/creature/creatures/creaturePermissions.js';
 import CreatureLogs from '/imports/api/creature/log/CreatureLogs.js';
 import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import CharacterSheetFab from '/imports/client/ui/creature/character/CharacterSheetFab.vue';
+import ActionsTab from '/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue';
 
 export default {
   components: {
     StatsTab,
     FeaturesTab,
-    InventoryTab,
+    ActionsTab,
     SpellsTab,
+    InventoryTab,
     CharacterTab,
     BuildTab,
     TreeTab,
+    CharacterSheetFab,
   },
   props: {
     creatureId: {
@@ -171,6 +232,19 @@ export default {
 }
 </script>
 
+<style scoped>
+.bottom-nav-btns > .v-btn{
+  min-width: 0 !important;
+  padding: 0 !important;
+  flex: 1 1 auto !important;
+  font-size: 0.6rem !important;
+}
+.character-sheet-bottom-fab {
+  z-index: 5;
+  bottom: 50px;
+}
+</style>
+
 <style>
 .character-sheet .v-window-item {
   min-height: calc(100vh - 96px);
diff --git a/app/imports/client/ui/creature/character/CharacterSheetFab.vue b/app/imports/client/ui/creature/character/CharacterSheetFab.vue
index 8381cab7..82dc6830 100644
--- a/app/imports/client/ui/creature/character/CharacterSheetFab.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetFab.vue
@@ -1,7 +1,7 @@
 <template lang="html">
   <v-speed-dial
     v-model="fab"
-    direction="bottom"
+    v-bind="$attrs"
     :style="!speedDials ? 'visibility: hidden;' : ''"
   >
     <template #activator>
@@ -96,16 +96,6 @@
     }, 400);
   }
 
-  const tabs = [
-    'stats',
-    'features',
-    'inventory',
-    'spells',
-    'journal',
-    'build',
-    'tree',
-  ];
-
   export default {
     components: {
       LabeledFab,
@@ -120,21 +110,18 @@
       creatureId(){
         return this.$route.params.id;
       },
-      tabNumber(){
-        let tabNumber = this.$store.getters.tabById(this.creatureId);
-        if (this.hideSpellsTab && tabNumber > 2){
-          tabNumber += 1;
-        }
-        return tabNumber;
+      tabName(){
+        return this.$store.getters.tabNameById(this.creatureId);
       },
       speedDials(){
-        return this.speedDialsByTab[tabs[this.tabNumber]];
+        return this.speedDialsByTab[this.tabName];
       },
       speedDialsByTab() { return {
-        'stats': ['attribute', 'skill', 'action', 'buff'],
+        'stats': ['attribute', 'skill', 'buff'],
         'features': ['feature'],
-        'inventory': ['item', 'container'],
         'spells': ['spellList', 'spell'],
+        'actions': ['action'],
+        'inventory': ['item', 'container'],
         'journal': ['note'],
         'tree': [null],
       };},
diff --git a/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue b/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
index 7b81f6cd..750819ef 100644
--- a/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
@@ -6,8 +6,8 @@
     :dark="isDark"
     :light="!isDark"
     clipped-right
-    extended
-    tabs
+    :extended="$vuetify.breakpoint.smAndUp"
+    :tabs="$vuetify.breakpoint.smAndUp"
     dense
   >
     <v-app-bar-nav-icon @click="toggleDrawer" />
@@ -64,11 +64,14 @@
               </v-list-item>
             </v-list>
           </v-menu>
-          <v-app-bar-nav-icon @click="toggleRightDrawer" />
+          <v-app-bar-nav-icon @click="toggleRightDrawer">
+            <v-icon>mdi-forum</v-icon>
+          </v-app-bar-nav-icon>
         </template>
       </v-layout>
     </v-fade-transition>
     <v-fade-transition
+      v-if="$vuetify.breakpoint.smAndUp"
       slot="extension"
       mode="out-in"
     >
@@ -102,11 +105,14 @@
             Features
           </v-tab>
           <v-tab>
-            Inventory
+            Actions
           </v-tab>
           <v-tab v-if="!creature.settings.hideSpellsTab">
             Spells
           </v-tab>
+          <v-tab>
+            Inventory
+          </v-tab>
           <v-tab>
             Journal
           </v-tab>
@@ -119,7 +125,8 @@
         </v-tabs>
         <v-spacer />
         <character-sheet-fab
-          class="character-sheet-fab"
+          direction="bottom"
+          class="character-sheet-extension-fab"
           :edit-permission="editPermission"
         />
       </div>
@@ -250,7 +257,7 @@ export default {
   background: none !important;
 }
 
-.character-sheet-fab {
+.character-sheet-extension-fab {
   bottom: -24px;
   right: 8px;
   margin-left: 16px;
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
new file mode 100644
index 00000000..9021333c
--- /dev/null
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
@@ -0,0 +1,73 @@
+<template lang="html">
+  <div
+    class="actions-tab ma-2"
+  >
+    <column-layout wide-columns>
+      <folder-group-card
+        v-for="folder in startFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
+      <div
+        v-for="action in actions"
+        :key="action._id"
+        class="action"
+      >
+        <action-card
+          :model="action"
+          :data-id="action._id"
+          @click="clickProperty({_id: action._id})"
+          @sub-click="_id => clickTreeProperty({_id})"
+        />
+      </div>
+      <folder-group-card
+        v-for="folder in endFolders"
+        :key="folder._id"
+        :model="folder"
+        @click-property="clickProperty"
+        @sub-click="_id => clickTreeProperty({_id})"
+        @remove="softRemove"
+      />
+    </column-layout>
+  </div>
+</template>
+
+<script lang="js">
+import ColumnLayout from '/imports/client/ui/components/ColumnLayout.vue';
+import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import tabFoldersMixin from '/imports/client/ui/properties/components/folders/tabFoldersMixin.js';
+
+export default {
+  components: {
+    ColumnLayout,
+    ActionCard,
+  },
+  mixins: [tabFoldersMixin],
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+  },
+  data() { return {
+    tabName: 'actions',
+  }},
+  meteor: {
+    actions() {
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        type: 'action',
+        actionType: { $ne: 'event' },
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { actionType: 1, order: 1 },
+      });
+    }
+  },
+};
+</script>
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
index 12c65775..f34da451 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -9,6 +9,16 @@
         @sub-click="_id => clickTreeProperty({_id})"
         @remove="softRemove"
       />
+      <div
+        v-if="spellSlots && spellSlots.length || hasSpells"
+        class="spell-slots"
+      >
+        <spell-slot-card
+          :creature-id="creatureId"
+          :spell-slots="spellSlots"
+          :has-spells="hasSpells"
+        />
+      </div>
       <div v-if="spellsWithoutList.length">
         <v-card>
           <spell-list
@@ -44,12 +54,14 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import SpellListCard from '/imports/client/ui/properties/components/spells/SpellListCard.vue';
 import SpellList from '/imports/client/ui/properties/components/spells/SpellList.vue';
 import tabFoldersMixin from '/imports/client/ui/properties/components/folders/tabFoldersMixin.js';
+import SpellSlotCard from '/imports/client/ui/properties/components/attributes/SpellSlotCard.vue';
 
 export default {
   components: {
     ColumnLayout,
     SpellList,
     SpellListCard,
+    SpellSlotCard,
   },
   mixins: [tabFoldersMixin],
   props: {
@@ -65,6 +77,20 @@ export default {
     }
   },
   meteor: {
+    spellSlots() {
+      return CreatureProperties.find({
+        'ancestors.id': this.creatureId,
+        inactive: { $ne: true },
+        removed: { $ne: true },
+        overridden: { $ne: true },
+        type: 'attribute',
+        attributeType: 'spellSlot',
+        $nor: [
+          { hideWhenTotalZero: true, total: 0 },
+          { hideWhenValueZero: true, value: 0 },
+        ],
+      });
+    },
     spellLists() {
       return CreatureProperties.find({
         'ancestors.id': this.creatureId,
@@ -75,6 +101,14 @@ export default {
         sort: { order: 1 }
       });
     },
+    hasSpells() {
+      return !!CreatureProperties.findOne({
+        'ancestors.id': this.creatureId,
+        type: 'spell',
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      });
+    },
     spellsWithoutList() {
       return CreatureProperties.find({
         'ancestors.id': {
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index 2da6dfb5..93dff4e1 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -65,8 +65,8 @@
       />
 
       <damage-multiplier-card
-        v-if="properties.multiplier && properties.multiplier.length"
-        :multipliers="properties.multiplier"
+        v-if="properties.damageMultiplier && properties.damageMultiplier.length"
+        :multipliers="properties.damageMultiplier"
         @click-multiplier="clickProperty"
       />
 
@@ -198,38 +198,13 @@
       </div>
 
       <div
-        v-if="properties.attribute.spellSlot && properties.attribute.spellSlot.length || hasSpells"
+        v-if="properties.attribute.spellSlot && properties.attribute.spellSlot.length"
         class="spell-slots"
       >
-        <v-card data-id="spell-slot-card">
-          <v-list
-            v-if="properties.attribute.spellSlot && properties.attribute.spellSlot.length"
-            two-line
-            subheader
-          >
-            <v-subheader>Spell Slots</v-subheader>
-            <spell-slot-list-tile
-              v-for="spellSlot in properties.attribute.spellSlot"
-              :key="spellSlot._id"
-              :model="spellSlot"
-              :data-id="spellSlot._id"
-              @click="clickProperty({_id: spellSlot._id})"
-            />
-          </v-list>
-          <div
-            v-if="hasSpells"
-            class="d-flex justify-end"
-          >
-            <v-btn
-              color="accent"
-              style="width: 100%;"
-              outlined
-              @click="castSpell"
-            >
-              Cast a spell
-            </v-btn>
-          </div>
-        </v-card>
+        <spell-slot-card
+          :creature-id="creatureId"
+          :spell-slots="properties.attribute.spellSlot"
+        />
       </div>
 
       <folder-group-card
@@ -255,6 +230,19 @@
               :data-id="save._id"
               @click="clickProperty({_id: save._id})"
             />
+            <v-list-item
+              v-for="(effect, index) in saveConditionals"
+              :key="effect._id"
+              :data-id="effect._id"
+              :class="{'mt-2': !index}"
+              @click="clickProperty({_id: effect._id})"
+            >
+              <v-list-item-content>
+                <v-list-item-subtitle style="white-space: unset;">
+                  {{ effect.text }}
+                </v-list-item-subtitle>
+              </v-list-item-content>
+            </v-list-item>
           </v-list>
         </v-card>
       </div>
@@ -273,6 +261,19 @@
               :data-id="skill._id"
               @click="clickProperty({_id: skill._id})"
             />
+            <v-list-item
+              v-for="(effect, index) in skillConditionals"
+              :key="effect._id"
+              :data-id="effect._id"
+              :class="{'mt-2': !index}"
+              @click="clickProperty({_id: effect._id})"
+            >
+              <v-list-item-content>
+                <v-list-item-subtitle style="white-space: unset;">
+                  {{ effect.text }}
+                </v-list-item-subtitle>
+              </v-list-item-content>
+            </v-list-item>
           </v-list>
         </v-card>
       </div>
@@ -286,28 +287,6 @@
         @remove="softRemove"
       />
 
-      <div
-        v-for="action in properties.action"
-        :key="action._id"
-        class="action"
-      >
-        <action-card
-          :model="action"
-          :data-id="action._id"
-          @click="clickProperty({_id: action._id})"
-          @sub-click="_id => clickTreeProperty({_id})"
-        />
-      </div>
-
-      <folder-group-card
-        v-for="folder in properties.folder.actions"
-        :key="folder._id"
-        :model="folder"
-        @click-property="clickProperty"
-        @sub-click="_id => clickTreeProperty({_id})"
-        @remove="softRemove"
-      />
-
       <div
         v-if="properties.skill.weapon && properties.skill.weapon.length"
         class="weapon-proficiencies"
@@ -422,17 +401,15 @@ import DamageMultiplierCard from '/imports/client/ui/properties/components/damag
 import HitDiceListTile from '/imports/client/ui/properties/components/attributes/HitDiceListTile.vue';
 import SkillListTile from '/imports/client/ui/properties/components/skills/SkillListTile.vue';
 import ResourceCard from '/imports/client/ui/properties/components/attributes/ResourceCard.vue';
-import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
-import ActionCard from '/imports/client/ui/properties/components/actions/ActionCard.vue';
 import RestButton from '/imports/client/ui/creature/RestButton.vue';
 import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import ToggleCard from '/imports/client/ui/properties/components/toggles/ToggleCard.vue';
 import BuffListItem from '/imports/client/ui/properties/components/buffs/BuffListItem.vue';
-import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
+import SpellSlotCard from '/imports/client/ui/properties/components/attributes/SpellSlotCard.vue';
 import EventButton from '/imports/client/ui/properties/components/actions/EventButton.vue';
 import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
 import FolderGroupCard from '/imports/client/ui/properties/components/folders/FolderGroupCard.vue';
-import { get, set } from 'lodash';
+import { get, set, uniqBy } from 'lodash';
 import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js'
 
 function walkDown(forest, callback){
@@ -487,7 +464,7 @@ const propertyHandlers = {
     if (prop.actionType === 'event') {
       return { propPath: 'event' };
     }
-    return { propPath: 'action' };
+    return { propPath: null };
   },
 }
 
@@ -503,8 +480,7 @@ export default {
     HitDiceListTile,
     SkillListTile,
     ResourceCard,
-    SpellSlotListTile,
-    ActionCard,
+    SpellSlotCard,
     ToggleCard,
     EventButton,
     FolderGroupCard,
@@ -520,6 +496,30 @@ export default {
       doCheckLoading: false,
     }
   },
+  computed: {
+    saveConditionals(){
+      const conditionals = [];
+      this.properties.skill?.save?.forEach(prop => {
+        prop?.effects?.forEach(effect => {
+          if (effect.operation === 'conditional') {
+            conditionals.push(effect);
+          }
+        });
+      });
+      return uniqBy(conditionals, '_id');
+    },
+    skillConditionals(){
+      const conditionals = [];
+      this.properties.skill?.skill?.forEach(prop => {
+        prop?.effects?.forEach(effect => {
+          if (effect.operation === 'conditional') {
+            conditionals.push(effect);
+          }
+        });
+      });
+      return uniqBy(conditionals, '_id');
+    },
+  },
   meteor: {
     properties() {
       const creature = this.creature;
@@ -531,11 +531,22 @@ export default {
           { type: 'toggle' },
         ],
         removed: { $ne: true },
+        type: {
+          $in: [
+            'action',
+            'attribute',
+            'buff',
+            'damageMultiplier',
+            'folder',
+            'skill',
+            'toggle',
+          ]
+        }
       };
       if (creature.settings.hideUnusedStats) {
         filter.hide = { $ne: true };
       }
-      const allProps = CreatureProperties.find(filter);
+      const allProps = CreatureProperties.find(filter, { sort: { order: 1 } });
       const forest = nodeArrayToTree(allProps);
       const properties = { folder: {}, attribute: {}, skill: {} };
       walkDown(forest, node => {
@@ -555,6 +566,7 @@ export default {
         }
         return { skipChildren };
       });
+      properties.damageMultiplier?.sort((a, b) => a.value - b.value);
       return properties;
     },
     creature() {
@@ -572,9 +584,6 @@ export default {
         sort: { order: 1 }
       });
     },
-    hasSpells() {
-      return this.properties?.spell?.length
-    },
   },
   methods: {
     clickProperty({ _id }) {
@@ -611,30 +620,6 @@ export default {
         }
       });
     },
-    castSpell() {
-      this.$store.commit('pushDialogStack', {
-        component: 'cast-spell-with-slot-dialog',
-        elementId: 'spell-slot-card',
-        data: {
-          creatureId: this.creatureId,
-        },
-        callback({ spellId, slotId, advantage, ritual } = {}) {
-          if (!spellId) return;
-          doCastSpell.call({
-            spellId,
-            slotId,
-            ritual,
-            scope: {
-              $attackAdvantage: advantage,
-            },
-          }, error => {
-            if (!error) return;
-            snackbar({ text: error.reason || error.message || error.toString() });
-            console.error(error);
-          });
-        },
-      });
-    }
   },
 };
 </script>
diff --git a/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue b/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
index 1dfb7105..6886b492 100644
--- a/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
+++ b/app/imports/client/ui/creature/creatureList/CharacterListToolbarItems.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <div>
+  <div class="d-flex">
     <creature-storage-stats />
     <archive-button />
   </div>
diff --git a/app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue b/app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue
index 6bbcfb66..4a90d54e 100644
--- a/app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureStorageStats.vue
@@ -1,15 +1,17 @@
 <template>
   <div
-    class="creature-storage-stats"
-    style="display: inline-block;"
+    class="creature-storage-stats d-flex align-center"
+    style="white-space: nowrap;"
   >
-    {{ creatureCount }} /
+    <div>
+      {{ creatureCount }} /
+    </div>
     <v-icon v-if="characterSlots === -1">
       mdi-infinity
     </v-icon>
-    <template v-else>
+    <div v-else>
       {{ characterSlots }}
-    </template>
+    </div>
   </div>
 </template>
 
diff --git a/app/imports/client/ui/dialogStack/DialogStack.vue b/app/imports/client/ui/dialogStack/DialogStack.vue
index 1bf88109..ac3a945b 100644
--- a/app/imports/client/ui/dialogStack/DialogStack.vue
+++ b/app/imports/client/ui/dialogStack/DialogStack.vue
@@ -102,9 +102,12 @@
         let stackLength = this.$store.state.dialogStack.dialogs.length - offset;
         if (stackLength){
           let topDialog = this.$refs[stackLength - 1][0];
-          return topDialog.$el.querySelector(`[data-id='${elementId}']`);
+          // First look in the active window, then look elsewhere
+          return topDialog.$el.querySelector(`.v-window-item--active [data-id='${elementId}']`) ?? 
+            topDialog.$el.querySelector(`[data-id='${elementId}']`);
         } else {
-          return document.querySelector(`[data-id='${elementId}']`);
+          return document.querySelector(`.v-window-item--active [data-id='${elementId}']`) ??
+            document.querySelector(`[data-id='${elementId}']`);
         }
       },
       enter(target, done){
diff --git a/app/imports/client/ui/layouts/AppLayout.vue b/app/imports/client/ui/layouts/AppLayout.vue
index 97e0e9d0..a8d3f6bf 100644
--- a/app/imports/client/ui/layouts/AppLayout.vue
+++ b/app/imports/client/ui/layouts/AppLayout.vue
@@ -12,7 +12,8 @@
       app
       color="secondary"
       dark
-      tabs
+      :extended="$vuetify.breakpoint.smAndUp"
+      :tabs="$vuetify.breakpoint.smAndUp"
       dense
     >
       <v-app-bar-nav-icon @click="toggleDrawer" />
@@ -25,11 +26,17 @@
       </v-toolbar-title>
       <v-spacer />
       <v-fade-transition mode="out-in">
-        <div :key="$route.meta.title">
+        <div
+          :key="$route.meta.title"
+          style="
+        text-overflow: ellipsis;
+        overflow: hidden;"
+        >
           <router-view name="toolbarItems" />
         </div>
       </v-fade-transition>
       <v-fade-transition
+        v-if="$vuetify.breakpoint.smAndUp"
         slot="extension"
         mode="out-in"
       >
diff --git a/app/imports/client/ui/library/SingleLibraryToolbar.vue b/app/imports/client/ui/library/SingleLibraryToolbar.vue
index c3404d8f..038dc867 100644
--- a/app/imports/client/ui/library/SingleLibraryToolbar.vue
+++ b/app/imports/client/ui/library/SingleLibraryToolbar.vue
@@ -3,8 +3,8 @@
     app
     color="secondary"
     dark
-    tabs
-    extended
+    :extended="$vuetify.breakpoint.smAndUp"
+    :tabs="$vuetify.breakpoint.smAndUp"
     dense
   >
     <v-app-bar-nav-icon @click="toggleDrawer" />
diff --git a/app/imports/client/ui/properties/components/attributes/SpellSlotCard.vue b/app/imports/client/ui/properties/components/attributes/SpellSlotCard.vue
new file mode 100644
index 00000000..3abae994
--- /dev/null
+++ b/app/imports/client/ui/properties/components/attributes/SpellSlotCard.vue
@@ -0,0 +1,87 @@
+<template>
+  <v-card data-id="spell-slot-card">
+    <v-list
+      v-if="spellSlots.length"
+      two-line
+      subheader
+    >
+      <v-subheader>Spell Slots</v-subheader>
+      <spell-slot-list-tile
+        v-for="spellSlot in spellSlots"
+        :key="spellSlot._id"
+        :model="spellSlot"
+        :data-id="`spell-slot-card-${spellSlot._id}`"
+        @click="clickProperty({_id: spellSlot._id})"
+      />
+    </v-list>
+    <div
+      v-if="hasSpells"
+      class="d-flex justify-end"
+    >
+      <v-btn
+        color="accent"
+        style="width: 100%;"
+        outlined
+        @click="castSpell"
+      >
+        Cast a spell
+      </v-btn>
+    </div>
+  </v-card>
+</template>
+
+<script lang="js">
+import SpellSlotListTile from '/imports/client/ui/properties/components/attributes/SpellSlotListTile.vue';
+import doCastSpell from '/imports/api/engine/actions/doCastSpell.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+
+export default {
+  components: {
+    SpellSlotListTile,
+  },
+  props: {
+    creatureId: {
+      type: String,
+      required: true,
+    },
+    hasSpells: Boolean,
+    spellSlots: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  methods: {
+    castSpell() {
+      this.$store.commit('pushDialogStack', {
+        component: 'cast-spell-with-slot-dialog',
+        elementId: 'spell-slot-card',
+        data: {
+          creatureId: this.creatureId,
+        },
+        callback({ spellId, slotId, advantage, ritual } = {}) {
+          if (!spellId) return;
+          doCastSpell.call({
+            spellId,
+            slotId,
+            ritual,
+            scope: {
+              $attackAdvantage: advantage,
+            },
+          }, error => {
+            if (!error) return;
+            snackbar({ text: error.reason || error.message || error.toString() });
+            console.error(error);
+          });
+        },
+      });
+    },
+    clickProperty({ _id }) {
+      this.$store.commit('pushDialogStack', {
+        component: 'creature-property-dialog',
+        elementId: `spell-slot-card-${_id}`,
+        data: { _id },
+      });
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/app/imports/client/ui/properties/forms/FolderForm.vue b/app/imports/client/ui/properties/forms/FolderForm.vue
index d337e794..f98d87ba 100644
--- a/app/imports/client/ui/properties/forms/FolderForm.vue
+++ b/app/imports/client/ui/properties/forms/FolderForm.vue
@@ -46,8 +46,9 @@
                 :items="[
                   { text: 'Stats Tab', value: 'stats' },
                   { text: 'Features Tab', value: 'features' },
-                  { text: 'Inventory Tab', value: 'inventory' },
+                  { text: 'Actions Tab', value: 'actions' },
                   { text: 'Spells Tab', value: 'spells' },
+                  { text: 'Inventory Tab', value: 'inventory' },
                   { text: 'Journal Tab', value: 'journal' },
                   { text: 'Build Tab', value: 'build' },
                 ]"
@@ -90,7 +91,6 @@ export default {
           { text: 'After events', value: 'events' },
           { text: 'After stats', value: 'stats' },
           { text: 'After skills', value: 'skills' },
-          { text: 'After actions', value: 'actions' },
           { text: 'After proficiencies', value: 'proficiencies' },
           { text: 'End', value: 'end' },
         ];
diff --git a/app/imports/client/ui/vuexStore.js b/app/imports/client/ui/vuexStore.js
index 4c301190..feaf1544 100644
--- a/app/imports/client/ui/vuexStore.js
+++ b/app/imports/client/ui/vuexStore.js
@@ -2,8 +2,8 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import dialogStackStore from '/imports/client/ui/dialogStack/dialogStackStore.js';
 import Creatures from '/imports/api/creature/creatures/Creatures.js';
-const tabs = ['stats', 'features', 'inventory', 'spells', 'journal', 'build', 'tree'];
-const tabsWithoutSpells = ['stats', 'features', 'inventory', 'journal', 'build', 'tree'];
+const tabs = ['stats', 'features', 'actions', 'spells', 'inventory', 'journal', 'build', 'tree'];
+const tabsWithoutSpells = ['stats', 'features', 'actions', 'inventory', 'journal', 'build', 'tree'];
 
 Vue.use(Vuex);
 const store = new Vuex.Store({
@@ -20,14 +20,10 @@ const store = new Vuex.Store({
   },
   getters: {
     tabById: (state) => (id) => {
-      if (id in state.characterSheetTabs){
-        return state.characterSheetTabs[id];
-      } else {
-        return 0;
-      }
+      return state.characterSheetTabs[id] ?? 0;
     },
     tabNameById: (state) => (id) => {
-      const tabNumber = state.characterSheetTabs[id];
+      const tabNumber = state.characterSheetTabs[id] ?? 0;
       const creature = Creatures.findOne(id);
       if (creature?.settings?.hideSpellsTab) {
         return tabsWithoutSpells[tabNumber];
@@ -37,26 +33,26 @@ const store = new Vuex.Store({
     }
   },
   mutations: {
-    toggleDrawer (state) {
+    toggleDrawer(state) {
       state.drawer = !state.drawer;
     },
-    toggleRightDrawer (state) {
+    toggleRightDrawer(state) {
       state.rightDrawer = !state.rightDrawer;
     },
-    setDrawer (state, value) {
+    setDrawer(state, value) {
       state.drawer = value;
     },
-    setRightDrawer (state, value) {
+    setRightDrawer(state, value) {
       state.rightDrawer = value;
     },
-    setPageTitle (state, value) {
+    setPageTitle(state, value) {
       state.pageTitle = value;
       document.title = value;
     },
-    setTabForCharacterSheet(state, {tab, id}){
+    setTabForCharacterSheet(state, { tab, id }) {
       Vue.set(state.characterSheetTabs, id, tab);
     },
-    setShowDetailsDialog(state, value){
+    setShowDetailsDialog(state, value) {
       state.showDetailsDialog = value;
     },
   },

From 046509224ed93b00de8738ba0f2caeaf7d27c3d4 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 21:21:53 +0200
Subject: [PATCH 42/46] Fixed library page janky loading

---
 app/imports/client/ui/library/LibraryList.vue | 14 --------------
 app/imports/client/ui/pages/Library.vue       |  9 ++++++---
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/imports/client/ui/library/LibraryList.vue b/app/imports/client/ui/library/LibraryList.vue
index cb9d09d1..f50540e3 100644
--- a/app/imports/client/ui/library/LibraryList.vue
+++ b/app/imports/client/ui/library/LibraryList.vue
@@ -44,20 +44,6 @@
         @select="val => $emit('select-library', library._id, val)"
       />
     </v-list-group>
-    <v-expand-transition>
-      <v-row
-        v-if="!$subReady.libraries"
-        align="center"
-        justify="center"
-        class="pa-4"
-      >
-        <v-progress-circular
-          indeterminate
-          color="primary"
-          size="32"
-        />
-      </v-row>
-    </v-expand-transition>
   </v-list>
 </template>
 
diff --git a/app/imports/client/ui/pages/Library.vue b/app/imports/client/ui/pages/Library.vue
index 87eaacd7..c1fefb4b 100644
--- a/app/imports/client/ui/pages/Library.vue
+++ b/app/imports/client/ui/pages/Library.vue
@@ -10,8 +10,10 @@
           xl="8"
         >
           <v-card :class="{'mb-4': libraryCollections && libraryCollections.length}">
-            <library-list />
-            <v-expand-transition>
+            <v-fade-transition
+              hide-on-leave
+              leave-absolute
+            >
               <v-row
                 v-if="!$subReady.libraries"
                 align="center"
@@ -24,7 +26,8 @@
                   size="32"
                 />
               </v-row>
-            </v-expand-transition>
+              <library-list v-else />
+            </v-fade-transition>
           </v-card>
           <div class="layout justify-end mt-2">
             <v-btn

From d947b62ba4c0fd1d17ffe03a05ebc7157300c88c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 21:29:08 +0200
Subject: [PATCH 43/46] Fixed events not being selectable for reset in
 libraries

---
 app/imports/server/publications/library.js | 52 +++++++++++-----------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/app/imports/server/publications/library.js b/app/imports/server/publications/library.js
index 67dcf74a..68c378b5 100644
--- a/app/imports/server/publications/library.js
+++ b/app/imports/server/publications/library.js
@@ -18,6 +18,8 @@ const LIBRARY_NODE_TREE_FIELDS = {
   slotFillerCondition: 1,
   removed: 1,
   removedAt: 1,
+  // Actions
+  actionType: 1,
   // SlotFillers
   slotQuantityFilled: 1,
   slotFillerType: 1,
@@ -47,7 +49,7 @@ const LIBRARY_NODE_TREE_FIELDS = {
 }
 
 export { LIBRARY_NODE_TREE_FIELDS };
-  
+
 Meteor.publish('libraryCollection', function (libraryCollectionId) {
   this.autorun(function () {
     let userId = this.userId;
@@ -63,10 +65,10 @@ Meteor.publish('libraryCollection', function (libraryCollectionId) {
         ]
       });
       const libraryCollection = libraryCollectionCursor.fetch()[0];
-      if (!libraryCollection) return [ libraryCollectionCursor ];
+      if (!libraryCollection) return [libraryCollectionCursor];
       this.autorun(function () {
         const libraryCursor = Libraries.find({
-          _id: {$in: libraryCollection.libraries},
+          _id: { $in: libraryCollection.libraries },
           $or: [
             { owner: userId },
             { writers: userId },
@@ -76,7 +78,7 @@ Meteor.publish('libraryCollection', function (libraryCollectionId) {
         }, {
           sort: { name: 1 }
         });
-        return [ libraryCollectionCursor, libraryCursor ];
+        return [libraryCollectionCursor, libraryCursor];
       });
     });
   })
@@ -135,14 +137,14 @@ Meteor.publish('libraries', function () {
   });
 });
 
-Meteor.publish('library', function(libraryId){
+Meteor.publish('library', function (libraryId) {
   if (!libraryId) return [];
-  libraryIdSchema.validate({libraryId});
-  this.autorun(function (){
+  libraryIdSchema.validate({ libraryId });
+  this.autorun(function () {
     let userId = this.userId;
     let library = Libraries.findOne(libraryId);
     try { assertViewPermission(library, userId) }
-    catch(e){
+    catch (e) {
       return this.error(e);
     }
     return Libraries.find({
@@ -152,20 +154,20 @@ Meteor.publish('library', function(libraryId){
 });
 
 let libraryIdSchema = new SimpleSchema({
-  libraryId:{
+  libraryId: {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
   },
 });
 
-Meteor.publish('libraryNodes', function(libraryId){
+Meteor.publish('libraryNodes', function (libraryId) {
   if (!libraryId) return [];
-  libraryIdSchema.validate({libraryId});
-  this.autorun(function (){
+  libraryIdSchema.validate({ libraryId });
+  this.autorun(function () {
     let userId = this.userId;
     let library = Libraries.findOne(libraryId);
     try { assertViewPermission(library, userId) }
-    catch(e){
+    catch (e) {
       return this.error(e);
     }
     return [
@@ -191,54 +193,54 @@ Meteor.publish('libraryNode', function (libraryNodeId) {
   nodeIdSchema.validate({ libraryNodeId });
   this.autorun(function () {
     const userId = this.userId;
-    const nodeCursor = LibraryNodes.find({_id: libraryNodeId});
+    const nodeCursor = LibraryNodes.find({ _id: libraryNodeId });
     let node = nodeCursor.fetch()[0];
     try { assertDocViewPermission(node, userId) }
     catch (e) {
       return this.error(e);
     }
-    return [ nodeCursor ];
+    return [nodeCursor];
   });
 });
 
-Meteor.publish('softRemovedLibraryNodes', function(libraryId){
+Meteor.publish('softRemovedLibraryNodes', function (libraryId) {
   if (!libraryId) return [];
-  libraryIdSchema.validate({libraryId});
-  this.autorun(function (){
+  libraryIdSchema.validate({ libraryId });
+  this.autorun(function () {
     let userId = this.userId;
     let library = Libraries.findOne(libraryId);
     try { assertViewPermission(library, userId) }
-    catch(e){
+    catch (e) {
       return this.error(e);
     }
     return [
       LibraryNodes.find({
         'ancestors.0.id': libraryId,
         removed: true,
-        removedWith: {$exists: false},
+        removedWith: { $exists: false },
       }, {
-        sort: {order: 1},
+        sort: { order: 1 },
       }),
     ];
   });
 });
 
-Meteor.publish('descendantLibraryNodes', function(nodeId){
+Meteor.publish('descendantLibraryNodes', function (nodeId) {
   let node = LibraryNodes.findOne(nodeId);
   let libraryId = node?.ancestors[0]?.id;
   if (!libraryId) return [];
-  this.autorun(function (){
+  this.autorun(function () {
     let userId = this.userId;
     let library = Libraries.findOne(libraryId);
     try { assertViewPermission(library, userId) }
-    catch(e){
+    catch (e) {
       return this.error(e);
     }
     return [
       LibraryNodes.find({
         'ancestors.id': nodeId,
       }, {
-        sort: {order: 1},
+        sort: { order: 1 },
       }),
     ];
   });

From fd9d525ba92430e55a7388cf69f22c7653219805 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Nov 2022 21:59:44 +0200
Subject: [PATCH 44/46] fixed: Show only the last event with a var name

---
 .../buildComputation/linkTypeDependencies.js  | 101 +++++++++---------
 .../computeByType/computeAction.js            |  12 +--
 .../computeByType/computeVariable.js          |  37 +++----
 .../aggregate/aggregateEventDefinition.js     |  22 ++++
 .../computeVariable/aggregate/index.js        |   2 +
 app/imports/api/properties/Actions.js         |   6 ++
 .../character/characterSheetTabs/StatsTab.vue |   2 +-
 7 files changed, 108 insertions(+), 74 deletions(-)
 create mode 100644 app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEventDefinition.js

diff --git a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
index 44fc93e9..7ed69d19 100644
--- a/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
+++ b/app/imports/api/engine/computation/buildComputation/linkTypeDependencies.js
@@ -23,23 +23,26 @@ const linkDependenciesByType = {
   toggle: linkToggle,
 }
 
-export default function linkTypeDependencies(dependencyGraph, prop, computation){
+export default function linkTypeDependencies(dependencyGraph, prop, computation) {
   linkDependenciesByType[prop.type]?.(dependencyGraph, prop, computation);
 }
 
-function dependOnCalc({dependencyGraph, prop, key}){
+function dependOnCalc({ dependencyGraph, prop, key }) {
   let calc = get(prop, key);
   if (!calc) return;
-  if (calc.type !== '_calculation'){
+  if (calc.type !== '_calculation') {
     throw `Expected calculation got ${calc.type}`
   }
   dependencyGraph.addLink(prop._id, `${prop._id}.${key}`, 'calculation');
 }
 
-function linkAction(dependencyGraph, prop, {propsById}){
+function linkAction(dependencyGraph, prop, { propsById }) {
+  if (prop.variableName) {
+    dependencyGraph.addLink(prop.variableName, prop._id, 'eventDefinition');
+  }
   // The action depends on its attack roll and uses calculations
-  dependOnCalc({dependencyGraph, prop, key: 'attackRoll'});
-  dependOnCalc({dependencyGraph, prop, key: 'uses'});
+  dependOnCalc({ dependencyGraph, prop, key: 'attackRoll' });
+  dependOnCalc({ dependencyGraph, prop, key: 'uses' });
 
   // Link the resources the action uses
   if (!prop.resources) return;
@@ -47,7 +50,7 @@ function linkAction(dependencyGraph, prop, {propsById}){
   prop.resources.itemsConsumed.forEach((itemConsumed, index) => {
     if (!itemConsumed.itemId) return;
     const item = propsById[itemConsumed.itemId];
-    if (!item || item.inactive){
+    if (!item || item.inactive) {
       // Unlink if the item doesn't exist or is inactive
       itemConsumed.itemId = undefined;
       return;
@@ -79,48 +82,48 @@ function linkAction(dependencyGraph, prop, {propsById}){
   });
 }
 
-function linkAdjustment(dependencyGraph, prop){
+function linkAdjustment(dependencyGraph, prop) {
   // Adjustment depends on its amount
-  dependOnCalc({dependencyGraph, prop, key: 'amount'});
+  dependOnCalc({ dependencyGraph, prop, key: 'amount' });
 }
 
-function linkAttribute(dependencyGraph, prop){
+function linkAttribute(dependencyGraph, prop) {
   linkVariableName(dependencyGraph, prop);
   // Depends on spellSlotLevel
-  dependOnCalc({dependencyGraph, prop, key: 'spellSlotLevel'});
+  dependOnCalc({ dependencyGraph, prop, key: 'spellSlotLevel' });
 
   // Depends on base value
-  dependOnCalc({dependencyGraph, prop, key: 'baseValue'});
+  dependOnCalc({ dependencyGraph, prop, key: 'baseValue' });
 
   // hit dice depend on constitution
-  if (prop.attributeType === 'hitDice'){
+  if (prop.attributeType === 'hitDice') {
     dependencyGraph.addLink(prop._id, 'constitution', 'hitDiceConMod');
   }
 }
 
-function linkBranch(dependencyGraph, prop){
-  dependOnCalc({dependencyGraph, prop, key: 'condition'});
+function linkBranch(dependencyGraph, prop) {
+  dependOnCalc({ dependencyGraph, prop, key: 'condition' });
 }
 
-function linkBuff(dependencyGraph, prop){
-  dependOnCalc({dependencyGraph, prop, key: 'duration'});
+function linkBuff(dependencyGraph, prop) {
+  dependOnCalc({ dependencyGraph, prop, key: 'duration' });
 }
 
 function linkClassLevel(dependencyGraph, prop) {
   if (prop.inactive) return;
   // The variableName of the prop depends on the prop
-  if (prop.variableName && prop.level){
+  if (prop.variableName && prop.level) {
     dependencyGraph.addLink(prop.variableName, prop._id, 'classLevel');
     // The level variable depends on the class variableName variable
     let existingLevelLink = dependencyGraph.getLink('level', prop.variableName);
-    if (!existingLevelLink){
+    if (!existingLevelLink) {
       dependencyGraph.addLink('level', prop.variableName, 'level');
     }
   }
 }
 
-function linkDamage(dependencyGraph, prop){
-  dependOnCalc({dependencyGraph, prop, key: 'amount'});
+function linkDamage(dependencyGraph, prop) {
+  dependOnCalc({ dependencyGraph, prop, key: 'amount' });
 }
 
 function linkEffects(dependencyGraph, prop, computation) {
@@ -132,7 +135,7 @@ function linkEffects(dependencyGraph, prop, computation) {
   if (prop.inactive) {
     // Inactive effects apply to no stats
     return;
-  } else if (prop.targetByTags){
+  } else if (prop.targetByTags) {
     getEffectTagTargets(prop, computation).forEach(targetId => {
       const targetProp = computation.propsById[targetId];
       if (
@@ -147,8 +150,8 @@ function linkEffects(dependencyGraph, prop, computation) {
         // Otherwise target a field on that property
         const key = prop.targetField || getDefaultCalculationField(targetProp);
         const calcObj = get(targetProp, key);
-        if (calcObj && calcObj.calculation){
-          dependencyGraph.addLink(`${targetProp._id}.${key}`, prop._id , 'effect');
+        if (calcObj && calcObj.calculation) {
+          dependencyGraph.addLink(`${targetProp._id}.${key}`, prop._id, 'effect');
         }
       }
     });
@@ -161,14 +164,14 @@ function linkEffects(dependencyGraph, prop, computation) {
 }
 
 // Returns an array of IDs of the properties the effect targets
-function getEffectTagTargets(effect, computation){
+function getEffectTagTargets(effect, computation) {
   let targets = getTargetListFromTags(effect.targetTags, computation);
   let notIds = [];
-  if (effect.extraTags){
+  if (effect.extraTags) {
     effect.extraTags.forEach(ex => {
       if (ex.operation === 'OR') {
         targets = union(targets, getTargetListFromTags(ex.tags, computation));
-      } else if (ex.operation === 'NOT'){
+      } else if (ex.operation === 'NOT') {
         ex.tags.forEach(tag => {
           const idList = computation.propsWithTag[tag];
           if (idList) {
@@ -181,7 +184,7 @@ function getEffectTagTargets(effect, computation){
   return difference(targets, notIds);
 }
 
-function getTargetListFromTags(tags, computation){
+function getTargetListFromTags(tags, computation) {
   const targetTagIdLists = [];
   if (!tags) return [];
   tags.forEach(tag => {
@@ -192,8 +195,8 @@ function getTargetListFromTags(tags, computation){
   return targets;
 }
 
-function getDefaultCalculationField(prop){
-  switch (prop.type){
+function getDefaultCalculationField(prop) {
+  switch (prop.type) {
     case 'action': return 'attackRoll';
     case 'adjustment': return 'amount';
     case 'attribute': return 'baseValue';
@@ -223,13 +226,13 @@ function getDefaultCalculationField(prop){
   }
 }
 
-function linkRoll(dependencyGraph, prop){
-  dependOnCalc({dependencyGraph, prop, key: 'roll'});
+function linkRoll(dependencyGraph, prop) {
+  dependOnCalc({ dependencyGraph, prop, key: 'roll' });
 }
 
-function linkVariableName(dependencyGraph, prop){
+function linkVariableName(dependencyGraph, prop) {
   // The variableName of the prop depends on the prop if the prop is active
-  if (prop.variableName && !prop.inactive){
+  if (prop.variableName && !prop.inactive) {
     dependencyGraph.addLink(prop.variableName, prop._id, 'definition');
   }
 }
@@ -243,7 +246,7 @@ function linkDamageMultiplier(dependencyGraph, prop) {
   });
 }
 
-function linkPointBuy(dependencyGraph, prop){
+function linkPointBuy(dependencyGraph, prop) {
   dependOnCalc({ dependencyGraph, prop, key: 'min' });
   dependOnCalc({ dependencyGraph, prop, key: 'max' });
   dependOnCalc({ dependencyGraph, prop, key: 'cost' });
@@ -265,7 +268,7 @@ function linkPointBuy(dependencyGraph, prop){
   if (prop.inactive) return;
 }
 
-function linkProficiencies(dependencyGraph, prop){
+function linkProficiencies(dependencyGraph, prop) {
   // The stats depend on the proficiency
   if (prop.inactive) return;
   prop.stats.forEach(statName => {
@@ -274,36 +277,36 @@ function linkProficiencies(dependencyGraph, prop){
   });
 }
 
-function linkSavingThrow(dependencyGraph, prop){
-  dependOnCalc({dependencyGraph, prop, key: 'dc'});
+function linkSavingThrow(dependencyGraph, prop) {
+  dependOnCalc({ dependencyGraph, prop, key: 'dc' });
 }
 
-function linkSkill(dependencyGraph, prop){
+function linkSkill(dependencyGraph, prop) {
   // Depends on base value
   dependOnCalc({ dependencyGraph, prop, key: 'baseValue' });
   // Link dependents
   if (prop.inactive) return;
   linkVariableName(dependencyGraph, prop);
   // The prop depends on the variable references as the ability
-  if (prop.ability){
+  if (prop.ability) {
     dependencyGraph.addLink(prop._id, prop.ability, 'skillAbilityScore');
   }
   // Skills depend on the creature's proficiencyBonus
   dependencyGraph.addLink(prop._id, 'proficiencyBonus', 'skillProficiencyBonus');
 }
 
-function linkSlot(dependencyGraph, prop){
-  dependOnCalc({dependencyGraph, prop, key: 'quantityExpected'});
-  dependOnCalc({dependencyGraph, prop, key: 'slotCondition'});
+function linkSlot(dependencyGraph, prop) {
+  dependOnCalc({ dependencyGraph, prop, key: 'quantityExpected' });
+  dependOnCalc({ dependencyGraph, prop, key: 'slotCondition' });
 }
 
-function linkSpellList(dependencyGraph, prop){
-  dependOnCalc({dependencyGraph, prop, key: 'maxPrepared'});
-  dependOnCalc({dependencyGraph, prop, key: 'attackRollBonus'});
-  dependOnCalc({dependencyGraph, prop, key: 'dc'});
+function linkSpellList(dependencyGraph, prop) {
+  dependOnCalc({ dependencyGraph, prop, key: 'maxPrepared' });
+  dependOnCalc({ dependencyGraph, prop, key: 'attackRollBonus' });
+  dependOnCalc({ dependencyGraph, prop, key: 'dc' });
 }
 
-function linkToggle(dependencyGraph, prop){
+function linkToggle(dependencyGraph, prop) {
   linkVariableName(dependencyGraph, prop);
-  dependOnCalc({dependencyGraph, prop, key: 'condition'});
+  dependOnCalc({ dependencyGraph, prop, key: 'condition' });
 }
diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js
index c52dec00..663922a5 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeAction.js
@@ -1,8 +1,8 @@
-export default function computeAction(computation, node){
+export default function computeAction(computation, node) {
   const prop = node.data;
-  if (prop.uses){
+  if (prop.uses) {
     prop.usesLeft = prop.uses.value - (prop.usesUsed || 0);
-    if (!prop.usesLeft){
+    if (!prop.usesLeft) {
       prop.insufficientResources = true;
     }
   }
@@ -10,19 +10,19 @@ export default function computeAction(computation, node){
   if (!prop.resources) return;
   prop.resources.itemsConsumed.forEach(itemConsumed => {
     if (!itemConsumed.itemId) return;
-    if (itemConsumed.available < itemConsumed.quantity?.value){
+    if (itemConsumed.available < itemConsumed.quantity?.value) {
       prop.insufficientResources = true;
     }
   });
   prop.resources.attributesConsumed.forEach(attConsumed => {
     if (!attConsumed.variableName) return;
-    if (attConsumed.available < attConsumed.quantity?.value){
+    if (attConsumed.available < attConsumed.quantity?.value) {
       prop.insufficientResources = true;
     }
   });
 }
 
-function computeResources(computation, node){
+function computeResources(computation, node) {
   const resources = node.data?.resources;
   if (!resources) return;
   resources.attributesConsumed.forEach(attConsumed => {
diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable.js
index 279ad3d6..5ef7d0be 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable.js
@@ -7,7 +7,7 @@ import computeVariableAsToggle from './computeVariable/computeVariableAsToggle.j
 import computeImplicitVariable from './computeVariable/computeImplicitVariable.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
-export default function computeVariable(computation, node){
+export default function computeVariable(computation, node) {
   const scope = computation.scope;
   if (!node.data) node.data = {};
   aggregateLinks(computation, node);
@@ -15,7 +15,7 @@ export default function computeVariable(computation, node){
   // Don't add to the scope if the node id is not a legitimate variable name
   // Without this `some.thing` could break the entire sheet as a database key
   if (!VARIABLE_NAME_REGEX.test(node.id)) return;
-  if (node.data.definingProp){
+  if (node.data.definingProp) {
     // Add the defining variable to the scope
     scope[node.id] = node.data.definingProp
   } else {
@@ -24,7 +24,7 @@ export default function computeVariable(computation, node){
   }
 }
 
-function aggregateLinks(computation, node){
+function aggregateLinks(computation, node) {
   computation.dependencyGraph.forEachLinkedNode(
     node.id,
     (linkedNode, link) => {
@@ -32,11 +32,12 @@ function aggregateLinks(computation, node){
       // Ignore inactive props
       if (linkedNode.data.inactive) return;
       // Apply all the aggregations
-      let arg = {node, linkedNode, link, computation};
+      let arg = { node, linkedNode, link, computation };
       aggregate.classLevel(arg);
       aggregate.damageMultiplier(arg);
       aggregate.definition(arg);
       aggregate.effect(arg);
+      aggregate.eventDefinition(arg);
       aggregate.inventory(arg);
       aggregate.proficiency(arg);
     },
@@ -44,7 +45,7 @@ function aggregateLinks(computation, node){
   );
 }
 
-function combineAggregations(computation, node){
+function combineAggregations(computation, node) {
   combineMultiplierAggregator(node);
   node.data.overridenProps?.forEach(prop => {
     computeVariableProp(computation, node, prop);
@@ -52,51 +53,51 @@ function combineAggregations(computation, node){
   computeVariableProp(computation, node, node.data.definingProp);
 }
 
-function computeVariableProp(computation, node, prop){
+function computeVariableProp(computation, node, prop) {
   if (!prop) return;
 
   // Combine damage multipliers in all props so that they can't be overridden
-  if (node.data.immunity){
+  if (node.data.immunity) {
     prop.immunity = node.data.immunity;
     prop.immunities = node.data.immunities;
   }
-  if (node.data.resistance){
+  if (node.data.resistance) {
     prop.resistance = node.data.resistance;
     prop.resistances = node.data.resistances;
   }
-  if (node.data.vulnerability){
+  if (node.data.vulnerability) {
     prop.vulnerability = node.data.vulnerability;
     prop.vulnerabilities = node.data.vulnerabilities;
   }
 
-  if (prop.type === 'attribute'){
+  if (prop.type === 'attribute') {
     computeVariableAsAttribute(computation, node, prop);
-  } else if (prop.type === 'skill'){
+  } else if (prop.type === 'skill') {
     computeVariableAsSkill(computation, node, prop);
-  } else if (prop.type === 'constant'){
+  } else if (prop.type === 'constant') {
     computeVariableAsConstant(computation, node, prop);
-  } else if (prop.type === 'class'){
+  } else if (prop.type === 'class') {
     computeVariableAsClass(computation, node, prop);
-  } else if (prop.type === 'toggle'){
+  } else if (prop.type === 'toggle') {
     computeVariableAsToggle(computation, node, prop);
   }
 }
 
-function combineMultiplierAggregator(node){
+function combineMultiplierAggregator(node) {
   // get a reference to the  aggregator
   const aggregator = node.data.multiplierAggregator;
   if (!aggregator) return;
 
   // Combine
-  if (aggregator.immunities?.length){
+  if (aggregator.immunities?.length) {
     node.data.immunity = true;
     node.data.immunities = aggregator.immunities;
   }
-  if (aggregator.resistances?.length){
+  if (aggregator.resistances?.length) {
     node.data.resistance = true;
     node.data.resistances = aggregator.resistances;
   }
-  if (aggregator.vulnerabilities?.length){
+  if (aggregator.vulnerabilities?.length) {
     node.data.vulnerability = true;
     node.data.vulnerabilities = aggregator.vulnerabilities;
   }
diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEventDefinition.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEventDefinition.js
new file mode 100644
index 00000000..f36cf5b9
--- /dev/null
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/aggregateEventDefinition.js
@@ -0,0 +1,22 @@
+
+export default function aggregateEventDefinition({ node, linkedNode, link }) {
+  // Look at all event definition links
+  if (link.data !== 'eventDefinition') return;
+
+  // Store which property is THE defining event and which are overridden
+  const prop = linkedNode.data;
+  // get current defining event
+  const definingEvent = node.data.definingEvent;
+  // Find the last defining event
+  if (
+    !definingEvent ||
+    prop.order > definingEvent.order
+  ) {
+    // override the current defining prop
+    if (definingEvent) definingEvent.overridden = true;
+    // set this prop as the new defining prop
+    node.data.definingEvent = prop;
+  } else {
+    prop.overridden = true;
+  }
+}
diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/index.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/index.js
index 4b455afa..3a617494 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/index.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/aggregate/index.js
@@ -1,6 +1,7 @@
 import definition from './aggregateDefinition.js';
 import damageMultiplier from './aggregateDamageMultiplier.js';
 import effect from './aggregateEffect.js';
+import eventDefinition from './aggregateEventDefinition.js';
 import proficiency from './aggregateProficiency.js';
 import classLevel from './aggregateClassLevel.js';
 import inventory from './aggregateInventory.js';
@@ -10,6 +11,7 @@ export default Object.freeze({
   damageMultiplier,
   definition,
   effect,
+  eventDefinition,
   inventory,
   proficiency,
 });
diff --git a/app/imports/api/properties/Actions.js b/app/imports/api/properties/Actions.js
index 99910081..d4a5c4b4 100644
--- a/app/imports/api/properties/Actions.js
+++ b/app/imports/api/properties/Actions.js
@@ -162,6 +162,12 @@ const ComputedOnlyActionSchema = createPropertySchema({
     optional: true,
     removeBeforeCompute: true,
   },
+  // Denormalised tag if event is overridden by one with the same variable name
+  overridden: {
+    type: Boolean,
+    optional: true,
+    removeBeforeCompute: true,
+  },
   // Resources
   resources: {
     type: Object,
diff --git a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
index 93dff4e1..b5254836 100644
--- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -461,7 +461,7 @@ const propertyHandlers = {
     return { propPath: 'toggle' };
   },
   action(prop) {
-    if (prop.actionType === 'event') {
+    if (prop.actionType === 'event' && !prop.overridden) {
       return { propPath: 'event' };
     }
     return { propPath: null };

From c3ac49a8c4ce075635374fb60f49c7a3c0f89e2e Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 23 Nov 2022 15:51:09 +0200
Subject: [PATCH 45/46] Fixed default doc importing

---
 app/imports/api/docs/Docs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/imports/api/docs/Docs.js b/app/imports/api/docs/Docs.js
index b9fa1e4f..cb8aeb4e 100644
--- a/app/imports/api/docs/Docs.js
+++ b/app/imports/api/docs/Docs.js
@@ -145,7 +145,7 @@ if (Meteor.isClient) {
 } else if (Meteor.isServer) {
   Meteor.startup(() => {
     if (!Docs.findOne()) {
-      Assets.getText('docs/defaultDocs.json', (string) => {
+      Assets.getText('docs/defaultDocs.json', (error, string) => {
         const docs = JSON.parse(string)
         docs.forEach(doc => Docs.insert(doc));
       });

From 7e49100d148c5dfea11c59c3950c887b089ae24f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Wed, 23 Nov 2022 15:52:45 +0200
Subject: [PATCH 46/46] Fixed dragging on mobile

---
 .../ui/components/global/DragHandle.vue       | 45 +++++++++++++++++++
 .../ui/components/global/globalIndex.js       |  2 +
 .../client/ui/components/tree/TreeNode.vue    | 12 ++---
 .../ui/components/tree/TreeNodeList.vue       |  2 -
 .../creatureList/CreatureListTile.vue         |  9 ++--
 .../components/inventory/ItemListTile.vue     |  7 +--
 .../components/spells/SpellListTile.vue       |  7 +--
 7 files changed, 57 insertions(+), 27 deletions(-)
 create mode 100644 app/imports/client/ui/components/global/DragHandle.vue

diff --git a/app/imports/client/ui/components/global/DragHandle.vue b/app/imports/client/ui/components/global/DragHandle.vue
new file mode 100644
index 00000000..8c06cc0f
--- /dev/null
+++ b/app/imports/client/ui/components/global/DragHandle.vue
@@ -0,0 +1,45 @@
+<template>
+  <v-icon
+    class="handle"
+    v-bind="$attrs"
+    @click.stop="() => { }"
+    @touchstart.native.stop="() => { }"
+    @touchend.native="portalEvent"
+  >
+    mdi-drag
+  </v-icon>
+</template>
+
+<script lang="js">
+import { defer } from 'lodash'
+
+export default {
+  methods: {
+    portalEvent(e) {
+      // Stop everything in the document listening for this touch event
+      e.stopPropagation();
+      // But also send it to straight to the root for draggable.js
+      defer(() => {
+        e.target.ownerDocument.dispatchEvent(e);
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+.handle {
+  cursor: move !important;
+  cursor: -webkit-grab !important;
+}
+.handle::after {
+  opacity: 0 !important;
+}
+</style>
+
+<style>
+.sortable-drag.handle {
+  cursor: move !important;
+  cursor: -webkit-grabbing !important;
+}
+</style>
diff --git a/app/imports/client/ui/components/global/globalIndex.js b/app/imports/client/ui/components/global/globalIndex.js
index bb0898d5..f7e48b3e 100644
--- a/app/imports/client/ui/components/global/globalIndex.js
+++ b/app/imports/client/ui/components/global/globalIndex.js
@@ -1,6 +1,7 @@
 import Vue from 'vue';
 // Global components
 import DatePicker from '/imports/client/ui/components/global/DatePicker.vue';
+import DragHandle from '/imports/client/ui/components/global/DragHandle.vue';
 import IconPicker from '/imports/client/ui/components/global/IconPicker.vue';
 import TextField from '/imports/client/ui/components/global/TextField.vue';
 import TextArea from '/imports/client/ui/components/global/TextArea.vue';
@@ -13,6 +14,7 @@ import SvgIcon from '/imports/client/ui/components/global/SvgIcon.vue';
 import SmartSlider from '/imports/client/ui/components/global/SmartSlider.vue';
 
 Vue.component('DatePicker', DatePicker);
+Vue.component('DragHandle', DragHandle);
 Vue.component('IconPicker', IconPicker);
 Vue.component('TextField', TextField);
 Vue.component('TextArea', TextArea);
diff --git a/app/imports/client/ui/components/tree/TreeNode.vue b/app/imports/client/ui/components/tree/TreeNode.vue
index 2a8ee46e..9ef46561 100644
--- a/app/imports/client/ui/components/tree/TreeNode.vue
+++ b/app/imports/client/ui/components/tree/TreeNode.vue
@@ -30,14 +30,12 @@
         :class="{'ml-4': startExpanded}"
         style="flex-grow: 0;"
       >
-        <v-icon
+        <drag-handle
           v-if="organize"
-          class="handle mr-2"
+          class="mr-2"
           :class="selected && 'primary--text'"
           :disabled="expanded"
-        >
-          mdi-drag
-        </v-icon>
+        />
         <!--{{node && node.order}}-->
         <tree-node-view
           :model="node"
@@ -177,10 +175,6 @@ export default {
   min-height: 32px;
 }
 
-.handle {
-  cursor: move;
-}
-
 .empty .drag-area {
   box-shadow: -2px 0px 0px 0px rgb(128, 128, 128, 0.4);
 }
diff --git a/app/imports/client/ui/components/tree/TreeNodeList.vue b/app/imports/client/ui/components/tree/TreeNodeList.vue
index 71925cac..0eef77c3 100644
--- a/app/imports/client/ui/components/tree/TreeNodeList.vue
+++ b/app/imports/client/ui/components/tree/TreeNodeList.vue
@@ -4,7 +4,6 @@
     v-model="displayedChildren"
     class="drag-area"
     :group="group"
-    :move="move"
     :animation="200"
     ghost-class="ghost"
     draggable=".item"
@@ -27,7 +26,6 @@
       @selected="e => $emit('selected', e)"
       @reordered="e => $emit('reordered', e)"
       @reorganized="e => $emit('reorganized', e)"
-      @dragstart.native="e => e.dataTransfer.setData('cow', child.node && child.node.name)"
     />
   </draggable>
 </template>
diff --git a/app/imports/client/ui/creature/creatureList/CreatureListTile.vue b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
index ee9a7d95..2685ff13 100644
--- a/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
@@ -40,12 +40,9 @@
       <shared-icon :model="model" />
     </v-list-item-action>
     <v-list-item-action v-if="!selection && !dense">
-      <v-icon
-        style="height: 100%; width: 40px; cursor: move;"
-        class="handle"
-      >
-        mdi-drag
-      </v-icon>
+      <drag-handle
+        style="height: 100%; width: 40px;"
+      />
     </v-list-item-action>
   </v-list-item>
 </template>
diff --git a/app/imports/client/ui/properties/components/inventory/ItemListTile.vue b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
index cf252ddc..839db61d 100644
--- a/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
+++ b/app/imports/client/ui/properties/components/inventory/ItemListTile.vue
@@ -33,13 +33,10 @@
       />
     </v-list-item-action>
     <v-list-item-action class="drag-handle">
-      <v-icon
+      <drag-handle 
         :disabled="context.editPermission === false"
         style="height: 100%; width: 40px; cursor: move;"
-        class="handle"
-      >
-        mdi-drag
-      </v-icon>
+      />
     </v-list-item-action>
   </v-list-item>
 </template>
diff --git a/app/imports/client/ui/properties/components/spells/SpellListTile.vue b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
index 6c47536f..2b20c73f 100644
--- a/app/imports/client/ui/properties/components/spells/SpellListTile.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellListTile.vue
@@ -29,14 +29,11 @@
         @click.native.stop="() => {}"
         @change="setPrepared"
       />
-      <v-icon
+      <drag-handle
         v-else-if="!hideHandle"
         :disabled="context.editPermission === false"
         style="height: 100%; width: 40px; cursor: move;"
-        class="handle"
-      >
-        mdi-drag
-      </v-icon>
+      />
       <v-btn
         v-else-if="showInfoButton"
         icon