diff --git a/app/imports/api/library/librarySchemas.js b/app/imports/api/library/librarySchemas.js
index b354eb66..f4c19a65 100644
--- a/app/imports/api/library/librarySchemas.js
+++ b/app/imports/api/library/librarySchemas.js
@@ -1,6 +1,7 @@
 import { CreatureSchema } from '/imports/api/creature/Creatures.js';
 import { ActionSchema } from '/imports/api/creature/properties/Actions.js';
 import { AttributeSchema } from '/imports/api/creature/properties/Attributes.js';
+import { StoredBuffSchema } from '/imports/api/creature/properties/Buffs.js';
 import { ClassSchema } from '/imports/api/creature/properties/Classes.js';
 import { ClassLevelSchema } from '/imports/api/creature/properties/ClassLevels.js';
 import { DamageMultiplierSchema } from '/imports/api/creature/properties/DamageMultipliers.js';
@@ -10,6 +11,7 @@ import { FeatureSchema } from '/imports/api/creature/properties/Features.js';
 import { FolderSchema } from '/imports/api/creature/properties/Folders.js';
 import { NoteSchema } from '/imports/api/creature/properties/Notes.js';
 import { ProficiencySchema } from '/imports/api/creature/properties/Proficiencies.js';
+import { RollSchema } from '/imports/api/creature/properties/Rolls.js';
 import { SkillSchema } from '/imports/api/creature/properties/Skills.js';
 import { SpellListSchema } from '/imports/api/creature/properties/SpellLists.js';
 import { SpellSchema } from '/imports/api/creature/properties/Spells.js';
