diff --git a/blade_runner_rpg/bladerunner_rpg.css b/blade_runner_rpg/bladerunner_rpg.css
index bc7f70afd4..b83639c045 100644
--- a/blade_runner_rpg/bladerunner_rpg.css
+++ b/blade_runner_rpg/bladerunner_rpg.css
@@ -206,17 +206,8 @@
   gap: 5px;
 }
 .charsheet .bladerunner [class*=container--character] .container__middle .section__specialties .repcontainer .repitem {
-  display: -ms-grid;
-  display: grid;
-  -ms-grid-columns: 1fr 5px auto;
+  -ms-grid-columns: 1fr auto;
   grid-template-columns: 1fr auto;
-  gap: 5px;
-}
-.charsheet .bladerunner [class*=container--character] .container__middle .section__specialties .repcontainer .repitem input {
-  width: auto;
-}
-.charsheet .bladerunner [class*=container--character] .container__middle .section__specialties .repcontainer .repitem textarea {
-  grid-column: 1/-1;
 }
 .charsheet .bladerunner [class*=container--character] .container__middle .section__weapons {
   grid-column: 1/-1;
@@ -239,6 +230,9 @@
       -ms-flex-direction: column;
           flex-direction: column;
   gap: 5px;
+  -ms-flex-item-align: start;
+      -ms-grid-row-align: start;
+      align-self: start;
 }
 .charsheet .bladerunner [class*=container--character] .container__middle .section__weapons .inputRow {
   display: -webkit-box;
@@ -308,11 +302,16 @@
 .charsheet .bladerunner [class*=container--character] .container__middle .section__armor input[name=attr_armor_name] {
   width: auto;
 }
+.charsheet .bladerunner [class*=container--character] .container__middle .section__armor .attribute__value {
+  -ms-grid-row-align: center;
+  -ms-grid-column-align: center;
+  place-self: center;
+}
 .charsheet .bladerunner [class*=container--character] .container__middle .section__armor textarea {
   -ms-grid-column-span: 2;
   grid-column: span 2;
 }
-.charsheet .bladerunner [class*=container--character] .container__middle .section__injuries {
+.charsheet .bladerunner [class*=container--character] .container__middle .injuries {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -324,7 +323,7 @@
   -ms-grid-row-span: 3;
   grid-row: span 3;
 }
-.charsheet .bladerunner [class*=container--character] .container__middle .section__injuries > div {
+.charsheet .bladerunner [class*=container--character] .container__middle .injuries > div {
   gap: 1rem;
 }
 @media (max-width: 860px) {
@@ -728,13 +727,9 @@
 .sheet-rolltemplate-bladerunner:not(:first-child) {
   margin-top: 20px;
 }
-.sheet-rolltemplate-bladerunner-push.sheet-rolltemplate-darkmode h1,
-.sheet-rolltemplate-bladerunner.sheet-rolltemplate-darkmode h1 {
-  color: var(--col-tone);
-}
-.sheet-rolltemplate-bladerunner-push.sheet-rolltemplate-darkmode h2,
-.sheet-rolltemplate-bladerunner.sheet-rolltemplate-darkmode h2 {
-  background: var(--col-deep);
+.sheet-rolltemplate-bladerunner-push .sheet-push,
+.sheet-rolltemplate-bladerunner .sheet-push {
+  text-transform: capitalize;
 }
 .sheet-rolltemplate-bladerunner-push h1,
 .sheet-rolltemplate-bladerunner h1 {
@@ -744,9 +739,12 @@
   font-weight: normal;
   line-height: 1;
   color: var(--col-alt);
-  mix-blend-mode: exclusion;
   grid-column: 1/-1;
 }
+.sheet-rolltemplate-bladerunner-push h1 a,
+.sheet-rolltemplate-bladerunner h1 a {
+  color: var(--col-schematic);
+}
 .sheet-rolltemplate-bladerunner-push h2,
 .sheet-rolltemplate-bladerunner h2 {
   padding-left: 1rem;
@@ -777,11 +775,16 @@
   -webkit-box-pack: justify;
       -ms-flex-pack: justify;
           justify-content: space-between;
+  text-transform: capitalize;
 }
 .sheet-rolltemplate-bladerunner-push .sheet-name,
 .sheet-rolltemplate-bladerunner .sheet-name {
   background: linear-gradient(12deg, rgba(44, 39, 61, 0.2), rgba(27, 177, 177, 0.2));
 }
+.sheet-rolltemplate-bladerunner-push a,
+.sheet-rolltemplate-bladerunner a {
+  color: white;
+}
 .sheet-rolltemplate-bladerunner-push a[href^="~"], .sheet-rolltemplate-bladerunner-push a[href^="!"],
 .sheet-rolltemplate-bladerunner a[href^="~"],
 .sheet-rolltemplate-bladerunner a[href^="!"] {
@@ -815,10 +818,6 @@
           box-shadow: 0 0 4px var(--col-red-glow), inset 0 0 4px var(--col-red-glow);
   color: var(--col-red-glow);
 }
-.sheet-rolltemplate-bladerunner-push a:hover,
-.sheet-rolltemplate-bladerunner a:hover {
-  mix-blend-mode: color-dodge;
-}
 .sheet-rolltemplate-bladerunner-push .inlinerollresult.inlinerollresult,
 .sheet-rolltemplate-bladerunner .inlinerollresult.inlinerollresult {
   display: -ms-grid;
@@ -855,6 +854,12 @@
 .sheet-rolltemplate-bladerunner .inlinerollresult.inlinerollresult[original-title*="computed value"] {
   pointer-events: none;
 }
+.sheet-rolltemplate-bladerunner-push .sheet-force-fumble .inlinerollresult,
+.sheet-rolltemplate-bladerunner .sheet-force-fumble .inlinerollresult {
+  -webkit-box-shadow: 0 0 4px var(--col-red-glow), inset 0 0 4px var(--col-red-glow);
+          box-shadow: 0 0 4px var(--col-red-glow), inset 0 0 4px var(--col-red-glow);
+  color: var(--col-red-glow);
+}
 .sheet-rolltemplate-bladerunner-push .sheet-successes,
 .sheet-rolltemplate-bladerunner .sheet-successes {
   -ms-grid-row: 5;
@@ -890,7 +895,6 @@
   font-family: var(--font-main);
   font-size: 4rem;
   color: var(--col-alt);
-  mix-blend-mode: color-dodge;
 }
 .sheet-rolltemplate-bladerunner-push .sheet-successes .fullcrit, .sheet-rolltemplate-bladerunner-push .sheet-successes .fullfail,
 .sheet-rolltemplate-bladerunner .sheet-successes .fullcrit,
@@ -929,7 +933,6 @@
   position: relative;
   -webkit-perspective: 1000px;
           perspective: 1000px;
-  mix-blend-mode: color-dodge;
 }
 .sheet-rolltemplate-bladerunner-push .sheet-rolls h3,
 .sheet-rolltemplate-bladerunner .sheet-rolls h3 {
@@ -955,7 +958,6 @@
   color: white;
   -webkit-filter: drop-shadow(0 0 2px var(--col-blue-glow)) drop-shadow(0 0 8px var(--col-blue-glow));
           filter: drop-shadow(0 0 2px var(--col-blue-glow)) drop-shadow(0 0 8px var(--col-blue-glow));
-  mix-blend-mode: color-dodge;
   border: 0px;
 }
 .sheet-rolltemplate-bladerunner-push .sheet-rolls h3.fullfail,
@@ -1229,7 +1231,7 @@
   font-family: var(--font-header);
   font-size: 18px;
   text-transform: uppercase;
-  color: var(--col-blue);
+  color: var(--col-tone);
   -webkit-transform-origin: 0 0;
           transform-origin: 0 0;
   rotate: 90deg;
@@ -1240,11 +1242,31 @@
 .sheet-rolltemplate-bladerunner .sheet-span-all {
   grid-column: 1/-1;
 }
+.sheet-rolltemplate-bladerunner-push .sheet-effect,
+.sheet-rolltemplate-bladerunner .sheet-effect {
+  text-transform: capitalize;
+  text-align: center;
+}
 .sheet-rolltemplate-bladerunner-push .sheet-description,
 .sheet-rolltemplate-bladerunner .sheet-description {
   color: white;
   font-family: inherit;
-  text-align: center;
+}
+.sheet-rolltemplate-bladerunner-push.sheet-rolltemplate-darkmode h1,
+.sheet-rolltemplate-bladerunner.sheet-rolltemplate-darkmode h1 {
+  color: var(--col-tone);
+}
+.sheet-rolltemplate-bladerunner-push.sheet-rolltemplate-darkmode h1 a,
+.sheet-rolltemplate-bladerunner.sheet-rolltemplate-darkmode h1 a {
+  color: var(--col-alt);
+}
+.sheet-rolltemplate-bladerunner-push.sheet-rolltemplate-darkmode h2,
+.sheet-rolltemplate-bladerunner.sheet-rolltemplate-darkmode h2 {
+  background: var(--col-deep);
+}
+.sheet-rolltemplate-bladerunner-push.sheet-rolltemplate-darkmode .sheet-choice-table::before,
+.sheet-rolltemplate-bladerunner.sheet-rolltemplate-darkmode .sheet-choice-table::before {
+  color: var(--col-blue);
 }
 
 .sheet-darkmode .ui-dialog .dialog .nav.nav-tabs a[data-tab=charsheet]:before,
@@ -1284,6 +1306,8 @@
   --col-schematic: rgb(112, 148, 146);
   --col-schematic-glow: rgba(90, 141, 138, 0.5);
   --col-background: rgb(128, 160, 157);
+  --selectedColor:var(--col-blue);
+  --unselectedColor1:var(--col-background);
   --col-option2: rgba(133, 90, 90, 0.0);
   --img-bladerunner: url("https://s3.amazonaws.com/files.d20.io/images/304284738/jAqK_uR6cB2p2lCFKoDTOA/max.png?1663001456");
   --img-caution: repeating-linear-gradient(
@@ -1303,6 +1327,8 @@
 }
 .ui-dialog .dialog .nav.nav-tabs a[data-tab=charsheet] > *,
 .ui-dialog .dialog .nav.nav-tabs a[data-tab=charsheet]:is(:focus, :hover) > * {
+  -ms-grid-row: 1;
+  -ms-grid-column: 1;
   grid-area: content;
 }
 .ui-dialog .dialog .nav.nav-tabs a[data-tab=charsheet]:before,
@@ -1317,6 +1343,130 @@
   -webkit-filter: invert(100%);
           filter: invert(100%);
 }
+.ui-dialog .tab-content .charsheet .flex-box {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+}
+.ui-dialog .tab-content .charsheet .gap {
+  gap: 5px;
+}
+.ui-dialog .tab-content .charsheet .capitalize {
+  text-transform: capitalize;
+}
+.ui-dialog .tab-content .charsheet .adaptive {
+  display: -ms-grid;
+  display: grid;
+  -ms-grid-columns: auto;
+  grid-template-columns: auto;
+  -ms-grid-rows: auto;
+  grid-template-rows: auto;
+      grid-template-areas: "content";
+  position: relative;
+}
+.ui-dialog .tab-content .charsheet .adaptive > * {
+  -ms-grid-row: 1;
+  -ms-grid-column: 1;
+  grid-area: content;
+}
+.ui-dialog .tab-content .charsheet .adaptive > span {
+  opacity: 0;
+  z-index: -10;
+  text-transform: initial;
+  border-radius: 0px;
+}
+.ui-dialog .tab-content .charsheet .adaptive--text {
+  min-height: 4rem;
+}
+.ui-dialog .tab-content .charsheet .adaptive--text__span {
+  white-space: pre-wrap;
+  padding: 4px;
+  border: 1px solid transparent;
+}
+.ui-dialog .tab-content .charsheet .adaptive--text__textarea {
+  width: 100%;
+  height: 100%;
+  resize: none;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.ui-dialog .tab-content .charsheet .adaptive--text__textarea,
+.ui-dialog .tab-content .charsheet .adaptive--input__input {
+  position: absolute;
+}
+.ui-dialog .tab-content .charsheet .adaptive--input__input {
+  width: 100%;
+}
+.ui-dialog .tab-content .charsheet .adaptive--input__span {
+  padding: 2px;
+  min-height: 1.5rem;
+}
+.ui-dialog .tab-content .charsheet .collapse-container {
+  position: relative;
+}
+.ui-dialog .tab-content .charsheet .repitem:hover .collapse, .ui-dialog .tab-content .charsheet .repitem:hover .roll-container,
+.ui-dialog .tab-content .charsheet .collapse-container:hover .collapse,
+.ui-dialog .tab-content .charsheet .collapse-container:hover .roll-container {
+  opacity: 1;
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+       appearance: none;
+  opacity: 0;
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  border: 0px solid black;
+  border-radius: 0;
+  color: var(--selectedColor);
+  text-transform: none;
+  background-color: transparent;
+  display: inline;
+  font-size: 16px;
+  z-index: 100;
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse:before,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:before {
+  content: "y";
+  font-family: pictos;
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse:checked,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:checked {
+  color: var(--unselectedColor1);
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse:checked ~ .expanded,
+.ui-dialog .tab-content .charsheet .repitem .collapse:checked ~ .collapse-container .expanded,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:checked ~ .expanded,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:checked ~ .collapse-container .expanded {
+  display: none !important;
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse:checked ~ .expanded--empty:is(:not([value]), [value=""]) + *,
+.ui-dialog .tab-content .charsheet .repitem .collapse:checked ~ .collapse-container ~ .expanded--empty:is(:not([value]), [value=""]) + *,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:checked ~ .expanded--empty:is(:not([value]), [value=""]) + *,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:checked ~ .collapse-container ~ .expanded--empty:is(:not([value]), [value=""]) + * {
+  display: none !important;
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse:not(:checked) ~ .collapsed,
+.ui-dialog .tab-content .charsheet .repitem .collapse:not(:checked) ~ .collapse-container .collapsed,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:not(:checked) ~ .collapsed,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:not(:checked) ~ .collapse-container .collapsed {
+  display: none !important;
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse:hover,
+.ui-dialog .tab-content .charsheet .collapse-container .collapse:hover {
+  color: var(--selectedColor);
+}
+.ui-dialog .tab-content .charsheet .repitem .collapse {
+  right: -15px;
+}
+.ui-dialog .tab-content .charsheet .repcontainer.editmode .collapse {
+  display: none;
+}
+.ui-dialog .tab-content .charsheet .section-control:not(:checked) + .section-display {
+  display: none !important;
+}
 .ui-dialog .charsheet {
   padding: 0;
 }
@@ -1362,10 +1512,10 @@
 }
 .charsheet .bladerunner .tabs__container > *:nth-child(odd) {
   position: relative;
-  -webkit-animation: spawn-right 500ms ease-in-out forwards;
-          animation: spawn-right 500ms ease-in-out forwards;
-  -webkit-animation-fill-mode: forward;
-          animation-fill-mode: forward;
+  -webkit-animation: spawn-right 500ms ease-in-out;
+          animation: spawn-right 500ms ease-in-out;
+  -webkit-animation-fill-mode: forwards;
+          animation-fill-mode: forwards;
 }
 @-webkit-keyframes spawn-left {
   0% {
@@ -1506,12 +1656,15 @@
 }
 .charsheet .bladerunner textarea:-moz-placeholder-shown, .charsheet .bladerunner input[type=text]:-moz-placeholder-shown, .charsheet .bladerunner input[type=number]:-moz-placeholder-shown, .charsheet .bladerunner select:-moz-placeholder-shown {
   background: var(--img-caution);
+  text-transform: capitalize;
 }
 .charsheet .bladerunner textarea:-ms-input-placeholder, .charsheet .bladerunner input[type=text]:-ms-input-placeholder, .charsheet .bladerunner input[type=number]:-ms-input-placeholder, .charsheet .bladerunner select:-ms-input-placeholder {
   background: var(--img-caution);
+  text-transform: capitalize;
 }
 .charsheet .bladerunner textarea:placeholder-shown, .charsheet .bladerunner input[type=text]:placeholder-shown, .charsheet .bladerunner input[type=number]:placeholder-shown, .charsheet .bladerunner select:placeholder-shown {
   background: var(--img-caution);
+  text-transform: capitalize;
 }
 .charsheet .bladerunner textarea:placeholder-shown::-webkit-input-placeholder, .charsheet .bladerunner input[type=text]:placeholder-shown::-webkit-input-placeholder, .charsheet .bladerunner input[type=number]:placeholder-shown::-webkit-input-placeholder, .charsheet .bladerunner select:placeholder-shown::-webkit-input-placeholder {
   color: var(--col-red);
@@ -1535,8 +1688,8 @@
   color: var(--col-red);
 }
 .charsheet .bladerunner textarea:hover, .charsheet .bladerunner textarea:focus-within, .charsheet .bladerunner input[type=text]:hover, .charsheet .bladerunner input[type=text]:focus-within, .charsheet .bladerunner input[type=number]:hover, .charsheet .bladerunner input[type=number]:focus-within, .charsheet .bladerunner select:hover, .charsheet .bladerunner select:focus-within {
-  -webkit-animation: pulse 1s ease-in-out infinite;
-          animation: pulse 1s ease-in-out infinite;
+  -webkit-animation: pulse 2s ease infinite;
+          animation: pulse 2s ease infinite;
 }
 @-webkit-keyframes pulse {
   0% {
@@ -1640,6 +1793,7 @@
       -ms-flex-direction: column;
           flex-direction: column;
   padding: 1rem;
+  gap: 5px;
   background: linear-gradient(90deg, rgb(24, 74, 82), rgb(7, 17, 21) 60px, rgb(7, 17, 21) calc(100% - 60px), rgb(24, 74, 82));
   background-attachment: fixed;
   -webkit-box-shadow: -4px 4px 4px rgba(248, 0, 255, 0.1803921569), 0px 4px 4px rgba(255, 212, 0, 0.1803921569), 4px 4px 4px rgba(0, 194, 255, 0.1803921569);
@@ -1706,11 +1860,6 @@
 .charsheet .bladerunner button[type=roll]::before, .charsheet .bladerunner button[type=roll][type=roll]::before, .charsheet .bladerunner button[type=action][type=roll]::before, .charsheet .bladerunner .button[type=roll]::before {
   content: none;
 }
-.charsheet .bladerunner button span, .charsheet .bladerunner button[type=roll] span, .charsheet .bladerunner button[type=action] span, .charsheet .bladerunner .button span {
-  margin: 0 5px;
-  padding: 2px;
-  border: 1px solid var(--col-alt);
-}
 .charsheet .bladerunner button:active:not(.subtle-button), .charsheet .bladerunner button[type=roll]:active:not(.subtle-button), .charsheet .bladerunner button[type=action]:active:not(.subtle-button), .charsheet .bladerunner .button:active:not(.subtle-button) {
   background: var(--col-red-glow);
   -webkit-transition: background 50ms;
@@ -1723,32 +1872,6 @@
   -webkit-filter: none;
           filter: none;
 }
-.charsheet .bladerunner button.subtle-button:hover {
-  border-color: var(--col-alt);
-  color: var(--col-alt);
-  -webkit-filter: drop-shadow(0 0 4px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow));
-          filter: drop-shadow(0 0 4px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow));
-}
-.charsheet .bladerunner button.subtle-button:hover::after {
-  background: var(--col-accent);
-}
-.charsheet .bladerunner button.subtle-button:hover h3 {
-  color: var(--col-deep);
-}
-.charsheet .bladerunner button.subtle-button:hover .grade {
-  color: var(--col-deep);
-  border-color: var(--col-deep);
-}
-.charsheet .bladerunner button.subtle-button:active {
-  -webkit-filter: drop-shadow(0 0 4px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
-          filter: drop-shadow(0 0 4px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
-  color: white;
-}
-.charsheet .bladerunner button.subtle-button:active::after {
-  background: var(--col-red-glow) !important;
-  -webkit-transition: background 50ms;
-  transition: background 50ms;
-}
 .charsheet .bladerunner input.grade, .charsheet .bladerunner .gradeMenu input {
   background: none;
   position: relative;
@@ -1782,29 +1905,150 @@
   line-height: 2;
 }
 .charsheet .bladerunner .attribute_wrapper {
-  position: relative;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
+  display: -ms-grid;
+  display: grid;
   height: -webkit-fit-content;
   height: -moz-fit-content;
   height: fit-content;
   -webkit-box-flex: 1;
       -ms-flex: 1;
           flex: 1;
+  -ms-grid-columns: [button-start] 1fr auto minmax(auto, 40px) [button-end];
+  grid-template-columns: [button-start] 1fr auto minmax(auto, 40px) [button-end];
+      grid-template-areas: "header select dice";
+}
+.charsheet .bladerunner .attribute_wrapper:first-child:not(.button-wrapper) {
+  -ms-grid-rows: [button-start] 46px [button-end];
+  grid-template-rows: [button-start] 46px [button-end];
+}
+.charsheet .bladerunner .attribute_wrapper.button-wrapper, .charsheet .bladerunner .attribute_wrapper:not(:first-child) {
+  -ms-grid-rows: [button-start] 40px [button-end];
+  grid-template-rows: [button-start] 40px [button-end];
 }
 .charsheet .bladerunner .attribute_wrapper > div {
   border: 0px;
 }
+.charsheet .bladerunner .attribute_wrapper:hover button {
+  border-color: var(--col-alt);
+  color: var(--col-alt);
+  -webkit-filter: drop-shadow(0 0 4px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow));
+          filter: drop-shadow(0 0 4px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow));
+}
+.charsheet .bladerunner .attribute_wrapper:hover button::after {
+  background: var(--col-accent);
+}
+.charsheet .bladerunner .attribute_wrapper:hover h3 {
+  color: var(--col-deep);
+}
+.charsheet .bladerunner .attribute_wrapper:hover:not(:first-child) .grade {
+  color: var(--col-deep);
+  border-color: var(--col-deep);
+}
+.charsheet .bladerunner .attribute_wrapper:active button {
+  -webkit-filter: drop-shadow(0 0 4px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
+          filter: drop-shadow(0 0 4px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
+  color: white;
+}
+.charsheet .bladerunner .attribute_wrapper:active button::after {
+  background: var(--col-red-glow) !important;
+  -webkit-transition: background 50ms;
+  transition: background 50ms;
+}
 .charsheet .bladerunner .attribute_wrapper button, .charsheet .bladerunner .attribute_wrapper .button {
   -webkit-box-flex: 1;
       -ms-flex: 1;
           flex: 1;
-  height: 36px;
+  grid-area: button;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute__value {
+  -ms-grid-row: 1;
+  -ms-grid-column: 2;
+  grid-area: select;
+  -ms-grid-row-align: center;
+      align-self: center;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute__name {
+  -ms-grid-row: 1;
+  -ms-grid-column: 1;
+  -ms-grid-column-span: 1;
+  grid-area: header;
+  z-index: 10;
+  place-self: stretch;
+  padding: 5px 10px;
+  margin: 0;
+  overflow: hidden;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute__name > span {
+  height: 100%;
+  overflow: hidden;
+  display: inline;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute__name, .charsheet .bladerunner .attribute_wrapper .attribute__dice {
+  pointer-events: none;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute__dice {
+  -ms-grid-row: 1;
+  -ms-grid-column: 3;
+  grid-area: dice;
+  display: inline-block;
+  -webkit-mask-image: linear-gradient(-60deg, var(--col-blue), transparent 80%);
+          mask-image: linear-gradient(-60deg, var(--col-blue), transparent 80%);
+  padding: 0 5px 5px;
+  -ms-grid-row-align: end;
+      align-self: end;
+  border: none;
+  font-size: 16px;
+  text-align: right;
+  color: var(--col-blue);
+  text-shadow: 1px 1px 0px var(--col-blue-glow);
+  z-index: 1;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute__dice::first-letter {
+  font-size: 0.75em;
+}
+.charsheet .bladerunner .attribute_wrapper:not(.button-wrapper):first-of-type {
+  border: 2px solid black;
+  -o-border-image: linear-gradient(190deg, var(--col-blue), transparent 70%) 1;
+     border-image: linear-gradient(190deg, var(--col-blue), transparent 70%) 1;
+  border-width: 2px 2px 0 2px;
+  -webkit-filter: drop-shadow(0 0 4px var(--col-blue-glow)) drop-shadow(0 0 8px var(--col-blue-glow));
+          filter: drop-shadow(0 0 4px var(--col-blue-glow)) drop-shadow(0 0 8px var(--col-blue-glow));
+}
+.charsheet .bladerunner .attribute_wrapper:not(.button-wrapper):first-of-type .attribute__name {
+  text-transform: uppercase !important;
+  color: var(--col-blue);
+  text-shadow: none;
+  text-shadow: 1px 1px var(--col-blue-glow);
+}
+.charsheet .bladerunner .attribute_wrapper .attribute {
+  position: relative;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute .attribute__value {
+  z-index: 2;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::before, .charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::after {
+  position: absolute;
+  content: "";
+  background: -webkit-gradient(linear, left bottom, left top, from(transparent), color-stop(var(--col-red)), to(transparent));
+  background: linear-gradient(to top, transparent, var(--col-red), transparent);
+  width: 2px;
+  height: 200%;
+  top: 50%;
+  translate: 0 -50%;
+  -webkit-filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
+          filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
+  z-index: 5;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::before {
+  left: 0;
+}
+.charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::after {
+  right: 0;
 }
 .charsheet .bladerunner .attribute__value {
-  position: absolute;
-  right: 40px;
+  position: relative;
 }
 .charsheet .bladerunner .attribute__value input[type=hidden][value=B] ~ .gradeMenu {
   left: calc(-100% - 1px);
@@ -1815,6 +2059,9 @@
 .charsheet .bladerunner .attribute__value input[type=hidden][value=D] ~ .gradeMenu {
   left: calc(-300% - 1px);
 }
+.charsheet .bladerunner .attribute__value input[type=hidden][value="-"] ~ .gradeMenu {
+  left: calc(-400% - 1px);
+}
 .charsheet .bladerunner .attribute__value .gradeMenu {
   position: absolute;
   left: 0px;
@@ -2087,72 +2334,6 @@
     -ms-grid-column: 1;
   }
 }
-.charsheet .bladerunner .attribute_wrapper:first-of-type {
-  border: 2px solid black;
-  -o-border-image: linear-gradient(190deg, var(--col-blue), transparent 70%) 1;
-     border-image: linear-gradient(190deg, var(--col-blue), transparent 70%) 1;
-  border-width: 2px 2px 0 2px;
-  -webkit-filter: drop-shadow(0 0 4px var(--col-blue-glow)) drop-shadow(0 0 8px var(--col-blue-glow));
-          filter: drop-shadow(0 0 4px var(--col-blue-glow)) drop-shadow(0 0 8px var(--col-blue-glow));
-}
-.charsheet .bladerunner .attribute_wrapper:first-of-type .attribute__name {
-  text-transform: uppercase !important;
-  color: var(--col-blue);
-  text-shadow: none;
-  text-shadow: 1px 1px var(--col-blue-glow);
-}
-.charsheet .bladerunner .attribute_wrapper .attribute {
-  position: relative;
-  display: -ms-grid;
-  display: grid;
-  -ms-grid-columns: 1fr auto 40px;
-  grid-template-columns: 1fr auto 40px;
-}
-.charsheet .bladerunner .attribute_wrapper .attribute .attribute__value {
-  z-index: 2;
-}
-.charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::before, .charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::after {
-  position: absolute;
-  content: "";
-  background: -webkit-gradient(linear, left bottom, left top, from(transparent), color-stop(var(--col-red)), to(transparent));
-  background: linear-gradient(to top, transparent, var(--col-red), transparent);
-  width: 2px;
-  height: 200%;
-  top: 50%;
-  translate: 0 -50%;
-  -webkit-filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
-          filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow));
-  z-index: 5;
-}
-.charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::before {
-  left: 0;
-}
-.charsheet .bladerunner .attribute_wrapper .attribute:hover .attribute__value::after {
-  right: 0;
-}
-.charsheet .bladerunner .attribute_wrapper .attribute span {
-  position: absolute;
-  margin: 0;
-  padding: 0 5px;
-  right: 1rem;
-  bottom: 5px;
-  width: 30%;
-  display: inline-block;
-  -webkit-mask-image: linear-gradient(-60deg, var(--col-blue), transparent 80%);
-          mask-image: linear-gradient(-60deg, var(--col-blue), transparent 80%);
-  -ms-flex-item-align: end;
-      -ms-grid-row-align: end;
-      align-self: end;
-  border: none;
-  font-size: 16px;
-  text-align: right;
-  color: var(--col-blue);
-  text-shadow: 1px 1px 0px var(--col-blue-glow);
-  z-index: 1;
-}
-.charsheet .bladerunner .attribute_wrapper .attribute span::first-letter {
-  font-size: 0.75em;
-}
 .charsheet .bladerunner .logo-lapd {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -2469,8 +2650,8 @@
           appearance: none;
   background: none;
   border: 2px solid var(--col-alt);
-  -webkit-filter: drop-shadow(0 0 2px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow)) drop-shadow(0px 8px 1px var(--col-schematic));
-          filter: drop-shadow(0 0 2px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow)) drop-shadow(0px 8px 1px var(--col-schematic));
+  -webkit-filter: drop-shadow(0 0 2px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow)) drop-shadow(0px 4px 1px var(--col-schematic));
+          filter: drop-shadow(0 0 2px var(--col-alt-glow)) drop-shadow(0 0 8px var(--col-alt-glow)) drop-shadow(0px 4px 1px var(--col-schematic));
   -webkit-transition: background 100ms ease-out;
   transition: background 100ms ease-out;
 }
@@ -2479,9 +2660,17 @@
   border-color: var(--col-red-glow);
   outline: 2px solid var(--col-alt);
   outline-offset: -4px;
-  -webkit-filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow)) drop-shadow(0px 8px 1px var(--col-accent));
-          filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow)) drop-shadow(0px 8px 1px var(--col-accent));
+  -webkit-filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow)) drop-shadow(0px 4px 1px var(--col-accent));
+          filter: drop-shadow(0 0 2px var(--col-red-glow)) drop-shadow(0 0 8px var(--col-red-glow)) drop-shadow(0px 4px 1px var(--col-accent));
 }
 .charsheet .bladerunner .span-all {
   grid-column: 1/-1;
+}
+.charsheet .bladerunner .repitem {
+  display: -ms-grid;
+  display: grid;
+  gap: 5px;
+}
+.charsheet .bladerunner .repitem input {
+  width: auto;
 }
\ No newline at end of file
diff --git a/blade_runner_rpg/bladerunner_rpg.html b/blade_runner_rpg/bladerunner_rpg.html
index d2563c34aa..a7b39da205 100644
--- a/blade_runner_rpg/bladerunner_rpg.html
+++ b/blade_runner_rpg/bladerunner_rpg.html
@@ -26,389 +26,401 @@
     <nav class="tabs__header tabs--tabs__header">
       <button class="tabs__button tabs--tabs__button tabs--tabs__button--character" name="act_nav-tabs-tabs--character" data-container-button="tabs" data-button="character" data-i18n="tabs-tabs-character" type="action" title="%{nav-tabs-tabs--character}" data-container-tab="tabs" data-tab="character">
       </button>
-      <button class="tabs__button tabs--tabs__button tabs--tabs__button--shift-log custom-button" name="act_nav-tabs-tabs--shift-log" data-container-button="tabs" data-button="shift-log" data-i18n="tabs-tabs-shift-log" type="action" title="%{nav-tabs-tabs--shift-log}" data-container-tab="tabs" data-tab="shift-log">
+      <button class="tabs__button tabs--tabs__button tabs--tabs__button--shift-log" name="act_nav-tabs-tabs--shift-log" data-container-button="tabs" data-button="shift-log" data-i18n="tabs-tabs-shift-log" type="action" title="%{nav-tabs-tabs--shift-log}" data-container-tab="tabs" data-tab="shift-log">
       </button>
       <button class="tabs__button tabs--tabs__button tabs--tabs__button--vehicle" name="act_nav-tabs-tabs--vehicle" data-container-button="tabs" data-button="vehicle" data-i18n="tabs-tabs-vehicle" type="action" title="%{nav-tabs-tabs--vehicle}" data-container-tab="tabs" data-tab="vehicle">
       </button>
     </nav>
     <div class="tabs__body tabs--tabs__body">
-      <div class="tabs__container tabs--tabs__container tabs--tabs__container--character tab_horizontal" data-container-tab="tabs" data-tab="character"> 
+      <div class="tabs__container tabs--tabs__container tabs--tabs__container--character" data-container-tab="tabs" data-tab="character">
   <div class="section__basic"> 
     <h1 class="logo-lapd">Profile Database </h1>
     <label class="inputRow"> 
-      <h3>Name </h3>
+      <h3 data-i18n="name"></h3>
       <input name="attr_character_name" type="text" title="@{character_name}"/>
     </label>
     <label class="inputRow">
-      <h3>Archetype </h3>
-      <input name="attr_archetype" placeholder="Requires Input" type="text" title="@{archetype}"/>
+      <h3 data-i18n="archetype"> </h3>
+      <input name="attr_archetype" data-i18n-placeholder="requires input" type="text" title="@{archetype}"/>
     </label>
     <div class="option_replicant">
       <input name="attr_option_replicant" type="hidden" title="@{option_replicant}"/>
-      <label>Human
+      <label><span class="capitalize" data-i18n="human"></span>
         <input name="attr_option_replicant" value="human" label="Human" type="radio" title="@{option_replicant}"/>
       </label>
-      <label>Replicant
+      <label><span class="capitalize" data-i18n="replicant"></span>
         <input name="attr_option_replicant" value="replicant" label="Replicant" type="radio" title="@{option_replicant}"/>
       </label>
     </div>
   </div>
   <div class="container__top">
     <div class="section__keyMemory">
-      <h2>Key Memory</h2>
-      <textarea name="attr_key_memory" label="Key Memory" title="@{key_memory}"></textarea>
+      <h2 data-i18n="key memory"></h2>
+      <textarea name="attr_key_memory" title="@{key_memory}"></textarea>
     </div>
     <div class="section__keyRelationship"> 
-      <h2>Key Relationship</h2>
-      <textarea name="attr_key_relationship" label="Key Relationship" title="@{key_relationship}"></textarea>
+      <h2 data-i18n="key relationship"></h2>
+      <textarea name="attr_key_relationship" title="@{key_relationship}"></textarea>
     </div>
     <div class="section__home"> 
-      <h2>Home</h2>
+      <h2 data-i18n="home"></h2>
       <textarea name="attr_home" label="Home" title="@{home}"></textarea>
       <label class="inputRow">
-        <h2>Years on the Force </h2>
+        <h2 data-i18n="years on the force"></h2>
         <input name="attr_years_on_force" type="number" title="@{years_on_force}"/>
       </label>
     </div>
     <div class="section__appearance">
-      <h2>Appearance</h2>
+      <h2 data-i18n="appearance"></h2>
       <textarea name="attr_appearance" label="Appearance" title="@{appearance}"></textarea>
     </div>
   </div>
   <div class="section__attributes"> 
-    <h2>Attributes &#38; Skills</h2>
-    <div class="content__attribute undefined">
+    <h2 data-i18n="attributes &amp; skills"></h2>
+    <div class="content__attribute">
       <div class="attribute_wrapper">
-        <div class="attribute subtle-button button">
-          <h3 class="attribute__name">strength</h3><span name="attr_strength_dice" title="@{strength_dice}">d6</span>
-        </div>
+        <div class="attribute subtle-button button"></div>
+        <h3 class="attribute__name" data-i18n="strength">
+        </h3>
         <div class="attribute__value">
           <input name="attr_strength" value="C" type="hidden" title="@{strength}"/>
-          <input name="attr_strength_dice" value="d6" type="hidden" title="@{strength_dice}"/>
+          <input name="attr_strength_dice" value="d8" type="hidden" title="@{strength_dice}"/>
           <input class="grade" name="attr_strength" value="C" type="text" title="@{strength}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_strength" value="A" label="A" type="radio" title="@{strength}"/>
             <input name="attr_strength" value="B" label="B" type="radio" title="@{strength}"/>
-            <input name="attr_strength" value="C" label="C" type="radio" title="@{strength}"/>
-            <input name="attr_strength" value="D" label="D" selected="" type="radio" title="@{strength}"/>
+            <input name="attr_strength" value="C" label="C" checked="checked" type="radio" title="@{strength}"/>
+            <input name="attr_strength" value="D" label="D" type="radio" title="@{strength}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_strength_dice" title="@{strength_dice}">d8</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_force" value="@{force_action}" title="%{force}" type="roll">
-          <h3 class="attribute__name">force</h3><span name="attr_force_dice" title="@{force_dice}">d6</span>
         </button>
         <button name="act_force-action" hidden="" type="action" title="%{force-action}">
         </button>
         <input name="attr_force_action" type="hidden" title="@{force_action}"/>
+        <h3 class="attribute__name" data-i18n="force">
+        </h3>
         <div class="attribute__value">
           <input name="attr_force" value="D" type="hidden" title="@{force}"/>
           <input name="attr_force_dice" value="d6" type="hidden" title="@{force_dice}"/>
           <input class="grade" name="attr_force" value="D" type="text" title="@{force}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_force" value="A" label="A" type="radio" title="@{force}"/>
             <input name="attr_force" value="B" label="B" type="radio" title="@{force}"/>
             <input name="attr_force" value="C" label="C" type="radio" title="@{force}"/>
-            <input name="attr_force" value="D" label="D" selected="" type="radio" title="@{force}"/>
+            <input name="attr_force" value="D" label="D" checked="checked" type="radio" title="@{force}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_force_dice" title="@{force_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_hand_to_hand" value="@{hand_to_hand_action}" title="%{hand_to_hand}" type="roll">
-          <h3 class="attribute__name">hand to hand</h3><span name="attr_hand_to_hand_dice" title="@{hand_to_hand_dice}">d6</span>
         </button>
         <button name="act_hand-to-hand-action" hidden="" type="action" title="%{hand-to-hand-action}">
         </button>
         <input name="attr_hand_to_hand_action" type="hidden" title="@{hand_to_hand_action}"/>
+        <h3 class="attribute__name" data-i18n="hand to hand">
+        </h3>
         <div class="attribute__value">
           <input name="attr_hand_to_hand" value="D" type="hidden" title="@{hand_to_hand}"/>
           <input name="attr_hand_to_hand_dice" value="d6" type="hidden" title="@{hand_to_hand_dice}"/>
           <input class="grade" name="attr_hand_to_hand" value="D" type="text" title="@{hand_to_hand}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_hand_to_hand" value="A" label="A" type="radio" title="@{hand_to_hand}"/>
             <input name="attr_hand_to_hand" value="B" label="B" type="radio" title="@{hand_to_hand}"/>
             <input name="attr_hand_to_hand" value="C" label="C" type="radio" title="@{hand_to_hand}"/>
-            <input name="attr_hand_to_hand" value="D" label="D" selected="" type="radio" title="@{hand_to_hand}"/>
+            <input name="attr_hand_to_hand" value="D" label="D" checked="checked" type="radio" title="@{hand_to_hand}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_hand_to_hand_dice" title="@{hand_to_hand_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_stamina" value="@{stamina_action}" title="%{stamina}" type="roll">
-          <h3 class="attribute__name">stamina</h3><span name="attr_stamina_dice" title="@{stamina_dice}">d6</span>
         </button>
         <button name="act_stamina-action" hidden="" type="action" title="%{stamina-action}">
         </button>
         <input name="attr_stamina_action" type="hidden" title="@{stamina_action}"/>
+        <h3 class="attribute__name" data-i18n="stamina">
+        </h3>
         <div class="attribute__value">
           <input name="attr_stamina" value="D" type="hidden" title="@{stamina}"/>
           <input name="attr_stamina_dice" value="d6" type="hidden" title="@{stamina_dice}"/>
           <input class="grade" name="attr_stamina" value="D" type="text" title="@{stamina}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_stamina" value="A" label="A" type="radio" title="@{stamina}"/>
             <input name="attr_stamina" value="B" label="B" type="radio" title="@{stamina}"/>
             <input name="attr_stamina" value="C" label="C" type="radio" title="@{stamina}"/>
-            <input name="attr_stamina" value="D" label="D" selected="" type="radio" title="@{stamina}"/>
+            <input name="attr_stamina" value="D" label="D" checked="checked" type="radio" title="@{stamina}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_stamina_dice" title="@{stamina_dice}">d6</span>
       </div>
     </div>
-    <div class="content__attribute undefined">
+    <div class="content__attribute">
       <div class="attribute_wrapper">
-        <div class="attribute subtle-button button">
-          <h3 class="attribute__name">agility</h3><span name="attr_agility_dice" title="@{agility_dice}">d6</span>
-        </div>
+        <div class="attribute subtle-button button"></div>
+        <h3 class="attribute__name" data-i18n="agility">
+        </h3>
         <div class="attribute__value">
           <input name="attr_agility" value="C" type="hidden" title="@{agility}"/>
-          <input name="attr_agility_dice" value="d6" type="hidden" title="@{agility_dice}"/>
+          <input name="attr_agility_dice" value="d8" type="hidden" title="@{agility_dice}"/>
           <input class="grade" name="attr_agility" value="C" type="text" title="@{agility}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_agility" value="A" label="A" type="radio" title="@{agility}"/>
             <input name="attr_agility" value="B" label="B" type="radio" title="@{agility}"/>
-            <input name="attr_agility" value="C" label="C" type="radio" title="@{agility}"/>
-            <input name="attr_agility" value="D" label="D" selected="" type="radio" title="@{agility}"/>
+            <input name="attr_agility" value="C" label="C" checked="checked" type="radio" title="@{agility}"/>
+            <input name="attr_agility" value="D" label="D" type="radio" title="@{agility}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_agility_dice" title="@{agility_dice}">d8</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_firearms" value="@{firearms_action}" title="%{firearms}" type="roll">
-          <h3 class="attribute__name">firearms</h3><span name="attr_firearms_dice" title="@{firearms_dice}">d6</span>
         </button>
         <button name="act_firearms-action" hidden="" type="action" title="%{firearms-action}">
         </button>
         <input name="attr_firearms_action" type="hidden" title="@{firearms_action}"/>
+        <h3 class="attribute__name" data-i18n="firearms">
+        </h3>
         <div class="attribute__value">
           <input name="attr_firearms" value="D" type="hidden" title="@{firearms}"/>
           <input name="attr_firearms_dice" value="d6" type="hidden" title="@{firearms_dice}"/>
           <input class="grade" name="attr_firearms" value="D" type="text" title="@{firearms}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_firearms" value="A" label="A" type="radio" title="@{firearms}"/>
             <input name="attr_firearms" value="B" label="B" type="radio" title="@{firearms}"/>
             <input name="attr_firearms" value="C" label="C" type="radio" title="@{firearms}"/>
-            <input name="attr_firearms" value="D" label="D" selected="" type="radio" title="@{firearms}"/>
+            <input name="attr_firearms" value="D" label="D" checked="checked" type="radio" title="@{firearms}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_firearms_dice" title="@{firearms_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_mobility" value="@{mobility_action}" title="%{mobility}" type="roll">
-          <h3 class="attribute__name">mobility</h3><span name="attr_mobility_dice" title="@{mobility_dice}">d6</span>
         </button>
         <button name="act_mobility-action" hidden="" type="action" title="%{mobility-action}">
         </button>
         <input name="attr_mobility_action" type="hidden" title="@{mobility_action}"/>
+        <h3 class="attribute__name" data-i18n="mobility">
+        </h3>
         <div class="attribute__value">
           <input name="attr_mobility" value="D" type="hidden" title="@{mobility}"/>
           <input name="attr_mobility_dice" value="d6" type="hidden" title="@{mobility_dice}"/>
           <input class="grade" name="attr_mobility" value="D" type="text" title="@{mobility}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_mobility" value="A" label="A" type="radio" title="@{mobility}"/>
             <input name="attr_mobility" value="B" label="B" type="radio" title="@{mobility}"/>
             <input name="attr_mobility" value="C" label="C" type="radio" title="@{mobility}"/>
-            <input name="attr_mobility" value="D" label="D" selected="" type="radio" title="@{mobility}"/>
+            <input name="attr_mobility" value="D" label="D" checked="checked" type="radio" title="@{mobility}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_mobility_dice" title="@{mobility_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_stealth" value="@{stealth_action}" title="%{stealth}" type="roll">
-          <h3 class="attribute__name">stealth</h3><span name="attr_stealth_dice" title="@{stealth_dice}">d6</span>
         </button>
         <button name="act_stealth-action" hidden="" type="action" title="%{stealth-action}">
         </button>
         <input name="attr_stealth_action" type="hidden" title="@{stealth_action}"/>
+        <h3 class="attribute__name" data-i18n="stealth">
+        </h3>
         <div class="attribute__value">
           <input name="attr_stealth" value="D" type="hidden" title="@{stealth}"/>
           <input name="attr_stealth_dice" value="d6" type="hidden" title="@{stealth_dice}"/>
           <input class="grade" name="attr_stealth" value="D" type="text" title="@{stealth}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_stealth" value="A" label="A" type="radio" title="@{stealth}"/>
             <input name="attr_stealth" value="B" label="B" type="radio" title="@{stealth}"/>
             <input name="attr_stealth" value="C" label="C" type="radio" title="@{stealth}"/>
-            <input name="attr_stealth" value="D" label="D" selected="" type="radio" title="@{stealth}"/>
+            <input name="attr_stealth" value="D" label="D" checked="checked" type="radio" title="@{stealth}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_stealth_dice" title="@{stealth_dice}">d6</span>
       </div>
     </div>
-    <div class="content__attribute undefined">
+    <div class="content__attribute">
       <div class="attribute_wrapper">
-        <div class="attribute subtle-button button">
-          <h3 class="attribute__name">intelligence</h3><span name="attr_intelligence_dice" title="@{intelligence_dice}">d6</span>
-        </div>
+        <div class="attribute subtle-button button"></div>
+        <h3 class="attribute__name" data-i18n="intelligence">
+        </h3>
         <div class="attribute__value">
           <input name="attr_intelligence" value="C" type="hidden" title="@{intelligence}"/>
-          <input name="attr_intelligence_dice" value="d6" type="hidden" title="@{intelligence_dice}"/>
+          <input name="attr_intelligence_dice" value="d8" type="hidden" title="@{intelligence_dice}"/>
           <input class="grade" name="attr_intelligence" value="C" type="text" title="@{intelligence}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_intelligence" value="A" label="A" type="radio" title="@{intelligence}"/>
             <input name="attr_intelligence" value="B" label="B" type="radio" title="@{intelligence}"/>
-            <input name="attr_intelligence" value="C" label="C" type="radio" title="@{intelligence}"/>
-            <input name="attr_intelligence" value="D" label="D" selected="" type="radio" title="@{intelligence}"/>
+            <input name="attr_intelligence" value="C" label="C" checked="checked" type="radio" title="@{intelligence}"/>
+            <input name="attr_intelligence" value="D" label="D" type="radio" title="@{intelligence}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_intelligence_dice" title="@{intelligence_dice}">d8</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_medical_aid" value="@{medical_aid_action}" title="%{medical_aid}" type="roll">
-          <h3 class="attribute__name">medical aid</h3><span name="attr_medical_aid_dice" title="@{medical_aid_dice}">d6</span>
         </button>
         <button name="act_medical-aid-action" hidden="" type="action" title="%{medical-aid-action}">
         </button>
         <input name="attr_medical_aid_action" type="hidden" title="@{medical_aid_action}"/>
+        <h3 class="attribute__name" data-i18n="medical aid">
+        </h3>
         <div class="attribute__value">
           <input name="attr_medical_aid" value="D" type="hidden" title="@{medical_aid}"/>
           <input name="attr_medical_aid_dice" value="d6" type="hidden" title="@{medical_aid_dice}"/>
           <input class="grade" name="attr_medical_aid" value="D" type="text" title="@{medical_aid}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_medical_aid" value="A" label="A" type="radio" title="@{medical_aid}"/>
             <input name="attr_medical_aid" value="B" label="B" type="radio" title="@{medical_aid}"/>
             <input name="attr_medical_aid" value="C" label="C" type="radio" title="@{medical_aid}"/>
-            <input name="attr_medical_aid" value="D" label="D" selected="" type="radio" title="@{medical_aid}"/>
+            <input name="attr_medical_aid" value="D" label="D" checked="checked" type="radio" title="@{medical_aid}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_medical_aid_dice" title="@{medical_aid_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_observation" value="@{observation_action}" title="%{observation}" type="roll">
-          <h3 class="attribute__name">observation</h3><span name="attr_observation_dice" title="@{observation_dice}">d6</span>
         </button>
         <button name="act_observation-action" hidden="" type="action" title="%{observation-action}">
         </button>
         <input name="attr_observation_action" type="hidden" title="@{observation_action}"/>
+        <h3 class="attribute__name" data-i18n="observation">
+        </h3>
         <div class="attribute__value">
           <input name="attr_observation" value="D" type="hidden" title="@{observation}"/>
           <input name="attr_observation_dice" value="d6" type="hidden" title="@{observation_dice}"/>
           <input class="grade" name="attr_observation" value="D" type="text" title="@{observation}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_observation" value="A" label="A" type="radio" title="@{observation}"/>
             <input name="attr_observation" value="B" label="B" type="radio" title="@{observation}"/>
             <input name="attr_observation" value="C" label="C" type="radio" title="@{observation}"/>
-            <input name="attr_observation" value="D" label="D" selected="" type="radio" title="@{observation}"/>
+            <input name="attr_observation" value="D" label="D" checked="checked" type="radio" title="@{observation}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_observation_dice" title="@{observation_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_tech" value="@{tech_action}" title="%{tech}" type="roll">
-          <h3 class="attribute__name">tech</h3><span name="attr_tech_dice" title="@{tech_dice}">d6</span>
         </button>
         <button name="act_tech-action" hidden="" type="action" title="%{tech-action}">
         </button>
         <input name="attr_tech_action" type="hidden" title="@{tech_action}"/>
+        <h3 class="attribute__name" data-i18n="tech">
+        </h3>
         <div class="attribute__value">
           <input name="attr_tech" value="D" type="hidden" title="@{tech}"/>
           <input name="attr_tech_dice" value="d6" type="hidden" title="@{tech_dice}"/>
           <input class="grade" name="attr_tech" value="D" type="text" title="@{tech}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_tech" value="A" label="A" type="radio" title="@{tech}"/>
             <input name="attr_tech" value="B" label="B" type="radio" title="@{tech}"/>
             <input name="attr_tech" value="C" label="C" type="radio" title="@{tech}"/>
-            <input name="attr_tech" value="D" label="D" selected="" type="radio" title="@{tech}"/>
+            <input name="attr_tech" value="D" label="D" checked="checked" type="radio" title="@{tech}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_tech_dice" title="@{tech_dice}">d6</span>
       </div>
     </div>
-    <div class="content__attribute undefined">
+    <div class="content__attribute">
       <div class="attribute_wrapper">
-        <div class="attribute subtle-button button">
-          <h3 class="attribute__name">empathy</h3><span name="attr_empathy_dice" title="@{empathy_dice}">d6</span>
-        </div>
+        <div class="attribute subtle-button button"></div>
+        <h3 class="attribute__name" data-i18n="empathy">
+        </h3>
         <div class="attribute__value">
           <input name="attr_empathy" value="C" type="hidden" title="@{empathy}"/>
-          <input name="attr_empathy_dice" value="d6" type="hidden" title="@{empathy_dice}"/>
+          <input name="attr_empathy_dice" value="d8" type="hidden" title="@{empathy_dice}"/>
           <input class="grade" name="attr_empathy" value="C" type="text" title="@{empathy}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_empathy" value="A" label="A" type="radio" title="@{empathy}"/>
             <input name="attr_empathy" value="B" label="B" type="radio" title="@{empathy}"/>
-            <input name="attr_empathy" value="C" label="C" type="radio" title="@{empathy}"/>
-            <input name="attr_empathy" value="D" label="D" selected="" type="radio" title="@{empathy}"/>
+            <input name="attr_empathy" value="C" label="C" checked="checked" type="radio" title="@{empathy}"/>
+            <input name="attr_empathy" value="D" label="D" type="radio" title="@{empathy}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_empathy_dice" title="@{empathy_dice}">d8</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_connections" value="@{connections_action}" title="%{connections}" type="roll">
-          <h3 class="attribute__name">connections</h3><span name="attr_connections_dice" title="@{connections_dice}">d6</span>
         </button>
         <button name="act_connections-action" hidden="" type="action" title="%{connections-action}">
         </button>
         <input name="attr_connections_action" type="hidden" title="@{connections_action}"/>
+        <h3 class="attribute__name" data-i18n="connections">
+        </h3>
         <div class="attribute__value">
           <input name="attr_connections" value="D" type="hidden" title="@{connections}"/>
           <input name="attr_connections_dice" value="d6" type="hidden" title="@{connections_dice}"/>
           <input class="grade" name="attr_connections" value="D" type="text" title="@{connections}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_connections" value="A" label="A" type="radio" title="@{connections}"/>
             <input name="attr_connections" value="B" label="B" type="radio" title="@{connections}"/>
             <input name="attr_connections" value="C" label="C" type="radio" title="@{connections}"/>
-            <input name="attr_connections" value="D" label="D" selected="" type="radio" title="@{connections}"/>
+            <input name="attr_connections" value="D" label="D" checked="checked" type="radio" title="@{connections}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_connections_dice" title="@{connections_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_insight" value="@{insight_action}" title="%{insight}" type="roll">
-          <h3 class="attribute__name">insight</h3><span name="attr_insight_dice" title="@{insight_dice}">d6</span>
         </button>
         <button name="act_insight-action" hidden="" type="action" title="%{insight-action}">
         </button>
         <input name="attr_insight_action" type="hidden" title="@{insight_action}"/>
+        <h3 class="attribute__name" data-i18n="insight">
+        </h3>
         <div class="attribute__value">
           <input name="attr_insight" value="D" type="hidden" title="@{insight}"/>
           <input name="attr_insight_dice" value="d6" type="hidden" title="@{insight_dice}"/>
           <input class="grade" name="attr_insight" value="D" type="text" title="@{insight}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_insight" value="A" label="A" type="radio" title="@{insight}"/>
             <input name="attr_insight" value="B" label="B" type="radio" title="@{insight}"/>
             <input name="attr_insight" value="C" label="C" type="radio" title="@{insight}"/>
-            <input name="attr_insight" value="D" label="D" selected="" type="radio" title="@{insight}"/>
+            <input name="attr_insight" value="D" label="D" checked="checked" type="radio" title="@{insight}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_insight_dice" title="@{insight_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_manipulation" value="@{manipulation_action}" title="%{manipulation}" type="roll">
-          <h3 class="attribute__name">manipulation</h3><span name="attr_manipulation_dice" title="@{manipulation_dice}">d6</span>
         </button>
         <button name="act_manipulation-action" hidden="" type="action" title="%{manipulation-action}">
         </button>
         <input name="attr_manipulation_action" type="hidden" title="@{manipulation_action}"/>
+        <h3 class="attribute__name" data-i18n="manipulation">
+        </h3>
         <div class="attribute__value">
           <input name="attr_manipulation" value="D" type="hidden" title="@{manipulation}"/>
           <input name="attr_manipulation_dice" value="d6" type="hidden" title="@{manipulation_dice}"/>
           <input class="grade" name="attr_manipulation" value="D" type="text" title="@{manipulation}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_manipulation" value="A" label="A" type="radio" title="@{manipulation}"/>
             <input name="attr_manipulation" value="B" label="B" type="radio" title="@{manipulation}"/>
             <input name="attr_manipulation" value="C" label="C" type="radio" title="@{manipulation}"/>
-            <input name="attr_manipulation" value="D" label="D" selected="" type="radio" title="@{manipulation}"/>
+            <input name="attr_manipulation" value="D" label="D" checked="checked" type="radio" title="@{manipulation}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_manipulation_dice" title="@{manipulation_dice}">d6</span>
       </div>
     </div>
     <div class="content__attribute driving">
       <div class="attribute_wrapper">
-        <div class="attribute subtle-button button">
-          <h3 class="attribute__name">driving</h3><span name="attr_driving_dice" title="@{driving_dice}">d6</span>
-        </div>
+        <div class="attribute subtle-button button"></div>
+        <h3 class="attribute__name" data-i18n="driving">
+        </h3>
         <div class="attribute__value">
           <input name="attr_driving" value="D" type="hidden" title="@{driving}"/>
           <input name="attr_driving_dice" value="d6" type="hidden" title="@{driving_dice}"/>
           <input class="grade" name="attr_driving" value="D" type="text" title="@{driving}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu">
             <input name="attr_driving" value="A" label="A" type="radio" title="@{driving}"/>
             <input name="attr_driving" value="B" label="B" type="radio" title="@{driving}"/>
             <input name="attr_driving" value="C" label="C" type="radio" title="@{driving}"/>
-            <input name="attr_driving" value="D" label="D" selected="" type="radio" title="@{driving}"/>
+            <input name="attr_driving" value="D" label="D" checked="checked" type="radio" title="@{driving}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_driving_dice" title="@{driving_dice}">d6</span>
       </div>
     </div>
   </div>
   <div class="container__shifts"> 
-    <button name="act_next-shift" type="action" title="%{next-shift}">Next Shift
+    <button name="act_next-shift" data-i18n="next shift" type="action" title="%{next-shift}">
     </button>
-    <button name="act_downtime" type="action" title="%{downtime}">Downtime<span name="attr_shift_counter" title="@{shift_counter}"></span>
+    <button class="flex-box gap" name="act_downtime" type="action" title="%{downtime}"><span class="capitalize" data-i18n="downtime"></span><span name="attr_shift_counter" title="@{shift_counter}"></span>
     </button>
   </div>
   <div class="container__middle">
     <div class="section__weapons"> 
-      <h2>Weapons</h2>
-      <h3>Hand to Hand</h3>
+      <h2 data-i18n="weapons"></h2>
+      <h3 data-i18n="hand to hand"></h3>
       <fieldset class="repeating_weapons-hand">
         <div class="inputRow"> 
-          <input class="title_input" name="attr_name" placeholder="Weapon name" type="text" title="@{repeating_weapons-hand_$X_name}"/>
+          <input class="title_input" name="attr_name" data-i18n-placeholder="weapon name" type="text" title="@{repeating_weapons-hand_$X_name}"/>
           <button class="roller" name="roll_roll" value="@{action}" title="%{repeating_weapons-hand_$X_roll}" type="roll">
           </button>
           <button name="act_action" hidden="" type="action" title="%{repeating_weapons-hand_$X_action}">
@@ -418,7 +430,7 @@
           </button>
           <button hidden="" name="act_crit" type="action" title="%{repeating_weapons-hand_$X_crit}">
           </button>
-          <input name="attr_damage" placeholder="Damage" type="number" title="@{repeating_weapons-hand_$X_damage}"/>
+          <input name="attr_damage" data-i18n-placeholder="damage" type="number" title="@{repeating_weapons-hand_$X_damage}"/>
           <select name="attr_crit_die" title="@{repeating_weapons-hand_$X_crit_die}">
             <option value="6" selected="">d6
             </option>
@@ -435,14 +447,14 @@
             <option value="piercing">Piercing
             </option>
           </select>
-          <input name="attr_min_range" placeholder="Min. Range" type="text" title="@{repeating_weapons-hand_$X_min_range}"/>
-          <input name="attr_max_range" placeholder="Max. Range" type="text" title="@{repeating_weapons-hand_$X_max_range}"/>
+          <input name="attr_min_range" data-i18n-placeholder="min. range" type="text" title="@{repeating_weapons-hand_$X_min_range}"/>
+          <input name="attr_max_range" data-i18n-placeholder="max. range" type="text" title="@{repeating_weapons-hand_$X_max_range}"/>
         </div>
       </fieldset>
       <h3>Firearms</h3>
       <fieldset class="repeating_weapons-firearm">
         <div class="inputRow"> 
-          <input class="title_input" name="attr_name" placeholder="Name" type="text" title="@{repeating_weapons-firearm_$X_name}"/>
+          <input class="title_input" name="attr_name" data-i18n-placeholder="name" type="text" title="@{repeating_weapons-firearm_$X_name}"/>
           <button class="roller" name="roll_roll" value="@{action}" title="%{repeating_weapons-firearm_$X_roll}" type="roll">
           </button>
           <button name="act_action" hidden="" type="action" title="%{repeating_weapons-firearm_$X_action}">
@@ -452,7 +464,7 @@
           </button>
           <button hidden="" name="act_crit" type="action" title="%{repeating_weapons-firearm_$X_crit}">
           </button>
-          <input name="attr_damage" placeholder="Damage" type="number" title="@{repeating_weapons-firearm_$X_damage}"/>
+          <input name="attr_damage" data-i18n-placeholder="damage" type="number" title="@{repeating_weapons-firearm_$X_damage}"/>
           <select name="attr_crit_die" title="@{repeating_weapons-firearm_$X_crit_die}">
             <option value="6" selected="">d6
             </option>
@@ -469,44 +481,93 @@
             <option value="piercing" selected="">Piercing
             </option>
           </select>
-          <input name="attr_min_range" placeholder="Min. Range" type="text" title="@{repeating_weapons-firearm_$X_min_range}"/>
-          <input name="attr_max_range" placeholder="Max. Range" type="text" title="@{repeating_weapons-firearm_$X_max_range}"/>
+          <input name="attr_min_range" data-i18n-placeholder="min. range" type="text" title="@{repeating_weapons-firearm_$X_min_range}"/>
+          <input name="attr_max_range" data-i18n-placeholder="max. range" type="text" title="@{repeating_weapons-firearm_$X_max_range}"/>
         </div>
       </fieldset>
     </div>
     <div class="section__specialties"> 
       <h2>Specialties</h2>
       <fieldset class="repeating_specialties">
-        <input class="title_input" name="attr_name" label="Specialties" placeholder="New Specialty" type="text" title="@{repeating_specialties_$X_name}"/>
+        <input class="collapse" name="attr_collapse" value="1" type="checkbox" title="@{repeating_specialties_$X_collapse}"/>
+        <input class="title_input" name="attr_name" label="Specialties" data-i18n-placeholder="new specialty" type="text" title="@{repeating_specialties_$X_name}"/>
         <input class="br-checkbox" name="attr_shift" value="1" label="Used this shift" type="checkbox" title="@{repeating_specialties_$X_shift}"/>
-        <textarea name="attr_description" title="@{repeating_specialties_$X_description}"></textarea>
+        <div class="adaptive adaptive--text expanded span-all"><span class="adaptive--text__span" name="attr_description" title="@{repeating_specialties_$X_description}"></span>
+          <textarea class="adaptive--text__textarea" name="attr_description" data-i18n-placeholder="specialty description" title="@{repeating_specialties_$X_description}"></textarea>
+        </div>
       </fieldset>
     </div>
-    <div class="section__armor"> 
+    <div class="section__armor collapse-container">
+      <input class="collapse" name="attr_armor_collapse" value="1" type="checkbox" title="@{armor_collapse}"/>
       <h2>Armor</h2>
-      <input name="attr_armor_name" type="text" title="@{armor_name}"/>
-      <input class="fit-grid center-text uppercase" name="attr_armor_rating" type="text" title="@{armor_rating}"/>
-      <textarea name="attr_armor_effect" title="@{armor_effect}"></textarea>
+      <div class="content__attribute collapsed span-all">
+        <div class="attribute_wrapper button-wrapper">
+          <button class="attribute subtle-button roller" name="roll_armor" value="@{armor_action}" title="%{armor}" type="roll">
+          </button>
+          <button name="act_armor-action" hidden="" type="action" title="%{armor-action}">
+          </button>
+          <input name="attr_armor_action" type="hidden" title="@{armor_action}"/>
+          <h3 class="attribute__name"><span name="attr_armor_name" title="@{armor_name}"></span>
+          </h3>
+          <div class="attribute__value">
+            <input name="attr_armor" value="-" type="hidden" title="@{armor}"/>
+            <input name="attr_armor_dice" value="d6" type="hidden" title="@{armor_dice}"/>
+            <input class="grade" name="attr_armor" value="-" type="text" title="@{armor}"/>
+            <div class="gradeMenu has-null">
+              <input name="attr_armor" value="A" label="A" type="radio" title="@{armor}"/>
+              <input name="attr_armor" value="B" label="B" type="radio" title="@{armor}"/>
+              <input name="attr_armor" value="C" label="C" type="radio" title="@{armor}"/>
+              <input name="attr_armor" value="D" label="D" type="radio" title="@{armor}"/>
+              <input name="attr_armor" value="-" label="-" checked="checked" type="radio" title="@{armor}"/>
+            </div>
+          </div><span class="attribute__dice" name="attr_armor_dice" title="@{armor_dice}">d6</span>
+        </div>
+      </div>
+      <input class="expanded" name="attr_armor_name" data-i18n-placeholder="armor name" type="text" title="@{armor_name}"/>
+      <div class="attribute__value expanded">
+        <input name="attr_armor" value="-" type="hidden" title="@{armor}"/>
+        <input name="attr_armor_dice" value="d6" type="hidden" title="@{armor_dice}"/>
+        <input class="grade" name="attr_armor" value="-" type="text" title="@{armor}"/>
+        <div class="gradeMenu has-null">
+          <input name="attr_armor" value="A" label="A" type="radio" title="@{armor}"/>
+          <input name="attr_armor" value="B" label="B" type="radio" title="@{armor}"/>
+          <input name="attr_armor" value="C" label="C" type="radio" title="@{armor}"/>
+          <input name="attr_armor" value="D" label="D" type="radio" title="@{armor}"/>
+          <input name="attr_armor" value="-" label="-" checked="checked" type="radio" title="@{armor}"/>
+        </div>
+      </div>
+      <div class="adaptive adaptive--text expanded span-all"><span class="adaptive--text__span" name="attr_armor_effect" title="@{armor_effect}"></span>
+        <textarea class="adaptive--text__textarea" name="attr_armor_effect" data-i18n-placeholder="armor description" title="@{armor_effect}"></textarea>
+      </div>
     </div>
-    <div class="section__signatureItem"> 
+    <div class="section__signatureItem collapse-container gap">
+      <input class="collapse" name="attr_collapse" value="1" type="checkbox" title="@{collapse}"/>
       <h2>Signature Item</h2>
-      <div class="inputRow"> 
-        <input name="attr_signature_item" label="Signature Item" type="text" title="@{signature_item}"/>
+      <div class="inputRow">
+        <input name="attr_signature_item" data-i18n-placeholder="signature item name" type="text" title="@{signature_item}"/>
+        <input class="br-checkbox" name="attr_shift" value="1" label="Used this shift" type="checkbox" title="@{shift}"/>
+      </div>
+      <div class="adaptive adaptive--text expanded"><span class="adaptive--text__span" name="attr_signature_description" title="@{signature_description}"></span>
+        <textarea class="adaptive--text__textarea" name="attr_signature_description" data-i18n-placeholder="signature item description" title="@{signature_description}"></textarea>
       </div>
     </div>
     <div class="section__gear"> 
       <h2>Gear</h2>
       <fieldset class="repeating_gear">
+        <input class="collapse" name="attr_collapse" value="1" type="checkbox" title="@{repeating_gear_$X_collapse}"/>
         <div class="inputRow">
-          <input name="attr_name" label="Gear" type="text" title="@{repeating_gear_$X_name}"/>
+          <input name="attr_name" data-i18n-placeholder="item name" type="text" title="@{repeating_gear_$X_name}"/>
+        </div>
+        <div class="adaptive adaptive--text expanded"><span class="adaptive--text__span" name="attr_description" title="@{repeating_gear_$X_description}"></span>
+          <textarea class="adaptive--text__textarea" name="attr_description" data-i18n-placeholder="item description" title="@{repeating_gear_$X_description}"></textarea>
         </div>
       </fieldset>
     </div>
-    <div class="section__injuries">
+    <div class="injuries">
       <div class="section__health"> 
-        <h2>Health</h2>
+        <h2 data-i18n="health"></h2>
         <div class="inputRow"> 
-          <h3>Maximum Health </h3>
+          <h3 data-i18n="maximum health"></h3>
           <input name="attr_health_max" type="number" title="@{health|max}"/>
         </div>
         <input class="dynamic_fill" name="attr_health_max" value="0" type="hidden" title="@{health|max}"/>
@@ -527,9 +588,9 @@
         <textarea name="attr_health_injuries" label="Critical Injuries" title="@{health_injuries}"></textarea>
       </div>
       <div class="section__resolve"> 
-        <h2>Resolve</h2>
+        <h2 data-i18n="resolve"></h2>
         <div class="inputRow"> 
-          <h3>Maximum Resolve </h3>
+          <h3 data-i18n="maximum resolve"></h3>
           <input name="attr_resolve_max" type="number" title="@{resolve|max}"/>
         </div>
         <input class="dynamic_fill" name="attr_resolve_max" value="0" type="hidden" title="@{resolve|max}"/>
@@ -553,7 +614,7 @@
   </div>
   <div class="container__bottom"> 
     <div class="section__promotion"> 
-      <h2>Promotion Points</h2>
+      <h2 data-i18n="promotion points"></h2>
       <div class="fill-left radio_promotion">
         <input class="fill-left__radio fill-left__radio--clearer" name="attr_promotion" value="0" checked="" type="radio" title="@{promotion}"/>
         <input class="fill-left__radio" name="attr_promotion" value="1" type="radio" title="@{promotion}"/>
@@ -579,7 +640,7 @@
       </div>
     </div>
     <div class="section__humanity"> 
-      <h2>Humanity Points</h2>
+      <h2 data-i18n="humanity points"></h2>
       <div class="fill-left radio_humanity">
         <input class="fill-left__radio fill-left__radio--clearer" name="attr_humanity" value="0" checked="" type="radio" title="@{humanity}"/>
         <input class="fill-left__radio" name="attr_humanity" value="1" type="radio" title="@{humanity}"/>
@@ -605,7 +666,7 @@
       </div>
     </div>
     <div class="section__chinyen"> 
-      <h2>Chinyen Points</h2>
+      <h2 data-i18n="chinyen points"></h2>
       <div class="fill-left radio_chinyen">
         <input class="fill-left__radio fill-left__radio--clearer" name="attr_chinyen" value="0" checked="" type="radio" title="@{chinyen}"/>
         <input class="fill-left__radio" name="attr_chinyen" value="1" type="radio" title="@{chinyen}"/>
@@ -632,20 +693,20 @@
     </div>
   </div>
       </div>
-      <div class="tabs__container tabs--tabs__container tabs--tabs__container--shift-log tab_horizontal" data-container-tab="tabs" data-tab="shift-log">
+      <div class="tabs__container tabs--tabs__container tabs--tabs__container--shift-log" data-container-tab="tabs" data-tab="shift-log">
   <div class="section__basic"> 
-    <h1 class="logo-lapd">Shift Log</h1>
+    <h1 class="logo-lapd" data-i18n="shift log"> </h1>
     <label class="inputRow"> 
-      <h3>Name </h3>
+      <h3 data-i18n="Name"></h3>
       <input name="attr_character_name" type="text" title="@{character_name}"/>
     </label>
     <label class="inputRow">
-      <h3>Archetype </h3>
-      <input name="attr_archetype" placeholder="Requires Input" type="text" title="@{archetype}"/>
+      <h3 data-i18n="Archetype"></h3>
+      <input name="attr_archetype" data-i18n-placeholder="requires input" type="text" title="@{archetype}"/>
     </label>
   </div>
   <div class="section__shifts"> 
-    <h2>Shifts</h2>
+    <h2 data-i18n="Shifts"></h2>
     <button class="repcontrol-button repcontrol-button--add" name="act_add-shift" type="action" title="%{add-shift}">
     </button><span class="shifts_calendar" hidden=""></span>
     <fieldset class="repeating_shift">
@@ -660,49 +721,49 @@
     <div class="shift_display">
       <input name="attr_day_id" value="" type="hidden" title="@{day_id}"/>
       <input name="attr_day_label" type="hidden" title="@{day_label}"/>
-      <h3>Log File<span name="attr_day_label"></span></h3>
+      <h3 data-i18n="Log File"><span name="attr_day_label"></span></h3>
       <div class="shift-panel">
-        <h3>Morning</h3>
+        <h3 data-i18n="morning"></h3>
         <input class="br-checkbox" name="attr_active_shift" value="morning" checked="" type="radio" title="@{active_shift}"/>
         <textarea class="span-all" name="attr_morning_shift" title="@{morning_shift}"></textarea>
       </div>
       <div class="shift-panel">
-        <h3>Day</h3>
+        <h3 data-i18n="day"></h3>
         <input class="br-checkbox" name="attr_active_shift" value="day" type="radio" title="@{active_shift}"/>
         <textarea class="span-all" name="attr_day_shift" title="@{day_shift}"></textarea>
       </div>
       <div class="shift-panel">
-        <h3>Evening</h3>
+        <h3 data-i18n="evening"></h3>
         <input class="br-checkbox" name="attr_active_shift" value="evening" type="radio" title="@{active_shift}"/>
         <textarea class="span-all" name="attr_evening_shift" title="@{evening_shift}"></textarea>
       </div>
       <div class="shift-panel">
-        <h3>Night</h3>
+        <h3 data-i18n="night"></h3>
         <input class="br-checkbox" name="attr_active_shift" value="night" type="radio" title="@{active_shift}"/>
         <textarea class="span-all" name="attr_night_shift" title="@{night_shift}"></textarea>
       </div>
     </div>
   </div>
       </div>
-      <span class="tabs__container tabs--tabs__container tabs--tabs__container--vehicle tab_horizontal" data-container-tab="tabs" data-tab="vehicle">
-  <div class="section__basic"> 
-    <h1 class="logo-lapd">Vehicle</h1>
-    <label class="inputRow"> 
-      <h3>Name </h3>
+      <div class="tabs__container tabs--tabs__container tabs--tabs__container--vehicle" data-container-tab="tabs" data-tab="vehicle">
+  <div class="section__basic">
+    <h1 class="logo-lapd" data-i18n="vehicle"></h1>
+    <label class="inputRow">
+      <h3 data-i18n="name"></h3>
       <input name="attr_character_name" type="text" title="@{character_name}"/>
     </label>
     <label class="inputRow">
-      <h3>Archetype </h3>
-      <input name="attr_archetype" placeholder="Requires Input" type="text" title="@{archetype}"/>
+      <h3 data-i18n="archetype"></h3>
+      <input name="attr_archetype" data-i18n-placeholder="requires input" type="text" title="@{archetype}"/>
     </label>
   </div>
-  <div class="section__stats"> 
-    <div class="inputRow"> 
-      <h3>Passengers </h3>
+  <div class="section__stats">
+    <div class="inputRow">
+      <h3 data-i18n="passengers"></h3>
       <input name="attr_passengers" type="number" title="@{passengers}"/>
     </div>
     <div class="inputRow">
-      <h3>Hull </h3>
+      <h3 data-i18n="hull"></h3>
       <input class="dynamic_fill" name="attr_hull_max" value="10" type="hidden" title="@{hull|max}"/>
       <div class="fill-left radio_hull">
         <input class="fill-left__radio fill-left__radio--clearer" name="attr_hull" value="0" checked="" type="radio" title="@{hull}"/>
@@ -719,45 +780,52 @@
       </div>
       <input name="attr_hull_max" value="10" type="number" title="@{hull|max}"/>
     </div>
-    <div class="content__attribute undefined">
-      <div class="attribute_wrapper">
-        <div class="attribute subtle-button button">
-          <h3 class="attribute__name">Armor</h3><span name="attr_Armor_dice" title="@{Armor_dice}">d6</span>
-        </div>
+    <div class="content__attribute">
+      <div class="attribute_wrapper button-wrapper">
+        <button class="attribute subtle-button roller" name="roll_vehicle_armor" value="@{vehicle_armor_action}" title="%{vehicle_armor}" type="roll">
+        </button>
+        <button name="act_vehicle-armor-action" hidden="" type="action" title="%{vehicle-armor-action}">
+        </button>
+        <input name="attr_vehicle_armor_action" type="hidden" title="@{vehicle_armor_action}"/>
+        <h3 class="attribute__name" data-i18n="vehicle armor">
+        </h3>
         <div class="attribute__value">
-          <input name="attr_Armor" value="D" type="hidden" title="@{Armor}"/>
-          <input name="attr_Armor_dice" value="d6" type="hidden" title="@{Armor_dice}"/>
-          <input class="grade" name="attr_Armor" value="D" type="text" title="@{Armor}"/>
-          <div class="gradeMenu"> 
-            <input name="attr_Armor" value="A" label="A" type="radio" title="@{Armor}"/>
-            <input name="attr_Armor" value="B" label="B" type="radio" title="@{Armor}"/>
-            <input name="attr_Armor" value="C" label="C" type="radio" title="@{Armor}"/>
-            <input name="attr_Armor" value="D" label="D" selected="" type="radio" title="@{Armor}"/>
+          <input name="attr_vehicle_armor" value="D" type="hidden" title="@{vehicle_armor}"/>
+          <input name="attr_vehicle_armor_dice" value="d6" type="hidden" title="@{vehicle_armor_dice}"/>
+          <input class="grade" name="attr_vehicle_armor" value="D" type="text" title="@{vehicle_armor}"/>
+          <div class="gradeMenu has-null">
+            <input name="attr_vehicle_armor" value="A" label="A" type="radio" title="@{vehicle_armor}"/>
+            <input name="attr_vehicle_armor" value="B" label="B" type="radio" title="@{vehicle_armor}"/>
+            <input name="attr_vehicle_armor" value="C" label="C" type="radio" title="@{vehicle_armor}"/>
+            <input name="attr_vehicle_armor" value="D" label="D" checked="checked" type="radio" title="@{vehicle_armor}"/>
+            <input name="attr_vehicle_armor" value="-" label="-" type="radio" title="@{vehicle_armor}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_vehicle_armor_dice" title="@{vehicle_armor_dice}">d6</span>
       </div>
       <div class="attribute_wrapper">
         <button class="attribute subtle-button roller" name="roll_maneuverability" value="@{maneuverability_action}" title="%{maneuverability}" type="roll">
-          <h3 class="attribute__name">maneuverability</h3><span name="attr_maneuverability_dice" title="@{maneuverability_dice}">d6</span>
         </button>
         <button name="act_maneuverability-action" hidden="" type="action" title="%{maneuverability-action}">
         </button>
         <input name="attr_maneuverability_action" type="hidden" title="@{maneuverability_action}"/>
+        <h3 class="attribute__name" data-i18n="maneuverability">
+        </h3>
         <div class="attribute__value">
           <input name="attr_maneuverability" value="C" type="hidden" title="@{maneuverability}"/>
           <input name="attr_maneuverability_dice" value="d6" type="hidden" title="@{maneuverability_dice}"/>
           <input class="grade" name="attr_maneuverability" value="C" type="text" title="@{maneuverability}"/>
-          <div class="gradeMenu"> 
+          <div class="gradeMenu has-null">
             <input name="attr_maneuverability" value="A" label="A" type="radio" title="@{maneuverability}"/>
             <input name="attr_maneuverability" value="B" label="B" type="radio" title="@{maneuverability}"/>
-            <input name="attr_maneuverability" value="C" label="C" type="radio" title="@{maneuverability}"/>
-            <input name="attr_maneuverability" value="D" label="D" selected="" type="radio" title="@{maneuverability}"/>
+            <input name="attr_maneuverability" value="C" label="C" checked="checked" type="radio" title="@{maneuverability}"/>
+            <input name="attr_maneuverability" value="D" label="D" type="radio" title="@{maneuverability}"/>
+            <input name="attr_maneuverability" value="-" label="-" type="radio" title="@{maneuverability}"/>
           </div>
-        </div>
+        </div><span class="attribute__dice" name="attr_maneuverability_dice" title="@{maneuverability_dice}">d6</span>
       </div>
     </div>
   </div>
-      </span>
+      </div>
     </div>
   </div>
 </div>
@@ -766,13 +834,13 @@
   <h1 class="character_name">{{character_name}}</h1>{{/character_id}}{{/character_name}}
   <h2>{{label}}</h2>{{#successes}}
   <div class="successes">{{computed::successes}}</div>{{/successes}}
-  <div class="rolls">
-    {{computed::roll1}}
-    {{computed::roll2}}{{#roll3}}{{computed::roll3}}{{/roll3}}{{#damage}}
+  <div class="rolls">{{#computed::roll1}}{{#rollTotal() roll1 1}}<span class="force-fumble">{{computed::roll1}}</span>{{/rollTotal() roll1 1}}{{#^rollTotal() roll1 1}}{{computed::roll1}}{{/^rollTotal() roll1 1}}{{/computed::roll1}}{{#computed::roll2}}{{#rollTotal() roll2 1}}<span class="force-fumble">{{computed::roll2}}</span>{{/rollTotal() roll2 1}}{{#^rollTotal() roll2 1}}{{computed::roll2}}{{/^rollTotal() roll2 1}}{{/computed::roll2}}{{#computed::roll3}}{{#rollTotal() roll3 1}}<span class="force-fumble">{{computed::roll3}}</span>{{/rollTotal() roll3 1}}{{#^rollTotal() roll3 1}}{{computed::roll3}}{{/^rollTotal() roll3 1}}{{/computed::roll3}}{{#roll1}}{{^computed::roll1}}
+    <h3>{{roll1}}</h3>{{/computed::roll1}}{{/roll1}}{{#damage}}
     <h3>damage</h3>{{damage}}{{/damage}}
-  </div>{{#push}}
-  <div class="push">[Push](~{{character_name}}|push||{{computed::push}})</div>{{/push}}{{#character_name}}{{#attack_id}}
-  <div class="damage-buttons"><span>[Damage](~{{character_name}}|{{attack_id}}_damage)</span><span>[Critical](~{{character_name}}|{{attack_id}}_crit)</span></div>{{/attack_id}}{{/character_name}}{{#description}}
+  </div>{{#^rollTotal() computed::push 0}}
+  <div class="push">[{{push_label}}](~{{character_name}}|push||{{computed::push_through}})</div>{{/^rollTotal() computed::push 0}}{{#character_name}}{{#attack_id}}
+  <div class="damage-buttons"><span>[{{damage_label}}](~{{character_name}}|{{attack_id}}_damage)</span><span>[{{critical_label}}](~{{character_name}}|{{attack_id}}_crit)</span></div>{{/attack_id}}{{/character_name}}{{#effect}}
+  <p class="effect description span-all">{{effect}}</p>{{/effect}}{{#description}}
   <p class="description span-all">{{description}}</p>{{/description}}
 </rolltemplate>
 <rolltemplate class="sheet-rolltemplate-bladerunner-push">{{#character_name}}{{#character_id}}
@@ -796,11 +864,11 @@
   const k = (function(){
   const kFuncs = {};
   
-  const cascades = {"attr_character_name":{"name":"character_name","type":"text","defaultValue":"","affects":[],"triggeredFuncs":["setActionCalls"],"listenerFunc":"accessSheet","listener":"change:character_name"},"act_push":{"triggeredFuncs":["pushRoll"],"name":"push","listener":"clicked:push","listenerFunc":"accessSheet","type":"action"},"act_execute-push":{"triggeredFuncs":["executePush"],"name":"execute-push","listener":"clicked:execute-push","listenerFunc":"accessSheet","type":"action"},"attr_drop_name":{"triggeredFuncs":["handleCompendiumDrop"],"name":"drop_name","listener":"change:drop_name","listenerFunc":"accessSheet","type":"hidden","defaultValue":"","affects":[]},"attr_drop_data":{"name":"drop_data","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_tabs_tab":{"triggeredFuncs":["kTabOnOpen"],"name":"tabs_tab","listener":"change:tabs_tab","listenerFunc":"accessSheet","type":"hidden","defaultValue":"nav-tabs-tabs--character","affects":[]},"attr_skill_toggle":{"name":"skill_toggle","type":"hidden","defaultValue":"normal","triggeredFuncs":[],"affects":[]},"act_nav-tabs-tabs--character":{"triggeredFuncs":["kSwitchTab"],"name":"nav-tabs-tabs--character","listener":"clicked:nav-tabs-tabs--character","listenerFunc":"accessSheet","type":"action"},"act_nav-tabs-tabs--shift-log":{"triggeredFuncs":["kSwitchTab"],"name":"nav-tabs-tabs--shift-log","listener":"clicked:nav-tabs-tabs--shift-log","listenerFunc":"accessSheet","type":"action"},"act_nav-tabs-tabs--vehicle":{"triggeredFuncs":["kSwitchTab"],"name":"nav-tabs-tabs--vehicle","listener":"clicked:nav-tabs-tabs--vehicle","listenerFunc":"accessSheet","type":"action"},"attr_archetype":{"name":"archetype","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_option_replicant":{"name":"option_replicant","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_key_memory":{"name":"key_memory","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_key_relationship":{"name":"key_relationship","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_home":{"name":"home","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_years_on_force":{"name":"years_on_force","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_appearance":{"name":"appearance","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_strength_dice":{"name":"strength_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"attr_strength":{"name":"strength","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["strength_dice"],"listener":"change:strength","listenerFunc":"accessSheet"},"attr_force_dice":{"name":"force_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_force-action":{"triggeredFuncs":["rollAttribute"],"name":"force-action","listener":"clicked:force-action","listenerFunc":"accessSheet","type":"action"},"attr_force_action":{"name":"force_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_force":{"name":"force","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["force_dice"],"listener":"change:force","listenerFunc":"accessSheet"},"attr_hand_to_hand_dice":{"name":"hand_to_hand_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_hand-to-hand-action":{"triggeredFuncs":["rollAttribute"],"name":"hand-to-hand-action","listener":"clicked:hand-to-hand-action","listenerFunc":"accessSheet","type":"action"},"attr_hand_to_hand_action":{"name":"hand_to_hand_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_hand_to_hand":{"name":"hand_to_hand","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["hand_to_hand_dice"],"listener":"change:hand_to_hand","listenerFunc":"accessSheet"},"attr_stamina_dice":{"name":"stamina_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_stamina-action":{"triggeredFuncs":["rollAttribute"],"name":"stamina-action","listener":"clicked:stamina-action","listenerFunc":"accessSheet","type":"action"},"attr_stamina_action":{"name":"stamina_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_stamina":{"name":"stamina","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["stamina_dice"],"listener":"change:stamina","listenerFunc":"accessSheet"},"attr_agility_dice":{"name":"agility_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"attr_agility":{"name":"agility","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["agility_dice"],"listener":"change:agility","listenerFunc":"accessSheet"},"attr_firearms_dice":{"name":"firearms_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_firearms-action":{"triggeredFuncs":["rollAttribute"],"name":"firearms-action","listener":"clicked:firearms-action","listenerFunc":"accessSheet","type":"action"},"attr_firearms_action":{"name":"firearms_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_firearms":{"name":"firearms","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["firearms_dice"],"listener":"change:firearms","listenerFunc":"accessSheet"},"attr_mobility_dice":{"name":"mobility_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_mobility-action":{"triggeredFuncs":["rollAttribute"],"name":"mobility-action","listener":"clicked:mobility-action","listenerFunc":"accessSheet","type":"action"},"attr_mobility_action":{"name":"mobility_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_mobility":{"name":"mobility","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["mobility_dice"],"listener":"change:mobility","listenerFunc":"accessSheet"},"attr_stealth_dice":{"name":"stealth_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_stealth-action":{"triggeredFuncs":["rollAttribute"],"name":"stealth-action","listener":"clicked:stealth-action","listenerFunc":"accessSheet","type":"action"},"attr_stealth_action":{"name":"stealth_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_stealth":{"name":"stealth","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["stealth_dice"],"listener":"change:stealth","listenerFunc":"accessSheet"},"attr_intelligence_dice":{"name":"intelligence_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"attr_intelligence":{"name":"intelligence","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["intelligence_dice"],"listener":"change:intelligence","listenerFunc":"accessSheet"},"attr_medical_aid_dice":{"name":"medical_aid_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_medical-aid-action":{"triggeredFuncs":["rollAttribute"],"name":"medical-aid-action","listener":"clicked:medical-aid-action","listenerFunc":"accessSheet","type":"action"},"attr_medical_aid_action":{"name":"medical_aid_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_medical_aid":{"name":"medical_aid","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["medical_aid_dice"],"listener":"change:medical_aid","listenerFunc":"accessSheet"},"attr_observation_dice":{"name":"observation_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_observation-action":{"triggeredFuncs":["rollAttribute"],"name":"observation-action","listener":"clicked:observation-action","listenerFunc":"accessSheet","type":"action"},"attr_observation_action":{"name":"observation_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_observation":{"name":"observation","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["observation_dice"],"listener":"change:observation","listenerFunc":"accessSheet"},"attr_tech_dice":{"name":"tech_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_tech-action":{"triggeredFuncs":["rollAttribute"],"name":"tech-action","listener":"clicked:tech-action","listenerFunc":"accessSheet","type":"action"},"attr_tech_action":{"name":"tech_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_tech":{"name":"tech","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["tech_dice"],"listener":"change:tech","listenerFunc":"accessSheet"},"attr_empathy_dice":{"name":"empathy_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"attr_empathy":{"name":"empathy","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["empathy_dice"],"listener":"change:empathy","listenerFunc":"accessSheet"},"attr_connections_dice":{"name":"connections_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_connections-action":{"triggeredFuncs":["rollAttribute"],"name":"connections-action","listener":"clicked:connections-action","listenerFunc":"accessSheet","type":"action"},"attr_connections_action":{"name":"connections_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_connections":{"name":"connections","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["connections_dice"],"listener":"change:connections","listenerFunc":"accessSheet"},"attr_insight_dice":{"name":"insight_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_insight-action":{"triggeredFuncs":["rollAttribute"],"name":"insight-action","listener":"clicked:insight-action","listenerFunc":"accessSheet","type":"action"},"attr_insight_action":{"name":"insight_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_insight":{"name":"insight","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["insight_dice"],"listener":"change:insight","listenerFunc":"accessSheet"},"attr_manipulation_dice":{"name":"manipulation_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_manipulation-action":{"triggeredFuncs":["rollAttribute"],"name":"manipulation-action","listener":"clicked:manipulation-action","listenerFunc":"accessSheet","type":"action"},"attr_manipulation_action":{"name":"manipulation_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_manipulation":{"name":"manipulation","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["manipulation_dice"],"listener":"change:manipulation","listenerFunc":"accessSheet"},"attr_driving_dice":{"name":"driving_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"attr_driving":{"name":"driving","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["driving_dice"],"listener":"change:driving","listenerFunc":"accessSheet"},"act_next-shift":{"triggeredFuncs":["incrementShift"],"name":"next-shift","listener":"clicked:next-shift","listenerFunc":"accessSheet","type":"action"},"act_downtime":{"triggeredFuncs":["takeDowntime"],"name":"downtime","listener":"clicked:downtime","listenerFunc":"accessSheet","type":"action"},"attr_shift_counter":{"type":"span","defaultValue":0,"name":"shift_counter","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_name":{"name":"repeating_weapons-hand_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-hand_$X_action":{"triggeredFuncs":["rollAttack"],"name":"repeating_weapons-hand_$X_action","listener":"clicked:repeating_weapons-hand:action","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-hand_$X_action":{"name":"repeating_weapons-hand_$X_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-hand_$X_damage":{"triggeredFuncs":["rollDamage"],"name":"repeating_weapons-hand_$X_damage","listener":"clicked:repeating_weapons-hand:damage","listenerFunc":"accessSheet","type":"action"},"act_repeating_weapons-hand_$X_crit":{"triggeredFuncs":["rollCrit"],"name":"repeating_weapons-hand_$X_crit","listener":"clicked:repeating_weapons-hand:crit","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-hand_$X_damage":{"name":"repeating_weapons-hand_$X_damage","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_crit_die":{"name":"repeating_weapons-hand_$X_crit_die","type":"select","defaultValue":6,"triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_type":{"name":"repeating_weapons-hand_$X_type","type":"select","defaultValue":"crushing","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_min_range":{"name":"repeating_weapons-hand_$X_min_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_max_range":{"name":"repeating_weapons-hand_$X_max_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_name":{"name":"repeating_weapons-firearm_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-firearm_$X_action":{"triggeredFuncs":["rollAttack"],"name":"repeating_weapons-firearm_$X_action","listener":"clicked:repeating_weapons-firearm:action","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-firearm_$X_action":{"name":"repeating_weapons-firearm_$X_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-firearm_$X_damage":{"triggeredFuncs":["rollDamage"],"name":"repeating_weapons-firearm_$X_damage","listener":"clicked:repeating_weapons-firearm:damage","listenerFunc":"accessSheet","type":"action"},"act_repeating_weapons-firearm_$X_crit":{"triggeredFuncs":["rollCrit"],"name":"repeating_weapons-firearm_$X_crit","listener":"clicked:repeating_weapons-firearm:crit","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-firearm_$X_damage":{"name":"repeating_weapons-firearm_$X_damage","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_crit_die":{"name":"repeating_weapons-firearm_$X_crit_die","type":"select","defaultValue":"6","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_type":{"name":"repeating_weapons-firearm_$X_type","type":"select","defaultValue":"crushing","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_min_range":{"name":"repeating_weapons-firearm_$X_min_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_max_range":{"name":"repeating_weapons-firearm_$X_max_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_specialties_$X_name":{"name":"repeating_specialties_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_specialties_$X_shift":{"name":"repeating_specialties_$X_shift","type":"checkbox","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_specialties_$X_description":{"name":"repeating_specialties_$X_description","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_armor_name":{"name":"armor_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_armor_rating":{"name":"armor_rating","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_armor_effect":{"name":"armor_effect","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_signature_item":{"name":"signature_item","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_gear_$X_name":{"name":"repeating_gear_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_health_max":{"triggeredFuncs":["limitHealthResolve"],"name":"health_max","listener":"change:health_max","listenerFunc":"accessSheet","type":"number","defaultValue":0,"affects":[]},"attr_health":{"triggeredFuncs":["limitHealthResolve"],"name":"health","listener":"change:health","listenerFunc":"accessSheet","type":"radio","defaultValue":0,"affects":[]},"attr_health_injuries":{"name":"health_injuries","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_resolve_max":{"triggeredFuncs":["limitHealthResolve"],"name":"resolve_max","listener":"change:resolve_max","listenerFunc":"accessSheet","type":"number","defaultValue":0,"affects":[]},"attr_resolve":{"triggeredFuncs":["limitHealthResolve"],"name":"resolve","listener":"change:resolve","listenerFunc":"accessSheet","type":"radio","defaultValue":0,"affects":[]},"attr_resolve_injuries":{"name":"resolve_injuries","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_promotion":{"name":"promotion","type":"radio","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_humanity":{"name":"humanity","type":"radio","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_chinyen":{"name":"chinyen","type":"radio","defaultValue":0,"triggeredFuncs":[],"affects":[]},"act_add-shift":{"listenerFunc":"addItem","name":"add-shift","listener":"clicked:add-shift","type":"action"},"fieldset_repeating_shift":{"triggeredFuncs":["deleteShift"],"addFuncs":["addCalendar"],"name":"repeating_shift","listener":"remove:repeating_shift","listenerFunc":"accessSheet","type":"fieldset"},"act_repeating_shift_$X_display-log":{"triggeredFuncs":["displayLog"],"name":"repeating_shift_$X_display-log","listener":"clicked:repeating_shift:display-log","listenerFunc":"accessSheet","type":"action"},"attr_repeating_shift_$X_morning":{"name":"repeating_shift_$X_morning","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_day":{"name":"repeating_shift_$X_day","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_evening":{"name":"repeating_shift_$X_evening","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_night":{"name":"repeating_shift_$X_night","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_name":{"triggeredFuncs":["displayLog"],"name":"repeating_shift_$X_name","listener":"change:repeating_shift:name","listenerFunc":"accessSheet","type":"text","defaultValue":"","affects":[]},"attr_day_id":{"name":"day_id","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_day_label":{"name":"day_label","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_active_shift":{"name":"active_shift","type":"radio","defaultValue":"morning","triggeredFuncs":[],"affects":[]},"attr_morning_shift":{"triggeredFuncs":["storeShift"],"name":"morning_shift","listener":"change:morning_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_day_shift":{"triggeredFuncs":["storeShift"],"name":"day_shift","listener":"change:day_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_evening_shift":{"triggeredFuncs":["storeShift"],"name":"evening_shift","listener":"change:evening_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_night_shift":{"triggeredFuncs":["storeShift"],"name":"night_shift","listener":"change:night_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_passengers":{"name":"passengers","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_hull_max":{"name":"hull_max","type":"hidden","defaultValue":10,"triggeredFuncs":["limitHealthResolve"],"affects":[],"listener":"change:hull_max","listenerFunc":"accessSheet"},"attr_hull":{"triggeredFuncs":["limitHealthResolve"],"name":"hull","listener":"change:hull","listenerFunc":"accessSheet","type":"radio","defaultValue":0,"affects":[]},"attr_Armor_dice":{"name":"Armor_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"attr_Armor":{"name":"Armor","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["Armor_dice"],"listener":"change:Armor","listenerFunc":"accessSheet"},"attr_maneuverability_dice":{"name":"maneuverability_dice","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[],"calculation":"calcAttributeDice"},"act_maneuverability-action":{"triggeredFuncs":["rollAttribute"],"name":"maneuverability-action","listener":"clicked:maneuverability-action","listenerFunc":"accessSheet","type":"action"},"attr_maneuverability_action":{"name":"maneuverability_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_maneuverability":{"name":"maneuverability","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["maneuverability_dice"],"listener":"change:maneuverability","listenerFunc":"accessSheet"},"attr_template_start":{"name":"template_start","type":"hidden","defaultValue":"&{template:bladerunner} {{character_name=@{character_name}}} {{character_id=@{character_id}}}","triggeredFuncs":[],"affects":[]},"attr_push_start":{"name":"push_start","type":"hidden","defaultValue":"&{template:bladerunner-push} {{character_name=@{character_name}}} {{character_id=@{character_id}}}","triggeredFuncs":[],"affects":[]}};
+  const cascades = {"attr_character_name":{"name":"character_name","type":"text","defaultValue":"","affects":[],"triggeredFuncs":["setActionCalls"],"listenerFunc":"accessSheet","listener":"change:character_name"},"attr_armor_rating":{"name":"armor_rating","type":"string","defaultValue":"D","affects":[],"triggerFuncs":[]},"act_push":{"triggeredFuncs":["pushRoll"],"name":"push","listener":"clicked:push","listenerFunc":"accessSheet","type":"action"},"act_execute-push":{"triggeredFuncs":["executePush"],"name":"execute-push","listener":"clicked:execute-push","listenerFunc":"accessSheet","type":"action"},"attr_drop_name":{"triggeredFuncs":["handleCompendiumDrop"],"name":"drop_name","listener":"change:drop_name","listenerFunc":"accessSheet","type":"hidden","defaultValue":"","affects":[]},"attr_drop_data":{"name":"drop_data","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_tabs_tab":{"triggeredFuncs":["kTabOnOpen"],"name":"tabs_tab","listener":"change:tabs_tab","listenerFunc":"accessSheet","type":"hidden","defaultValue":"nav-tabs-tabs--character","affects":[]},"attr_skill_toggle":{"name":"skill_toggle","type":"hidden","defaultValue":"normal","triggeredFuncs":[],"affects":[]},"act_nav-tabs-tabs--character":{"triggeredFuncs":["kSwitchTab"],"name":"nav-tabs-tabs--character","listener":"clicked:nav-tabs-tabs--character","listenerFunc":"accessSheet","type":"action"},"act_nav-tabs-tabs--shift-log":{"triggeredFuncs":["kSwitchTab"],"name":"nav-tabs-tabs--shift-log","listener":"clicked:nav-tabs-tabs--shift-log","listenerFunc":"accessSheet","type":"action"},"act_nav-tabs-tabs--vehicle":{"triggeredFuncs":["kSwitchTab"],"name":"nav-tabs-tabs--vehicle","listener":"clicked:nav-tabs-tabs--vehicle","listenerFunc":"accessSheet","type":"action"},"attr_archetype":{"name":"archetype","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_option_replicant":{"name":"option_replicant","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_key_memory":{"name":"key_memory","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_key_relationship":{"name":"key_relationship","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_home":{"name":"home","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_years_on_force":{"name":"years_on_force","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_appearance":{"name":"appearance","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_strength":{"name":"strength","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["strength_dice"],"listener":"change:strength","listenerFunc":"accessSheet"},"attr_strength_dice":{"calculation":"calcAttributeDice","name":"strength_dice","type":"hidden","defaultValue":"d8","triggeredFuncs":[],"affects":[]},"act_force-action":{"triggeredFuncs":["rollAttribute"],"name":"force-action","listener":"clicked:force-action","listenerFunc":"accessSheet","type":"action"},"attr_force_action":{"name":"force_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_force":{"name":"force","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["force_dice"],"listener":"change:force","listenerFunc":"accessSheet"},"attr_force_dice":{"calculation":"calcAttributeDice","name":"force_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_hand-to-hand-action":{"triggeredFuncs":["rollAttribute"],"name":"hand-to-hand-action","listener":"clicked:hand-to-hand-action","listenerFunc":"accessSheet","type":"action"},"attr_hand_to_hand_action":{"name":"hand_to_hand_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_hand_to_hand":{"name":"hand_to_hand","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["hand_to_hand_dice"],"listener":"change:hand_to_hand","listenerFunc":"accessSheet"},"attr_hand_to_hand_dice":{"calculation":"calcAttributeDice","name":"hand_to_hand_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_stamina-action":{"triggeredFuncs":["rollAttribute"],"name":"stamina-action","listener":"clicked:stamina-action","listenerFunc":"accessSheet","type":"action"},"attr_stamina_action":{"name":"stamina_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_stamina":{"name":"stamina","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["stamina_dice"],"listener":"change:stamina","listenerFunc":"accessSheet"},"attr_stamina_dice":{"calculation":"calcAttributeDice","name":"stamina_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"attr_agility":{"name":"agility","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["agility_dice"],"listener":"change:agility","listenerFunc":"accessSheet"},"attr_agility_dice":{"calculation":"calcAttributeDice","name":"agility_dice","type":"hidden","defaultValue":"d8","triggeredFuncs":[],"affects":[]},"act_firearms-action":{"triggeredFuncs":["rollAttribute"],"name":"firearms-action","listener":"clicked:firearms-action","listenerFunc":"accessSheet","type":"action"},"attr_firearms_action":{"name":"firearms_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_firearms":{"name":"firearms","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["firearms_dice"],"listener":"change:firearms","listenerFunc":"accessSheet"},"attr_firearms_dice":{"calculation":"calcAttributeDice","name":"firearms_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_mobility-action":{"triggeredFuncs":["rollAttribute"],"name":"mobility-action","listener":"clicked:mobility-action","listenerFunc":"accessSheet","type":"action"},"attr_mobility_action":{"name":"mobility_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_mobility":{"name":"mobility","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["mobility_dice"],"listener":"change:mobility","listenerFunc":"accessSheet"},"attr_mobility_dice":{"calculation":"calcAttributeDice","name":"mobility_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_stealth-action":{"triggeredFuncs":["rollAttribute"],"name":"stealth-action","listener":"clicked:stealth-action","listenerFunc":"accessSheet","type":"action"},"attr_stealth_action":{"name":"stealth_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_stealth":{"name":"stealth","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["stealth_dice"],"listener":"change:stealth","listenerFunc":"accessSheet"},"attr_stealth_dice":{"calculation":"calcAttributeDice","name":"stealth_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"attr_intelligence":{"name":"intelligence","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["intelligence_dice"],"listener":"change:intelligence","listenerFunc":"accessSheet"},"attr_intelligence_dice":{"calculation":"calcAttributeDice","name":"intelligence_dice","type":"hidden","defaultValue":"d8","triggeredFuncs":[],"affects":[]},"act_medical-aid-action":{"triggeredFuncs":["rollAttribute"],"name":"medical-aid-action","listener":"clicked:medical-aid-action","listenerFunc":"accessSheet","type":"action"},"attr_medical_aid_action":{"name":"medical_aid_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_medical_aid":{"name":"medical_aid","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["medical_aid_dice"],"listener":"change:medical_aid","listenerFunc":"accessSheet"},"attr_medical_aid_dice":{"calculation":"calcAttributeDice","name":"medical_aid_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_observation-action":{"triggeredFuncs":["rollAttribute"],"name":"observation-action","listener":"clicked:observation-action","listenerFunc":"accessSheet","type":"action"},"attr_observation_action":{"name":"observation_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_observation":{"name":"observation","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["observation_dice"],"listener":"change:observation","listenerFunc":"accessSheet"},"attr_observation_dice":{"calculation":"calcAttributeDice","name":"observation_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_tech-action":{"triggeredFuncs":["rollAttribute"],"name":"tech-action","listener":"clicked:tech-action","listenerFunc":"accessSheet","type":"action"},"attr_tech_action":{"name":"tech_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_tech":{"name":"tech","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["tech_dice"],"listener":"change:tech","listenerFunc":"accessSheet"},"attr_tech_dice":{"calculation":"calcAttributeDice","name":"tech_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"attr_empathy":{"name":"empathy","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["empathy_dice"],"listener":"change:empathy","listenerFunc":"accessSheet"},"attr_empathy_dice":{"calculation":"calcAttributeDice","name":"empathy_dice","type":"hidden","defaultValue":"d8","triggeredFuncs":[],"affects":[]},"act_connections-action":{"triggeredFuncs":["rollAttribute"],"name":"connections-action","listener":"clicked:connections-action","listenerFunc":"accessSheet","type":"action"},"attr_connections_action":{"name":"connections_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_connections":{"name":"connections","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["connections_dice"],"listener":"change:connections","listenerFunc":"accessSheet"},"attr_connections_dice":{"calculation":"calcAttributeDice","name":"connections_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_insight-action":{"triggeredFuncs":["rollAttribute"],"name":"insight-action","listener":"clicked:insight-action","listenerFunc":"accessSheet","type":"action"},"attr_insight_action":{"name":"insight_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_insight":{"name":"insight","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["insight_dice"],"listener":"change:insight","listenerFunc":"accessSheet"},"attr_insight_dice":{"calculation":"calcAttributeDice","name":"insight_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_manipulation-action":{"triggeredFuncs":["rollAttribute"],"name":"manipulation-action","listener":"clicked:manipulation-action","listenerFunc":"accessSheet","type":"action"},"attr_manipulation_action":{"name":"manipulation_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_manipulation":{"name":"manipulation","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["manipulation_dice"],"listener":"change:manipulation","listenerFunc":"accessSheet"},"attr_manipulation_dice":{"calculation":"calcAttributeDice","name":"manipulation_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"attr_driving":{"name":"driving","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["driving_dice"],"listener":"change:driving","listenerFunc":"accessSheet"},"attr_driving_dice":{"calculation":"calcAttributeDice","name":"driving_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_next-shift":{"triggeredFuncs":["incrementShift"],"name":"next-shift","listener":"clicked:next-shift","listenerFunc":"accessSheet","type":"action"},"act_downtime":{"triggeredFuncs":["takeDowntime"],"name":"downtime","listener":"clicked:downtime","listenerFunc":"accessSheet","type":"action"},"attr_shift_counter":{"type":"span","defaultValue":0,"name":"shift_counter","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_name":{"name":"repeating_weapons-hand_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-hand_$X_action":{"triggeredFuncs":["rollAttack"],"name":"repeating_weapons-hand_$X_action","listener":"clicked:repeating_weapons-hand:action","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-hand_$X_action":{"name":"repeating_weapons-hand_$X_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-hand_$X_damage":{"triggeredFuncs":["rollDamage"],"name":"repeating_weapons-hand_$X_damage","listener":"clicked:repeating_weapons-hand:damage","listenerFunc":"accessSheet","type":"action"},"act_repeating_weapons-hand_$X_crit":{"triggeredFuncs":["rollCrit"],"name":"repeating_weapons-hand_$X_crit","listener":"clicked:repeating_weapons-hand:crit","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-hand_$X_damage":{"name":"repeating_weapons-hand_$X_damage","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_crit_die":{"name":"repeating_weapons-hand_$X_crit_die","type":"select","defaultValue":6,"triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_type":{"name":"repeating_weapons-hand_$X_type","type":"select","defaultValue":"crushing","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_min_range":{"name":"repeating_weapons-hand_$X_min_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-hand_$X_max_range":{"name":"repeating_weapons-hand_$X_max_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_name":{"name":"repeating_weapons-firearm_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-firearm_$X_action":{"triggeredFuncs":["rollAttack"],"name":"repeating_weapons-firearm_$X_action","listener":"clicked:repeating_weapons-firearm:action","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-firearm_$X_action":{"name":"repeating_weapons-firearm_$X_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"act_repeating_weapons-firearm_$X_damage":{"triggeredFuncs":["rollDamage"],"name":"repeating_weapons-firearm_$X_damage","listener":"clicked:repeating_weapons-firearm:damage","listenerFunc":"accessSheet","type":"action"},"act_repeating_weapons-firearm_$X_crit":{"triggeredFuncs":["rollCrit"],"name":"repeating_weapons-firearm_$X_crit","listener":"clicked:repeating_weapons-firearm:crit","listenerFunc":"accessSheet","type":"action"},"attr_repeating_weapons-firearm_$X_damage":{"name":"repeating_weapons-firearm_$X_damage","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_crit_die":{"name":"repeating_weapons-firearm_$X_crit_die","type":"select","defaultValue":"6","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_type":{"name":"repeating_weapons-firearm_$X_type","type":"select","defaultValue":"crushing","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_min_range":{"name":"repeating_weapons-firearm_$X_min_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_weapons-firearm_$X_max_range":{"name":"repeating_weapons-firearm_$X_max_range","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_specialties_$X_collapse":{"name":"repeating_specialties_$X_collapse","type":"checkbox","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_specialties_$X_name":{"name":"repeating_specialties_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_specialties_$X_shift":{"name":"repeating_specialties_$X_shift","type":"checkbox","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_specialties_$X_description":{"name":"repeating_specialties_$X_description","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_armor_collapse":{"name":"armor_collapse","type":"checkbox","defaultValue":0,"triggeredFuncs":[],"affects":[]},"act_armor-action":{"triggeredFuncs":["rollAttribute"],"name":"armor-action","listener":"clicked:armor-action","listenerFunc":"accessSheet","type":"action"},"attr_armor_action":{"name":"armor_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_armor_name":{"name":"armor_name","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_armor":{"name":"armor","type":"hidden","defaultValue":"-","triggeredFuncs":[],"affects":["armor_dice"],"listener":"change:armor","listenerFunc":"accessSheet"},"attr_armor_dice":{"calculation":"calcAttributeDice","name":"armor_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"attr_armor_effect":{"name":"armor_effect","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_collapse":{"name":"collapse","type":"checkbox","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_signature_item":{"name":"signature_item","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_shift":{"name":"shift","type":"checkbox","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_signature_description":{"name":"signature_description","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_gear_$X_collapse":{"name":"repeating_gear_$X_collapse","type":"checkbox","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_repeating_gear_$X_name":{"name":"repeating_gear_$X_name","type":"text","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_gear_$X_description":{"name":"repeating_gear_$X_description","type":"span","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_health_max":{"triggeredFuncs":["limitHealthResolve"],"name":"health_max","listener":"change:health_max","listenerFunc":"accessSheet","type":"number","defaultValue":0,"affects":[]},"attr_health":{"triggeredFuncs":["limitHealthResolve"],"name":"health","listener":"change:health","listenerFunc":"accessSheet","type":"radio","defaultValue":0,"affects":[]},"attr_health_injuries":{"name":"health_injuries","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_resolve_max":{"triggeredFuncs":["limitHealthResolve"],"name":"resolve_max","listener":"change:resolve_max","listenerFunc":"accessSheet","type":"number","defaultValue":0,"affects":[]},"attr_resolve":{"triggeredFuncs":["limitHealthResolve"],"name":"resolve","listener":"change:resolve","listenerFunc":"accessSheet","type":"radio","defaultValue":0,"affects":[]},"attr_resolve_injuries":{"name":"resolve_injuries","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_promotion":{"name":"promotion","type":"radio","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_humanity":{"name":"humanity","type":"radio","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_chinyen":{"name":"chinyen","type":"radio","defaultValue":0,"triggeredFuncs":[],"affects":[]},"act_add-shift":{"listenerFunc":"addItem","name":"add-shift","listener":"clicked:add-shift","type":"action"},"fieldset_repeating_shift":{"triggeredFuncs":["deleteShift"],"addFuncs":["addCalendar"],"name":"repeating_shift","listener":"remove:repeating_shift","listenerFunc":"accessSheet","type":"fieldset"},"act_repeating_shift_$X_display-log":{"triggeredFuncs":["displayLog"],"name":"repeating_shift_$X_display-log","listener":"clicked:repeating_shift:display-log","listenerFunc":"accessSheet","type":"action"},"attr_repeating_shift_$X_morning":{"name":"repeating_shift_$X_morning","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_day":{"name":"repeating_shift_$X_day","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_evening":{"name":"repeating_shift_$X_evening","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_night":{"name":"repeating_shift_$X_night","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_repeating_shift_$X_name":{"triggeredFuncs":["displayLog"],"name":"repeating_shift_$X_name","listener":"change:repeating_shift:name","listenerFunc":"accessSheet","type":"text","defaultValue":"","affects":[]},"attr_day_id":{"name":"day_id","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_day_label":{"name":"day_label","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_active_shift":{"name":"active_shift","type":"radio","defaultValue":"morning","triggeredFuncs":[],"affects":[]},"attr_morning_shift":{"triggeredFuncs":["storeShift"],"name":"morning_shift","listener":"change:morning_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_day_shift":{"triggeredFuncs":["storeShift"],"name":"day_shift","listener":"change:day_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_evening_shift":{"triggeredFuncs":["storeShift"],"name":"evening_shift","listener":"change:evening_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_night_shift":{"triggeredFuncs":["storeShift"],"name":"night_shift","listener":"change:night_shift","listenerFunc":"accessSheet","defaultValue":"","affects":[]},"attr_passengers":{"name":"passengers","type":"number","defaultValue":0,"triggeredFuncs":[],"affects":[]},"attr_hull_max":{"name":"hull_max","type":"hidden","defaultValue":10,"triggeredFuncs":["limitHealthResolve"],"affects":[],"listener":"change:hull_max","listenerFunc":"accessSheet"},"attr_hull":{"triggeredFuncs":["limitHealthResolve"],"name":"hull","listener":"change:hull","listenerFunc":"accessSheet","type":"radio","defaultValue":0,"affects":[]},"act_vehicle-armor-action":{"triggeredFuncs":["rollAttribute"],"name":"vehicle-armor-action","listener":"clicked:vehicle-armor-action","listenerFunc":"accessSheet","type":"action"},"attr_vehicle_armor_action":{"name":"vehicle_armor_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_vehicle_armor":{"name":"vehicle_armor","type":"hidden","defaultValue":"D","triggeredFuncs":[],"affects":["vehicle_armor_dice"],"listener":"change:vehicle_armor","listenerFunc":"accessSheet"},"attr_vehicle_armor_dice":{"calculation":"calcAttributeDice","name":"vehicle_armor_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"act_maneuverability-action":{"triggeredFuncs":["rollAttribute"],"name":"maneuverability-action","listener":"clicked:maneuverability-action","listenerFunc":"accessSheet","type":"action"},"attr_maneuverability_action":{"name":"maneuverability_action","type":"hidden","defaultValue":"","triggeredFuncs":[],"affects":[]},"attr_maneuverability":{"name":"maneuverability","type":"hidden","defaultValue":"C","triggeredFuncs":[],"affects":["maneuverability_dice"],"listener":"change:maneuverability","listenerFunc":"accessSheet"},"attr_maneuverability_dice":{"calculation":"calcAttributeDice","name":"maneuverability_dice","type":"hidden","defaultValue":"d6","triggeredFuncs":[],"affects":[]},"attr_template_start":{"name":"template_start","type":"hidden","defaultValue":"&{template:bladerunner} {{character_name=@{character_name}}} {{character_id=@{character_id}}}","triggeredFuncs":[],"affects":[]},"attr_push_start":{"name":"push_start","type":"hidden","defaultValue":"&{template:bladerunner-push} {{character_name=@{character_name}}} {{character_id=@{character_id}}}","triggeredFuncs":[],"affects":[]}};
   
   kFuncs.cascades = cascades;
   
-  const repeatingSectionDetails = [{"section":"repeating_weapons-hand","fields":["name","action","damage","crit_die","type","min_range","max_range"]},{"section":"repeating_weapons-firearm","fields":["name","action","damage","crit_die","type","min_range","max_range"]},{"section":"repeating_specialties","fields":["name","shift","description"]},{"section":"repeating_gear","fields":["name"]},{"section":"repeating_shift","fields":["morning","day","evening","night","name"]}];
+  const repeatingSectionDetails = [{"section":"repeating_weapons-hand","fields":["name","action","damage","crit_die","type","min_range","max_range"]},{"section":"repeating_weapons-firearm","fields":["name","action","damage","crit_die","type","min_range","max_range"]},{"section":"repeating_specialties","fields":["collapse","name","shift","description"]},{"section":"repeating_gear","fields":["collapse","name","description"]},{"section":"repeating_shift","fields":["morning","day","evening","night","name"]}];
   
   kFuncs.repeatingSectionDetails = repeatingSectionDetails;
   /**
@@ -1216,8 +1284,8 @@ const createAttrProxy = function(attrs){
         if(/reporder|^repeating_[^_]+$/.test(prop)){
           let section = prop.replace(/_reporder_/,'');
           obj.repOrders[section] = value;
-        }else if(`${obj.attributes}` !== `${value}` || 
-          (obj.updates[prop] && `${obj.updates}` !== `${value}`)
+        }else if(`${obj.attributes[prop]}` !== `${value}` || 
+          (obj.updates[prop] && `${obj.updates[prop]}` !== `${value}`)
         ){
           obj.updates[prop] = value;
         }
@@ -1659,7 +1727,7 @@ const baseGet = Object.entries(cascades).reduce((memo,[attrName,detailObj])=>{
     listeners[detailObj.listener] = detailObj.listenerFunc;
   }
   return memo;
-},[]);
+},['sheet_version']);
 kFuncs.baseGet = baseGet;
 const registerEventHandlers = function(){
   on('sheet:opened',updateSheet);
@@ -1743,8 +1811,38 @@ const kTabOnOpen = function({trigger,attributes,sections,casc}){
 registerFuncs({ kTabOnOpen },{type:['opener']});
   return kFuncs;
   }());
-  const actionAttributes = ["force_action","hand_to_hand_action","stamina_action","firearms_action","mobility_action","stealth_action","medical_aid_action","observation_action","tech_action","connections_action","insight_action","manipulation_action","repeating_weapons-hand_$X_action","repeating_weapons-firearm_$X_action","maneuverability_action"];const criticalEffects = {"crushing":["Teeth Knocked Out","Broken Nose","Broken Fingers","Gouged Eye","Cracked Ribs","Concussion","Broken Leg","Broken Arm","Internal Bleeding","broken neck","shattered pelvis","crushed skull"],"piercing":["ear torn off","hand impaled","pierced eye","shoulder hit","bleeding gut","cracked skull","punctured lung","brains blown out","massive internal organ damage","pierced heart","severed leg","shattered head"]};const persistentTabs = ["tabs_tab"];const abilitySkill = {"force":"strength","hand to hand":"strength","stamina":"strength","firearms":"agility","mobility":"agility","stealth":"agility","medical aid":"intelligence","observation":"intelligence","tech":"intelligence","connections":"empathy","insight":"empathy","manipulation":"empathy","maneuverability":"driving"};const shifts = ["morning","day","evening","night"];
-  k.version = 1;/**
+  const actionAttributes = ["force_action","hand_to_hand_action","stamina_action","firearms_action","mobility_action","stealth_action","medical_aid_action","observation_action","tech_action","connections_action","insight_action","manipulation_action","repeating_weapons-hand_$X_action","repeating_weapons-firearm_$X_action","armor_action","vehicle_armor_action","maneuverability_action"];const criticalEffects = {"crushing":["Teeth Knocked Out","Broken Nose","Broken Fingers","Gouged Eye","Cracked Ribs","Concussion","Broken Leg","Broken Arm","Internal Bleeding","broken neck","shattered pelvis","crushed skull"],"piercing":["ear torn off","hand impaled","pierced eye","shoulder hit","bleeding gut","cracked skull","punctured lung","brains blown out","massive internal organ damage","pierced heart","severed leg","shattered head"]};const persistentTabs = ["tabs_tab"];const abilitySkill = {"force":"strength","hand to hand":"strength","stamina":"strength","firearms":"agility","mobility":"agility","stealth":"agility","medical aid":"intelligence","observation":"intelligence","tech":"intelligence","connections":"empathy","insight":"empathy","manipulation":"empathy","maneuverability":"driving"};const shifts = ["morning","day","evening","night"];
+  k.version = 1.01;/**
+ * 
+ * @param {object} trigger - The trigger that caused the function to be called
+ * @param {object} attributes - The attribute values of the character
+ * @param {object[]} sections - All the repeating section IDs
+ * @param {object} casc - Expanded cascade object
+ */
+const update1x01 = function({trigger,attributes,sections,casc}){
+  if(attributes.armor_rating){
+    if(/^(?:a|b|c|d)$/i.test(attributes.armor_rating)){
+      attributes.armor = attributes.armor_rating.toUpperCase();
+    }else{
+      const dieRatingSwitch = {
+        '6':'D',
+        '8':'C',
+        '10':'B',
+        '12':'A'
+      };
+      const dieSize = attributes.armor_rating.replace(/\D/g,'');
+      const rating = dieRatingSwitch[dieSize];
+      if(rating){
+        attributes.armor = rating;
+      }
+    }
+    if(attributes.updates.armor){
+      attributes.queue.push('armor');
+    }
+    attributes.armor_rating = '';
+  }
+};
+k.registerFuncs({'1.01':update1x01},{type:['updater']});/**
  * 
  * @param {object} trigger - The trigger that caused the function to be called
  * @param {object} attributes - The attribute values of the character
@@ -1760,7 +1858,7 @@ const calcAttributeDice = function({trigger,attributes,sections,casc}){
     C:'d8',
     D:'d6'
   };
-  return ratingDieSwitch[attributes[attrName]];
+  return ratingDieSwitch[attributes[attrName]] || '-';
 };
 k.registerFuncs({calcAttributeDice});/**
  * Limites the health and resolve values to the current maxiumum. Triggerd by changing the health or resolve (or their maximums)
@@ -1773,24 +1871,15 @@ const limitHealthResolve = function({trigger,attributes,sections,casc}){
   const baseName = trigger.name.replace(/_max$/,'');//Convert to the base health attribute name
   attributes[baseName] = Math.min(attributes[baseName],attributes[`${baseName}_max`]);
 };
-k.registerFuncs({limitHealthResolve});
-
-/**
- * Increments the shift.
- * @param {object} trigger - The trigger that caused the function to be called
- * @param {object} attributes - The attribute values of the character
- * @param {object[]} sections - All the repeating section IDs
- * @param {object} casc - Expanded cascade object
- */
-const incrementShift = function({trigger,attributes,sections,casc}){
-  attributes.shift_counter += 1; 
-  const nextShiftIndex = (shifts.indexOf(attributes.active_shift) + 1) % 4;//Limit the shift index to be between 0 and 3, looping back to 0 on overflow
-  attributes.active_shift = shifts[nextShiftIndex];
-  sections.repeating_specialties.forEach(id => {
-    attributes[`repeating_specialties_${id}_shift`] = 0;
-  });
-};
-k.registerFuncs({incrementShift});
+k.registerFuncs({limitHealthResolve});const createShift = (attributes,sections,row) => {
+  const isNew = !!row;
+  row = row || k.generateRowID('repeating_shift',sections);
+  const dayTranslation = getTranslationByKey('day {{day number}}').replace(/\{\{0\}\}/,sections.repeating_shift.length);
+  attributes[`${row}_name`] = isNew && attributes.day_label ?
+    attributes.day_label :
+    k.capitalize(dayTranslation);
+    return row;
+}
 
 /**
  * Stores the shift log in the day's database entry
@@ -1800,10 +1889,22 @@ k.registerFuncs({incrementShift});
  * @param {object} casc - Expanded cascade object
  */
  const storeShift = function({trigger,attributes,sections,casc}){
-  if(!attributes.day_id) return;
-  const row = `repeating_shift_${attributes.day_id}`;
-  const shift = trigger.name.replace(/_shift$/,'');
-  attributes[`${row}_${shift}`] = attributes[trigger.name];
+  const existingLog = attributes.day_id  && sections.repeating_shift.includes(attributes.day_id)
+  const row = existingLog ?
+    `repeating_shift_${attributes.day_id}` :
+    k.generateRowID('repeating_shift',sections);
+  
+    // Store the day_id if it was changed and update the day name if it was changed
+  if(!existingLog){
+    createShift(attributes,sections,row);
+  }
+  attributes.day_label = attributes.day_label || attributes[`${row}_name`];
+  attributes.day_id = existingLog ?
+    attributes.day_id :
+    k.parseRepeatName(row)[1];
+  shifts.forEach(shift =>
+    attributes[`${row}_${shift}`] = attributes[`${shift}_shift`]
+    )
 }
 k.registerFuncs({storeShift});
 
@@ -1836,6 +1937,28 @@ const addCalendar = function({trigger,attributes,sections,casc,newRow}){
 };
 k.registerFuncs({addCalendar});
 
+/**
+ * Increments the shift.
+ * @param {object} trigger - The trigger that caused the function to be called
+ * @param {object} attributes - The attribute values of the character
+ * @param {object[]} sections - All the repeating section IDs
+ * @param {object} casc - Expanded cascade object
+ */
+const incrementShift = function({trigger,attributes,sections,casc}){
+  attributes.shift_counter += 1;
+  const rawNextShiftIndex = shifts.indexOf(attributes.active_shift) + 1;
+  if(rawNextShiftIndex > 3){
+    const row = createShift(attributes,sections);
+    displayLog({trigger:{name:`${row}_display-log`},attributes,sections,casc});
+  }
+  const nextShiftIndex = rawNextShiftIndex % 4;//Limit the shift index to be between 0 and 3, looping back to 0 on overflow
+  attributes.active_shift = shifts[nextShiftIndex];
+  sections.repeating_specialties.forEach(id => {
+    attributes[`repeating_specialties_${id}_shift`] = 0;
+  });
+};
+k.registerFuncs({incrementShift});
+
 /**
  * Clears the active shift tracker
  * @param {object} trigger - The trigger that caused the function to be called
@@ -1844,6 +1967,7 @@ k.registerFuncs({addCalendar});
  * @param {object} casc - Expanded cascade object
  */
 const takeDowntime = function({trigger,attributes,sections,casc}){
+  incrementShift({attributes,sections,casc})
   attributes.shift_counter = 0;
 };
 k.registerFuncs({takeDowntime});/**
@@ -1871,9 +1995,14 @@ const lowerDie = (dieObj) => {
  */
 const applyRollType = (die1,die2,attributes) => {
   const dieObj = {
-    roll1:`[[${die1}]]`,
-    roll2:`[[${die2}]]`
+    roll1: die1 && die1 !== '-' ? `[[${die1}]]` : '',
+    roll2: die2 && die2 !== '-' ? `[[${die2}]]` : ''
   };
+  if(!dieObj.roll1 && !dieObj.roll2){
+    dieObj.roll1 = '^{no dice to roll}';
+    dieObj.pushable = 0;
+    return dieObj;
+  }
   if(attributes.skill_toggle === 'normal'){
     return dieObj;
   }
@@ -1894,7 +2023,9 @@ const applyRollType = (die1,die2,attributes) => {
  */
 const getSkillDice = (skillName,attributes) => {
   const attrDice = attributes[`${skillName}_dice`];
-  const baseAbi = abilitySkill[skillName.replace(/_|-/g,' ')];
+  const baseAbi = skillName.includes('armor') ?
+    skillName :
+    abilitySkill[skillName.replace(/_|-/g,' ')];
   const abiDice = baseAbi ?
     attributes[`${baseAbi}_dice`] :
     null;
@@ -1911,11 +2042,13 @@ const getSkillDice = (skillName,attributes) => {
 const rollAttribute = function({trigger,attributes,sections,casc}){
   const rollName = trigger.name.replace(/-action/,'').replace(/-/g,' ');
   const rollObj = {
-    label:rollName,
-    ...getSkillDice(rollName.replace(/\s+/g,'_'),attributes),
+    label:rollName === 'armor' ?
+      attributes.armor_name :
+      rollName,
     pushable: attributes.option_replicant === 'replicant' ?
       2 :
-      1
+      1,
+      ...getSkillDice(rollName.replace(/\s+/g,'_'),attributes),
   };
   executeRoll(rollObj,attributes);
 };
@@ -1939,11 +2072,14 @@ k.registerFuncs({rollAttribute});
 const executeRoll = async (rollObj,attributes,templateStart) => {
   if(rollObj.pushable){
     rollObj.push = `[[0[computed value]]]`;
+    rollObj.push_through = `[[0[computed value]]]`;
+    rollObj.push_label = '^{push}';
   }
   const rollString = assembleRoll(rollObj,templateStart);
   const roll = await startRoll(rollString);
   const computedObj = {};
   k.debug({roll});
+  computedObj.push = 0;
   computedObj.successes = [1,2,3].reduce((total,n) => {
     const result = roll.results[`roll${n}`] && roll.results[`roll${n}`].result;
     if(result >= 6){
@@ -1952,9 +2088,12 @@ const executeRoll = async (rollObj,attributes,templateStart) => {
     if(result >= 10){
       total += 1;
     }
+    if(result && result !== 1){
+      computedObj.push++;
+    }
     return total;
   },0);
-
+  k.log({computedObj});
   if(rollObj.push){
     const toEscape = {
       pushable:rollObj.pushable - 1,
@@ -1968,7 +2107,7 @@ const executeRoll = async (rollObj,attributes,templateStart) => {
         toEscape[key] = val;
       }
     });
-    computedObj.push = RE.escape(toEscape);
+    computedObj.push_through = RE.escape(toEscape);
   }
 
   finishRoll(roll.rollId,computedObj);
@@ -2006,13 +2145,12 @@ const pushRoll = async function({trigger,attributes,sections,casc}){
     const passThroughs = {};
     const allRolls = [];
     [1,2,3].forEach(n => {
-      if(rollData[`result${n}`] === 1){
-        rollData[`roll${n}`] = '[[1]]'
-        delete rollData[`result${n}`];
-      }
       if(rollData[`result${n}`]){
         baseRoll[`roll${n}`] = `[[${rollData[`result${n}`]}]]`;
       }
+      if(rollData[`result${n}`] === 1){
+        delete rollData[`result${n}`];
+      }
       if(rollData[`result${n}`]){
         allRolls.push(rollData[`roll${n}`]);
       }
@@ -2075,7 +2213,9 @@ k.registerFuncs({pushRoll});
  */
 const executePush = function({trigger,attributes,sections,casc}){
   const rollData = RE.unescape(trigger.originalRollId);
-  rollData.label = `pushed ${rollData.label}`;
+  if(rollData.pushable || attributes.option_replicant === 'human'){
+    rollData.label = getTranslationByKey('pushed {{label}}').replace(/\{\{0\}\}/,rollData.label);
+  }
   executeRoll(rollData,attributes);
 };
 k.registerFuncs({executePush});
@@ -2119,6 +2259,8 @@ const RE = {
     ...getSkillDice(skill,attributes),
     label:attributes[`${row}_name`],
     attack_id:`${row}`,
+    critical_label:'^{critical}',
+    damage_label:'^{damage}',
     pushable: attributes.option_replicant === 'replicant' ?
       2 :
       1
@@ -2138,8 +2280,8 @@ const rollDamage = function({trigger,attributes,sections,casc}){
   const [section,rowID] = k.parseTriggerName(trigger.name);
   const row = `${section}_${rowID}`;
   const rollObj = {
-    label: `${attributes[`${row}_name`]} - damage`,
-    roll1:`[[${attributes[`${row}_damage`]}]]`
+    label: getTranslationByKey('{{weapon name}} - damage').replace(/\{\{0\}\}/,attributes[`${row}_name`]),
+    damage:`[[${attributes[`${row}_damage`]}]]`,
   };
   executeRoll(rollObj,attributes,'@{template_start}');
 };
@@ -2160,11 +2302,11 @@ const rollCrit = async function({trigger,attributes,sections,casc}){
   const critResults = critRolls.results.roll.dice;
 
   const rollObj = {
-    label: `${attributes[`${row}_name`]} - critical`,
+    label: getTranslationByKey('{{weapon name}} - critical').replace(/\{\{0\}\}/,attributes[`${row}_name`]),
     damage:`[[${attributes[`${row}_damage`]} + ${critResults.length}[Crit Damage]]]`,
-    description: critResults.map(n => {
-      return criticalEffects[attributes[`${row}_type`]][n - 1];
-    }).join('\nOR\n')
+    effect: critResults.map(n => {
+      return `^{${criticalEffects[attributes[`${row}_type`]][n - 1]}}`;
+    }).join('\n')
   };
   executeRoll(rollObj,attributes,'@{template_start}');
 };
@@ -2335,6 +2477,14 @@ const getItemDetails = function(itemObj, dataArr, expansionIDs) {
 /*jshint -W014,-W084,-W030,-W033*/
 const maxAttr = ['health','resolve','hull'];
 
+const convertAttributeNames = (key) => {
+  key = key.replace(/^(?:data-)?cs(?:list)?-/,'');
+  const conversionChart = {
+    armor_rating:'armor'
+  };
+  return conversionChart[key] || key;
+}
+
 const handleCompendiumDrop = function({attributes,sections,casc}){
   let data = parseDropData(attributes.drop_data);
   if(!data) return;
@@ -2350,17 +2500,15 @@ const handleCompendiumDrop = function({attributes,sections,casc}){
         attributes.character_name = data['data-cs-name'];
         delete data['data-cs-name'];
       }
-      attributes.queue.push('tabs_tab');
-
+      
       attributes['tabs_tab'] = 
         data.Category === 'Vehicles' ?
           'nav-tabs-tabs--vehicle':
           'nav-tabs-tabs--character';
       k.debug({parsedData:lookupObj});
-      
       const sectionsToQuery = [];
+      debugger;
       processDropData({data:lookupObj,attributes,sections,casc,sectionsToQuery});
-      await querySections(attributes,sectionsToQuery,sections,casc);
       const protoQueue = Object.keys(attributes.updates)
         .flatMap( key => {
           const cascRef = key.replace(/(repeating_[^_]+)_[^_]+_(.+)/,'$1_\$X_$2');
@@ -2378,55 +2526,6 @@ const handleCompendiumDrop = function({attributes,sections,casc}){
 };
 k.registerFuncs({handleCompendiumDrop});
 
-const querySections = (attributes,sectionsToQuery,sections,casc) => {
-  const modWorker = async (name,newMods,modQueue)=>{
-    const mod = modQueue.shift();
-    const translation = getTranslationByKey('mod drop options')
-      .replace(/\{\{1\}\}/,name);
-    const prompt = `${translation}|`;
-    const options = mod
-      .trim()
-      .split(/\s+or\s+/i);
-    const query = `${prompt}${options.join('|')}`;
-    const result = await k.extractQueryResult(query);
-    newMods.push(result);
-    if(modQueue.length){
-      return modWorker(name,newMods,modQueue);
-    }else{
-      return k.pseudoQuery();
-    }
-  };
-
-  const sectionWorker = async (queue)=>{
-    const section = queue.shift();
-    const mods = attributes[`${section}_mods`]
-      .split(/\s*;\s*/);
-    const newMods = [];
-    const name = attributes[`${section}_name`];
-    const queryMods = mods.reduce((memo,mod) => {
-      if(/\s+or\s+/i.test(mod)){
-        memo.push(mod);
-      }else{
-        newMods.push(mod);
-      }
-      return memo;
-    },[]);
-    await modWorker(name,newMods,queryMods);
-    if(queue.length){
-      return sectionWorker(queue);
-    }else{
-      attributes[`${section}_mods`] = newMods.join(';');
-      const trigger = casc[`attr_${section}_mods`];
-      applyMods({trigger,attributes,sections,casc});
-      return k.pseudoQuery();
-    }
-  };
-  return sectionsToQuery.length ?
-    sectionWorker([...sectionsToQuery]) :
-    k.pseudoQuery();
-};
-// Pseudo code for querySections
-
 const parseDropData = function(drop_data){
   k.debug('parsing drop data');
   k.debug({drop_data:`"${drop_data}"`});
@@ -2498,7 +2597,7 @@ const processDropData = function({data, attributes, sections, casc,sectionsToQue
   const worker = (queue) => {
     let [key,val] = queue.shift();
     try{
-      let setKey = key.replace(/^(?:data-)?cs(?:list)?-/,'');
+      const setKey = convertAttributeNames(key);
       if(typeof val === 'string' && val.startsWith('[{')){
         val = JSON.parse(val);
       }
diff --git a/blade_runner_rpg/translation.json b/blade_runner_rpg/translation.json
index 1280d4f01a..eca0984571 100644
--- a/blade_runner_rpg/translation.json
+++ b/blade_runner_rpg/translation.json
@@ -1,5 +1,100 @@
 {
+  "no dice to roll":"no dice to roll",
+  "{{weapon name}} - critical":"{{0}} - critical",
+  "{{weapon name}} - damage":"{{0}} - damage",
+  "critical":"critical",
+  "Teeth Knocked Out":"Teeth Knocked Out",
+  "Broken Nose":"Broken Nose",
+  "Broken Fingers":"Broken Fingers",
+  "Gouged Eye":"Gouged Eye",
+  "Cracked Ribs":"Cracked Ribs",
+  "Concussion":"Concussion",
+  "Broken Leg":"Broken Leg",
+  "Broken Arm":"Broken Arm",
+  "Internal Bleeding":"Internal Bleeding",
+  "broken neck":"broken neck",
+  "shattered pelvis":"shattered pelvis",
+  "crushed skull":"crushed skull",
+  "ear torn off":"ear torn off",
+  "hand impaled":"hand impaled",
+  "pierced eye":"pierced eye",
+  "shoulder hit":"shoulder hit",
+  "bleeding gut":"bleeding gut",
+  "cracked skull":"cracked skull",
+  "punctured lung":"punctured lung",
+  "brains blown out":"brains blown out",
+  "massive internal organ damage":"massive internal organ damage",
+  "pierced heart":"pierced heart",
+  "severed leg":"severed leg",
+  "shattered head":"shattered head",
+  "push":"push",
+  "pushed {{label}}":"pushed {{0}}",
+  "name": "name",
+  "archetype": "archetype",
+  "human": "human",
+  "replicant": "replicant",
+  "key memory": "key memory",
+  "key relationship": "key relationship",
+  "home": "home",
+  "years on the force": "years on the force",
+  "appearance": "appearance",
+  "attributes & skills": "attributes & skills",
+  "strength": "strength",
+  "force": "force",
+  "hand to hand": "hand to hand",
+  "stamina": "stamina",
+  "agility": "agility",
+  "firearms": "firearms",
+  "mobility": "mobility",
+  "stealth": "stealth",
+  "intelligence": "intelligence",
+  "medical aid": "medical aid",
+  "observation": "observation",
+  "tech": "tech",
+  "empathy": "empathy",
+  "connections": "connections",
+  "insight": "insight",
+  "manipulation": "manipulation",
+  "driving": "driving",
+  "next shift": "next shift",
+  "downtime": "downtime",
+  "weapons": "weapons",
+  "weapon name": "weapon name",
+  "damage": "damage",
+  "min. range": "min. range",
+  "max. range": "max. range",
+  "new specialty": "new specialty",
+  "specialty description": "specialty description",
+  "armor name": "armor name",
+  "armor description": "armor description",
+  "signature item name": "signature item name",
+  "signature item description": "signature item description",
+  "item name": "item name",
+  "item description": "item description",
+  "health": "health",
+  "maximum health": "maximum health",
+  "resolve": "resolve",
+  "maximum resolve": "maximum resolve",
+  "promotion points": "promotion points",
+  "humanity points": "humanity points",
+  "chinyen points": "chinyen points",
+  "shift log": "shift log",
+  "Name": "Name",
+  "Archetype": "Archetype",
+  "requires input": "requires input",
+  "Shifts": "Shifts",
+  "Log File": "Log File",
+  "morning": "morning",
+  "day": "day",
+  "evening": "evening",
+  "night": "night",
+  "vehicle": "vehicle",
+  "passengers": "passengers",
+  "hull": "hull",
+  "vehicle armor": "vehicle armor",
+  "maneuverability": "maneuverability",
   "tabs-tabs-character": "Blade Runner",
   "tabs-tabs-shift-log": "Shift Log",
-  "tabs-tabs-vehicle": "Vehicle"
+  "tabs-tabs-vehicle": "Vehicle",
+  "day {{day number}}": "day {{0}}"
 }
\ No newline at end of file