Merge branch 'develop' into version-2-tabletop

2023-01-14 19:12:17 +02:00
parent 16af33b52f 3532898be9
commit cd45008f38
100 changed files with 1228 additions and 1953 deletions
--- a/app/imports/api/creature/archive/ArchiveCreatureFiles.js
+++ b/app/imports/api/creature/archive/ArchiveCreatureFiles.js
@@ -1,8 +1,14 @@
-import { createS3FilesCollection } from '/imports/api/files/s3FileStorage.js';
+
 import SimpleSchema from 'simpl-schema';
 import { incrementFileStorageUsed } from '/imports/api/users/methods/updateFileStorageUsed.js';
 import { CreaturePropertySchema } from '/imports/api/creature/creatureProperties/CreatureProperties.js';
 import { CreatureSchema } from '/imports/api/creature/creatures/Creatures.js';
+let createS3FilesCollection;
+if (Meteor.isServer) {
+  createS3FilesCollection = require('/imports/api/files/server/s3FileStorage.js').createS3FilesCollection
+} else {
+  createS3FilesCollection = require('/imports/api/files/client/s3FileStorage.js').createS3FilesCollection
+}

 const ArchiveCreatureFiles = createS3FilesCollection({
  collectionName: 'archiveCreatureFiles',
--- a/app/imports/api/creature/creatures/methods/restCreature.js
+++ b/app/imports/api/creature/creatures/methods/restCreature.js
@@ -83,13 +83,13 @@ export function resetProperties(creatureId, resetFilter, actionContext) {
  const attributeFilter = {
    ...filter,
    type: 'attribute',
-    damage: { $ne: 0 },
+    damage: { $nin: [0, undefined] },
  }
  CreatureProperties.find(attributeFilter).forEach(prop => {
    damagePropertyWork({
      prop,
      operation: 'increment',
-      value: -prop.damage,
+      value: -prop.damage ?? 0,
      actionContext,
      logFunction(increment) {
        actionContext.addLog({
@@ -105,7 +105,7 @@ export function resetProperties(creatureId, resetFilter, actionContext) {
    type: {
      $in: ['action', 'spell']
    },
-    usesUsed: { $ne: 0 },
+    usesUsed: { $nin: [0, undefined] },
  };
  CreatureProperties.find(actionFilter, {
    fields: { name: 1, usesUsed: 1 }
--- a/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
+++ b/app/imports/api/engine/actions/applyPropertyByType/applyAction.js
@@ -165,7 +165,7 @@ function rollAttack(attack, scope) {
  }
  scope['$attackDiceRoll'] = { value };
  const result = value + attack.value;
-  scope['$attackRoll'] = { result };
+  scope['$attackRoll'] = { value: result };
  const { criticalHit, criticalMiss } = applyCrits(value, scope);
  return { resultPrefix, result, value, criticalHit, criticalMiss };
 }
--- a/app/imports/api/files/UserImages.js
+++ b/app/imports/api/files/UserImages.js
@@ -1,4 +1,9 @@
-import { createS3FilesCollection } from '/imports/api/files/s3FileStorage.js';
+let createS3FilesCollection;
+if (Meteor.isServer) {
+  createS3FilesCollection = require('/imports/api/files/server/s3FileStorage.js').createS3FilesCollection
+} else {
+  createS3FilesCollection = require('/imports/api/files/client/s3FileStorage.js').createS3FilesCollection
+}

 const UserImages = createS3FilesCollection({
  collectionName: 'userImages',
--- a/app/imports/api/files/client/s3FileStorage.js
+++ b/app/imports/api/files/client/s3FileStorage.js
@@ -0,0 +1,24 @@
+// https://github.com/VeliovGroup/Meteor-Files/blob/master/docs/aws-s3-integration.md
+import { FilesCollection } from 'meteor/ostrio:files';
+
+const createS3FilesCollection = function ({
+  collectionName,
+  storagePath,
+  onBeforeUpload,
+  onAfterUpload,
+  debug,// = !Meteor.isProduction,
+  allowClientCode = false,
+}) {
+  const collection = new FilesCollection({
+    collectionName,
+    storagePath,
+    onBeforeUpload,
+    onAfterUpload,
+    debug,
+    allowClientCode,
+  });
+
+  return collection;
+}
+
+export { createS3FilesCollection };
--- a/app/imports/api/files/server/s3.js
+++ b/app/imports/api/files/server/s3.js
@@ -1,2 +0,0 @@
-import S3 from 'aws-sdk/clients/s3';
-export default S3;
--- a/app/imports/api/files/server/s3FileStorage.js
+++ b/app/imports/api/files/server/s3FileStorage.js
@@ -4,9 +4,7 @@ import { each, clone } from 'lodash';
 import { Random } from 'meteor/random';
 import { FilesCollection } from 'meteor/ostrio:files';
 import stream from 'stream';
-if (Meteor.isServer) {
-  import S3 from '/imports/api/files/server/s3.js';
-}
+import S3 from 'aws-sdk/clients/s3';

 /* See fs-extra and graceful-fs NPM packages */
 /* For better i/o performance */
@@ -31,7 +29,7 @@ let createS3FilesCollection;

 /* Check settings existence in `Meteor.settings` */
 /* This is the best practice for app security */
-if (Meteor.isServer && Meteor.settings.useS3) {
+if (Meteor.settings.useS3) {
  // Create a new S3 object
  const s3 = new S3({
    accessKeyId: s3Conf.key,
@@ -236,13 +234,11 @@ if (Meteor.isServer && Meteor.settings.useS3) {
      allowClientCode,
    });

-    if (Meteor.isServer) {
-      // Use the normal file system to read files
-      collection.readJSONFile = async function (file) {
-        const fileString = await fsp.readFile(file.path, 'utf8');
-        return JSON.parse(fileString);
-      };
-    }
+    // Use the normal file system to read files
+    collection.readJSONFile = async function (file) {
+      const fileString = await fsp.readFile(file.path, 'utf8');
+      return JSON.parse(fileString);
+    };

    return collection;
  }
--- a/app/imports/client/ui/components/ColumnLayout.vue
+++ b/app/imports/client/ui/components/ColumnLayout.vue
@@ -39,9 +39,6 @@ export default {

 .column-layout>div,
 .column-layout>span>div {
-  /*
-      Table and width set because firefox does not support break-inside: avoid
-    */
  display: table;
  table-layout: fixed;
  width: 100%;
--- a/app/imports/client/ui/components/global/DragHandle.vue
+++ b/app/imports/client/ui/components/global/DragHandle.vue
@@ -2,8 +2,8 @@
  <v-icon
    class="handle"
    v-bind="$attrs"
-    @click.stop="() => { }"
-    @touchstart.native.stop="() => { }"
+    @click.native="e => { }"
+    @touchstart.native.stop="e => { }"
    @touchend.native="portalEvent"
  >
    mdi-drag
--- a/app/imports/client/ui/creature/CreatureForm.vue
+++ b/app/imports/client/ui/creature/CreatureForm.vue
@@ -218,30 +218,30 @@ export default {
  },
  methods: {
    changeShowTreeTab(value) {
+      let currentTab = this.$store.getters.tabNameById(this.model._id);
+      if (!value && currentTab === 'tree') {
+        this.$store.commit(
+          'setTabForCharacterSheet',
+          { id: this.model._id, tab: 'build' }
+        );
+      }
      this.$emit('change', {
        path: ['settings', 'showTreeTab'],
        value: !!value
      });
-      let currentTab = this.$store.getters.tabById(this.model._id);
-      if (!value && currentTab === 5) {
-        this.$store.commit(
-          'setTabForCharacterSheet',
-          { id: this.model._id, tab: 4 }
-        );
-      }
    },
    changeHideSpellsTab(value) {
+      let currentTab = this.$store.getters.tabNameById(this.model._id);
+      if (!value && currentTab === 'spells') {
+        this.$store.commit(
+          'setTabForCharacterSheet',
+          { id: this.model._id, tab: 'actions' }
+        );
+      }
      this.$emit('change', {
        path: ['settings', 'hideSpellsTab'],
        value: !value
      });
-      let currentTab = this.$store.getters.tabById(this.model._id);
-      if (!value && currentTab === 3) {
-        this.$store.commit(
-          'setTabForCharacterSheet',
-          { id: this.model._id, tab: 4 }
-        );
-      }
    },
    allUserLibrariesChange(value, ack) {
      toggleAllUserLibraries.call({
--- a/app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
+++ b/app/imports/client/ui/creature/buildTree/BuildTreeNode.vue
@@ -4,7 +4,7 @@
    :class="{
      'empty': !hasChildren,
    }"
-    :data-id="`build-tree-node-${node._id}`"
+    :data-id="`tree-node-${node._id}`"
  >
    <div
      class="layout align-center justify-start tree-node-title"
--- a/app/imports/client/ui/creature/character/CharacterCreationDialog.vue
+++ b/app/imports/client/ui/creature/character/CharacterCreationDialog.vue
@@ -195,7 +195,7 @@ export default {
        } else {
          this.$store.commit(
              'setTabForCharacterSheet',
-              {id: creatureId, tab: 5}
+              {id: creatureId, tab: 'build'}
            );
          this.$emit('pop', creatureId);
          defer(() => {
--- a/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
+++ b/app/imports/client/ui/creature/character/CharacterDeleteDialog.vue
@@ -5,7 +5,7 @@
    </v-toolbar-title>
    <div>
      <p v-if="name">
-        Type "{{ name }}" to permanenetly delete the character
+        Type "{{ name }}" to permanently delete the character
      </p>
      <v-text-field
        v-if="name"
--- a/app/imports/client/ui/creature/character/CharacterSheet.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheet.vue
@@ -46,9 +46,6 @@
          <v-tab-item>
            <stats-tab :creature-id="creatureId" />
          </v-tab-item>
-          <v-tab-item>
-            <features-tab :creature-id="creatureId" />
-          </v-tab-item>
          <v-tab-item>
            <actions-tab :creature-id="creatureId" />
          </v-tab-item>
@@ -58,6 +55,9 @@
          <v-tab-item>
            <inventory-tab :creature-id="creatureId" />
          </v-tab-item>
+          <v-tab-item>
+            <features-tab :creature-id="creatureId" />
+          </v-tab-item>
          <v-tab-item>
            <character-tab :creature-id="creatureId" />
          </v-tab-item>
@@ -96,22 +96,22 @@
        <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-btn v-if="!creature.settings.hideSpellsTab">
+        <span>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>Features</span>
+        <v-icon>mdi-text</v-icon>
+      </v-btn>
      <v-btn>
        <span>Journal</span>
        <v-icon>mdi-book-open-variant</v-icon>
--- a/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
+++ b/app/imports/client/ui/creature/character/CharacterSheetToolbar.vue
@@ -39,27 +39,45 @@
                <v-icon>mdi-dots-vertical</v-icon>
              </v-btn>
            </template>
-            <v-list v-if="editPermission">
-              <v-list-item @click="deleteCharacter">
+            <v-list>
+              <v-list-item :to="printUrl">
                <v-list-item-title>
-                  <v-icon>mdi-delete</v-icon> Delete
+                  <v-icon left>
+                    mdi-printer
+                  </v-icon> Print
                </v-list-item-title>
              </v-list-item>
-              <v-list-item @click="showCharacterForm">
+              <template v-if="editPermission">
+                <v-list-item @click="deleteCharacter">
+                  <v-list-item-title>
+                    <v-icon left>
+                      mdi-delete
+                    </v-icon> Delete
+                  </v-list-item-title>
+                </v-list-item>
+                <v-list-item @click="showCharacterForm">
+                  <v-list-item-title>
+                    <v-icon left>
+                      mdi-pencil
+                    </v-icon> Edit details
+                  </v-list-item-title>
+                </v-list-item>
+                <v-list-item @click="showShareDialog">
+                  <v-list-item-title>
+                    <v-icon left>
+                      mdi-share-variant
+                    </v-icon> Sharing
+                  </v-list-item-title>
+                </v-list-item>
+              </template>
+              <v-list-item
+                v-else
+                @click="unshareWithMe"
+              >
                <v-list-item-title>
-                  <v-icon>mdi-pencil</v-icon> Edit details
-                </v-list-item-title>
-              </v-list-item>
-              <v-list-item @click="showShareDialog">
-                <v-list-item-title>
-                  <v-icon>mdi-share-variant</v-icon> Sharing
-                </v-list-item-title>
-              </v-list-item>
-            </v-list>
-            <v-list v-else>
-              <v-list-item @click="unshareWithMe">
-                <v-list-item-title>
-                  <v-icon>mdi-delete</v-icon> Unshare with me
+                  <v-icon left>
+                    mdi-delete
+                  </v-icon> Unshare with me
                </v-list-item-title>
              </v-list-item>
            </v-list>
@@ -101,9 +119,6 @@
          <v-tab>
            Stats
          </v-tab>
-          <v-tab>
-            Features
-          </v-tab>
          <v-tab>
            Actions
          </v-tab>
@@ -113,6 +128,9 @@
          <v-tab>
            Inventory
          </v-tab>
+          <v-tab>
+            Features
+          </v-tab>
          <v-tab>
            Journal
          </v-tab>
@@ -144,6 +162,7 @@ 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';
+import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';

 export default {
  components: {
@@ -167,6 +186,9 @@ export default {
    isDark() {
      return isDarkColor(this.toolbarColor);
    },
+    printUrl() {
+      return `/print-character/${this.creature._id}/${getCreatureUrlName(this.creature)}`;
+    },
  },
  methods: {
    ...mapMutations([
--- a/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/ActionsTab.vue
@@ -58,8 +58,20 @@ export default {
  }},
  meteor: {
    actions() {
-      return CreatureProperties.find({
+      const folderIds = CreatureProperties.find({
        'ancestors.id': this.creatureId,
+        type: 'folder',
+        groupStats: true,
+        hideStatsGroup: true,
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, { fields: { _id: 1 } }).map(folder => folder._id);
+
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: folderIds,
+        },
        type: 'action',
        actionType: { $ne: 'event' },
        removed: { $ne: true },
--- a/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/BuildTab.vue
@@ -86,7 +86,7 @@
          <build-tree-node-list
            :children="slotBuildTree"
            class="mx-2"
-            @selected="_id => propertyClicked({_id, prefix: 'build-tree-node-'})"
+            @selected="_id => propertyClicked({_id, prefix: 'tree-node-'})"
          />
        </v-card>
      </v-col>
--- a/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/FeaturesTab.vue
@@ -56,8 +56,20 @@ export default {
  },
  meteor: {
    features() {
-      return CreatureProperties.find({
+      const folderIds = CreatureProperties.find({
        'ancestors.id': this.creatureId,
+        type: 'folder',
+        groupStats: true,
+        hideStatsGroup: true,
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, { fields: { _id: 1 } }).map(folder => folder._id);
+      
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: folderIds,
+        },
        type: 'feature',
        removed: { $ne: true },
        inactive: { $ne: true },
--- a/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/InventoryTab.vue
@@ -141,9 +141,22 @@ export default {
    };
  },
  meteor: {
-    containers() {
+    folderIds() {
      return CreatureProperties.find({
        'ancestors.id': this.creatureId,
+        type: 'folder',
+        groupStats: true,
+        hideStatsGroup: true,
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, { fields: { _id: 1 } }).map(folder => folder._id);
+    },
+    containers() {
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: this.folderIds,
+        },
        type: 'container',
        removed: { $ne: true },
        inactive: { $ne: true },
@@ -166,7 +179,7 @@ export default {
      return CreatureProperties.find({
        'ancestors.id': {
          $eq: this.creatureId,
-          $nin: this.containerIds
+          $nin: [...this.containerIds, ...this.folderIds],
        },
        type: 'container',
        removed: { $ne: true },
@@ -179,7 +192,7 @@ export default {
      return CreatureProperties.find({
        'ancestors.id': {
          $eq: this.creatureId,
-          $nin: this.containerIds
+          $nin: [...this.containerIds, ...this.folderIds],
        },
        type: 'item',
        equipped: { $ne: true },
--- a/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/JournalTab.vue
@@ -60,8 +60,20 @@ export default {
  },
  meteor: {
    notes(){
-      return CreatureProperties.find({
+      const folderIds = CreatureProperties.find({
        'ancestors.id': this.creatureId,
+        type: 'folder',
+        groupStats: true,
+        hideStatsGroup: true,
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, { fields: { _id: 1 } }).map(folder => folder._id);
+      
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: folderIds,
+        },
        type: 'note',
        removed: {$ne: true},
        inactive: {$ne: true},
--- a/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -10,7 +10,7 @@
        @remove="softRemove"
      />
      <div
-        v-if="spellSlots && spellSlots.length || hasSpells"
+        v-if="hasSpellSlots || hasSpells"
        class="spell-slots"
      >
        <spell-slot-card
@@ -77,9 +77,33 @@ export default {
    }
  },
  meteor: {
-    spellSlots() {
+    folderIds() {
      return CreatureProperties.find({
        'ancestors.id': this.creatureId,
+        type: 'folder',
+        groupStats: true,
+        hideStatsGroup: true,
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, { fields: { _id: 1 } }).map(folder => folder._id);
+    },
+    hasSpellSlots() {
+      return !!CreatureProperties.findOne({
+        'ancestors.id': this.creatureId,
+        inactive: { $ne: true },
+        removed: { $ne: true },
+        overridden: { $ne: true },
+        level: { $ne: 0 },
+        type: 'attribute',
+        attributeType: 'spellSlot',
+      });
+    },
+    spellSlots() {
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: this.folderIds,
+        },
        inactive: { $ne: true },
        removed: { $ne: true },
        overridden: { $ne: true },
@@ -89,11 +113,16 @@ export default {
          { hideWhenTotalZero: true, total: 0 },
          { hideWhenValueZero: true, value: 0 },
        ],
+      }, {
+        sort: { order: 1 }
      });
    },
    spellLists() {
      return CreatureProperties.find({
-        'ancestors.id': this.creatureId,
+        'ancestors.id': {
+          $eq: this.creatureId,
+          $nin: this.folderIds,
+        },
        type: 'spellList',
        removed: { $ne: true },
        inactive: { $ne: true },
@@ -113,7 +142,7 @@ export default {
      return CreatureProperties.find({
        'ancestors.id': {
          $eq: this.creatureId,
-          $nin: this.spellListIds,
+          $nin: [...this.spellListIds, ...this.folderIds],
        },
        type: 'spell',
        removed: { $ne: true },
@@ -130,7 +159,7 @@ export default {
      return CreatureProperties.find({
        'ancestors.id': {
          $eq: this.creatureId,
-          $nin: this.spellListIds,
+          $nin: [...this.spellListIds, ...this.folderIds],
        },
        type: 'spellList',
        removed: { $ne: true },
--- a/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
+++ b/app/imports/client/ui/creature/character/characterSheetTabs/StatsTab.vue
@@ -28,7 +28,7 @@
        @remove="softRemove"
      />
      <div
-        v-if="!creature.settings.hideRestButtons || (properties.action.event && properties.action.event.length)"
+        v-if="!creature.settings.hideRestButtons || (properties.action && properties.action.event && properties.action.event.length)"
        class="character-buttons"
      >
        <v-card>
@@ -161,13 +161,13 @@
      </div>

      <div
-        v-if="properties.hitDice && properties.hitDice.length"
+        v-if="properties.attribute.hitDice && properties.attribute.hitDice.length"
        class="hit-dice"
      >
        <v-card>
          <v-list>
            <v-subheader>Hit Dice</v-subheader>
-            <template v-for="(hitDie, index) in hitDice">
+            <template v-for="(hitDie, index) in properties.attribute.hitDice">
              <v-divider
                v-if="index !== 0"
                :key="hitDie._id + 'divider'"
@@ -427,10 +427,10 @@ const propertyHandlers = {
  folder(prop) {
    let skipChildren;
    let propPath = null;
-    if (prop.hideStatsGroup) {
-      return { skipChildren: true}
+    if (prop.groupStats && prop.hideStatsGroup) {
+      skipChildren = true;
    }
-    if (prop.tab === 'stats') {
+    if (prop.groupStats && prop.tab === 'stats') {
      propPath = ['folder', prop.location]
    }
    return { skipChildren, propPath }
@@ -546,7 +546,7 @@ export default {
      if (creature.settings.hideUnusedStats) {
        filter.hide = { $ne: true };
      }
-      const allProps = CreatureProperties.find(filter, { sort: { order: 1 } });
+      const allProps = CreatureProperties.find(filter, { sort: { order: -1 } });
      const forest = nodeArrayToTree(allProps);
      const properties = { folder: {}, attribute: {}, skill: {} };
      walkDown(forest, node => {
--- a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue
@@ -32,7 +32,7 @@
        light
      >
        <div class="page pa-3">
-          <div class="px-3 d-flex align-center">
+          <div class="title-block px-3 d-flex align-center">
            <div class="logo-background" />
            <div class="creature-name mr-3">
              {{ creature.name }}
@@ -42,7 +42,7 @@
                {{ creature.alignment }} {{ background }}
              </div>
              <dir v-if="race || creature.gender">
-                {{ race }} {{ creature.gender }}
+                {{ creature.gender }} {{ race }}
              </dir>
              <div v-if="level && classes && classes.length === 1">
                Level {{ level }} {{ classes[0].name }}
@@ -236,9 +236,33 @@ export default {
  color: black;
  font-size: 11pt;
 }
+
+.character-sheet-printed * {
+  print-color-adjust: exact;
+  -webkit-print-color-adjust: exact;
+  cursor: unset !important;
+}
+
 .page {
  padding: 4px;
 }
+
+.character-sheet-printed .column-layout, .character-sheet-printed .column-layout.wide-columns {
+  position:relative;
+  width: 100%;
+  widows: 0;
+  orphans: 0;
+  -webkit-column-fill: balance-all;
+  column-fill: balance-all;
+}
+
+.character-sheet-printed .column-layout>div {
+  position:relative;
+}
+.character-sheet-printed .column-layout > div > * {
+  page-break-inside: avoid;
+}
+
 .character-sheet-printed .inactive {
  opacity: 1 !important;
 }
@@ -253,8 +277,6 @@ 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 {
@@ -265,39 +287,26 @@ export default {
 .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 .span-all {
+  page-break-after: avoid;
+  break-after: avoid;
+}
+.span-all + div {
+  page-break-before: avoid;
+  break-before: avoid;
 }

 .character-sheet-printed .stats .label {
@@ -326,10 +335,32 @@ export default {
  }
 }
@media print {
-  header {
-    display: none !important;
+  @page { 
+      size: auto;
+      margin: 8mm 8mm 8mm 8mm;  
  }
-  nav {
+  body {  
+      margin: 0;  
+  }
+  .character-sheet-printed .page {
+    width: 100%;
+    padding: 0 !important;
+  }
+  .character-sheet-printed .column-layout {
+    padding: 4px 0 !important;
+  }
+  .character-sheet-printed .title-block {
+    padding-left: 0 !important;
+    padding-right: 4px !important;
+  }
+  .v-main, .v-application, .v-application--wrap, .character-sheet-printed {
+    display: block !important;
+    background-color: white !important;
+  }
+  html {
+    background-color: white !important;
+  }
+  header, nav, .v-snack, .dialog-stack {
    display: none !important;
  }
  .v-main {
--- a/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrintedToolbar.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrintedToolbar.vue
@@ -0,0 +1,97 @@
+<template>
+  <v-app-bar
+    app
+    class="character-sheet-printed-toolbar"
+    :color="toolbarColor"
+    :dark="isDark"
+    :light="!isDark"
+    clipped-right
+    :extended="$vuetify.breakpoint.smAndUp"
+    :tabs="$vuetify.breakpoint.smAndUp"
+    dense
+  >
+    <v-app-bar-nav-icon @click="toggleDrawer" />
+    <v-btn
+      icon
+      :to="characterUrl"
+    >
+      <v-icon>mdi-arrow-left</v-icon>
+    </v-btn>
+    <v-toolbar-title>
+      <v-fade-transition mode="out-in">
+        <div :key="$store.state.pageTitle">
+          {{ $store.state.pageTitle }}
+        </div>
+      </v-fade-transition>
+    </v-toolbar-title>
+    <v-spacer />
+    <div
+      slot="extension"
+      style="width: 100%"
+    >
+      <v-btn
+        class="print-fab"
+        color="accent"
+        elevation="4"
+        fab
+        @click="print"
+      >
+        <v-icon>mdi-printer</v-icon>
+      </v-btn>
+    </div>
+  </v-app-bar>
+</template>
+
+<script lang="js">
+import Creatures from '/imports/api/creature/creatures/Creatures.js';
+import { mapMutations } from 'vuex';
+import isDarkColor from '/imports/client/ui/utility/isDarkColor.js';
+import getThemeColor from '/imports/client/ui/utility/getThemeColor.js';
+import getCreatureUrlName from '/imports/api/creature/creatures/getCreatureUrlName.js';
+
+export default {
+  inject: {
+    context: { default: {} }
+  },
+  computed: {
+    creatureId() {
+      return this.$route.params.id;
+    },
+    toolbarColor() {
+      if (this.creature && this.creature.color) {
+        return this.creature.color;
+      } else {
+        return getThemeColor('secondary');
+      }
+    },
+    isDark() {
+      return isDarkColor(this.toolbarColor);
+    },
+    characterUrl() {
+      if (!this.creature) return;
+      return `/character/${this.creature._id}/${getCreatureUrlName(this.creature)}`;
+    },
+  },
+  methods: {
+    ...mapMutations([
+      'toggleDrawer',
+    ]),
+    print() {
+      print();
+    },
+  },
+  meteor: {
+    creature() {
+      return Creatures.findOne(this.creatureId);
+    },
+  },
+}
+</script>
+
+<style scoped>
+  .print-fab {
+    position: absolute;
+    bottom: -24px;
+    right: 24px;
+  }
+</style>
--- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedInventory.vue
@@ -1,7 +1,6 @@
 <template lang="html">
  <div
    class="inventory"
-    style="page-break-before: always;"
  >
    <column-layout wide-columns>
      <div class="span-all">
@@ -62,7 +61,7 @@
      >
        <div 
          :key="container._id"
-          class="span-all container-header"
+          class="span-all"
        >
          <printed-container
            class="octagon-border"
@@ -232,22 +231,6 @@ 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;
@@ -262,9 +245,4 @@ export default {
 .inventory-stat > .v-icon {
  margin-right: 8px;
 }
-
-.container-header {
-  page-break-after: avoid;
-  page-break-inside: avoid;
-}
 </style>
--- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedSpells.vue
@@ -1,7 +1,6 @@
 <template lang="html">
  <div
    class="spells"
-    style="page-break-before: always;"
  >
    <column-layout wide-columns>
      <div class="span-all">
--- a/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/PrintedStats.vue
@@ -2,97 +2,104 @@
  <div class="stats">
    <column-layout>
      <div
-        v-if="abilities.length"
-        class="ability-scores"
+        v-for="ability in abilities"
+        :key="ability._id"
      >
-        <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
+          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="double-border name label">
-              {{ ability.name }}
+            <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
        v-for="toggle in toggles"
        :key="toggle._id"
-        class="number-label"
      >
-        <div class="box double-border" />
-        <div class="label double-border">
-          {{ toggle.name }}
+        <div
+          class="number-label"
+        >
+          <div class="box double-border" />
+          <div class="label double-border">
+            {{ toggle.name }}
+          </div>
        </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' : 'octagon-border'"
-          class="number big-number"
+          class="number-label"
+          :class="stat.variableName == 'armor' && 'shield-number-label'"
        >
-          {{ stat.value }}
-        </div>
-        <div class="label double-border">
-          {{ stat.name }}
+          <div
+            :class="stat.variableName == 'armor' ? 'shield-border' : 'octagon-border'"
+            class="number big-number"
+          >
+            {{ stat.value }}
+          </div>
+          <div class="label double-border">
+            {{ stat.name }}
+          </div>
        </div>
      </div>

      <div
        v-for="modifier in modifiers"
        :key="modifier._id"
-        class="number-label"
      >
-        <div class="number octagon-border big-number">
-          {{ numberToSignedString(modifier.value) }}
-        </div>
-        <div class="label double-border">
-          {{ modifier.name }}
+        <div
+          class="number-label"
+        >
+          <div class="number octagon-border big-number">
+            {{ numberToSignedString(modifier.value) }}
+          </div>
+          <div class="label double-border">
+            {{ modifier.name }}
+          </div>
        </div>
      </div>

      <div
        v-for="check in checks"
        :key="check._id"
-        class="number-label"
      >
-        <div class="number octagon-border big-number">
-          {{ numberToSignedString(check.value) }}
-        </div>
-        <div class="label double-border">
-          {{ check.name }}
+        <div
+          class="number-label"
+        >
+          <div class="number octagon-border big-number">
+            {{ numberToSignedString(check.value) }}
+          </div>
+          <div class="label double-border">
+            {{ check.name }}
+          </div>
        </div>
      </div>
      <div
        v-for="healthBar in healthBars"
        :key="healthBar._id"
-        class="m-2"
      >
        <div class="double-border">
          <div class="label">
@@ -115,7 +122,6 @@
      </div>
      <div
        v-if="hitDice.length"
-        class="hit-dice m-2"
      >
        <div class="double-border">
          <div>
@@ -528,21 +534,10 @@ export default {
  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;
@@ -571,23 +566,13 @@ export default {
  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;
+  z-index: 2;
 }
 .ability .name {
  margin-top: 10px;
--- a/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
+++ b/app/imports/client/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="inventory-container">
    <div class="d-flex justify-center">
      <property-icon
        class="ml-2"
--- a/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderHeader.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-  <v-list-item-content style="min-height: 60px;">
+  <v-list-item-content :style="dense ? undefined : 'min-height: 60px;'">
    <v-list-item-title class="d-flex align-center">
      <div
        v-if="!renaming"
--- a/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureFolderList.vue
@@ -1,6 +1,8 @@
 <template lang="html">
  <v-list
    expand
+    :nav="nav"
+    :dense="dense"
    class="creature-folder-list"
  >
    <creature-list
@@ -14,7 +16,7 @@
      v-for="folder in folders"
      :key="folder._id"
      v-model="openFolders[folder._id]"
-      group="folder"
+      :dense="dense"
    >
      <template #activator>
        <creature-folder-header
@@ -60,6 +62,7 @@ export default {
      default: undefined,
    },
    dense: Boolean,
+    nav: Boolean,
  },
  data(){return{
    openFolders: {},
--- a/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
+++ b/app/imports/client/ui/creature/creatureList/CreatureListTile.vue
@@ -5,10 +5,12 @@
  <v-list-item
    v-bind="$attrs"
    :class="isSelected && 'primary--text v-list-item--active'"
+    :dense="dense"
    v-on="selection ? { click() {$emit('click')} } : {}"
  >
    <v-list-item-avatar
      :color="isSelected ? 'red darken-1' : model.color || 'grey'"
+      :size="dense ? 30 : undefined"
      class="white--text"
      style="transition: background 0.3s;"
    >
--- a/app/imports/client/ui/creature/slots/SlotCard.vue
+++ b/app/imports/client/ui/creature/slots/SlotCard.vue
@@ -8,7 +8,7 @@
    class="slot-card d-flex flex-column"
    @mouseover="hover = true"
    @mouseleave="hover = false"
-    @click="$emit('click')"
+    @click="fillSlot"
  >
    <card-highlight 
      :active="hover"
@@ -28,7 +28,7 @@
      <v-btn
        icon
        color="accent"
-        @click.stop="$emit('ignore')"
+        @click.stop="ignoreProp"
      >
        <v-icon>mdi-close</v-icon>
      </v-btn>
@@ -39,6 +39,9 @@
 <script lang="js">
 import CardHighlight from '/imports/client/ui/components/CardHighlight.vue';
 import PropertyDescription from '/imports/client/ui/properties/viewers/shared/PropertyDescription.vue';
+import insertPropertyFromLibraryNode from '/imports/api/creature/creatureProperties/methods/insertPropertyFromLibraryNode.js';
+import { snackbar } from '/imports/client/ui/components/snackbars/SnackbarQueue.js';
+import updateCreatureProperty from '/imports/api/creature/creatureProperties/methods/updateCreatureProperty.js';

 export default {
  components: {
@@ -51,6 +54,9 @@ export default {
        isDark: false,
      },
    },
+    context: {
+      default: {},
+    },
  },
  props: {
    model: {
@@ -72,5 +78,45 @@ export default {
      }
    }
  },
+  methods: {
+    fillSlot() {
+      const slotId = this.model._id;
+      this.$store.commit('pushDialogStack', {
+        component: 'slot-fill-dialog',
+        elementId: `slot-card-${slotId}`,
+        data: {
+          slotId,
+          creatureId: this.context.creatureId,
+        },
+        callback(nodeIds){
+          if (!nodeIds || !nodeIds.length) return;
+          insertPropertyFromLibraryNode.call({
+            nodeIds,
+            parentRef: {
+              'id': slotId,
+              'collection': 'creatureProperties',
+            },
+          }, error => {
+            if (error){
+              console.error(error);
+              snackbar({text: error.reason || error.message || error.toString()});
+            }
+          });
+        }
+      });
+    },
+    ignoreProp(){
+      updateCreatureProperty.call({
+        _id: this.model._id,
+        path: ['ignored'],
+        value: true
+      }, error => {
+        if (error){
+          console.error(error);
+          snackbar({text: error.reason || error.message || error.toString()});
+        }
+      });
+    },
+  }
 }
 </script>
--- a/app/imports/client/ui/creature/slots/SlotCardsToFill.vue
+++ b/app/imports/client/ui/creature/slots/SlotCardsToFill.vue
@@ -1,5 +1,8 @@
 <template>
-  <column-layout wide-columns class="slots-to-fill">
+  <column-layout
+    wide-columns
+    class="slots-to-fill"
+  >
    <v-fade-transition
      group
      leave-absolute
@@ -39,7 +42,6 @@ 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/client/ui/components/snackbars/SnackbarQueue.js';

 export default {
@@ -64,31 +66,6 @@ export default {
        }
      });
    },
-    fillSlot(slotId){
-      this.$store.commit('pushDialogStack', {
-        component: 'slot-fill-dialog',
-        elementId: `slot-card-${slotId}`,
-        data: {
-          slotId,
-          creatureId: this.context.creatureId,
-        },
-        callback(nodeIds){
-          if (!nodeIds || !nodeIds.length) return;
-          insertPropertyFromLibraryNode.call({
-            nodeIds,
-            parentRef: {
-              'id': slotId,
-              'collection': 'creatureProperties',
-            },
-          }, error => {
-            if (error){
-              console.error(error);
-              snackbar({text: error.reason || error.message || error.toString()});
-            }
-          });
-        }
-      });
-    },
    editPointBuy(_id){
      this.$store.commit('pushDialogStack', {
        component: 'creature-property-dialog',
@@ -101,10 +78,21 @@ export default {
    },
  },
  meteor: {
-    slots(){
-      return CreatureProperties.find({
-        type: 'propertySlot',
+    slots() {
+      const folderIds = CreatureProperties.find({
        'ancestors.id': this.context.creatureId,
+        type: 'folder',
+        hideStatsGroup: true,
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, { fields: { _id: 1 } }).map(folder => folder._id);
+
+      return CreatureProperties.find({
+        'ancestors.id': {
+          $eq: this.context.creatureId,
+          $nin: folderIds,
+        },
+        type: 'propertySlot',
        ignored: { $ne: true },
        $and: [
          { 
--- a/app/imports/client/ui/dialogStack/DialogStack.vue
+++ b/app/imports/client/ui/dialogStack/DialogStack.vue
@@ -63,21 +63,14 @@
    },
    watch: {
      dialogs(newDialogs) {
-        let el = document.documentElement;
+        const el = document.documentElement;
        if (newDialogs.length) {
          this.top = el.scrollTop;
          if (el.scrollHeight > el.clientHeight){
-            el.style.position = 'fixed';
-            el.style.top = `${-this.top}px`;
-            el.style.left = 0;
-            el.style.right = 0;
-            el.style.overflowY = 'scroll';
+            el.style.overflowY = 'hidden';
+            el.scrollTop = this.top;
          }
        } else {
-          el.style.position = null;
-          el.style.top = null;
-          el.style.left = null;
-          el.style.right = null;
          el.style.overflowY = null;
          el.scrollTop = this.top;
        }
--- a/app/imports/client/ui/docs/DocEditForm.vue
+++ b/app/imports/client/ui/docs/DocEditForm.vue
@@ -82,8 +82,8 @@
            cols="12"
          >
            <text-area
-              auto-grow
              label="Body"
+              :rows="20"
              :value="doc.description"
              @change="(value, ack) => change({path: ['description'], value, ack})"
            />
--- a/app/imports/client/ui/layouts/Sidebar.vue
+++ b/app/imports/client/ui/layouts/Sidebar.vue
@@ -11,7 +11,10 @@
        Sign in
      </v-btn>
    </v-layout>
-    <v-list>
+    <v-list
+      nav
+      class="links"
+    >
      <v-list-item v-if="signedIn">
        <v-list-item-content>
          <v-list-item-title>
@@ -39,6 +42,7 @@
        :key="i"
        :to="link.to"
        :href="link.href"
+        :target="link.href ? '_blank': undefined"
      >
        <v-list-item-action>
          <v-icon>{{ link.icon }}</v-icon>
@@ -91,7 +95,7 @@ export default {
      let isLoggedIn = !!Meteor.userId();
      let links = [
        { title: 'Home', icon: 'mdi-home', to: '/' },
-        { title: 'Characters', icon: 'mdi-account-group', to: '/characterList', requireLogin: true },
+        { title: 'Characters', icon: 'mdi-account-group', to: '/character-list', 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},
@@ -100,7 +104,7 @@ export default {
        { 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' },
+        { title: 'Github', icon: 'mdi-github', href: 'https://github.com/ThaumRystra/DiceCloud/' },
      ];
      return links.filter(link => !link.requireLogin || isLoggedIn);
    },
@@ -138,3 +142,9 @@ export default {
  },
 };
 </script>
+
+<style scoped>
+.links .v-list-item:not(:last-child):not(:only-child) {
+  margin-bottom: 4px;
+}
+</style>
--- a/app/imports/client/ui/pages/About.vue
+++ b/app/imports/client/ui/pages/About.vue
@@ -2,8 +2,8 @@
  <div>
    <section>
      <v-parallax
-        src="/images/paper-dice-crown-with-candy.png"
-        height="400"
+        src="/images/paper-dice-crown.webp"
+        height="300"
      >
        <v-layout
          column
@@ -12,7 +12,7 @@
          class="white--text"
        >
          <p
-            class="white--text ma-2 text-h5 text-center"
+            class="white--text ma-2 text-center"
            style="max-width: 1200px;"
          >
            DiceCloud is a single-developer project started in 2014 with the aim of
--- a/app/imports/client/ui/pages/CharacterList.vue
+++ b/app/imports/client/ui/pages/CharacterList.vue
@@ -4,7 +4,10 @@
    style="height: 100%"
  >
    <v-container>
-      <v-row justify="center">
+      <v-row
+        justify="center"
+        class="mb-16"
+      >
        <v-col
          cols="12"
          xl="8"
--- a/app/imports/client/ui/pages/Home.vue
+++ b/app/imports/client/ui/pages/Home.vue
@@ -1,29 +1,75 @@
 <template>
  <div
-    class="content layout column justify-space-between"
+    class="home content layout column justify-space-between"
    style="min-height: 100%;"
  >
+    <section
+      class="py-12 px-4"
+    >
+      <v-row
+        align="end"
+        justify="center"
+        class="mb-8"
+      >
+        <v-col
+          class="text-center"
+          cols="12"
+        >
+          <h1 class="text-h4 mb-4">
+            Free, Auditable, real-time character tracking for 5th edition
+          </h1>
+          <h4 class="subheading">
+            Spend less time shuffling paper, and more time playing the game
+          </h4>
+        </v-col>
+      </v-row>
+      <v-layout
+        v-if="!signedIn"
+        align-center
+        justify-center
+      >
+        <v-btn
+          color="accent"
+          rounded
+          large
+          to="/register"
+          class="mr-4"
+        >
+          Register
+        </v-btn>
+        <v-btn
+          color="accent"
+          rounded
+          outlined
+          large
+          to="/sign-in"
+        >
+          Sign In
+        </v-btn>
+      </v-layout>
+      <v-layout
+        v-else
+        align-center
+        justify-center
+      >
+        <v-btn
+          color="accent"
+          rounded
+          large
+          to="/character-list"
+          class="mr-4"
+        >
+          My Characters
+        </v-btn>
+      </v-layout>
+    </section>
    <section>
      <v-parallax
-        src="/images/paper-dice-crown.png"
+        src="/images/crown-dice-on-ipad.webp"
        height="300"
-      >
-        <v-layout
-          column
-          align-center
-          justify-center
-          class="white--text"
-        >
-          <h1 class="white--text mb-2 text-h4 text-center">
-            DiceCloud - Free, Auditable, real-time character tracking for 5th edition
-          </h1>
-          <div class="subheading mb-3 text-center">
-            Spend less time shuffling paper, and more time playing the game
-          </div>
-        </v-layout>
-      </v-parallax>
+      />
    </section>
-    <section class="text-center">
+    <section class="text-center py-8 px-4">
      <v-layout
        wrap
        justify-space-around
@@ -43,7 +89,7 @@
            Free, open source, community funded
          </h3>
          <p>
-            DiceCloud is free to use. Its hosting is funded via Patreon,
+            DiceCloud is free to use, funded via Patreon,
            and the source code is available on Github under a GPL license.
          </p>
        </v-layout>
@@ -58,11 +104,11 @@
            mdi-ballot-outline
          </v-icon>
          <h3 class="mb-2">
-            Character sheets optimised for one ruleset
+            Custom everything
          </h3>
          <p>
-            By having a narrrow scope, DiceCloud can be the best at what it
-            does: being a fully automated character tracker
+            Add new ability scores, skills, health-bars, and stats to your character.
+            The entire sheet is under your control.
          </p>
        </v-layout>
        <v-layout
@@ -76,31 +122,37 @@
            mdi-file-tree-outline
          </v-icon>
          <h3 class="mb-2">
-            Inventory manager
+            Advanced Character Engine
          </h3>
          <p>
-            Equiping items changes your characters stats automatically.
+            Characters are computed in real-time based on their equipment,
+            features, and buffs.
          </p>
        </v-layout>
      </v-layout>
    </section>
-    <section
-      v-if="!signedIn"
-      class="ma-5"
-    >
-      <v-layout
-        align-center
-        justify-space-around
-      >
-        <v-btn
-          color="accent"
-          rounded
-          large
-          to="/sign-in"
+    <section class="pa-8">
+      <v-row>
+        <v-col
+          v-for="(card, index) in highlightCards"
+          :key="index"
+          v-bind="cols"
        >
-          Sign In
-        </v-btn>
-      </v-layout>
+          <v-card
+            tile
+            :elevation="0"
+          >
+            <v-img
+              class="white--text align-end"
+              :src="'/images/screenshots/' + card.img"
+              gradient="to bottom, rgba(0,0,0,0), rgba(0,0,0,.5)"
+              height="360px"
+            >
+              <v-card-title v-text="card.text" />  
+            </v-img>
+          </v-card>
+        </v-col>
+      </v-row>
    </section>
    <section class="text-center grey darken-3 white--text pa-5">
      <h1>
@@ -120,11 +172,16 @@
          ]"
          :key="btn.name"
          :href="btn.link"
-          text
+          outlined
          large
-          color="primary"
+          dark
        >
          {{ btn.name }}
+          <v-icon
+            right
+          >
+            mdi-open-in-new
+          </v-icon>
        </v-btn>
      </v-layout>
    </section>
@@ -133,6 +190,25 @@

 <script lang="js">
 export default {
+  data() {return {
+    cols: {
+      cols: 12,
+      sm: 6,
+      md: 4,
+      lg: 3,
+      xl: 2,
+    },
+    highlightCards: [
+      { text: 'Automated actions', img: 'actions.webp' },
+      { text: 'Auditable stats', img: 'auditable.webp' },
+      { text: 'Dice rolling', img: 'automated-dice-rolls.webp' },
+      { text: 'Hackable character builder', img: 'build-system.webp' },
+      { text: 'Drag and drop inventory manager', img: 'inventory.webp' },
+      { text: 'Custom libraries of content', img: 'libraries-of-content.webp' },
+      { text: 'Discord webhooks', img: 'send-to-discord.webp' },
+      { text: 'Printed character sheets', img: 'printing.webp' },
+    ],
+  }},
  meteor: {
    signedIn() {
      return Meteor.userId();
@@ -145,4 +221,7 @@ export default {
 .selling-points>* {
  max-width: 400px;
 }
+.dark-gradient {
+  background: linear-gradient(0deg, rgba(0,0,0,0.8) 0%, rgba(0,0,0,0) 100%);
+}
 </style>
--- a/app/imports/client/ui/pages/SignIn.vue
+++ b/app/imports/client/ui/pages/SignIn.vue
@@ -39,7 +39,10 @@
        >
          Reset Password
        </v-btn>
-        <div class="error--text">
+        <div
+          v-if="error"
+          class="error--text"
+        >
          {{ error }}
        </div>
        <v-layout>
@@ -59,6 +62,13 @@
            Register
          </v-btn>
        </v-layout>
+        <div class="text-caption mt-4 px-4">
+          <p>
+            DiceCloud Version 2 requires a new account to use.
+          </p><p>
+            Version 1 is still available at <a href="https://v1.dicecloud.com">v1.dicecloud.com</a>
+          </p>
+        </div>
      </v-layout>
    </v-form>
    <v-divider class="ma-4" />
--- a/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
+++ b/app/imports/client/ui/properties/components/folders/FolderGroupCard.vue
@@ -15,7 +15,8 @@
        :model="prop"
        :data-id="prop._id"
        @click="$emit('click-property', {_id: prop._id})"
-        @sub-click="_id => $emit('sub-click', _id)"
+        @click-property="e => $emit('click-property', e)"
+        @sub-click="e => $emit('sub-click', e)"
        @remove="$emit('remove', prop._id)"
      />
    </v-card>
@@ -27,15 +28,15 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/Creatur
 import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex.js';

 export default {
-  components: {
-    ...propComponents,
-  },
  props: {
    model: {
      type: Object,
      required: true,
    }
  },
+  beforeCreate() {
+    Object.assign(this.$options.components, propComponents);
+  },
  meteor: {
    properties() {
      const props = [];
@@ -50,6 +51,7 @@ export default {
            deactivatedByAncestor: { $ne: true },
          },
          {
+            type: { $ne: 'toggle' },
            inactive: { $ne: true }
          },
        ],
@@ -60,7 +62,7 @@ export default {
      }, {
        sort: { order: 1 },
      }).forEach(prop => {
-        if (this.$options.components[prop.type]) {
+        if (propComponents[prop.type]) {
          props.push(prop);
        }
      });
--- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
+++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/AttributeGroupComponent.vue
@@ -1,44 +1,55 @@
 <template>
-  <div class="attribute">
-    <ability-list-tile
-      v-if="model.attributeType === 'ability'"
+  <div>
+    <div
+      class="attribute"
+      :data-id="dataId"
+    >
+      <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>
+    <folder-group-children
      :model="model"
-      @click="$emit('click')"
+      @click-property="e => $emit('click-property', e)"
+      @sub-click="e => $emit('sub-click', e)"
+      @remove="e => $emit('remove', e)"
    />
-    <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>

@@ -50,6 +61,7 @@ import SpellSlotListTile from '/imports/client/ui/properties/components/attribut
 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 FolderGroupChildren from '/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue';

 import damageProperty from '/imports/api/creature/creatureProperties/methods/damageProperty.js';

@@ -62,12 +74,17 @@ export default {
    ResourceCardContent,
    AttributeCardContent,
    CardHighlight,
+    FolderGroupChildren,
  },
  props: {
    model: {
      type: Object,
      required: true,
    },
+    dataId: {
+      type: String,
+      required: true,
+    },
  },
  data() {
    return {
@@ -81,6 +98,10 @@ export default {
        value: change.value
      });
    },
+    log({_id}) {
+      console.log(...arguments)
+      this.$emit('click-property', { _id });
+    }
  }
 }
 </script>
--- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue
+++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue
@@ -0,0 +1,66 @@
+<template>
+  <div
+    v-if="properties && properties.length"
+  >
+    <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})"
+      @click-property="(e) => $emit('click-property', e)"
+      @sub-click="(e) => $emit('sub-click', e)"
+      @remove="$emit('remove', prop._id)"
+    />
+  </div>
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import propComponents from '/imports/client/ui/properties/components/folders/propertyComponentIndex.js';
+
+export default {
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    }
+  },
+  beforeCreate() {
+    Object.assign(this.$options.components, propComponents);
+  },
+  meteor: {
+    properties() {
+      const props = [];
+      CreatureProperties.find({
+        'parent.id': this.model._id,
+        removed: { $ne: true },
+        overridden: { $ne: true },
+        $or: [
+          {
+            type: 'toggle',
+            showUI: true,
+            deactivatedByAncestor: { $ne: true },
+          },
+          {
+            type: { $ne: 'toggle' },
+            inactive: { $ne: true },
+          },
+        ],
+        $nor: [
+          { hideWhenTotalZero: true, total: 0 },
+          { hideWhenValueZero: true, value: 0 },
+        ],
+      }, {
+        sort: { order: 1 },
+      }).forEach(prop => {
+        if (propComponents[prop.type]) {
+          props.push(prop);
+        }
+      });
+      return props;
+    },
+  },
+}
+</script>
--- a/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue
+++ b/app/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue
@@ -0,0 +1,82 @@
+<template>
+  <build-tree-node-list
+    :children="slotBuildTree"
+    class="mx-2"
+    @selected="_id => $emit('sub-click', _id)"
+  />
+</template>
+
+<script lang="js">
+import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js';
+import { nodeArrayToTree } from '/imports/api/parenting/nodesToTree.js';
+import BuildTreeNodeList from '/imports/client/ui/creature/buildTree/BuildTreeNodeList.vue';
+
+function traverse(tree, callback, parents = []){
+  tree.forEach(node => {
+    callback(node, parents);
+    traverse(node.children, callback, [...parents, node]);
+  });
+}
+
+export default {
+  components: {
+    BuildTreeNodeList,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  meteor: {
+    slotBuildTree() {
+      const slots = CreatureProperties.find({
+        $and: [ {
+          $or: [
+            { 'ancestors.id': this.model._id, },
+            { '_id': this.model._id, },
+          ],
+        }, {
+          $or:
+            [
+            { 'slotCondition.value': { $nin: [false, 0, ''] } },
+            { 'slotCondition.value': { $exists: false } },
+            { 'slotCondition': { $exists: false } },
+            ],
+        } ],
+        type: { $in: ['propertySlot', 'pointBuy'] },
+        removed: { $ne: true },
+        inactive: { $ne: true },
+      }, {
+        sort: { order: 1 }
+      });
+      const slotIds = slots.map(s => s._id);
+      const slotChildren = CreatureProperties.find({
+        'parent.id': { $in: slotIds },
+        removed: { $ne: true },
+      }, {
+        sort: { order: 1 },
+      });
+      const tree = nodeArrayToTree([
+        ...slots.fetch(),
+        ...slotChildren.fetch()
+      ]);
+      traverse(tree, (child, parents) => {
+        const model = child.node;
+        const isSlotWithSpace = model.type === 'propertySlot' && (
+          model.spaceLeft > 0 ||
+          !model.quantityExpected ||
+          model.quantityExpected.value === 0
+        );
+        if (isSlotWithSpace) {
+          model._canFill = true;
+          parents.forEach(node => {
+            node.node._descendantCanFill = true;
+          });
+        }
+      });
+      return tree;
+    },
+  }
+}
+</script>
--- a/app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
+++ b/app/imports/client/ui/properties/components/folders/propertyComponentIndex.js
@@ -17,16 +17,17 @@ import item from '/imports/client/ui/properties/components/inventory/ItemListTil
 import note from '/imports/client/ui/properties/components/persona/NoteCard.vue';
 //import pointBuy from '';
 //import proficiency from '';
-//import propertySlot from '';
+import propertySlot from '/imports/client/ui/properties/components/folders/folderGroupComponents/SlotBuildTree.vue';
 //import reference from '';
 //import roll from '';
 //import savingThrow from '';
 import skill from '/imports/client/ui/properties/components/skills/SkillListTile.vue';
 //import slotFiller from '';
-//import spellList from '';
-//import spell from '';
+import spellList from '/imports/client/ui/properties/components/spells/SpellListCard.vue';
+import spell from '/imports/client/ui/properties/components/spells/SpellListTile.vue';
 import toggle from '/imports/client/ui/properties/components/toggles/ToggleCard.vue';
 //import trigger from '';
+import FolderGroupChildren from '/imports/client/ui/properties/components/folders/folderGroupComponents/FolderGroupChildren.vue';

 export default {
  action,
@@ -43,19 +44,19 @@ export default {
  //damageMultiplier,
  //effect,
  feature,
-  //folder,
+  // folder // Like actions, we don't show sub-folders
  item,
  note,
  //pointBuy,
  //proficiency,
-  //propertySlot,
+  propertySlot,
  //reference,
  //roll,
  //savingThrow,
  skill,
-  //slotFiller,
-  //spellList,
-  //spell,
+  slotFiller: FolderGroupChildren,
+  spellList,
+  spell,
  toggle,
  //trigger,
 };
--- a/app/imports/client/ui/properties/components/spells/SpellListCard.vue
+++ b/app/imports/client/ui/properties/components/spells/SpellListCard.vue
@@ -5,11 +5,21 @@
    @toolbarclick="clickSpellList(model._id)"
  >
    <template slot="toolbar">
-      <v-toolbar-title>
+      <v-toolbar-title
+        v-if="!preparingSpells"
+      >
        {{ model.name }}
      </v-toolbar-title>
+      <v-spacer v-if="!preparingSpells && preparedError" />
+      <v-toolbar-title
+        v-if="preparingSpells || preparedError"
+        :class="{'error--text' : preparedError}"
+      >
+        {{ numPrepared }}/{{ model.maxPrepared.value }} spells prepared
+      </v-toolbar-title>
      <v-spacer />
      <v-menu
+        v-if="!preparingSpells"
        bottom
        left
        transition="slide-y-transition"
@@ -33,22 +43,29 @@
          />
        </v-list>
      </v-menu>
-    </template>
-    <v-expand-transition>
-      <v-card-text
-        v-if="preparedError || preparingSpells"
-        :class="{'error--text' : preparedError}"
-        class="pb-0"
+      <v-btn
+        v-else
+        icon
+        @click.stop="preparingSpells = false"
      >
-        <div v-if="model.maxPrepared && model.maxPrepared.value">
-          {{ numPrepared }}/{{ model.maxPrepared.value }} spells prepared
-        </div>
-        <v-switch
-          v-model="preparingSpells"
-          label="Change prepared spells"
-        />
-      </v-card-text>
-    </v-expand-transition>
+        <v-icon>mdi-check</v-icon>
+      </v-btn>
+    </template>
+    <!-- Disabled because it changes the height of the card
+    <v-card-text
+      v-if="preparedError || preparingSpells"
+      :class="{'error--text' : preparedError}"
+      class="pb-0"
+    >
+      <div v-if="model.maxPrepared && model.maxPrepared.value">
+        {{ numPrepared }}/{{ model.maxPrepared.value }} spells prepared
+      </div>
+      <v-switch
+        v-model="preparingSpells"
+        label="Change prepared spells"
+      />
+    </v-card-text>
+    -->
    <spell-list
      :spells="spells"
      :parent-ref="{id: model._id, collection: 'creatureProperties'}"
--- a/app/imports/client/ui/properties/forms/FolderForm.vue
+++ b/app/imports/client/ui/properties/forms/FolderForm.vue
@@ -35,7 +35,7 @@
          <v-expand-transition>
            <div v-if="model.groupStats">
              <smart-switch
-                label="Hide children from stats tab"
+                label="Hide children from their default locations"
                :value="model.hideStatsGroup"
                :error-messages="errors.hideStatsGroup"
                @change="change('hideStatsGroup', ...arguments)"
--- a/app/imports/client/ui/router.js
+++ b/app/imports/client/ui/router.js
@@ -13,6 +13,7 @@ const CharacterSheetPage = () => import('/imports/client/ui/pages/CharacterSheet
 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 CharacterSheetPrintedToolbar = () => import('/imports/client/ui/creature/character/printedCharacterSheet/CharacterSheetPrintedToolbar.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');
@@ -185,11 +186,14 @@ RouterFactory.configure(router => {
    alias: '/print-character/:id/:urlName',
    components: {
      default: CharacterSheetPrinted,
+      toolbar: CharacterSheetPrintedToolbar,
    },
    meta: {
      title: 'Print Character Sheet',
    },
-  }, {
+  },
+  /* Not ready for prime time <3
+  {
    path: '/tabletops',
    name: 'tabletops',
    component: Tabletops,
@@ -203,7 +207,9 @@ RouterFactory.configure(router => {
      rightDrawer: TabletopRightDrawer,
    },
    beforeEnter: ensureLoggedIn,
-  }, {
+  },
+  */
+  {
    path: '/friends',
    components: {
      default: NotImplemented,
--- a/app/imports/client/ui/styles/body.css
+++ b/app/imports/client/ui/styles/body.css
@@ -0,0 +1,37 @@
+html {
+  --scrollbarBG: #f0f0f0;
+  --thumbBG: #cdcdcd;
+  scrollbar-gutter: stable;
+  background-color: var(--scrollbarBG);
+}
+
+html:has(#app.theme--dark) {
+  --scrollbarBG: #212121;
+  --thumbBG: #404040;
+}
+
+#app.theme--dark {
+  --scrollbarBG: #212121;
+  --thumbBG: #404040;
+}
+
+* {
+  scrollbar-width: thin;
+  scrollbar-color: var(--thumbBG) var(--scrollbarBG);
+}
+
+::-webkit-scrollbar {
+  width: 8px;
+}
+
+::-webkit-scrollbar-track {
+  background-color: var(--scrollbarBG);
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: var(--thumbBG);
+}
+
+::-webkit-scrollbar-corner {
+  background-color: rgba(0, 0, 0, 0);
+}
--- a/app/imports/client/ui/styles/stylesIndex.js
+++ b/app/imports/client/ui/styles/stylesIndex.js
@@ -1,3 +1,4 @@
+import './body.css';
 import './cardColors.css';
 import './cardTitles.css';
 import './centeredInputs.css';
--- 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', 'actions', 'spells', 'inventory', 'journal', 'build', 'tree'];
-const tabsWithoutSpells = ['stats', 'features', 'actions', 'inventory', 'journal', 'build', 'tree'];
+const tabs = ['stats', 'actions', 'spells', 'inventory', 'features', 'journal', 'build', 'tree'];
+const tabsWithoutSpells = ['stats', 'actions', 'inventory', 'features', 'journal', 'build', 'tree'];

 Vue.use(Vuex);
 const store = new Vuex.Store({
@@ -50,6 +50,19 @@ const store = new Vuex.Store({
      document.title = value;
    },
    setTabForCharacterSheet(state, { tab, id }) {
+      // Convert tab names to tab numbers
+      if (typeof tab === 'string') {
+        const creature = Creatures.findOne(id);
+        if (creature?.settings?.hideSpellsTab) {
+          tab = tabsWithoutSpells.indexOf(tab);
+        } else {
+          tab = tabs.indexOf(tab);
+        }
+        if (!(tab > -1)) {
+          throw 'Could not find requested tab';
+        }
+        console.log('resolved: ', tab);
+      }
      Vue.set(state.characterSheetTabs, id, tab);
    },
    setShowDetailsDialog(state, value) {
--- a/app/imports/constants/STORAGE_LIMITS.js
+++ b/app/imports/constants/STORAGE_LIMITS.js
@@ -30,7 +30,7 @@ const STORAGE_LIMITS = Object.freeze({
  rollCount: 64,
  statsToTarget: 64,
  tagCount: 64,
-  writersCount: 20,
+  writersCount: 32,
  libraryCollectionCount: 32,
  pointBuyRowsCount: 32,
 });