@@ -21,6 +23,7 @@ const librarySchemas = {
   creature: CreatureSchema,
   action: ActionSchema,
   attribute: AttributeSchema,
+  buff: StoredBuffSchema,
   class: ClassSchema,
   classLevel: ClassLevelSchema,
   damageMultiplier: DamageMultiplierSchema,
@@ -30,6 +33,7 @@ const librarySchemas = {
   folder: FolderSchema,
   note: NoteSchema,
   proficiency: ProficiencySchema,
+  roll: RollSchema,
   skill: SkillSchema,
   spellList: SpellListSchema,
   spell: SpellSchema,
diff --git a/app/imports/ui/StoryBook.vue b/app/imports/ui/StoryBook.vue
index 9956334b..651422d1 100644
--- a/app/imports/ui/StoryBook.vue
+++ b/app/imports/ui/StoryBook.vue
@@ -41,11 +41,9 @@
 	import Vue from "vue";
 	import AbilityListTile from '/imports/ui/creature/properties/attributes/AbilityListTile.Story.vue';
 	import AttributeCard from '/imports/ui/creature/properties/attributes/AttributeCard.Story.vue';
-	import AttributeForm from '/imports/ui/creature/properties/attributes/AttributeForm.Story.vue';
 	import ColorPicker from '/imports/ui/components/ColorPicker.Story.vue';
 	import ColumnLayout from "/imports/ui/components/ColumnLayout.Story.vue";
 	import DialogStack from '/imports/ui/dialogStack/DialogStack.Story.vue';
-	import EffectForm from '/imports/ui/creature/properties/effects/EffectForm.Story.vue';
 	import EffectEditExpansionList from '/imports/ui/creature/properties/effects/EffectEditExpansionList.Story.vue';
 	import FeatureCard from '/imports/ui/creature/properties/features/FeatureCard.Story.vue';
 	import HealthBar from '/imports/ui/creature/properties/attributes/HealthBar.Story.vue';
@@ -62,11 +60,9 @@
 		components: {
 			AbilityListTile,
 			AttributeCard,
-			AttributeForm,
 			ColorPicker,
 			ColumnLayout,
 			DialogStack,
-			EffectForm,
 			EffectEditExpansionList,
 			FeatureCard,
 			HealthBar,
diff --git a/app/imports/ui/creature/properties/PropertySelector.vue b/app/imports/ui/creature/properties/PropertySelector.vue
index 73997098..22c56a8a 100644
--- a/app/imports/ui/creature/properties/PropertySelector.vue
+++ b/app/imports/ui/creature/properties/PropertySelector.vue
@@ -24,6 +24,7 @@ export default {
 			{name: 'Creature', icon: 'accessibility', type: 'creature'},
 			{name: 'Action', icon: 'offline-bolt', type: 'action'},
 			{name: 'Attribute', icon: 'star-rate', type: 'attribute'},
+			{name: 'Buff', icon: 'star', type: 'buff'},
 			{name: 'Class', icon: 'school', type: 'class'},
 			{name: 'Class Level', icon: 'plus-one', type: 'classLevel'},
 			{name: 'Damage Multiplier', icon: 'layers', type: 'damageMultiplier'},
@@ -33,6 +34,7 @@ export default {
 			{name: 'Folder', icon: 'folder', type: 'folder'},
 			{name: 'Note', icon: 'note', type: 'note'},
 			{name: 'Proficiency', icon: 'radio-button-checked', type: 'proficiency'},
+			{name: 'Roll', icon: 'dice', type: 'roll'},
 			{name: 'Skill', icon: 'check-box', type: 'skill'},
 			{name: 'Spell List', icon: 'list', type: 'spellList'},
 			{name: 'Spell', icon: 'whatshot', type: 'spell'},
diff --git a/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue b/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
index c20560ab..85646e5c 100644
--- a/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeCreationDialog.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-	import AttributeForm from 'imports/ui/forms/AttributeForm.vue';
+	import AttributeForm from '/imports/ui/forms/AttributeForm.vue';
 	import Attributes from '/imports/api/creature/properties/Attributes.js';
 	import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 
diff --git a/app/imports/ui/creature/properties/attributes/AttributeDialog.vue b/app/imports/ui/creature/properties/attributes/AttributeDialog.vue
index c14f1adb..d753a3b0 100644
--- a/app/imports/ui/creature/properties/attributes/AttributeDialog.vue
+++ b/app/imports/ui/creature/properties/attributes/AttributeDialog.vue
@@ -36,7 +36,7 @@
 <script>
 	import DialogBase from "/imports/ui/dialogStack/DialogBase.vue";
 	import EffectChildList from '/imports/ui/creature/properties/effects/EffectChildList.vue';
-	import AttributeForm from 'imports/ui/forms/AttributeForm.vue';
+	import AttributeForm from '/imports/ui/forms/AttributeForm.vue';
 	import numberToSignedString from '/imports/ui/utility/numberToSignedString.js';
 
 	export default {
diff --git a/app/imports/ui/forms/ActionForm.vue b/app/imports/ui/forms/ActionForm.vue
index 6a7de8f1..160f2358 100644
--- a/app/imports/ui/forms/ActionForm.vue
+++ b/app/imports/ui/forms/ActionForm.vue
@@ -95,8 +95,8 @@
 
 <script>
 	import FormSection, {FormSections} from '/imports/ui/forms/components/FormSection.vue';
-	import AdjustmentListForm from 'imports/ui/forms/AdjustmentListForm.vue';
-	import BuffListForm from 'imports/ui/forms/BuffListForm.vue';
+	import AdjustmentListForm from '/imports/ui/forms/AdjustmentListForm.vue';
+	import BuffListForm from '/imports/ui/forms/BuffListForm.vue';
 
 	export default {
 		components: {
diff --git a/app/imports/ui/forms/AdjustmentListForm.vue b/app/imports/ui/forms/AdjustmentListForm.vue
index 9cc0ba8c..c13f169d 100644
--- a/app/imports/ui/forms/AdjustmentListForm.vue
+++ b/app/imports/ui/forms/AdjustmentListForm.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-	import AdjustmentForm from 'imports/ui/forms/AdjustmentForm.vue';
+	import AdjustmentForm from '/imports/ui/forms/AdjustmentForm.vue';
 	import AdjustmentSchema from '/imports/api/creature/subSchemas/AdjustmentSchema.js';
 
 	export default {
diff --git a/app/imports/ui/forms/BuffListForm.vue b/app/imports/ui/forms/BuffListForm.vue
index e5952e1b..9f715dad 100644
--- a/app/imports/ui/forms/BuffListForm.vue
+++ b/app/imports/ui/forms/BuffListForm.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-	import BuffForm from 'imports/ui/forms/BuffForm.vue';
+	import BuffForm from '/imports/ui/forms/BuffForm.vue';
 	import {StoredBuffSchema, AppliedBuffSchema} from '/imports/api/creature/properties/Buffs.js';
 
 	export default {
diff --git a/app/imports/ui/forms/components/propertyFormIndex.js b/app/imports/ui/forms/components/propertyFormIndex.js
index 32e73b7d..102049ee 100644
--- a/app/imports/ui/forms/components/propertyFormIndex.js
+++ b/app/imports/ui/forms/components/propertyFormIndex.js
@@ -1,5 +1,5 @@
-import ActionForm from 'imports/ui/forms/ActionForm.vue';
-import AttributeForm from 'imports/ui/forms/AttributeForm.vue';
+import ActionForm from '/imports/ui/forms/ActionForm.vue';
+import AttributeForm from '/imports/ui/forms/AttributeForm.vue';
 import BuffForm from '/imports/ui/forms/BuffForm.vue';
 import EffectForm from '/imports/ui/forms/EffectForm.vue';
 import FeatureForm from '/imports/ui/forms/FeatureForm.vue';
diff --git a/app/imports/ui/library/LibraryNodeInsertForm.vue b/app/imports/ui/library/LibraryNodeInsertForm.vue
index 131d8149..5a176e78 100644
--- a/app/imports/ui/library/LibraryNodeInsertForm.vue
+++ b/app/imports/ui/library/LibraryNodeInsertForm.vue
@@ -28,8 +28,8 @@
 <script>
 import librarySchemas from '/imports/api/library/librarySchemas.js';
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
-import propertyFormIndex from 'imports/ui/forms/propertyFormIndex.vue';
-import schemaFormMixin from '/imports/ui/forms/components/schemaFormMixin.vue';
+import propertyFormIndex from '/imports/ui/forms/components/propertyFormIndex.js';
+import schemaFormMixin from '/imports/ui/forms/components/schemaFormMixin.js';
 export default {
 	components: {
 		...propertyFormIndex,