diff --git a/5e Darker Dungeons/5e Darker Dungeons.css b/5e Darker Dungeons/5e Darker Dungeons.css
index 6939f5ceb4..f813f9f78e 100644
--- a/5e Darker Dungeons/5e Darker Dungeons.css	
+++ b/5e Darker Dungeons/5e Darker Dungeons.css	
@@ -131,19 +131,8 @@
       border-radius: 100%; }
       .charsheet .sheet-darkerdungeons .sheet-container-attribute .sheet-container-footer input:hover, .charsheet .sheet-darkerdungeons .sheet-container-attribute .sheet-container-footer input:focus {
         background: #e5fffb; }
-        .charsheet .sheet-darkerdungeons .sheet-container-attribute .sheet-container-footer input:hover ~ span, .charsheet .sheet-darkerdungeons .sheet-container-attribute .sheet-container-footer input:focus ~ span {
-          display: none; }
     .charsheet .sheet-darkerdungeons .sheet-container-attribute .sheet-container-footer span {
-      display: block;
-      color: #14b500;
-      margin-top: -18px;
-      text-align: center;
-      background: white;
-      border-radius: 100%;
-      position: relative;
-      font-weight: bold; }
-      .charsheet .sheet-darkerdungeons .sheet-container-attribute .sheet-container-footer span:hover {
-        display: none; }
+      display: none; }
 
 .charsheet .sheet-darkerdungeons .sheet-container-bar {
   display: flex;
@@ -698,54 +687,6 @@
 .charsheet .sheet-darkerdungeons .sheet-display-brackets-xp::before {
   content: "("; }
 
-.sheet-compendium-warning,
-.sheet-monster-confirm {
-  display: none;
-  position: absolute;
-  top: 50%;
-  background: white;
-  left: 50%;
-  z-index: 100;
-  border: 2px solid black;
-  width: 300px;
-  box-sizing: border-box;
-  text-align: center;
-  margin: 0 0 0 -150px;
-  padding: 30px;
-  text-transform: uppercase;
-  font-weight: bold;
-  box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.75); }
-
-.sheet-compendium-warning {
-  margin-top: -41px; }
-
-.sheet-monster-confirm {
-  margin-top: -75px; }
-  .sheet-monster-confirm .sheet-monster-confirm-buttons {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 20px; }
-    .sheet-monster-confirm .sheet-monster-confirm-buttons .sheet-monster-confirm-button {
-      position: relative;
-      border: 1px solid black;
-      border-radius: 3px;
-      width: 100%;
-      padding: 5px; }
-      .sheet-monster-confirm .sheet-monster-confirm-buttons .sheet-monster-confirm-button + .sheet-monster-confirm-button {
-        margin-left: 10px; }
-      .sheet-monster-confirm .sheet-monster-confirm-buttons .sheet-monster-confirm-button input {
-        position: absolute;
-        height: 100%;
-        width: 100%;
-        margin: 0;
-        left: 0;
-        top: 0;
-        opacity: 0; }
-
-.sheet-licensecontainer.active-drop-target.dropping .sheet-compendium-warning,
-.sheet-monster_confirm_flag[value="1"] .sheet-licensecontainer .sheet-monster-confirm {
-  display: block; }
-
 .sheet-rolltemplate-spell .sheet-grey {
   color: #A0A0A0;
   font-weight: normal; }
@@ -986,7 +927,13 @@
 .sheet-rolltemplate-dmg .sheet-desc .inlinerollresult.fullfail
 .sheet-rolltemplate-atk .sheet-desc .inlinerollresult.fullcrit,
 .sheet-rolltemplate-atk .sheet-desc .inlinerollresult.importantroll,
-.sheet-rolltemplate-atk .sheet-desc .inlinerollresult.fullfail {
+.sheet-rolltemplate-atk .sheet-desc .inlinerollresult.fullfail,
+.sheet-rolltemplate-mancerroll .inlinerollresult.fullcrit,
+.sheet-rolltemplate-mancerroll .inlinerollresult.importantroll,
+.sheet-rolltemplate-mancerroll .inlinerollresult.fullfail,
+.sheet-rolltemplate-mancerhproll .inlinerollresult.fullcrit,
+.sheet-rolltemplate-mancerhproll .inlinerollresult.importantroll,
+.sheet-rolltemplate-mancerhproll .inlinerollresult.fullfail {
   color: black;
   border: 0px; }
 
@@ -1019,7 +966,9 @@
 
 .sheet-rolltemplate-dmg .sheet-desc .inlinerollresult,
 .sheet-rolltemplate-atkdmg .sheet-desc .inlinerollresult,
-.sheet-rolltemplate-atk .sheet-desc .inlinerollresult {
+.sheet-rolltemplate-atk .sheet-desc .inlinerollresult,
+.sheet-rolltemplate-mancerroll .inlinerollresult,
+.sheet-rolltemplate-mancerhproll .inlinerollresult {
   background-color: transparent;
   border: 0px;
   display: inline-block;
@@ -1296,27 +1245,6 @@
 .sheet-rolltemplate-npcatk a[href^="~"]:hover {
   color: #EC2127; }
 
-.sheet-rolltemplate-simple .sheet-charname,
-.sheet-rolltemplate-atk .sheet-charname,
-.sheet-rolltemplate-dmg .sheet-charname,
-.sheet-rolltemplate-atkdmg .sheet-charname {
-  text-align: center;
-  margin-top: -10px; }
-
-.sheet-rolltemplate-simple .sheet-charname span,
-.sheet-rolltemplate-atk .sheet-charname span,
-.sheet-rolltemplate-dmg .sheet-charname span,
-.sheet-rolltemplate-atkdmg .sheet-charname span {
-  font-size: 11px;
-  font-weight: normal;
-  color: #A0A0A0; }
-
-.sheet-rolltemplate-dmg .sheet-label .sheet-rolltemplate-inline,
-.sheet-rolltemplate-dmg .sheet-savedc .sheet-rolltemplate-inline,
-.sheet-rolltemplate-atkdmg .sheet-savedc .sheet-rolltemplate-inline,
-.sheet-rolltemplate-atkdmg .sheet-label .sheet-rolltemplate-inline {
-  display: inline-block; }
-
 .charsheet .sheet-darkerdungeons .sheet-section-npc-display .sheet-npc-header .sheet-npc-header-name {
   padding-right: 20px; }
 .charsheet .sheet-darkerdungeons .sheet-section-npc-display .sheet-npc-header > span {
@@ -1551,19 +1479,19 @@
       display: none;
       position: relative;
       padding: 0; }
-    .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(5) {
+    .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(4) {
       display: block; }
-      .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(5) .sheet-tab-content {
+      .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(4) .sheet-tab-content {
         display: block;
         top: 0; }
-        .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(5) .sheet-tab-content .sheet-container-well-spell-attributes {
+        .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(4) .sheet-tab-content .sheet-container-well-spell-attributes {
           display: none; }
-        .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(5) .sheet-tab-content .sheet-container-well-spells {
+        .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(4) .sheet-tab-content .sheet-container-well-spells {
           margin-bottom: 0;
           border-radius: 0;
           grid-template-columns: 1fr;
           grid-auto-flow: inherit; }
-          .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(5) .sheet-tab-content .sheet-container-well-spells > .sheet-container-spell {
+          .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) + .sheet-toggle-npc-spells:checked ~ .sheet-section-pc .sheet-tab:nth-of-type(4) .sheet-tab-content .sheet-container-well-spells > .sheet-container-spell {
             min-height: 112px; }
 .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) ~ .sheet-toggle-npc-edit:checked ~ .sheet-section-pc .sheet-tab-content {
   display: none !important; }
@@ -1706,22 +1634,20 @@
   .sheet-tabs .sheet-tab {
     width: 800px; }
     .sheet-tabs .sheet-tab:nth-of-type(2) > input[type="radio"], .sheet-tabs .sheet-tab:nth-of-type(2) > .sheet-tab-label {
-      margin-left: 16.66667%; }
+      margin-left: 20%; }
     .sheet-tabs .sheet-tab:nth-of-type(3) > input[type="radio"], .sheet-tabs .sheet-tab:nth-of-type(3) > .sheet-tab-label {
-      margin-left: 33.33333%; }
+      margin-left: 40%; }
     .sheet-tabs .sheet-tab:nth-of-type(4) > input[type="radio"], .sheet-tabs .sheet-tab:nth-of-type(4) > .sheet-tab-label {
-      margin-left: 50%; }
+      margin-left: 60%; }
     .sheet-tabs .sheet-tab:nth-of-type(5) > input[type="radio"], .sheet-tabs .sheet-tab:nth-of-type(5) > .sheet-tab-label {
-      margin-left: 66.66667%; }
-    .sheet-tabs .sheet-tab:nth-of-type(6) > input[type="radio"], .sheet-tabs .sheet-tab:nth-of-type(6) > .sheet-tab-label {
-      margin-left: 83.33333%; }
+      margin-left: 80%; }
     .sheet-tabs .sheet-tab > input[type="radio"] {
       height: 30px;
       margin: 0;
       opacity: 0;
       position: absolute;
       top: 0;
-      width: 16.66667%;
+      width: 20%;
       z-index: 1; }
       .sheet-tabs .sheet-tab > input[type="radio"]:hover ~ .sheet-tab-label {
         background: #e5fffb;
@@ -1742,7 +1668,7 @@
       position: absolute;
       text-transform: uppercase;
       top: 0;
-      width: 16.66667%;
+      width: 20%;
       border-left-color: white;
       border-top-color: white;
       border-right-color: white;
@@ -2075,14 +2001,11 @@
   grid-template-rows: 65px auto; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-health .sheet-pc-hp-max {
     grid-area: hp-max; }
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-health .sheet-pc-hp-max .sheet-container-body {
-      padding-top: 0; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-health .sheet-pc-hp-current {
     grid-area: hp; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-health .sheet-pc-hp-current .sheet-container-body {
       display: flex;
-      flex-direction: row;
-      padding-top: 0; }
+      flex-direction: row; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-health .sheet-pc-hp-current .sheet-container-footer {
       display: flex;
       padding-left: 10px;
@@ -2096,8 +2019,7 @@
     max-height: 65px; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-health .sheet-pc-hit-dice .sheet-container-body {
       display: flex;
-      flex-direction: row;
-      padding-top: 0; }
+      flex-direction: row; }
       .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-health .sheet-pc-hit-dice .sheet-container-body span {
         align-items: center;
         color: #dddddd;
@@ -2195,8 +2117,7 @@
     grid-area: exhaustion; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-conditions .sheet-pc-exhaustion .sheet-container-body {
       display: flex;
-      flex-direction: row;
-      padding-top: 0; }
+      flex-direction: row; }
       .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-conditions .sheet-pc-exhaustion .sheet-container-body span {
         align-items: center;
         display: flex;
@@ -2286,9 +2207,9 @@
   grid-area: attacks;
   grid-column-gap: 5px;
   grid-row-gap: 5px;
-  grid-template-areas: "spell-ability spell-dc spell-attack" "resource-class resource-other spell-burnout" "resources resources resources" "attacks attacks attacks";
+  grid-template-areas: "spell-ability spell-dc spell-attack" "resource-class resource-other spell-burnout" "attacks attacks attacks";
   grid-template-columns: repeat(3, 1fr);
-  grid-template-rows: 65px 65px auto 1fr; }
+  grid-template-rows: 65px 65px auto; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-spell-ability {
     grid-area: spell-ability; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-spell-dc {
@@ -2302,20 +2223,6 @@
     grid-area: resource-class; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resource-other {
     grid-area: resource-other; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resources {
-    grid-area: resources; }
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resources .sheet-pc-resource {
-      font-size: 11px; }
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resources .sheet-pc-resource span:nth-of-type(2) {
-        opacity: .5; }
-        .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resources .sheet-pc-resource span:nth-of-type(2)::before {
-          content: "("; }
-        .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resources .sheet-pc-resource span:nth-of-type(2)::after {
-          content: " /"; }
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resources .sheet-pc-resource span:nth-of-type(3) {
-        opacity: .5; }
-        .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resources .sheet-pc-resource span:nth-of-type(3)::after {
-          content: ")"; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resource-class .sheet-container-header,
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-container-well-attacks .sheet-pc-resource-other .sheet-container-header {
     position: relative; }
@@ -2393,49 +2300,31 @@
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-saving-throw-modifier,
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-tool-modifier,
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-modifier,
-.charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier,
-.charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-ac-modifier {
+.charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier {
   align-items: center;
   display: flex; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-saving-throw-modifier .sheet-checkbox-image,
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-tool-modifier .sheet-checkbox-image,
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-modifier .sheet-checkbox-image,
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier .sheet-checkbox-image,
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-ac-modifier .sheet-checkbox-image {
+  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier .sheet-checkbox-image {
     height: 10px;
     margin-right: 5px;
     width: 10px; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-saving-throw-modifier .sheet-checkbox-image span,
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-tool-modifier .sheet-checkbox-image span,
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-modifier .sheet-checkbox-image span,
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier .sheet-checkbox-image span,
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-ac-modifier .sheet-checkbox-image span {
+    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier .sheet-checkbox-image span {
       padding: 1px; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-saving-throw-modifier > span,
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-tool-modifier > span,
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-modifier > span,
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier > span,
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-ac-modifier > span {
+  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier > span {
     font-size: 11px; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-saving-throw-modifier > span + span,
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-tool-modifier > span + span,
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-modifier > span + span,
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier > span + span,
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-ac-modifier > span + span {
-      margin-left: 5px;
-      opacity: .5; }
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-saving-throw-modifier > span + span::before,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-tool-modifier > span + span::before,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-modifier > span + span::before,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier > span + span::before,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-ac-modifier > span + span::before {
-        content: "("; }
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-saving-throw-modifier > span + span::after,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-tool-modifier > span + span::after,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-modifier > span + span::after,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier > span + span::after,
-      .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-ac-modifier > span + span::after {
-        content: ")"; }
+    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-core .sheet-pc-attack-damage-modifier > span + span {
+      margin-left: 5px; }
 .charsheet .sheet-darkerdungeons .sheet-list-conditions {
   display: flex;
   flex-direction: column;
@@ -2684,8 +2573,7 @@
 .charsheet .sheet-darkerdungeons .sheet-pc-slots .sheet-container-body,
 .charsheet .sheet-darkerdungeons .sheet-pc-weight .sheet-container-body {
   display: flex;
-  flex-direction: row;
-  padding-top: 0; }
+  flex-direction: row; }
   .charsheet .sheet-darkerdungeons .sheet-pc-slots .sheet-container-body span,
   .charsheet .sheet-darkerdungeons .sheet-pc-weight .sheet-container-body span {
     align-items: center;
@@ -2709,19 +2597,19 @@
     width: 100%; }
 .charsheet .sheet-darkerdungeons .repitem:not(:first-of-type) .sheet-pc-item .sheet-pc-item-header {
   display: none; }
-.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="0"] ~ .repcontainer .sheet-pc-equipment-container-footer span:nth-of-type(4),
-.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="0"] ~ .repcontainer .sheet-pc-item-header span:nth-of-type(4),
+.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="0"] ~ .repcontainer .sheet-pc-equipment-container-footer span:nth-of-type(5),
+.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="0"] ~ .repcontainer .sheet-pc-item-header span:nth-of-type(5),
 .charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="0"] ~ .repcontainer .sheet-pc-item .sheet-pc-item-slots {
   display: none; }
-.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="1"] ~ .repcontainer .sheet-pc-equipment-container-footer span:nth-of-type(3),
-.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="1"] ~ .repcontainer .sheet-pc-item-header span:nth-of-type(3),
+.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="1"] ~ .repcontainer .sheet-pc-equipment-container-footer span:nth-of-type(4),
+.charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="1"] ~ .repcontainer .sheet-pc-item-header span:nth-of-type(4),
 .charsheet .sheet-darkerdungeons .sheet-pc-equipment .sheet-toggle-slots[value="1"] ~ .repcontainer .sheet-pc-item .sheet-pc-item-weight {
   display: none; }
 
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features > input[type="radio"]:checked ~ .sheet-tab-content {
   display: grid;
   grid-template-columns: auto 262.5px;
-  grid-template-rows: 355px auto;
+  grid-template-rows: 295px auto;
   grid-column-gap: 5px;
   grid-row-gap: 5px;
   grid-template-areas: "details features" "memories features"; }
@@ -2729,7 +2617,7 @@
   grid-area: details;
   display: grid;
   grid-template-columns: repeat(2, 1fr);
-  grid-template-rows: repeat(4, 1fr);
+  grid-template-rows: repeat(3, 65px) auto;
   grid-column-gap: 5px;
   grid-row-gap: 5px;
   grid-template-areas: "details personality" "details ideals" "details bonds" "details flaws"; }
@@ -2768,8 +2656,7 @@
       border-top: 0;
       border-left: 0;
       border-right: 0;
-      border-radius: 0;
-      padding: 0 4px; }
+      border-radius: 0; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail select {
       cursor: pointer;
       border-top: 0;
@@ -2791,21 +2678,6 @@
       flex-grow: 1;
       flex-shrink: 0;
       text-align: center; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-column {
-    display: flex;
-    flex-direction: column;
-    width: 100%; }
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-column * {
-      margin: 0;
-      flex-shrink: 0; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-habit,
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-motivation,
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-feature {
-    height: auto; }
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-habit label,
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-motivation label,
-    .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-feature label {
-      height: 100%; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-quest {
     height: 40px; }
     .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-details .sheet-pc-detail-quest label {
@@ -2818,8 +2690,7 @@
       border-right: 0;
       border-radius: 0;
       resize: none;
-      padding: 0 4px;
-      line-height: 13px; }
+      padding: 0; }
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-personality {
   grid-area: personality; }
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-ideals {
@@ -2858,8 +2729,7 @@
   padding: 0;
   resize: none;
   margin: 0;
-  height: auto;
-  line-height: 13px; }
+  height: auto; }
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-features {
   grid-area: features; }
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-features .sheet-pc-features .sheet-checkbox-cog:hover span {
@@ -2912,32 +2782,6 @@
       padding: 3px 5px;
       border-radius: 3px; }
 
-.charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-notes > input[type="radio"]:checked ~ .sheet-tab-content {
-  display: grid; }
-.charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-notes .sheet-pc-notes {
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
-  grid-template-rows: 1fr 1fr;
-  grid-column-gap: 10px;
-  grid-row-gap: 10px;
-  grid-template-areas: "backstory features features" "allies allies treasure"; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-notes .sheet-pc-notes textarea {
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    resize: none;
-    border: 0;
-    font-size: 11px;
-    line-height: 13px; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-notes .sheet-pc-notes .sheet-pc-notes-features {
-    grid-area: features; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-notes .sheet-pc-notes .sheet-pc-notes-backstory {
-    grid-area: backstory; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-notes .sheet-pc-notes .sheet-pc-notes-allies {
-    grid-area: allies; }
-  .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-notes .sheet-pc-notes .sheet-pc-notes-treasure {
-    grid-area: treasure; }
-
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-spells .sheet-pc-spell-ability .sheet-container-header,
 .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-spells .sheet-pc-burnout .sheet-container-header {
   padding-left: 10px;
@@ -3115,68 +2959,9 @@
   .charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-options .sheet-pc-options .sheet-form-fieldset .sheet-form-fieldset-header {
     background-color: lightgrey;
     color: inherit; }
-.charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-options .sheet-form-fieldset-custom-ac {
-  margin-top: 5px; }
-.charsheet .sheet-darkerdungeons .sheet-section-pc .sheet-tab-options .sheet-form-fieldset-hp-modifiers .repitem + .repitem {
-  margin-top: 5px; }
 
 .charsheet .sheet-darkerdungeons .sheet-section-roll {
-  margin: 0 auto;
-  width: 800px;
-  display: flex;
-  justify-content: flex-end;
-  margin-bottom: -18px;
-  height: 18px; }
-.charsheet .sheet-darkerdungeons .sheet-section-roll-advantage,
-.charsheet .sheet-darkerdungeons .sheet-section-roll-whisper {
   display: none; }
-  .charsheet .sheet-darkerdungeons .sheet-section-roll-advantage label,
-  .charsheet .sheet-darkerdungeons .sheet-section-roll-whisper label {
-    position: relative; }
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-advantage label:first-of-type span,
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-whisper label:first-of-type span {
-      border-radius: 4px 0 0 4px;
-      border-left: 1px solid #b7b7b7; }
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-advantage label:last-of-type span,
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-whisper label:last-of-type span {
-      border-radius: 0 4px 4px 0; }
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-advantage label span,
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-whisper label span {
-      background: #dddddd;
-      padding: 1px 5px;
-      font-weight: bold;
-      border: 1px solid #b7b7b7;
-      border-left: 0;
-      color: #909090; }
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-advantage label input,
-    .charsheet .sheet-darkerdungeons .sheet-section-roll-whisper label input {
-      position: absolute;
-      left: 0;
-      top: 0;
-      height: 100%;
-      width: 100%;
-      opacity: 0; }
-      .charsheet .sheet-darkerdungeons .sheet-section-roll-advantage label input:checked ~ span,
-      .charsheet .sheet-darkerdungeons .sheet-section-roll-whisper label input:checked ~ span {
-        background: #7e2d40;
-        color: white;
-        border-color: #7e2d40; }
-      .charsheet .sheet-darkerdungeons .sheet-section-roll-advantage label input:not(:checked):hover ~ span,
-      .charsheet .sheet-darkerdungeons .sheet-section-roll-whisper label input:not(:checked):hover ~ span {
-        color: black; }
-.charsheet .sheet-darkerdungeons .sheet-roll-toggle[value*="advantagetoggle"] + .sheet-section-roll-advantage,
-.charsheet .sheet-darkerdungeons .sheet-roll-toggle[value*="whispertoggle"] + .sheet-section-roll-whisper {
-  display: flex; }
-.charsheet .sheet-darkerdungeons .sheet-section-roll-whisper {
-  margin-left: 3px; }
-.charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) ~ .sheet-section-roll {
-  width: 385px;
-  justify-content: space-between;
-  margin-bottom: 0;
-  height: auto; }
-  .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) ~ .sheet-section-roll .sheet-section-roll-advantage,
-  .charsheet .sheet-darkerdungeons .sheet-toggle-npc:not([value="0"]) ~ .sheet-section-roll .sheet-section-roll-whisper {
-    margin-bottom: 10px; }
 
 .charsheet .sheet-darkerdungeons .sheet-section-templates {
   display: none; }
diff --git a/5e Darker Dungeons/5e Darker Dungeons.html b/5e Darker Dungeons/5e Darker Dungeons.html
index 8c7cbb5fa1..4c53f527a9 100644
--- a/5e Darker Dungeons/5e Darker Dungeons.html	
+++ b/5e Darker Dungeons/5e Darker Dungeons.html	
@@ -1,35 +1,19 @@
 <div class="sheet-darkerdungeons">
-	<input class="monster_confirm_flag" type="hidden" name="attr_monster_confirm_flag">
-	<div class="licensecontainer compendium-drop-target monsters">
+	<div class="compendium-drop-target">
 		<input class="sheet-toggle-npc" name="attr_npc" type="hidden" value="0">
 		<input class="sheet-toggle-npc-spells" name="attr_npcspellcastingflag" type="checkbox" value="1" hidden>
 		<input class="sheet-toggle-npc-edit" name="attr_npc_options-flag" type="checkbox" hidden>
 		<div class="sheet-section-roll">
-			<input type="hidden" name="attr_rtype" class="sheet-roll-toggle">
-			<div class="sheet-section-roll-advantage">
-				<label class="sheet-radio">
-					<input type="radio" name="attr_advantagetoggle" value="{{query=1}} {{advantage=1}} {{r2=[[@{d20}">
-					<span title="@{advantagetoggle}">Advantage</span>
-				</label>
-				<label class="sheet-radio">
-					<input type="radio" name="attr_advantagetoggle" value="{{query=1}} {{normal=1}} {{r2=[[0d20" checked="checked">
-					<span title="@{advantagetoggle}">Normal</span>
-				</label>
-				<label class="sheet-radio">
-					<input type="radio" name="attr_advantagetoggle" value="{{query=1}} {{disadvantage=1}} {{r2=[[@{d20}">
-					<span title="@{advantagetoggle}">Disadvantage</span>
-				</label>
+			<input type="hidden" name="attr_rtype">
+			<div>
+				<input type="radio" name="attr_advantagetoggle" value="{{query=1}} {{advantage=1}} {{r2=[[@{d20}"><span>ADVANTAGE</span>
+				<input type="radio" name="attr_advantagetoggle" value="{{query=1}} {{normal=1}} {{r2=[[0d20" checked="checked"><span>NORMAL</span>
+				<input type="radio" name="attr_advantagetoggle" value="{{query=1}} {{disadvantage=1}} {{r2=[[@{d20}"><span>DISADVANTAGE</span>
 			</div>
-			<input type="hidden" name="attr_wtype" class="sheet-roll-toggle">
-			<div class="sheet-section-roll-whisper">
-				<label class="sheet-radio">
-					<input type="radio" name="attr_whispertoggle" value="" checked="checked">
-					<span title="@{whispertoggle}">Public</span>
-				</label>
-				<label class="sheet-radio">
-					<input type="radio" name="attr_whispertoggle" value="/w gm ">
-					<span title="@{whispertoggle}">To GM</span>
-				</label>
+			<input type="hidden" name="attr_wtype">
+			<div>
+				<input type="radio" name="attr_whispertoggle" value="" checked="checked"><span>PUBLIC</span>
+				<input type="radio" name="attr_whispertoggle" value="/w gm "><span>TO <span>GM</span></span>
 			</div>
 		</div>
 		<div class="sheet-section-npc">
@@ -1174,11 +1158,7 @@
 																		<label class="sheet-form-checkbox">
 																			<input type="checkbox" name="attr_global_save_active_flag" value="1">
 																		</label>
-																		<input type="text" name="attr_global_save_name">
-																	</div>
-																	<div class="sheet-form-group">
-																		<label>Roll:</label>
-																		<input type="text" name="attr_global_save_roll">
+																		<input type="text" name="attr_global_save_rollstring">
 																	</div>
 																</div>
 															</div>
@@ -1189,7 +1169,7 @@
 																	<input type="checkbox" name="attr_global_save_active_flag" value="1">
 																	<span></span>
 																</div>
-																<span name="attr_global_save_name"></span><span name="attr_global_save_roll"></span>
+																<span name="attr_global_save_rollstring"></span>
 															</div>
 														</div>
 													</div>
@@ -1311,7 +1291,7 @@
 												<span></span>
 											</div>
 											<span name='attr_persuasion_bonus' title='@{persuasion_bonus}'>0</span>
-											<button type='roll' name='roll_persuasion' value='@{wtype}&{template:simple} {{rname=Persuasion}} {{mod=@{persuasion_bonus}}} {{r1=[[@{d20}+@{persuasion_bonus}@{pbd_safe}]]}} @{rtype}+@{persuasion_bonus}@{pbd_safe}]]}} {{global=@{global_skill_mod}}} @{charname_output}'>Persuasion <span>(Cha)</span></button>
+											<button type='roll' name='roll_persuasion' value='@{wtype}&{template:simple} {{rname=Persuasion}} {{mod=@{persuasion_bonus}}} {{r1=[[@{d20}+@{persuasion_bonus}@{pbd_safe}]]}} @{rtype}+@{persuasion_bonus}@{pbd_safe}]]}} {{global=@{global_skill_mod}}} @{charname_output}'>Persuasion <span>(Wis)</span></button>
 										</div>
 										<div class="sheet-pc-skill">
 											<div class="sheet-checkbox-image">
@@ -1426,11 +1406,7 @@
 																		<div class="sheet-form-checkbox">
 																			<input type="checkbox" name="attr_global_skill_active_flag" value="1">
 																		</div>
-																		<input type="text" name="attr_global_skill_name">
-																	</div>
-																	<div class="sheet-form-group">
-																		<label>Roll:</label>
-																		<input type="text" name="attr_global_skill_roll">
+																		<input type="text" name="attr_global_skill_rollstring">
 																	</div>
 																</div>
 															</div>
@@ -1441,8 +1417,7 @@
 																	<input type="checkbox" name="attr_global_skill_active_flag" value="1">
 																	<span></span>
 																</div>
-																<span name="attr_global_skill_name"></span>
-																<span name="attr_global_skill_roll"></span>
+																<span name="attr_global_skill_rollstring"></span>
 															</div>
 														</div>
 													</div>
@@ -2057,44 +2032,6 @@
 										</select>
 									</div>
 								</div>
-								<div class="sheet-container-panel sheet-pc-resources">
-									<div class="sheet-container-header">Other Resources</div>
-									<div class="sheet-container-body">
-										<fieldset class="repeating_resource">
-											<div class="sheet-fieldset-item sheet-fieldset-item-resource">
-												<div class="sheet-checkbox-cog">
-													<input type="checkbox" name="attr_options-flag" checked="checked"><span></span>
-													<span class="sheet-toggle-icon"></span>
-												</div>
-												<input type="checkbox" name="attr_options-flag" checked="checked" hidden class="sheet-toggle">
-												<div class="sheet-toggle-checked">
-													<div class="sheet-form">
-														<div class="sheet-form-header">Edit Resource</div>
-														<div class="sheet-form-body">
-															<div class="sheet-form-group">
-																<label>Name:</label>
-																<input type="text" name="attr_resourcename">
-															</div>
-															<div class="sheet-form-group">
-																<label>Amount:</label>
-																<input type="text" name="attr_resourceamount">
-																<label>Max:</label>
-																<input type="text" name="attr_resourcemax">
-															</div>
-														</div>
-													</div>
-												</div>
-												<div class="sheet-toggle-unchecked">
-													<div class="sheet-pc-resource">
-														<span name="attr_resourcename"></span>
-														<span name="attr_resourceamount"></span>
-														<span name="attr_resourcemax"></span>
-													</div>
-												</div>
-											</div>
-										</fieldset>
-									</div>
-								</div>
 								<div class="sheet-container-panel sheet-pc-attacks">
 									<div class="sheet-container-header">Attacks & Spellcasting</div>
 									<div class="sheet-container-body">
@@ -2253,8 +2190,8 @@
 												</div>
 												<div class="sheet-toggle-unchecked">
 													<div class="sheet-pc-attack">
-														<input type="text" name="attr_atkbonus" class="sheet-hidden" value="">
-														<input type="text" name="attr_atkdmgtype" class="sheet-hidden" value="">
+														<input type="text" name="attr_atkbonus" class="sheet-hidden" value="" disabled>
+														<input type="text" name="attr_atkdmgtype" class="sheet-hidden" value="" disabled>
 														<button type="roll" name="roll_attack" value="@{rollbase}" class="sheet-attack-button">
 															<span name="attr_atkname"></span>
 															<span name="attr_atkbonus"></span>
@@ -2294,11 +2231,7 @@
 																		<label class="sheet-form-checkbox">
 																			<input type="checkbox" name="attr_global_attack_active_flag" value="1">
 																		</label>
-																		<input type="text" name="attr_global_attack_name">
-																	</div>
-																	<div class="sheet-form-group">
-																		<label>Roll:</label>
-																		<input type="text" name="attr_global_attack_roll">
+																		<input type="text" name="attr_global_attack_rollstring">
 																	</div>
 																</div>
 															</div>
@@ -2309,8 +2242,7 @@
 																	<input type="checkbox" name="attr_global_attack_active_flag" value="1">
 																	<span></span>
 																</div>
-																<span name="attr_global_attack_name"></span>
-																<span name="attr_global_attack_roll"></span>
+																<span name="attr_global_attack_rollstring"></span>
 															</div>
 														</div>
 													</div>
@@ -2336,11 +2268,8 @@
 																		<label class="sheet-form-checkbox">
 																			<input type="checkbox" name="attr_global_damage_active_flag" value="1">
 																		</label>
-																		<input type="text" name="attr_global_damage_name">
-																	</div>
-																	<div class="sheet-form-group">
 																		<label>Damage:</label>
-																		<input type="text" name="attr_global_damage_damage" value="">
+																		<input type="text" name="attr_global_damage_rollstring">
 																	</div>
 																	<div class="sheet-form-group">
 																		<label>Type:</label>
@@ -2355,8 +2284,7 @@
 																	<input type="checkbox" name="attr_global_damage_active_flag" value="1">
 																	<span></span>
 																</div>
-																<span name="attr_global_damage_name"></span>
-																<span name="attr_global_damage_damage"></span>
+																<span name="attr_global_damage_rollstring"></span>
 																<span name="attr_global_damage_type"></span>
 															</div>
 														</div>
@@ -2364,48 +2292,6 @@
 												</fieldset>
 											</div>
 										</div>
-										<input type="hidden" name="attr_global_ac_mod_flag" class="sheet-field-toggle">
-										<div class="sheet-form sheet-form-inline">
-											<div class="sheet-form-header">Global AC Modifiers</div>
-											<div class="sheet-form-body">
-												<fieldset class="repeating_acmod">
-													<div class="sheet-fieldset-item">
-														<div class="sheet-checkbox-cog">
-															<input type="checkbox" name="attr_options-flag" checked="checked"><span></span>
-															<span class="sheet-toggle-icon"></span>
-														</div>
-														<input type="checkbox" name="attr_options-flag" checked="checked" hidden class="sheet-toggle">
-														<div class="sheet-toggle-checked">
-															<div class="sheet-form">
-																<div class="sheet-form-header">Edit Modifier</div>
-																<div class="sheet-form-body">
-																	<div class="sheet-form-group">
-																		<label class="sheet-form-checkbox">
-																			<input type="checkbox" name="attr_global_ac_active_flag" value="1">
-																		</label>
-																		<input type="text" name="attr_global_ac_name">
-																	</div>
-																	<div class="sheet-form-group">
-																		<label>Value:</label>
-																		<input type="text" name="attr_global_ac_val" value="">
-																	</div>
-																</div>
-															</div>
-														</div>
-														<div class="sheet-toggle-unchecked">
-															<div class="sheet-pc-ac-modifier">
-																<div class="sheet-checkbox-image">
-																	<input type="checkbox" name="attr_global_ac_active_flag" value="1">
-																	<span></span>
-																</div>
-																<span name="attr_global_ac_name"></span>
-																<span name="attr_global_ac_val"></span>
-															</div>
-														</div>
-													</div>
-												</fieldset>
-											</div>
-										</div>
 									</div>
 								</div>
 							</div>
@@ -2656,84 +2542,77 @@
 											</select>
 											<input type="text" name="attr_character_weight_detail" title="@{character_weight_detail}">
 										</div>
-										<div class="sheet-pc-detail sheet-pc-detail-feature">
+										<div class="sheet-pc-detail">
 											<label>Feature</label>
-											<div class="sheet-pc-detail-column">
-												<select name="attr_character_feature" title="@{character_feature}">
-													<option value=""></option>
-													<option value="scar">Scar</option>
-													<option value="tattoo">Tattoo</option>
-													<option value="Piercing">Piercing</option>
-													<option value="birthmark">Birthmark</option>
-													<option value="accent">Accent</option>
-												</select>
-												<input type="text" name="attr_character_feature_detail" title="@{character_feature_detail}">
-											</div>
+											<select name="attr_character_feature" title="@{character_feature}">
+												<option value=""></option>
+												<option value="scar">Scar</option>
+												<option value="tattoo">Tattoo</option>
+												<option value="Piercing">Piercing</option>
+												<option value="birthmark">Birthmark</option>
+												<option value="accent">Accent</option>
+											</select>
+											<input type="text" name="attr_character_feature_detail" title="@{character_feature_detail}">
 										</div>
-										<div class="sheet-pc-detail sheet-pc-detail-motivation">
+										<div class="sheet-pc-detail">
 											<label>Motivation</label>
-											<div class="sheet-pc-detail-column">
-												<select name="attr_character_motivation" title="@{character_motivation}">
-													<option value=""></option>
-													<option value="achievement">To become the best</option>
-													<option value="acquisition">To obtain possessions or wealth</option>
-													<option value="balance">To bring all things into harmony</option>
-													<option value="beneficence">To protect, heal, and mend</option>
-													<option value="creation">To build or make new</option>
-													<option value="discovery">To explore, uncover, and pioneer</option>
-													<option value="education">To inform, teach, or train</option>
-													<option value="hedonism">To enjoy all things sensuous</option>
-													<option value="liberation">To free the self and/or others</option>
-													<option value="nobility">To be virtuous, honest, and brave</option>
-													<option value="order">To organize and reduce chaos</option>
-													<option value="play">To have fun, to enjoy life</option>
-													<option value="power">To control and lead others</option>
-													<option value="recognition">To gain approval, status, or fame</option>
-													<option value="service">To follow a person or group</option>
-													<option value="understanding">To seek knowledge or wisdom</option>
-												</select>
-												<input type="text" name="attr_character_motivation_detail" title="@{character_motivation_detail}">
-											</div>
+											<select name="attr_character_motivation" title="@{character_motivation}">
+												<option value=""></option>
+												<option value="achievement">To become the best</option>
+												<option value="acquisition">To obtain possessions or wealth</option>
+												<option value="balance">To bring all things into harmony</option>
+												<option value="beneficence">To protect, heal, and mend</option>
+												<option value="creation">To build or make new</option>
+												<option value="discovery">To explore, uncover, and pioneer</option>
+												<option value="education">To inform, teach, or train</option>
+												<option value="hedonism">To enjoy all things sensuous</option>
+												<option value="liberation">To free the self and/or others</option>
+												<option value="nobility">To be virtuous, honest, and brave</option>
+												<option value="order">To organize and reduce chaos</option>
+												<option value="play">To have fun, to enjoy life</option>
+												<option value="power">To control and lead others</option>
+												<option value="recognition">To gain approval, status, or fame</option>
+												<option value="service">To follow a person or group</option>
+												<option value="understanding">To seek knowledge or wisdom</option>
+											</select>
 										</div>
-										<div class="sheet-pc-detail sheet-pc-detail-habit">
+										<div class="sheet-pc-detail">
 											<label>Habit</label>
-											<div class="sheet-pc-detail-column">
-												<select name="attr_character_habit" title="@{character_habit}">
-													<option value=""></option>
-													<option value="humming">Humming</option>
-													<option value="dancing">Dancing</option>
-													<option value="sleepwalking">Sleepwalking</option>
-													<option value="fingernail">Fingernail biting</option>
-													<option value="daydreaming">Daydreaming</option>
-													<option value="talking">Talking in sleep</option>
-													<option value="whistling">Whistling</option>
-													<option value="name">Name dropping</option>
-													<option value="grooming">Constant grooming</option>
-													<option value="tapping">Foot tapping</option>
-													<option value="biting">Lip biting/licking</option>
-													<option value="coin">Coin flipping</option>
-													<option value="chewing">Chewing</option>
-													<option value="cracking">Knuckle cracking</option>
-													<option value="collects">Collects odd things</option>
-													<option value="singing">Singing</option>
-													<option value="snacking">Snacking</option>
-													<option value="pacing">Pacing</option>
-													<option value="counting">Counting</option>
-													<option value="snoring">Snoring</option>
-													<option value="beard">Beard/hair stroking</option>
-													<option value="nose_picking">Nose picking</option>
-													<option value="exaggeration">Exaggeration</option>
-													<option value="superstitious">Superstitious</option>
-													<option value="belching">Belching</option>
-													<option value="repeating">Repeating others</option>
-													<option value="smelling">Smelling things</option>
-													<option value="teeth">Teeth picking</option>
-													<option value="swearing">Swearing</option>
-													<option value="secrets">Telling secrets</option>
-													<option value="repeating_yourself">Repeating yourself</option>
-												</select>
-												<input type="text" name="attr_character_habit_detail" title="@{character_habit_detail}">
-											</div>
+											<select name="attr_character_habit" title="@{character_habit}">
+												<option value=""></option>
+												<option value="humming">Humming</option>
+												<option value="dancing">Dancing</option>
+												<option value="sleepwalking">Sleepwalking</option>
+												<option value="fingernail">Fingernail biting</option>
+												<option value="daydreaming">Daydreaming</option>
+												<option value="talking">Talking in sleep</option>
+												<option value="whistling">Whistling</option>
+												<option value="name">Name dropping</option>
+												<option value="grooming">Constant grooming</option>
+												<option value="tapping">Foot tapping</option>
+												<option value="biting">Lip biting/licking</option>
+												<option value="coin">Coin flipping</option>
+												<option value="chewing">Chewing</option>
+												<option value="cracking">Knuckle cracking</option>
+												<option value="collects">Collects odd things</option>
+												<option value="singing">Singing</option>
+												<option value="snacking">Snacking</option>
+												<option value="pacing">Pacing</option>
+												<option value="counting">Counting</option>
+												<option value="snoring">Snoring</option>
+												<option value="beard">Beard/hair stroking</option>
+												<option value="nose_picking">Nose picking</option>
+												<option value="exaggeration">Exaggeration</option>
+												<option value="superstitious">Superstitious</option>
+												<option value="belching">Belching</option>
+												<option value="repeating">Repeating others</option>
+												<option value="smelling">Smelling things</option>
+												<option value="teeth">Teeth picking</option>
+												<option value="swearing">Swearing</option>
+												<option value="secrets">Telling secrets</option>
+												<option value="repeating_yourself">Repeating yourself</option>
+											</select>
+											<input type="text" name="attr_character_habit_detail" title="@{character_habit_detail}">
 										</div>
 										<div class="sheet-pc-detail">
 											<label>Family</label>
@@ -2972,38 +2851,6 @@
 							</div>
 						</div>
 					</div>
-					<div class="sheet-tab sheet-tab-notes">
-						<input type="radio" name="attr_tab" value="notes">
-						<span class="sheet-tab-label">Notes</span>
-						<div class="sheet-tab-content">
-							<div class="sheet-container-well sheet-pc-notes">
-								<div class="sheet-container-box sheet-pc-notes-features">
-									<div class="sheet-container-header">Additional Features & Traits</div>
-									<div class="sheet-container-body">
-										<textarea name="attr_additional_feature_and_traits"></textarea>
-									</div>
-								</div>
-								<div class="sheet-container-box sheet-pc-notes-backstory">
-									<div class="sheet-container-header">Character Backstory</div>
-									<div class="sheet-container-body">
-										<textarea name="attr_character_backstory"></textarea>
-									</div>
-								</div>
-								<div class="sheet-container-box sheet-pc-notes-allies">
-									<div class="sheet-container-header">Allies & Organisations</div>
-									<div class="sheet-container-body">
-										<textarea name="attr_allies_and_organizations"></textarea>
-									</div>
-								</div>
-								<div class="sheet-container-box sheet-pc-notes-treasure">
-									<div class="sheet-container-header">Treasure</div>
-									<div class="sheet-container-body">
-										<textarea name="attr_treasure"></textarea>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
 					<div class="sheet-tab sheet-tab-equipment">
 						<input type="radio" name="attr_tab" value="equipment">
 						<span class="sheet-tab-label">Equipment</span>
@@ -3324,9 +3171,9 @@
 															<div class="sheet-pc-item-header">
 																<span>Item Name</span>
 																<span>Quantity</span>
+																<span>Notches</span>
 																<span>Weight</span>
 																<span>Slots</span>
-																<span>Notches</span>
 															</div>
 															<div class="sheet-pc-item-content">
 																<span class="sheet-pc-item-name">
@@ -3337,15 +3184,15 @@
 																<span class="sheet-pc-item-quantity">
 																	<span name="attr_itemcount"></span>
 																</span>
+																<span class="sheet-pc-item-notches">
+																	<span name="attr_itemnotches"></span>
+																</span>
 																<span class="sheet-pc-item-weight">
 																	<span name="attr_itemweight"></span>
 																</span>
 																<span class="sheet-pc-item-slots">
 																	<span name="attr_itemsize"></span>
 																</span>
-																<span class="sheet-pc-item-notches">
-																	<span name="attr_itemnotches"></span>
-																</span>
 															</div>
 														</div>
 													</div>
@@ -3359,9 +3206,9 @@
 														<div class="sheet-pc-equipment-container-footer">
 															<span>Item Name</span>
 															<span>Quantity</span>
+															<span>Notches</span>
 															<span>Weight</span>
 															<span>Slots</span>
-															<span>Notches</span>
 														</div>
 													</div>
 												</div>
@@ -5995,7 +5842,7 @@
 											<div class="sheet-form-body">
 												<div class="sheet-form-group">
 													<label>Version:</label>
-													<input type="text" name="attr_version" value="2.1" hidden disabled>
+													<input type="text" name="attr_version" value="2.0" hidden disabled>
 													<span name="attr_version"</span>
 												</div>
 												<div class="sheet-form-group">
@@ -6067,12 +5914,6 @@
 														<span>Show Global Damage Modifier Field</span>
 													</label>
 												</div>
-												<div class="sheet-form-group">
-													<label class="sheet-form-checkbox" title="@{attr_global_ac_mod_flag}">
-														<input type="checkbox" name="attr_global_ac_mod_flag" value="1">
-														<span>Show Global AC Modifier Field</span>
-													</label>
-												</div>
 												<div class="sheet-form-group">
 													<label>Add Character Name to Templates:</label>
 													<select name="attr_charname_output" title="@{charname_output}">
@@ -6149,12 +5990,6 @@
 														<span>Show Survival Conditions</span>
 													</label>
 												</div>
-												<div class="sheet-form-group">
-													<label class="sheet-form-checkbox" title="@{use_intelligent_initiative}">
-														<input type="checkbox" name="attr_use_intelligent_initiative" value="1" checked="checked">
-														<span>Use Intelligence for Initiative</span>
-													</label>
-												</div>
 												<div class="sheet-form-group">
 													<label class="sheet-form-checkbox" title="@{use_inventory_slots}">
 														<input type="checkbox" name="attr_use_inventory_slots" value="1" checked="checked">
@@ -6216,6 +6051,10 @@
 														<span>Add Dex Tiebreaker to Initiative</span>
 													</label>
 												</div>
+												<div class="sheet-form-group">
+													<label>Global Armor Class Modifier:</label>
+													<input type="text" name="attr_globalacmod" placeholder="0" title="@{globalacmod}">
+												</div>
 												<div class="sheet-form-group">
 													<label>Armor Class Tracking:</label>
 													<select name="attr_custom_ac_flag" title="@{custom_ac_flag}">
@@ -6225,56 +6064,35 @@
 													</select>
 												</div>
 												<input type="hidden" name="attr_custom_ac_flag" class="sheet-field-toggle">
-												<div class="sheet-form-fieldset sheet-form-fieldset-custom-ac">
-													<div class="sheet-form-fieldset-header">CUSTOM AC</div>
-													<div class="sheet-form-fieldset-body">
-														<div class="sheet-form-group">
-															<label>AC:</label>
-															<input type="text" name="attr_custom_ac_base" placeholder="10" value="10" title="@{custom_ac_base}">
-															<span>+</span>
-															<select name="attr_custom_ac_part1" title="@{custom_ac_part1}">
-																<option value="none" selected="selected">&mdash;</option>
-																<option value="Strength">STR</option>
-																<option value="Dexterity">DEX</option>
-																<option value="Constitution">CON</option>
-																<option value="Intelligence">INT</option>
-																<option value="Wisdom">WIS</option>
-																<option value="Charisma">CHA</option>
-															</select>
-															<span>+</span>
-															<select name="attr_custom_ac_part2" title="@{custom_ac_part2}">
-																<option value="none" selected="selected">&mdash;</option>
-																<option value="Strength">STR</option>
-																<option value="Dexterity">DEX</option>
-																<option value="Constitution">CON</option>
-																<option value="Intelligence">INT</option>
-																<option value="Wisdom">WIS</option>
-																<option value="Charisma">CHA</option>
-															</select>
-														</div>
-														<div class="sheet-form-group">
-															<label class="sheet-form-checkbox" title="@{custom_ac_shield}">
-																<input type="checkbox" name="attr_custom_ac_shield" value="yes" checked>
-																<span>Allow shields?</span>
-															</label>
-														</div>
-													</div>
+												<div class="sheet-form-group">
+													<label>Custom AC:</label>
+													<input type="text" name="attr_custom_ac_base" placeholder="10" value="10" title="@{custom_ac_base}">
+													<span>+</span>
+													<select name="attr_custom_ac_part1" title="@{custom_ac_part1}">
+														<option value="none" selected="selected">&mdash;</option>
+														<option value="Strength">STR</option>
+														<option value="Dexterity">DEX</option>
+														<option value="Constitution">CON</option>
+														<option value="Intelligence">INT</option>
+														<option value="Wisdom">WIS</option>
+														<option value="Charisma">CHA</option>
+													</select>
+													<span>+</span>
+													<select name="attr_custom_ac_part2" title="@{custom_ac_part2}">
+														<option value="none" selected="selected">&mdash;</option>
+														<option value="Strength">STR</option>
+														<option value="Dexterity">DEX</option>
+														<option value="Constitution">CON</option>
+														<option value="Intelligence">INT</option>
+														<option value="Wisdom">WIS</option>
+														<option value="Charisma">CHA</option>
+													</select>
 												</div>
-												<div class="sheet-form-fieldset sheet-form-fieldset-hp-modifiers">
-													<div class="sheet-form-fieldset-header">HP MODIFIERS</div>
+												<div class="sheet-form-fieldset">
+													<div class="sheet-form-fieldset-header">HP MODIFIERS:</div>
 													<div class="sheet-form-fieldset-body">
 														<fieldset class="repeating_hpmod">
 															<div class="sheet-fieldset-item">
-																<div class="sheet-form-group">
-																	<label>Level:</label>
-																	<select name="attr_levels">
-																		<option value="total" selected="selected">Total level</option>
-																		<option value="base">Main class level</option>
-																		<option value="multiclass1">Class 2 level</option>
-																		<option value="multiclass2">Class 3 level</option>
-																		<option value="multiclass3">Class 4 level</option>
-																	</select>
-																</div>
 																<div class="sheet-form-group">
 																	<label>Source:</label>
 																	<input type="text" name="attr_source">
@@ -6587,7 +6405,6 @@
 			<input type='hidden' name='attr_show_stress_flag' value='1'>
 			<input type='hidden' name='attr_show_survival_conditions' value='1'>
 			<input type='hidden' name='attr_use_inventory_slots' value='1'>
-			<input type='hidden' name='attr_use_intelligent_initiative' value='1'>
 			<!-- COMPENDIUM DROP CATCHERS -->
 			<input type="hidden" name="attr_drop_category" accept="Category">
 			<input type="hidden" name="attr_drop_name" accept="Name">
@@ -6595,945 +6412,933 @@
 			<input type="hidden" name="attr_drop_content" accept="Content">
 		</div>
 		<div class="sheet-section-templates">
-			<div class="sheet-rolltemplates">
+			<div class="rolltemplates">
 				<rolltemplate class="sheet-rolltemplate-simple">
-					<div class="container">
-						<div class="result">
-							{{#always}}
-								<div class="adv">
-									<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
-								</div>
-								<div class="advspacer"></div>
-								<div class="adv">
-									<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
-								</div>
-							{{/always}}
-							{{#normal}}
-								<div class="solo">
-									<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
-								</div>
-							{{/normal}}
-							{{#advantage}}
-								{{#rollLess() r1 r2}}
-									<div class="adv">
-										<span class="grey">{{r1}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-								{{/rollLess() r1 r2}}
-								{{#rollTotal() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-								{{/rollTotal() r1 r2}}
-								{{#rollGreater() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span class="grey">{{r2}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-								{{/rollGreater() r1 r2}}
-							{{/advantage}}
-							{{#disadvantage}}
-								{{#rollLess() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span class="grey">{{r2}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-								{{/rollLess() r1 r2}}
-								{{#rollTotal() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-								{{/rollTotal() r1 r2}}
-								{{#rollGreater() r1 r2}}
-									<div class="adv">
-										<span class="grey">{{r1}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
-									</div>
-								{{/rollGreater() r1 r2}}
-							{{/disadvantage}}
-						</div>
-						<div class="label">
-							<span>{{rname}}{{#mod}} <span>({{mod}})</span>{{/mod}}</span>
-						</div>
-						{{#charname}}
-							<div class="charname">
-								<span>{{charname}}</span>
-							</div>
-						{{/charname}}
-					</div>
-				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-atk">
-					<div class="container">
-						<div class="result">
-							{{#always}}
-								<div class="adv">
-									<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-								</div>
-								<div class="advspacer"></div>
-								<div class="adv">
-									<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-								</div>
-							{{/always}}
-							{{#normal}}
-								<div class="solo">
-									<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-								</div>
-							{{/normal}}
-							{{#advantage}}
-								{{#rollLess() r1 r2}}
-									<div class="adv">
-										<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/rollLess() r1 r2}}
-								{{#rollTotal() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/rollTotal() r1 r2}}
-								{{#rollGreater() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/rollGreater() r1 r2}}
-							{{/advantage}}
-							{{#disadvantage}}
-								{{#rollLess() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/rollLess() r1 r2}}
-								{{#rollTotal() r1 r2}}
-									<div class="adv">
-										<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/rollTotal() r1 r2}}
-								{{#rollGreater() r1 r2}}
-									<div class="adv">
-										<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/rollGreater() r1 r2}}
-							{{/disadvantage}}
-						</div>
-						{{#range}}
-							<div class="sublabel">
-								<span>{{range}}</span>
-							</div>
-						{{/range}}
-						<div class="label">
-							{{#normal}}
-								{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}
-								{{#^rollWasCrit() r1}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r1}}
-							{{/normal}}
-							{{#always}}
-								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-								{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
-							{{/always}}
-							{{#advantage}}
-								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-								{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
-							{{/advantage}}
-							{{#disadvantage}}
-								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-								{{#rollTotal() r1 r2}}{{#^rollWasCrit() r1}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-								{{#rollLess() r1 r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollLess() r1 r2}}
-								{{#rollGreater() r1 r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollGreater() r1 r2}}
-							{{/disadvantage}}
-						</div>
-						{{#charname}}
-							<div class="charname">
-								<span>{{charname}}</span>
-							</div>
-						{{/charname}}
-					</div>
-					{{#desc}}
-						<div class="desc info">
-							<span>
-								<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
-							</span>
-						</div>
-					{{/desc}}
-				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-dmg">
-					{{#save}}
-						{{#attack}}
-							<div class="desc save">
-						{{/attack}}
-						{{^attack}}
-							<div class="atk save">
-						{{/attack}}
-							<div class="savedc">
-								<span class="rolltemplate-inline">DC</span><span class="rolltemplate-inline">{{savedc}}</span>
-							</div>
-							{{#savedesc}}
-								<div class="sublabel">
-									<span>{{savedesc}}</span>
-								</div>
-							{{/savedesc}}
-							<div class="label">
-								<span class="rolltemplate-inline">{{saveattr}}</span> <span class="rolltemplate-inline">Save</span>
-							</div>
-						</div>
-					{{/save}}
-					{{^attack}}
-						{{#desc}}
-							<div class="desc info">
-								<span>
-									<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
-								</span>
-							</div>
-						{{/desc}}
-					{{/attack}}
-					{{#globaldamage}}
-						{{#^rollTotal() globaldamage 0}}
-							<div class="desc">
-								<span>{{globaldamage}}{{#globaldamagecrit}}<span class="plus"> + </span>{{globaldamagecrit}}{{/globaldamagecrit}}</span>
-								<span class="sublabel">{{globaldamagetype}}</span>
-							</div>
-						{{/^rollTotal() globaldamage 0}}
-					{{/globaldamage}}
-					{{#hldmg}}
-						{{#^rollTotal() hldmg 0}}
-							<div class="desc">
-								<span>{{hldmg}}{{#hldmgcrit}}<span class="plus"> + </span>{{hldmgcrit}}{{/hldmgcrit}}</span>
-								<span class="sublabel">{{dmg1type}}</span>
-								<div class="label">
-									<span>Higher Level Cast</span>
-								</div>
-							</div>
-						{{/^rollTotal() hldmg 0}}
-					{{/hldmg}}
-					<div class="container damagetemplate">
-						<div class="result">
-							{{#dmg1flag}}
-								{{^dmg2flag}}
-									<div class="solo">
-										<span class="damage">{{dmg1}}{{#crit}} + {{crit1}}{{/crit}}</span>
-										<span class="sublabel">{{dmg1type}}</span>
-									</div>
-								{{/dmg2flag}}
-							{{/dmg1flag}}
-							{{#dmg2flag}}
-								{{^dmg1flag}}
-									<div class="solo">
-										<span class="damage">{{dmg2}}{{#crit}} + {{crit2}}{{/crit}}</span>
-										<span class="sublabel">{{dmg2type}}</span>
-									</div>
-								{{/dmg1flag}}
-							{{/dmg2flag}}
-							{{#dmg1flag}}
-								{{#dmg2flag}}
-									<div class="adv">
-										<span class="damage">{{dmg1}}{{#crit}} + {{crit1}}{{/crit}}</span>
-										<span class="sublabel">{{dmg1type}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span class="damage">{{dmg2}}{{#crit}} + {{crit2}}{{/crit}}</span>
-										<span class="sublabel">{{dmg2type}}</span>
-									</div>
-								{{/dmg2flag}}
-							{{/dmg1flag}}
-						</div>
-						{{^attack}}
-							{{#range}}
-								<div class="sublabel" style="color: black;">
-									<span>{{range}}</span>
-								</div>
-							{{/range}}
-							<div class="label">
-								<span>{{rname}}</span>{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}
-							</div>
-							{{#charname}}
-								<div class="charname">
-									<span>{{charname}}</span>
-								</div>
-							{{/charname}}
-						{{/attack}}
-					</div>
-				</rolltemplate>
-
-
-
-				<rolltemplate class="sheet-rolltemplate-atkdmg">
-					{{#attack}}
-						<div class="container atk">
-							<div class="result">
-								{{#always}}
-									<div class="adv">
-										<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-									<div class="advspacer"></div>
-									<div class="adv">
-										<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/always}}
-								{{#normal}}
-									<div class="solo">
-										<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-									</div>
-								{{/normal}}
-								{{#advantage}}
-									{{#rollLess() r1 r2}}
-										<div class="adv">
-											<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-										<div class="advspacer"></div>
-										<div class="adv">
-											<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-									{{/rollLess() r1 r2}}
-									{{#rollTotal() r1 r2}}
-										<div class="adv">
-											<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-										<div class="advspacer"></div>
-										<div class="adv">
-											<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-									{{/rollTotal() r1 r2}}
-									{{#rollGreater() r1 r2}}
-										<div class="adv">
-											<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-										<div class="advspacer"></div>
-										<div class="adv">
-											<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-									{{/rollGreater() r1 r2}}
-								{{/advantage}}
-								{{#disadvantage}}
-									{{#rollLess() r1 r2}}
-										<div class="adv">
-											<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-										<div class="advspacer"></div>
-										<div class="adv">
-											<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-									{{/rollLess() r1 r2}}
-									{{#rollTotal() r1 r2}}
-										<div class="adv">
-											<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-										<div class="advspacer"></div>
-										<div class="adv">
-											<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-									{{/rollTotal() r1 r2}}
-									{{#rollGreater() r1 r2}}
-										<div class="adv">
-											<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-										<div class="advspacer"></div>
-										<div class="adv">
-											<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
-										</div>
-									{{/rollGreater() r1 r2}}
-								{{/disadvantage}}
-							</div>
-							{{#range}}
-								<div class="sublabel">
-									<span>{{range}}</span>
-								</div>
-							{{/range}}
-							<div class="label">
-								<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}{{#attack}} <span>({{mod}})</span>{{/attack}}</span>
-							</div>
-							{{#charname}}
-								<div class="charname">
-									<span>{{charname}}</span>
-								</div>
-							{{/charname}}
-						</div>
-					{{/attack}}
-					{{#save}}
-						{{#attack}}
-							<div class="container desc save">
-						{{/attack}}
-						{{^attack}}
-							<div class="container atk save">
-						{{/attack}}
-							<div class="savedc">
-								<span class="rolltemplate-inline">DC</span><span class="rolltemplate-inline">{{savedc}}</span>
-							</div>
-							{{#savedesc}}
-								<div class="sublabel">
-									<span>{{savedesc}}</span>
-								</div>
-							{{/savedesc}}
-							<div class="label">
-								<span class="rolltemplate-inline">{{saveattr}}</span> <span class="rolltemplate-inline">Save</span>
-							</div>
-						</div>
-					{{/save}}
-					{{#desc}}
-						<div class="desc info">
-							<span>
-								<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
-							</span>
-						</div>
-					{{/desc}}
-					{{#globaldamage}}
-						{{#^rollTotal() globaldamage 0}}
-							<div class="desc">
-								<span>
-									{{globaldamage}}
-									{{#attack}}
-										{{#normal}}
-											{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}
-										{{/normal}}
+						<div class="container">
+								<div class="result">
 										{{#always}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+												<div class="adv">
+														<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
+												</div>
+												<div class="advspacer"></div>
+												<div class="adv">
+														<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
+												</div>
 										{{/always}}
+										{{#normal}}
+												<div class="solo">
+														<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
+												</div>
+										{{/normal}}
 										{{#advantage}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+												{{#rollLess() r1 r2}}
+														<div class="adv">
+																<span class="grey">{{r1}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+												{{/rollLess() r1 r2}}
+												{{#rollTotal() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+												{{/rollTotal() r1 r2}}
+												{{#rollGreater() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span class="grey">{{r2}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+												{{/rollGreater() r1 r2}}
 										{{/advantage}}
 										{{#disadvantage}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+												{{#rollLess() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span class="grey">{{r2}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+												{{/rollLess() r1 r2}}
+												{{#rollTotal() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+												{{/rollTotal() r1 r2}}
+												{{#rollGreater() r1 r2}}
+														<div class="adv">
+																<span class="grey">{{r1}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#global}} + {{global}}{{/global}}</span>
+														</div>
+												{{/rollGreater() r1 r2}}
 										{{/disadvantage}}
-									{{/attack}}
-								</span>
-								<span class="sublabel">{{globaldamagetype}}</span>
-							</div>
-						{{/^rollTotal() globaldamage 0}}
-					{{/globaldamage}}
-					{{#hldmg}}
-						{{#^rollTotal() hldmg 0}}
-							<div class="desc">
-								<span>
-									{{hldmg}}
-									<!-- {{#hldmgcrit}} + {{hldmgcrit}}{{/hldmgcrit}} -->
-									{{#attack}}
-										{{#normal}}
-											{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}
-										{{/normal}}
-										{{#always}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-										{{/always}}
-										{{#advantage}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-										{{/advantage}}
-										{{#disadvantage}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-										{{/disadvantage}}
-									{{/attack}}
-								</span>
-								<span class="sublabel">{{dmg1type}}</span>
-								<div class="label">
-									<span>Higher Level Cast</span>
 								</div>
-							</div>
-						{{/^rollTotal() hldmg 0}}
-					{{/hldmg}}
-					{{#damage}}
-						<div class="container damagetemplate">
-							<div class="result">
-								{{#dmg1flag}}
-									{{^dmg2flag}}
-										<div class="solo">
-											<span class="damage">
-												{{dmg1}}
-												{{#attack}}
-													{{#normal}}
-														{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}
-													{{/normal}}
-													{{#always}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/always}}
-													{{#advantage}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/advantage}}
-													{{#disadvantage}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-													{{/disadvantage}}
-												{{/attack}}
-											</span>
-											<span class="sublabel">{{dmg1type}}</span>
-										</div>
-									{{/dmg2flag}}
-								{{/dmg1flag}}
-								{{#dmg2flag}}
-									{{^dmg1flag}}
-										<div class="solo">
-											<span class="damage">
-												{{dmg2}}
-												{{#attack}}
-													{{#normal}}
-														{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}
-													{{/normal}}
-													{{#always}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/always}}
-													{{#advantage}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/advantage}}
-													{{#disadvantage}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-													{{/disadvantage}}
-												{{/attack}}
-											</span>
-											<span class="sublabel">{{dmg2type}}</span>
-										</div>
-									{{/dmg1flag}}
-								{{/dmg2flag}}
-								{{#dmg1flag}}
-									{{#dmg2flag}}
-										<div class="adv">
-											<span class="damage">
-												{{dmg1}}
-												{{#attack}}
-													{{#normal}}
-														{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}
-													{{/normal}}
-													{{#always}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/always}}
-													{{#advantage}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/advantage}}
-													{{#disadvantage}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-													{{/disadvantage}}
-												{{/attack}}
-											</span>
-											<span class="sublabel">{{dmg1type}}</span>
-										</div>
-										<div class="advspacer"></div>
-										<div class="adv">
-											<span>
-												{{dmg2}}
-												{{#attack}}
-													{{#normal}}
-														{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}
-													{{/normal}}
-													{{#always}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/always}}
-													{{#advantage}}
-														{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-														{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-													{{/advantage}}
-													{{#disadvantage}}
-														{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-													{{/disadvantage}}
-												{{/attack}}
-											</span>
-											<span class="sublabel">{{dmg2type}}</span>
-										</div>
-									{{/dmg2flag}}
-								{{/dmg1flag}}
-							</div>
-							{{^attack}}
-								{{#range}}
-									<div class="sublabel">
-										<span>{{range}}</span>
-									</div>
-								{{/range}}
 								<div class="label">
-									<span>{{rname}}</span>{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}
+										<span>{{rname}}{{#mod}} <span>({{mod}})</span>{{/mod}}</span>
 								</div>
 								{{#charname}}
-									<div class="charname">
-										<span>{{charname}}</span>
-									</div>
+										<div class="charname">
+												<span>{{charname}}</span>
+										</div>
 								{{/charname}}
-							{{/attack}}
 						</div>
-					{{/damage}}
 				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-desc">
-					<div class="desc info">
-						<span>
-							<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
-						</span>
-					</div>
+				<rolltemplate class="sheet-rolltemplate-atk">
+						<div class="container">
+								<div class="result">
+										{{#always}}
+												<div class="adv">
+														<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+												</div>
+												<div class="advspacer"></div>
+												<div class="adv">
+														<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+												</div>
+										{{/always}}
+										{{#normal}}
+												<div class="solo">
+														<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+												</div>
+										{{/normal}}
+										{{#advantage}}
+												{{#rollLess() r1 r2}}
+														<div class="adv">
+																<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/rollLess() r1 r2}}
+												{{#rollTotal() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/rollTotal() r1 r2}}
+												{{#rollGreater() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/rollGreater() r1 r2}}
+										{{/advantage}}
+										{{#disadvantage}}
+												{{#rollLess() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/rollLess() r1 r2}}
+												{{#rollTotal() r1 r2}}
+														<div class="adv">
+																<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/rollTotal() r1 r2}}
+												{{#rollGreater() r1 r2}}
+														<div class="adv">
+																<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/rollGreater() r1 r2}}
+										{{/disadvantage}}
+								</div>
+								{{#range}}
+										<div class="sublabel">
+												<span>{{range}}</span>
+										</div>
+								{{/range}}
+								<div class="label">
+										{{#normal}}
+												{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}
+												{{#^rollWasCrit() r1}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r1}}
+										{{/normal}}
+										{{#always}}
+												{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+												{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+												{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+												{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
+										{{/always}}
+										{{#advantage}}
+												{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+												{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+												{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+												{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
+										{{/advantage}}
+										{{#disadvantage}}
+												{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span>{{rnamec}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+												{{#rollTotal() r1 r2}}{{#^rollWasCrit() r1}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/^rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+												{{#rollLess() r1 r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollLess() r1 r2}}
+												{{#rollGreater() r1 r2}}<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}} <span>({{mod}})</span></span>{{/rollGreater() r1 r2}}
+										{{/disadvantage}}
+								</div>
+								{{#charname}}
+										<div class="charname">
+												<span>{{charname}}</span>
+										</div>
+								{{/charname}}
+						</div>
+						{{#desc}}
+								<div class="desc info">
+										<span>
+												<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
+										</span>
+								</div>
+						{{/desc}}
 				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-spell">
-					<div class="container">
-						<div class="title row">
-							<span>{{name}}</span>{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}
-						</div>
-						<div class="italics row">
-							<span>{{level}}{{#ritual}} (<span></span>){{/ritual}}</span>
-						</div>
-						<div class="spacer"></div>
-						{{#castingtime}}
-						<div class="row">
-							<span class="bold">Casting Time:</span> <span>{{castingtime}}</span>
-						</div>
-						{{/castingtime}}
-						{{#range}}
-						<div class="row">
-							<span class="bold">Range:</span> <span>{{range}}</span>
-						</div>
-						{{/range}}
-						{{#target}}
-						<div class="row">
-							<span class="bold">Target:</span> <span>{{target}}</span>
-						</div>
-						{{/target}}
-						<div class="row">
-							<span class="bold">Components:</span>
-							<span>
-								{{#v}}V{{#s}}, {{/s}}{{^s}}{{#m}}, {{/m}}{{/s}}{{/v}}
-								{{#s}}S{{#m}}, {{/m}}{{/s}}
-								{{#m}}M {{#material}}({{material}}){{/material}}{{/m}}
-							</span>
-						</div>
-						{{#duration}}
-						<div class="row">
-							<span class="bold">Duration:</span> <span>{{#concentration}}<span>Concentration</span> {{/concentration}}{{duration}}</span>
-						</div>
-						{{/duration}}
-						<div class="spacer"></div>
-						{{#description}}
-						<div class="row">
-							<span class="description">{{description}}</span>
-						</div>
-						{{/description}}
-						{{#athigherlevels}}
-						<div class="row">
-							<span class="bold italics">At Higher Levels</span>. <span class="description">{{athigherlevels}}</span>
-						</div>
-						{{/athigherlevels}}
-					</div>
-				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-traits">
-					<div class="row header">
-						<span>{{name}}</span>
-					</div>
-					{{#source}}
-						<div class="row subheader">
-							<span class="italics">{{#charname}}{{charname}} {{/charname}}{{source}}</span>
-						</div>
-					{{/source}}
-					{{#description}}
-						<div class="row">
-							<span class="desc">{{description}}</span>
-						</div>
-					{{/description}}
-				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-npc">
-					<div class="row header">
-						<span>{{rname}}</span>
-					</div>
-					{{#name}}
-						<div class="row subheader">
-							<span class="italics">{{name}}</span>
-						</div>
-					{{/name}}
-					<div class="arrow-right"></div>
-					<div class="row">
-						{{#normal}}
-							<span class="italics">{{type}}: </span><span>{{r1}}</span>
-						{{/normal}}
-						{{#always}}
-							<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-						{{/always}}
-						{{#advantage}}
-							{{#rollLess() r1 r2}}
-								<span class="italics">{{type}}: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}
-								<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}
-								<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
-							{{/rollGreater() r1 r2}}
-						{{/advantage}}
-						{{#disadvantage}}
-							{{#rollLess() r1 r2}}
-								<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
-							{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}
-								<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}
-								<span class="italics">{{type}}: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollGreater() r1 r2}}
-						{{/disadvantage}}
-					</div>
-				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-npcatk">
-					<div class="row header">
-						{{#normal}}
-							{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}
-							{{#^rollWasCrit() r1}}{{rname}}{{/^rollWasCrit() r1}}
-						{{/normal}}
-						{{#always}}
-							{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}{{rnamec}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-							{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}{{rname}}{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
-						{{/always}}
-						{{#advantage}}
-							{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}{{rnamec}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-							{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}{{rname}}{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
-						{{/advantage}}
-						{{#disadvantage}}
-							{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollTotal() r1 r2}}{{#^rollWasCrit() r1}}{{rname}}{{/^rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollLess() r1 r2}}{{rname}}{{/rollLess() r1 r2}}
-							{{#rollGreater() r1 r2}}{{rnamec}}{{/rollGreater() r1 r2}}
-						{{/disadvantage}}
-					</div>
-					{{#name}}
-						<div class="row subheader">
-							<span class="italics">{{name}}</span>
-						</div>
-					{{/name}}
-					<div class="arrow-right"></div>
-					<div class="row">
-						{{#normal}}
-							{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}
-							{{#^rollWasCrit() r1}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r1}}
-						{{/normal}}
-						{{#always}}
-							{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-							{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
-						{{/always}}
-						{{#advantage}}
-							{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="italics">[{{typec}}: </span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-							{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
-						{{/advantage}}
-						{{#disadvantage}}
-							{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollTotal() r1 r2}}{{#^rollWasCrit() r1}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-							{{#rollLess() r1 r2}}<span class="italics">{{type}}: </span>{{/rollLess() r1 r2}}
-							{{#rollGreater() r1 r2}}<span class="italics">{{typec}}: </span>{{/rollGreater() r1 r2}}
-						{{/disadvantage}}
-						{{#normal}}
-							<span>{{r1}}</span>
-						{{/normal}}
-						{{#always}}
-							<span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-						{{/always}}
-						{{#advantage}}
-							{{#rollLess() r1 r2}}
-								<span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}
-								<span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}
-								<span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
-							{{/rollGreater() r1 r2}}
-						{{/advantage}}
-						{{#disadvantage}}
-							{{#rollLess() r1 r2}}
-								<span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
-							{{/rollLess() r1 r2}}
-							{{#rollTotal() r1 r2}}
-								<span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollTotal() r1 r2}}
-							{{#rollGreater() r1 r2}}
-								<span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
-							{{/rollGreater() r1 r2}}
-						{{/disadvantage}}
-					</div>
-					{{#description}}
-						<div class="row">
-							<span class="desc">{{description}}</span>
-						</div>
-					{{/description}}
-				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-npcdmg">
-					<div class="container dmgcontainer damagetemplate">
-						<span class="italics">Damage: </span>
-						<span>
-							{{#dmg1flag}}
-								{{dmg1}}{{#crit}} + {{crit1}}{{/crit}}{{dmg1type}}
-							{{/dmg1flag}}
-							{{#dmg1flag}}{{#dmg2flag}}+{{/dmg2flag}}{{/dmg1flag}}
-							{{#dmg2flag}}
-								{{dmg2}}{{#crit}} + {{crit2}}{{/crit}}{{dmg2type}}
-							{{/dmg2flag}}
-						</span>
-					</div>
-				</rolltemplate>
-
-				<rolltemplate class="sheet-rolltemplate-npcaction">
-					<div class="container">
-						<div class="row header">
-							<span>{{rname}}</span>
-						</div>
-						{{#name}}
-							<div class="row subheader">
-								<span class="italics">{{name}}</span>
-							</div>
-						{{/name}}
-						<div class="arrow-right"></div>
-						{{#attack}}
-							<div class="row">
-								{{#normal}}
-									<span class="italics">Attack: </span><span>{{r1}}</span>
-								{{/normal}}
-								{{#always}}
-									<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-								{{/always}}
-								{{#advantage}}
-									{{#rollLess() r1 r2}}
-										<span class="italics">Attack: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
-									{{/rollLess() r1 r2}}
-									{{#rollTotal() r1 r2}}
-										<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-									{{/rollTotal() r1 r2}}
-									{{#rollGreater() r1 r2}}
-										<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
-									{{/rollGreater() r1 r2}}
-								{{/advantage}}
-								{{#disadvantage}}
-									{{#rollLess() r1 r2}}
-										<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
-									{{/rollLess() r1 r2}}
-									{{#rollTotal() r1 r2}}
-										<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
-									{{/rollTotal() r1 r2}}
-									{{#rollGreater() r1 r2}}
-										<span class="italics">Attack: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
-									{{/rollGreater() r1 r2}}
-								{{/disadvantage}}
-							</div>
+				<rolltemplate class="sheet-rolltemplate-dmg">
+						{{#save}}
+								{{#attack}}
+										<div class="desc save">
+								{{/attack}}
+								{{^attack}}
+										<div class="atk save">
+								{{/attack}}
+										<div class="savedc">
+												<span class="rolltemplate-inline">DC</span><span class="rolltemplate-inline">{{savedc}}</span>
+										</div>
+										{{#savedesc}}
+												<div class="sublabel">
+														<span>{{savedesc}}</span>
+												</div>
+										{{/savedesc}}
+										<div class="label">
+												<span class="rolltemplate-inline">{{saveattr}}</span> <span class="rolltemplate-inline">Save</span>
+										</div>
+								</div>
+						{{/save}}
+						{{^attack}}
+								{{#desc}}
+										<div class="desc info">
+												<span>
+														<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
+												</span>
+										</div>
+								{{/desc}}
 						{{/attack}}
-						{{#description}}
-							<span class="desc">{{description}}</span>
-						{{/description}}
+						{{#globaldamage}}
+								{{#^rollTotal() globaldamage 0}}
+										<div class="desc">
+												<span>{{globaldamage}}{{#globaldamagecrit}}<span class="plus"> + </span>{{globaldamagecrit}}{{/globaldamagecrit}}</span>
+												<span class="sublabel">{{globaldamagetype}}</span>
+										</div>
+								{{/^rollTotal() globaldamage 0}}
+						{{/globaldamage}}
+						{{#hldmg}}
+								{{#^rollTotal() hldmg 0}}
+										<div class="desc">
+												<span>{{hldmg}}{{#hldmgcrit}}<span class="plus"> + </span>{{hldmgcrit}}{{/hldmgcrit}}</span>
+												<span class="sublabel">{{dmg1type}}</span>
+												<div class="label">
+														<span>Higher Level Cast</span>
+												</div>
+										</div>
+								{{/^rollTotal() hldmg 0}}
+						{{/hldmg}}
+						<div class="container damagetemplate">
+								<div class="result">
+										{{#dmg1flag}}
+												{{^dmg2flag}}
+														<div class="solo">
+																<span class="damage">{{dmg1}}{{#crit}} + {{crit1}}{{/crit}}</span>
+																<span class="sublabel">{{dmg1type}}</span>
+														</div>
+												{{/dmg2flag}}
+										{{/dmg1flag}}
+										{{#dmg2flag}}
+												{{^dmg1flag}}
+														<div class="solo">
+																<span class="damage">{{dmg2}}{{#crit}} + {{crit2}}{{/crit}}</span>
+																<span class="sublabel">{{dmg2type}}</span>
+														</div>
+												{{/dmg1flag}}
+										{{/dmg2flag}}
+										{{#dmg1flag}}
+												{{#dmg2flag}}
+														<div class="adv">
+																<span class="damage">{{dmg1}}{{#crit}} + {{crit1}}{{/crit}}</span>
+																<span class="sublabel">{{dmg1type}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span class="damage">{{dmg2}}{{#crit}} + {{crit2}}{{/crit}}</span>
+																<span class="sublabel">{{dmg2type}}</span>
+														</div>
+												{{/dmg2flag}}
+										{{/dmg1flag}}
+								</div>
+								{{^attack}}
+										{{#range}}
+												<div class="sublabel" style="color: black;">
+														<span>{{range}}</span>
+												</div>
+										{{/range}}
+										<div class="label">
+												<span>{{rname}}</span>{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}
+										</div>
+										{{#charname}}
+												<div class="charname">
+														<span>{{charname}}</span>
+												</div>
+										{{/charname}}
+								{{/attack}}
 						</div>
+				</rolltemplate>
+				<rolltemplate class="sheet-rolltemplate-atkdmg">
+						{{#attack}}
+								<div class="container atk">
+										<div class="result">
+												{{#always}}
+														<div class="adv">
+																<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+														<div class="advspacer"></div>
+														<div class="adv">
+																<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/always}}
+												{{#normal}}
+														<div class="solo">
+																<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+														</div>
+												{{/normal}}
+												{{#advantage}}
+														{{#rollLess() r1 r2}}
+																<div class="adv">
+																		<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+																<div class="advspacer"></div>
+																<div class="adv">
+																		<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+														{{/rollLess() r1 r2}}
+														{{#rollTotal() r1 r2}}
+																<div class="adv">
+																		<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+																<div class="advspacer"></div>
+																<div class="adv">
+																		<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+														{{/rollTotal() r1 r2}}
+														{{#rollGreater() r1 r2}}
+																<div class="adv">
+																		<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+																<div class="advspacer"></div>
+																<div class="adv">
+																		<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+														{{/rollGreater() r1 r2}}
+												{{/advantage}}
+												{{#disadvantage}}
+														{{#rollLess() r1 r2}}
+																<div class="adv">
+																		<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+																<div class="advspacer"></div>
+																<div class="adv">
+																		<span class="grey">{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+														{{/rollLess() r1 r2}}
+														{{#rollTotal() r1 r2}}
+																<div class="adv">
+																		<span>{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+																<div class="advspacer"></div>
+																<div class="adv">
+																		<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+														{{/rollTotal() r1 r2}}
+														{{#rollGreater() r1 r2}}
+																<div class="adv">
+																		<span class="grey">{{r1}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+																<div class="advspacer"></div>
+																<div class="adv">
+																		<span>{{r2}}{{#globalattack}} + {{globalattack}}{{/globalattack}}</span>
+																</div>
+														{{/rollGreater() r1 r2}}
+												{{/disadvantage}}
+										</div>
+										{{#range}}
+												<div class="sublabel">
+														<span>{{range}}</span>
+												</div>
+										{{/range}}
+										<div class="label">
+												<span>{{rname}}{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}{{#attack}} <span>({{mod}})</span>{{/attack}}</span>
+										</div>
+										{{#charname}}
+												<div class="charname">
+														<span>{{charname}}</span>
+												</div>
+										{{/charname}}
+								</div>
+						{{/attack}}
+						{{#save}}
+								{{#attack}}
+										<div class="container desc save">
+								{{/attack}}
+								{{^attack}}
+										<div class="container atk save">
+								{{/attack}}
+										<div class="savedc">
+												<span class="rolltemplate-inline">DC</span><span class="rolltemplate-inline">{{savedc}}</span>
+										</div>
+										{{#savedesc}}
+												<div class="sublabel">
+														<span>{{savedesc}}</span>
+												</div>
+										{{/savedesc}}
+										<div class="label">
+												<span class="rolltemplate-inline">{{saveattr}}</span> <span class="rolltemplate-inline">Save</span>
+										</div>
+								</div>
+						{{/save}}
+						{{#desc}}
+								<div class="desc info">
+										<span>
+												<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
+										</span>
+								</div>
+						{{/desc}}
+						{{#globaldamage}}
+								{{#^rollTotal() globaldamage 0}}
+										<div class="desc">
+												<span>
+														{{globaldamage}}
+														{{#attack}}
+																{{#normal}}
+																		{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}
+																{{/normal}}
+																{{#always}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/always}}
+																{{#advantage}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/advantage}}
+																{{#disadvantage}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{globaldamagecrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																{{/disadvantage}}
+														{{/attack}}
+												</span>
+												<span class="sublabel">{{globaldamagetype}}</span>
+										</div>
+								{{/^rollTotal() globaldamage 0}}
+						{{/globaldamage}}
+						{{#hldmg}}
+								{{#^rollTotal() hldmg 0}}
+										<div class="desc">
+												<span>
+														{{hldmg}}
+														<!-- {{#hldmgcrit}} + {{hldmgcrit}}{{/hldmgcrit}} -->
+														{{#attack}}
+																{{#normal}}
+																		{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}
+																{{/normal}}
+																{{#always}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/always}}
+																{{#advantage}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/advantage}}
+																{{#disadvantage}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="plus"> + </span>{{hldmgcrit}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																{{/disadvantage}}
+														{{/attack}}
+												</span>
+												<span class="sublabel">{{dmg1type}}</span>
+												<div class="label">
+														<span>Higher Level Cast</span>
+												</div>
+										</div>
+								{{/^rollTotal() hldmg 0}}
+						{{/hldmg}}
 						{{#damage}}
-							<div class="container dmgcontainer damagetemplate">
-								<span class="italics">Damage: </span>
-								<span>
-									{{#dmg1flag}}
-										{{dmg1}}
-										{{#normal}}
-											{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}
-										{{/normal}}
-										{{#always}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-										{{/always}}
-										{{#advantage}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-										{{/advantage}}
-										{{#disadvantage}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-										{{/disadvantage}}
-										{{dmg1type}}
-									{{/dmg1flag}}
-									{{#dmg1flag}}{{#dmg2flag}}+{{/dmg2flag}}{{/dmg1flag}}
-									{{#dmg2flag}}
-										{{dmg2}}
-										{{#normal}}
-											{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}
-										{{/normal}}
-										{{#always}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-										{{/always}}
-										{{#advantage}}
-											{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-											{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
-										{{/advantage}}
-										{{#disadvantage}}
-											{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
-										{{/disadvantage}}
-										{{dmg2type}}
-									{{/dmg2flag}}
-								</span>
-							</div>
+								<div class="container damagetemplate">
+										<div class="result">
+												{{#dmg1flag}}
+														{{^dmg2flag}}
+																<div class="solo">
+																		<span class="damage">
+																				{{dmg1}}
+																				{{#attack}}
+																						{{#normal}}
+																								{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}
+																						{{/normal}}
+																						{{#always}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/always}}
+																						{{#advantage}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/advantage}}
+																						{{#disadvantage}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																						{{/disadvantage}}
+																				{{/attack}}
+																		</span>
+																		<span class="sublabel">{{dmg1type}}</span>
+																</div>
+														{{/dmg2flag}}
+												{{/dmg1flag}}
+												{{#dmg2flag}}
+														{{^dmg1flag}}
+																<div class="solo">
+																		<span class="damage">
+																				{{dmg2}}
+																				{{#attack}}
+																						{{#normal}}
+																								{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}
+																						{{/normal}}
+																						{{#always}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/always}}
+																						{{#advantage}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/advantage}}
+																						{{#disadvantage}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																						{{/disadvantage}}
+																				{{/attack}}
+																		</span>
+																		<span class="sublabel">{{dmg2type}}</span>
+																</div>
+														{{/dmg1flag}}
+												{{/dmg2flag}}
+												{{#dmg1flag}}
+														{{#dmg2flag}}
+																<div class="adv">
+																		<span class="damage">
+																				{{dmg1}}
+																				{{#attack}}
+																						{{#normal}}
+																								{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}
+																						{{/normal}}
+																						{{#always}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/always}}
+																						{{#advantage}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/advantage}}
+																						{{#disadvantage}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																						{{/disadvantage}}
+																				{{/attack}}
+																		</span>
+																		<span class="sublabel">{{dmg1type}}</span>
+																</div>
+																<div class="advspacer"></div>
+																<div class="adv">
+																		<span>
+																				{{dmg2}}
+																				{{#attack}}
+																						{{#normal}}
+																								{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}
+																						{{/normal}}
+																						{{#always}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/always}}
+																						{{#advantage}}
+																								{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}+ {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																								{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																						{{/advantage}}
+																						{{#disadvantage}}
+																								{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}+ {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																						{{/disadvantage}}
+																				{{/attack}}
+																		</span>
+																		<span class="sublabel">{{dmg2type}}</span>
+																</div>
+														{{/dmg2flag}}
+												{{/dmg1flag}}
+										</div>
+										{{^attack}}
+												{{#range}}
+														<div class="sublabel">
+																<span>{{range}}</span>
+														</div>
+												{{/range}}
+												<div class="label">
+														<span>{{rname}}</span>{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}
+												</div>
+												{{#charname}}
+														<div class="charname">
+																<span>{{charname}}</span>
+														</div>
+												{{/charname}}
+										{{/attack}}
+								</div>
 						{{/damage}}
 				</rolltemplate>
-			</div>
+				<rolltemplate class="sheet-rolltemplate-desc">
+						<div class="desc info">
+								<span>
+										<span class="top"></span><span class="middle">{{desc}}</span><span class="bottom"></span>
+								</span>
+						</div>
+				</rolltemplate>
+				<rolltemplate class="sheet-rolltemplate-spell">
+						<div class="container">
+								<div class="title row">
+										<span>{{name}}</span>{{#innate}}<span class="grey">, {{innate}}</span>{{/innate}}
+								</div>
+								<div class="italics row">
+										<span>{{level}}{{#ritual}} (<span>ritual</span>){{/ritual}}</span>
+								</div>
+								<div class="spacer"></div>
+								{{#castingtime}}
+								<div class="row">
+										<span class="bold">Casting Time:</span> <span>{{castingtime}}</span>
+								</div>
+								{{/castingtime}}
+								{{#range}}
+								<div class="row">
+										<span class="bold">Range:</span> <span>{{range}}</span>
+								</div>
+								{{/range}}
+								{{#target}}
+								<div class="row">
+										<span class="bold">Target:</span> <span>{{target}}</span>
+								</div>
+								{{/target}}
+								<div class="row">
+										<span class="bold">Components:</span>
+										<span>
+												{{#v}}V{{#s}}, {{/s}}{{^s}}{{#m}}, {{/m}}{{/s}}{{/v}}
+												{{#s}}S{{#m}}, {{/m}}{{/s}}
+												{{#m}}M {{#material}}({{material}}){{/material}}{{/m}}
+										</span>
+								</div>
+								{{#duration}}
+								<div class="row">
+										<span class="bold">Duration:</span> <span>{{#concentration}}<span>Concentration</span> {{/concentration}}{{duration}}</span>
+								</div>
+								{{/duration}}
+								<div class="spacer"></div>
+								{{#description}}
+								<div class="row">
+										<span class="description">{{description}}</span>
+								</div>
+								{{/description}}
+								{{#athigherlevels}}
+								<div class="row">
+										<span class="bold italics">At Higher Levels</span>. <span class="description">{{athigherlevels}}</span>
+								</div>
+								{{/athigherlevels}}
+						</div>
+				</rolltemplate>
+				<rolltemplate class="sheet-rolltemplate-traits">
+						<div class="row header">
+								<span>{{name}}</span>
+						</div>
+						{{#source}}
+								<div class="row subheader">
+										<span class="italics">{{#charname}}{{charname}} {{/charname}}{{source}}</span>
+								</div>
+						{{/source}}
+						{{#description}}
+								<div class="row">
+										<span class="desc">{{description}}</span>
+								</div>
+						{{/description}}
+				</rolltemplate>
+				<rolltemplate class="sheet-rolltemplate-npc">
+						<div class="row header">
+								<span>{{rname}}</span>
+						</div>
+						{{#name}}
+								<div class="row subheader">
+										<span class="italics">{{name}}</span>
+								</div>
+						{{/name}}
+						<div class="arrow-right"></div>
+						<div class="row">
+								{{#normal}}
+										<span class="italics">{{type}}: </span><span>{{r1}}</span>
+								{{/normal}}
+								{{#always}}
+										<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+								{{/always}}
+								{{#advantage}}
+										{{#rollLess() r1 r2}}
+												<span class="italics">{{type}}: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}
+												<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}
+												<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
+										{{/rollGreater() r1 r2}}
+								{{/advantage}}
+								{{#disadvantage}}
+										{{#rollLess() r1 r2}}
+												<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
+										{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}
+												<span class="italics">{{type}}: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}
+												<span class="italics">{{type}}: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollGreater() r1 r2}}
+								{{/disadvantage}}
+						</div>
+				</rolltemplate>
+				<rolltemplate class="sheet-rolltemplate-npcatk">
+						<div class="row header">
+								{{#normal}}
+										{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}
+										{{#^rollWasCrit() r1}}{{rname}}{{/^rollWasCrit() r1}}
+								{{/normal}}
+								{{#always}}
+										{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}{{rnamec}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+										{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}{{rname}}{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
+								{{/always}}
+								{{#advantage}}
+										{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}{{rnamec}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+										{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}{{rname}}{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
+								{{/advantage}}
+								{{#disadvantage}}
+										{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}{{rnamec}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollTotal() r1 r2}}{{#^rollWasCrit() r1}}{{rname}}{{/^rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollLess() r1 r2}}{{rname}}{{/rollLess() r1 r2}}
+										{{#rollGreater() r1 r2}}{{rnamec}}{{/rollGreater() r1 r2}}
+								{{/disadvantage}}
+						</div>
+						{{#name}}
+								<div class="row subheader">
+										<span class="italics">{{name}}</span>
+								</div>
+						{{/name}}
+						<div class="arrow-right"></div>
+						<div class="row">
+								{{#normal}}
+										{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}
+										{{#^rollWasCrit() r1}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r1}}
+								{{/normal}}
+								{{#always}}
+										{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+										{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
+								{{/always}}
+								{{#advantage}}
+										{{#rollLess() r1 r2}}{{#rollWasCrit() r2}}<span class="italics">[{{typec}}: </span>{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+										{{#^rollWasCrit() r1}}{{#^rollWasCrit() r2}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r2}}{{/^rollWasCrit() r1}}
+								{{/advantage}}
+								{{#disadvantage}}
+										{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}}<span class="italics">{{typec}}: </span>{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollTotal() r1 r2}}{{#^rollWasCrit() r1}}<span class="italics">{{type}}: </span>{{/^rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+										{{#rollLess() r1 r2}}<span class="italics">{{type}}: </span>{{/rollLess() r1 r2}}
+										{{#rollGreater() r1 r2}}<span class="italics">{{typec}}: </span>{{/rollGreater() r1 r2}}
+								{{/disadvantage}}
+								{{#normal}}
+										<span>{{r1}}</span>
+								{{/normal}}
+								{{#always}}
+										<span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+								{{/always}}
+								{{#advantage}}
+										{{#rollLess() r1 r2}}
+												<span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}
+												<span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}
+												<span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
+										{{/rollGreater() r1 r2}}
+								{{/advantage}}
+								{{#disadvantage}}
+										{{#rollLess() r1 r2}}
+												<span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
+										{{/rollLess() r1 r2}}
+										{{#rollTotal() r1 r2}}
+												<span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollTotal() r1 r2}}
+										{{#rollGreater() r1 r2}}
+												<span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
+										{{/rollGreater() r1 r2}}
+								{{/disadvantage}}
+						</div>
+						{{#description}}
+								<div class="row">
+										<span class="desc">{{description}}</span>
+								</div>
+						{{/description}}
+				</rolltemplate>
+				<rolltemplate class="sheet-rolltemplate-npcdmg">
+						<div class="container dmgcontainer damagetemplate">
+								<span class="italics">Damage: </span>
+								<span>
+										{{#dmg1flag}}
+												{{dmg1}}{{#crit}} + {{crit1}}{{/crit}}{{dmg1type}}
+										{{/dmg1flag}}
+										{{#dmg1flag}}{{#dmg2flag}}+{{/dmg2flag}}{{/dmg1flag}}
+										{{#dmg2flag}}
+												{{dmg2}}{{#crit}} + {{crit2}}{{/crit}}{{dmg2type}}
+										{{/dmg2flag}}
+								</span>
+						</div>
+				</rolltemplate>
+				<rolltemplate class="sheet-rolltemplate-npcaction">
+						<div class="container">
+								<div class="row header">
+										<span>{{rname}}</span>
+								</div>
+								{{#name}}
+										<div class="row subheader">
+												<span class="italics">{{name}}</span>
+										</div>
+								{{/name}}
+								<div class="arrow-right"></div>
+								{{#attack}}
+										<div class="row">
+												{{#normal}}
+														<span class="italics">Attack: </span><span>{{r1}}</span>
+												{{/normal}}
+												{{#always}}
+														<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+												{{/always}}
+												{{#advantage}}
+														{{#rollLess() r1 r2}}
+																<span class="italics">Attack: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
+														{{/rollLess() r1 r2}}
+														{{#rollTotal() r1 r2}}
+																<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+														{{/rollTotal() r1 r2}}
+														{{#rollGreater() r1 r2}}
+																<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
+														{{/rollGreater() r1 r2}}
+												{{/advantage}}
+												{{#disadvantage}}
+														{{#rollLess() r1 r2}}
+																<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span class="grey">{{r2}}</span>
+														{{/rollLess() r1 r2}}
+														{{#rollTotal() r1 r2}}
+																<span class="italics">Attack: </span><span>{{r1}}</span><span> | </span><span>{{r2}}</span>
+														{{/rollTotal() r1 r2}}
+														{{#rollGreater() r1 r2}}
+																<span class="italics">Attack: </span><span class="grey">{{r1}}</span><span> | </span><span>{{r2}}</span>
+														{{/rollGreater() r1 r2}}
+												{{/disadvantage}}
+										</div>
+								{{/attack}}
+								{{#description}}
+										<span class="desc">{{description}}</span>
+								{{/description}}
+								</div>
+								{{#damage}}
+										<div class="container dmgcontainer damagetemplate">
+												<span class="italics">Damage: </span>
+												<span>
+														{{#dmg1flag}}
+																{{dmg1}}
+																{{#normal}}
+																		{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}
+																{{/normal}}
+																{{#always}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/always}}
+																{{#advantage}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit1}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/advantage}}
+																{{#disadvantage}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit1}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																{{/disadvantage}}
+																{{dmg1type}}
+														{{/dmg1flag}}
+														{{#dmg1flag}}{{#dmg2flag}}+{{/dmg2flag}}{{/dmg1flag}}
+														{{#dmg2flag}}
+																{{dmg2}}
+																{{#normal}}
+																		{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}
+																{{/normal}}
+																{{#always}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/always}}
+																{{#advantage}}
+																		{{#rollLess() r1 r2}}{{#rollWasCrit() r2}} + {{crit2}}{{/rollWasCrit() r2}}{{/rollLess() r1 r2}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																		{{#rollGreater() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollGreater() r1 r2}}
+																{{/advantage}}
+																{{#disadvantage}}
+																		{{#rollTotal() r1 r2}}{{#rollWasCrit() r1}} + {{crit2}}{{/rollWasCrit() r1}}{{/rollTotal() r1 r2}}
+																{{/disadvantage}}
+																{{dmg2type}}
+														{{/dmg2flag}}
+												</span>
+										</div>
+								{{/damage}}
+				</rolltemplate>
+			</rolltemplate>
 		</div>
 		<script type="text/worker">
 			on("sheet:compendium-drop", function() {
@@ -7638,7 +7443,6 @@
 
 					(attr === "strength") ? update_weight() : false;
 					(attr === "dexterity") ? update_initiative() : false;
-					(attr === "intelligence") ? update_initiative() : false;
 				});
 			});
 
@@ -7660,7 +7464,6 @@
 							break;
 						case "intelligence":
 							update_skills(["arcana", "history", "investigation", "nature", "religion"]);
-							update_initiative();
 							break;
 						case "wisdom":
 							update_skills(["animal_handling", "insight", "medicine", "perception", "survival"]);
@@ -8018,7 +7821,7 @@
 				update_all_ability_checks();
 			});
 
-			on("change:initmod change:init_tiebreaker change:use_intelligent_initiative", function(eventinfo) {
+			on("change:initmod change:init_tiebreaker", function(eventinfo) {
 				if(eventinfo.sourceType && eventinfo.sourceType === "sheetworker") {
 					return;
 				}
@@ -8066,49 +7869,114 @@
 				});
 			});
 
-			[`ac`,`attack`,'save','skill',].forEach(attr => {
-				on(`change:global_${attr}_mod_flag`, (eventinfo) => {
-					const mod = (attr === "attack") ? "tohitmod" : `${attr}mod`;
-					if(eventinfo.newValue === "1") {
-						const firstAttr	   = (attr === "ac")  ? "val" : "roll";
-						const firstAttrValue  = (attr === "ac")  ? 1 : "1d4";
-						const secondAttrValue = (attr === "ac")  ? "Defense" : (attr === "skill") ? "GUIDANCE" : "BLESS";
-
-						getSectionIDs(mod, (ids) => {
-							if(!ids || ids.length === 0) {
-								var update = {};
-								var rowid = generateRowID();
-								update[`repeating_${mod}_${rowid}_global_${attr}_${firstAttr}`]= `${firstAttrValue}`;
-								update[`repeating_${mod}_${rowid}_global_${attr}_name`]		= `${secondAttrValue}`;
-								update[`repeating_${mod}_${rowid}_global_${attr}_active_flag`] = "1";
-								setAttrs(update);
-							}
-						});
-					} else {
-						getSectionIDs(mod, function(ids) {
-							var update = {};
-							var rowid = generateRowID();
-							_.each(ids, function(rowid) {
-								update[`repeating_${mod}_${rowid}_global_${attr}_active_flag`] = "0";
-							});
-							setAttrs(update);
-						});
-					}
-				});
-			});
-
 			on("change:repeating_skillmod remove:repeating_skillmod", function(eventinfo) {
 				update_globalskills();
 			});
 
+			on("change:global_skill_mod_flag", function(eventinfo) {
+				if(eventinfo.newValue === "1") {
+					getSectionIDs("skillmod", function(ids) {
+						if(!ids || ids.length === 0) {
+							var update = {};
+							var rowid = generateRowID();
+							update[`repeating_skillmod_${rowid}_global_skill_name`] = "GUIDANCE";
+							update[`repeating_skillmod_${rowid}_global_skill_roll`] = "1d4";
+							update[`repeating_skillmod_${rowid}_global_skill_active_flag`] = "1";
+							setAttrs(update);
+						}
+					});
+				} else {
+					getSectionIDs("skillmod", function(ids) {
+						var update = {};
+						var rowid = generateRowID();
+						_.each(ids, function(rowid) {
+							update[`repeating_skillmod_${rowid}_global_skill_active_flag`] = "0";
+						});
+						setAttrs(update);
+					});
+				}
+			});
+
 			on("change:repeating_savemod remove:repeating_savemod", function(eventinfo) {
 				update_globalsaves();
 			});
 
+			on("change:global_save_mod_flag", function(eventinfo) {
+				if(eventinfo.newValue === "1") {
+					getSectionIDs("savemod", function(ids) {
+						if(!ids || ids.length === 0) {
+							var update = {};
+							var rowid = generateRowID();
+							update[`repeating_savemod_${rowid}_global_save_roll`] = "1d4";
+							update[`repeating_savemod_${rowid}_global_save_name`] = "BLESS";
+							update[`repeating_savemod_${rowid}_global_save_active_flag`] = "1";
+							setAttrs(update);
+						}
+					});
+				} else {
+					getSectionIDs("savemod", function(ids) {
+						var update = {};
+						var rowid = generateRowID();
+						_.each(ids, function(rowid) {
+							update[`repeating_savemod_${rowid}_global_save_active_flag`] = "0";
+						});
+						setAttrs(update);
+					});
+				}
+			});
+
 			on("change:repeating_tohitmod remove:repeating_tohitmod", function(eventinfo) {
 				update_globalattack();
 			});
 
+			on("change:global_attack_mod_flag", function(eventinfo) {
+				if(eventinfo.newValue === "1") {
+					getSectionIDs("tohitmod", function(ids) {
+						if(!ids || ids.length === 0) {
+							var update = {};
+							var rowid = generateRowID();
+							update[`repeating_tohitmod_${rowid}_global_attack_roll`] = "1d4";
+							update[`repeating_tohitmod_${rowid}_global_attack_name`] = "BLESS";
+							update[`repeating_tohitmod_${rowid}_global_attack_active_flag`] = "1";
+							setAttrs(update);
+						}
+					});
+				} else {
+					getSectionIDs("tohitmod", function(ids) {
+						var update = {};
+						var rowid = generateRowID();
+						_.each(ids, function(rowid) {
+							update[`repeating_tohitmod_${rowid}_global_attack_active_flag`] = "0";
+						});
+						setAttrs(update);
+					});
+				}
+			});
+
+			on("change:global_ac_mod_flag", function(eventinfo) {
+				if(eventinfo.newValue === "1") {
+					getSectionIDs("acmod", function(ids) {
+						if(!ids || ids.length === 0) {
+							var update = {};
+							var rowid = generateRowID();
+							update[`repeating_acmod_${rowid}_global_ac_val`] = "1";
+							update[`repeating_acmod_${rowid}_global_ac_name`] = "Defense";
+							update[`repeating_acmod_${rowid}_global_ac_active_flag`] = "1";
+							setAttrs(update);
+						}
+					});
+				} else {
+					getSectionIDs("acmod", function(ids) {
+						var update = {};
+						var rowid = generateRowID();
+						_.each(ids, function(rowid) {
+							update[`repeating_acmod_${rowid}_global_ac_active_flag`] = "0";
+						});
+						setAttrs(update);
+					});
+				}
+			});
+
 			on("change:repeating_acmod remove:repeating_acmod", function(eventinfo) {
 				update_ac();
 			});
@@ -8245,7 +8113,7 @@
 							}
 						});
 
-						update[attr + "_flag"] = bonus != 0 || item_bonus > 0 || item_base > base ? 1 : 0;
+						update[attr + "_flag"] = bonus > 0 || item_bonus > 0 || item_base > base ? 1 : 0;
 						base = base > item_base ? base : item_base;
 						update[attr] = base + bonus + item_bonus;
 						setAttrs(update);
@@ -10386,6 +10254,7 @@
 
 				getAttrs(attack_attribs, function(v) {
 					_.each(attack_array, function(attackid) {
+						console.log("UPDATING ATTACK: " + attackid);
 						var callbacks = [];
 						var update = {};
 						var hbonus = "";
@@ -10904,10 +10773,6 @@
 							}
 						});
 
-						// CAP TOTALS AT 2 DECIMAL PLACES
-						wtotal = Math.round(wtotal * 100) / 100;
-						stotal = Math.round(stotal * 100) / 100;
-
 						update["weighttotal"] = wtotal;
 						update["slotstotal"] = stotal;
 
@@ -11136,7 +11001,7 @@
 			};
 
 			var update_initiative = function() {
-				var attrs_to_get = ["dexterity","dexterity_mod","intelligence_mod","initmod","jack_of_all_trades","jack","init_tiebreaker","pb_type","use_intelligent_initiative"];
+				var attrs_to_get = ["dexterity","dexterity_mod","initmod","jack_of_all_trades","jack","init_tiebreaker","pb_type"];
 				getSectionIDs("repeating_inventory", function(idarray){
 					_.each(idarray, function(currentID, i) {
 						attrs_to_get.push("repeating_inventory_" + currentID + "_equipped");
@@ -11145,9 +11010,6 @@
 					getAttrs(attrs_to_get, function(v) {
 						var update = {};
 						var final_init = parseInt(v["dexterity_mod"], 10);
-						if(v["use_intelligent_initiative"] && v["use_intelligent_initiative"] != 0) {
-							final_init = parseInt(v["intelligence_mod"], 10);
-						}
 						if(v["initmod"] && !isNaN(parseInt(v["initmod"], 10))) {
 							final_init = final_init + parseInt(v["initmod"], 10);
 						}
@@ -12456,19 +12318,5 @@
 				return value !== null && typeof(value) !== 'undefined';
 			};
 		</script>
-		<div class="sheet-compendium-warning">
-			<span>Importing compendium data</span>
-		</div>
-		<div class="sheet-monster-confirm">
-			<span>Are you sure you want to turn this character into a </span><span name="attr_drop_name"></span><span>?</span>
-			<div class="sheet-monster-confirm-buttons">
-				<div class="sheet-monster-confirm-button">
-					<input class="sheet-monster-confirm-cancel" type="checkbox" name="attr_cancel"><span class="cancel">Cancel</span>
-				</div>
-				<div class="sheet-monster-confirm-button">
-					<input class="sheet-monster-confirm-yes" type="checkbox" name="attr_confirm"><span class="yes">Yes</span>
-				</div>
-			</div>
-		</div>
 	</div>
 </div>
diff --git a/5e Darker Dungeons/sheet.json b/5e Darker Dungeons/sheet.json
index 854eace87c..add97a54ed 100644
--- a/5e Darker Dungeons/sheet.json	
+++ b/5e Darker Dungeons/sheet.json	
@@ -6,307 +6,5 @@
   "preview": "5e Darker Dungeons.png",
   "compendium": "dnd5e",
   "instructions": "A flexible character sheet compatible with D&D 5e and [Giffyglyph's Darker Dungeons](https://drive.google.com/file/d/1ufAyAnP4YTyJmOvyFQwnJZoTMTe95ETt/view?usp=sharing) ruleset.\n\n* Fully drag-and-drop compatible with the [Roll20 Compendium](https://app.roll20.net/compendium/dnd5e/BookIndex).\n* Add lingering wounds and mental afflictions that automatically update your ability modifiers.\n* Track and organise your equipment with easy-to-use containers.\n* Update your conditions and stress with new, color-coded helpers.\n* Make defence rolls, saving throw attacks, and spell burnout checks with new roll buttons.\n* Fully featured with auto-calculated fields, sheet workers, and roll buttons.\n* Multi-classing and custom classes fully supported.\n* Includes a complete NPC sheet to keep track of your monster profiles.",
-  "patreon": "https://www.patreon.com/giffyglyph",
-  "useroptions": [
-        {
-            "attribute": "npc",
-            "displayname": "NPC:",
-            "type": "checkbox",
-            "value": "1",
-            "description": "The NPC option sets new characters to default to the NPC card style sheet. Useful if the player characters have already been created and all new character sheets added to the game will likely represent none player characters.",
-        },
-        {
-            "attribute": "rtype",
-            "displayname": "Roll Queries:",
-            "type": "select", 
-            "options": [
-                "Always Roll Advantage|{{always=1}} {{r2=[[1d20", 
-                "Advantage Toggle|@{advantagetoggle}", 
-                "Query Advantage|{{query=1}} ?{Advantage?|Normal Roll,&#123&#123normal=1&#125&#125 &#123&#123r2=[[0d20|Advantage,&#123&#123advantage=1&#125&#125 &#123&#123r2=[[1d20|Disadvantage,&#123&#123disadvantage=1&#125&#125 &#123&#123r2=[[1d20}",
-                "Never Roll Advantage|{{normal=1}} {{r2=[[0d20"
-            ],
-            "default": "{{always=1}} {{r2=[[1d20",
-            "description": "D20 Rolls output according to this option. Always Roll Advantage is the default setting and will roll two D20 on every roll in case of advantage. The expectation is that if there is no advantage or disadvantage you use the left most result. The Advantage Toggle option adds three new buttons to the top of the sheet so that you can toggle advantage on a case by case basis. Query Advantage gives you a prompt every roll asking if the roll has advantage. Never Roll Advantage always rolls a single D20 on any given roll, expecting the player to roll a second time in case of advantage or disadvantage.",
-        },
-        {
-            "attribute": "wtype",
-            "displayname": "Whisper Rolls to GM:",
-            "type": "select", 
-            "options": [
-                "Never Whisper Rolls|", 
-                "Whisper Toggle|@{whispertoggle}",
-                "Query Whisper|?{Whisper?|Public Roll,|Whisper Roll,/w gm }",
-                "Always Whisper Rolls|/w gm "
-            ],
-            "default": "",
-            "description": "All sheet rolls are sent to all players in chat by default. Whisper Toggle gives a set of buttons to quick select your preference on the fly. Query Whisper option gives you a prompt with each roll of whether or not the roll should be sent privately only to yourself and the GM. Always Whisper Rolls will send all rolls only to yourself and the GM.",
-        },
-        {
-            "attribute": "dtype",
-            "displayname": "Auto Damage Roll:",
-            "type": "select", 
-            "options": [
-                "Don't Auto Roll Damage|pick",
-                "Auto Roll Damage & Crit|full"
-            ],
-            "default": "pick",
-            "description": "By default, attack damage rolls are not rolled until the hit is confirmed. Damage is rolled from the chat roll template by clicking on the name of the attack in the right hand bar, which then displays the damage. The default method is compatible with 3D dice. Optionally, you can choose to have the Auto Roll Damage & Crit option which will roll damage and critical hit dice at the same time of the attack, presenting all possible outcomes at the time of the attack.",
-        },
-        {
-            "attribute": "core_die",
-            "displayname": "Core Die Roll:",
-            "type": "text",
-            "default": "1d20",
-            "description": "Changing the core die will replace the normal 1d20 made with almost all rolls with a randomizer of your choice, such as 2d10 or 3d6.",
-        },
-        {
-            "attribute": "pb_type",
-            "displayname": "Proficiency Bonus:",
-            "type": "select", 
-            "options": [
-                "By Level (Default)|level",
-                "Proficency Die (DMG)|die",
-                "Custom|custom"
-            ],
-            "default": "level",
-            "description": "By default, the character's Proficiency Bonus will be automatically calculated based off of their total level as is the standard method in the PHB. The Proficency Die option supports the alternate method outlined in the DMG where, instead of a flat bonus, a die is rolled instead. The Custom option allows you to replace the PB with anything of your choosing.",
-        },
-        {
-            "attribute": "pb_custom",
-            "displayname": "Custom Proficency Bonus:",
-            "type": "text",
-            "default": "",
-            "description": "When the Proficiency Bonus type is set to Custom, the character sheet will use this value for the character's Proficiency Bonus.",
-        },
-        {
-            "attribute": "init_tiebreaker",
-            "displayname": "Add DEX Tiebreaker to Initiative:",
-            "type": "checkbox",
-            "value": "@{dexterity}/100",
-            "description": "Adds the character's dexterity score as a decimal to the end of the initiative bonus for purposes of breaking ties.",
-        },
-        {
-            "attribute": "global_save_mod_flag",
-            "displayname": "Show Global Save Modifiers:",
-            "type": "checkbox",
-            "value": "1",
-            "description": "Creates a custom global save modifier field, underneath the SAVING THROWS section of the character sheet. Anything put there will be applied to any save roll. Perfect for regular but not permanent bonuses like the Bless spell.",
-        },
-        {
-            "attribute": "global_skill_mod_flag",
-            "displayname": "Show Global Skill Modifiers:",
-            "type": "checkbox",
-            "value": "1",
-            "description": "Creates a custom global skill modifier field, underneath the SKILLS section of the character sheet. Anything put there will be applied to any save roll. Perfect for regular but not permanent bonuses like the Guidance spell.",
-        },
-        {
-            "attribute": "global_attack_mod_flag",
-            "displayname": "Show Global Attack Modifiers:",
-            "type": "checkbox",
-            "value": "1",
-            "description": "Creates a custom global attack modifier field, underneath the ATTACKS AND SPELL CASTING section of the character sheet. Anything put there will be applied to any attack to-hit roll. Perfect for regular but not permanent bonuses to attack like the Bless spell.",
-        },
-        {
-            "attribute": "global_damage_mod_flag",
-            "displayname": "Show Global Damage Modifiers:",
-            "type": "checkbox",
-            "value": "1",
-            "description": "Creates a custom global damage modifier field, underneath the ATTACKS AND SPELL CASTING section of the character sheet. Anything put there will be applied to any attack damage roll. Perfect for regular but not permanent bonuses to damage like the Sneak Attack ability.",
-        },
-        {
-            "attribute": "charname_output",
-            "displayname": "Add Character Name to Templates:",
-            "type": "select", 
-            "options": [
-                "On|{{charname=@{character_name}}}",
-                "Off|charname=@{character_name}"
-            ],
-            "default": "charname=@{character_name}",
-            "description": "Character names are not added to the roll template by default, and are only displayed as normal in the chat tab as the player/character selected as 'Speaking As'. Turning this option on adds the character making the roll's name to the template, useful for players representing multiple characters.",
-        },
-        {
-            "attribute": "level_calculations",
-            "displayname": "Auto Level Calculations:",
-            "type": "select", 
-            "options": [
-                "On|on",
-                "Off|off"
-            ],
-            "default": "on",
-            "description": "By default changing character levels will automatically set spell slots and hit dice. Changing this setting to off prevents this behavior.",
-        },
-        {
-            "attribute": "encumberance_setting",
-            "displayname": "Encumbrance:",
-            "type": "select", 
-            "options": [
-                "Simple|off",
-                "Variant (PHB p176)|on",
-                "Off|disabled"
-            ],
-            "default": "on",
-            "description": "The sheet uses the variant encumbrance rules on page 176 of the PHB. The Off option disables the variant rules and only uses a basic over-limit inventory weight check.",
-        },
-        {
-            "attribute": "simpleinventory",
-            "displayname": "Inventory Style:",
-            "type": "select", 
-            "options": [
-                "Compendium Compatible|complex",
-                "Simple|simple"
-            ],
-            "default": "complex",
-            "description": "Character Inventories default to the complex style that is compatible with the Roll20 5E Compendium. This includes granular item amounts/weights, weight and encumbrance tracking, sorting, AC calculations, automatic attack generation, and more. The Simple option provides a text field for item lists for players who want more manual control over the sheet.",
-        },
-        {
-            "attribute": "simpletraits",
-            "displayname": "Features & Traits:",
-            "type": "select", 
-            "options": [
-                "Compendium Compatible|complex",
-                "Simple|simple"
-            ],
-            "default": "complex",
-            "description": "Character FEATURES AND TRAITS section defaults to the complex style that is compatible with the Roll20 5E Compendium. The Simple option provides a text field for players who want more manual control over the sheet.",
-        },
-        {
-            "attribute": "simpleproficencies",
-            "displayname": "Proficiencies & Languages:",
-            "type": "select", 
-            "options": [
-                "Compendium Compatible|complex",
-                "Simple|simple"
-            ],
-            "default": "complex",
-            "description": "Character OTHER PROFICIENCIES & LANGUAGES section defaults to the complex style that is compatible with the Roll20 5E Compendium. The Simple option provides a text field for players who want more manual control over the sheet.",
-        },
-        {
-            "attribute": "npc_name_flag",
-            "displayname": "NPC Name in Rolls:",
-            "type": "select", 
-            "options": [
-                "Show|{{name=@{npc_name}}}",
-                "Hide|0"
-            ],
-            "default": "{{name=@{npc_name}}}",
-            "description": "In NPC roll results, show or hide the name of the NPC in the roll result card.",
-        },
-        {
-            "attribute": "ammotracking",
-            "displayname": "Ammo Tracking (API Required):",
-            "type": "select", 
-            "options": [
-                "On|on",
-                "Off|off"
-            ],
-            "optiontranslationkeys": ["on","off"],
-            "default": "off",
-            "description": "Provides automatic ammo tracking with the <a href='https://wiki.roll20.net/5th_Edition_OGL_by_Roll20#Utilizing_the_5th_Edition_OGL_Companion_API_Script'>5th Edition OGL by Roll20 Companion API Script</a>.",
-        },
-        {
-            "attribute": "cd_bar1_v",
-            "displayname": "Bar 1 Value:",
-            "type": "text",
-            "default": "hp_max",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, set the Bar 1's value to this attribute.",
-        },
-        {
-            "attribute": "cd_bar1_m",
-            "displayname": "Bar 1 Max:",
-            "type": "text",
-            "default": "hp_max",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, set the Bar 1's max to this attribute.",
-        },
-        {
-            "attribute": "cd_bar1_l",
-            "displayname": "Bar 1 Link:",
-            "type": "text",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, link the Bar 1's value to this attribute. If set this will override all other bar settings.",
-        },
-        {
-            "attribute": "cd_bar2_v",
-            "displayname": "Bar 2 Value:",
-            "type": "text",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, set the Bar 2's value to this attribute.",
-        },
-        {
-            "attribute": "cd_bar2_m",
-            "displayname": "Bar 2 Max:",
-            "type": "text",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, set the Bar 2's max to this attribute.",
-        },
-        {
-            "attribute": "cd_bar2_l",
-            "displayname": "Bar 2 Link:",
-            "type": "text",
-            "default": "npc_ac",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, link the Bar 2's value to this attribute. If set this will override all other bar settings.",
-        },
-        {
-            "attribute": "cd_bar3_v",
-            "displayname": "Bar 3 Value:",
-            "type": "text",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, set the Bar 3's value to this attribute.",
-        },
-        {
-            "attribute": "cd_bar3_m",
-            "displayname": "Bar 3 Max:",
-            "type": "text",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, set the Bar 3's max to this attribute.",
-        },
-        {
-            "attribute": "cd_bar3_l",
-            "displayname": "Bar 3 Link:",
-            "type": "text",
-            "description": "On Default Tokens created by doing a Compendium drop onto the virtual table top, link the Bar 3's value to this attribute. If set this will override all other bar settings.",
-        },
-        {
-            "attribute": "use_inventory_slots",
-            "displayname": "Use Inventory Slots",
-            "type": "checkbox",
-            "value": "1",
-            "checked" : "checked",
-            "description": "[Giffyglyph's Darker Dungeons] Track your inventory using slots instead of weight.",
-        },
-        {
-            "attribute": "show_exhaustion_flag",
-            "displayname": "Show Exhaustion",
-            "type": "checkbox",
-            "value": "1",
-            "checked" : "checked",
-            "description": "[Giffyglyph's Darker Dungeons] Show the exhaustion tracker and effects.",
-        },
-        {
-            "attribute": "show_death_failures_flag",
-            "displayname": "Death Save Failures Only",
-            "type": "checkbox",
-            "value": "1",
-            "checked" : "checked",
-            "description": "[Giffyglyph's Darker Dungeons] Track only death save failures.",
-        },
-        {
-            "attribute": "show_stress_flag",
-            "displayname": "Show Stress",
-            "type": "checkbox",
-            "value": "1",
-            "checked" : "checked",
-            "description": "[Giffyglyph's Darker Dungeons] Show the Stress panel, used for tracking your character's mental stress and afflicitions.",
-        },
-        {
-            "attribute": "show_survival_conditions",
-            "displayname": "Show Survival Conditions",
-            "type": "checkbox",
-            "value": "1",
-            "checked" : "checked",
-            "description": "[Giffyglyph's Darker Dungeons] Show the Survival Conditions panel, used for tracking hunger/thirst/fatigue/temperature.",
-        },
-        {
-            "attribute": "intelligent_initiative",
-            "displayname": "Use Intelligence for Initiative",
-            "type": "checkbox",
-            "value": "1",
-            "checked" : "checked",
-            "description": "[Giffyglyph's Darker Dungeons] Use your intelligence modifier (instead of your dexterity modifier) to calculate your initiative bonus.",
-        }
-    ]
+  "patreon": "https://www.patreon.com/giffyglyph"
 }