diff --git a/Stargate-RPG/Readme.md b/Stargate-RPG/Readme.md
index 67bd524dec..f0e91834fc 100644
--- a/Stargate-RPG/Readme.md
+++ b/Stargate-RPG/Readme.md
@@ -4,13 +4,27 @@ Offical Roll20 Character sheet for "Stargate RPG" by Wyvern Gaming (Full release
 
 ### Changelog
 
-**v.1.21 (2020-08-04)**
+**v.1.4**
+
+* Roll buttons & hover highlight made more distinct
+* roll templates updated, now mentions character name, works better for descriptions
 * Init & moxie now rolls only once
-* attacks section made more clear and given more space, rolls doesn't break if no damage is given any longer
+* attacks section made more clear and given more space, rolls doesn't break if no damage is given, any special info is displayed on the roll
 * Skills set as default to zero
 * Default speed set to 6m, deafult HP removed.
 * Important fields that need to be filled out, are higlighted in red while empty.
 
+Stat Additions/Removals:
+
+* determination now have a max value, moved next to AC
+* `hp_temp` added, next to `hp`
+* Tension die added, can be added to rolls with `@{td}`
+* (MP)Mission Points added
+* Bulk tracker
+* Small Inventory section on first page
+* Ammo trackers & `ac_extra` removed
+
+
 **v.1.2 (2020-07-28)**
 * skills, saves, init, ac, ac_extra & moxie now update when their attribute changes. init is keyed to dex, moxie to cha.
 * skills & saves that have been marked as proficient will now update when the prof bonus changes.
diff --git a/Stargate-RPG/stargate.css b/Stargate-RPG/stargate.css
index 5508457811..b3cbbac3a7 100644
--- a/Stargate-RPG/stargate.css
+++ b/Stargate-RPG/stargate.css
@@ -68,26 +68,31 @@ input[type="number"]{
   width: 40px;
 }
 
+.sheet-w30,
 input[type="text"].sheet-w30,
 input[type="number"].sheet-w30{
   width: 30px;
 }
 
+.sheet-w40,
 input[type="text"].sheet-w40,
-input[type="number"].sheet-w40{
+input[type="number"].sheet-w40,{
   width: 40px;
 }
 
+.sheet-w50,
 input[type="text"].sheet-w50,
 input[type="number"].sheet-w50{
   width: 50px;
 }
 
+.sheet-w70,
 input[type="text"].sheet-w70,
 input[type="number"].sheet-w70{
   width: 70px;
 }
 
+.sheet-w110,
 input[type="text"].sheet-w110,
 input[type="number"].sheet-w110{
   width: 110px;
@@ -142,8 +147,8 @@ button[type="roll"].sheet-txt-btn:before{
 }
 
 button[type="roll"].sheet-txt-btn{
-  height: 22px;
-  border-style: none;
+  height: 19px;
+  border: 2px solid black;
   background-color: transparent;
   margin-left: 5px;
   font-weight: bold;
@@ -151,8 +156,9 @@ button[type="roll"].sheet-txt-btn{
 }
 
 button[type="roll"].sheet-txt-btn:hover{
-    background-color: #d9d9d9;
+    background-color: #87AFC7;
     border-radius: 10px;
+    background-position: 0 -28px;
 }
 
 
@@ -161,8 +167,10 @@ button[type="roll"].sheet-txt-btn:hover{
 \*-----------------------------------------------------------------*/
 
 .sheet-version{
-    float: right;
-    margin-top: -20px;
+  float: left;
+  margin-top: -85px;
+  width: 170px;
+  margin-left: 550px;
 }
 
 
@@ -228,8 +236,8 @@ div.sheet-page1 {
                       "attr skills  hp      condition"
                       "attr skills  prof    condition"
                       "attr skills  ac      condition"
-                      "attr skills  speed   condition"
-                      "attr skills  saves   ammo     " 
+                      "attr skills  speed   bulk     "
+                      "attr skills  saves   inventory" 
                       "attr attacks attacks attacks  "; 
   width: 850px;
   height: 1000px;
@@ -238,7 +246,7 @@ div.sheet-page1 {
   background-size: 700px 700px;
   background-position: center;
   background-color: black;
-  margin-top: -23px;
+  margin-top: -52px;
 }
 
 div.sheet-page2 {
@@ -255,7 +263,7 @@ div.sheet-page2 {
   background-size: 700px 700px;
   background-position: center;
   background-color: black;
-  margin-top: -23px;
+  margin-top: -52px;
   grid-gap: 10px;
   padding: 5px;
 }
@@ -283,6 +291,16 @@ div.sheet-name label{
     padding-left: 10px;
 }
 
+div.sheet-name div select{
+  width: 42px;
+  margin-left: 16px;
+}
+
+div.sheet-name input[type="number"]{
+  height: 20px;
+}
+
+
 /* ATTRS SECTION */
 div.sheet-attr{
   grid-area: attr;
@@ -337,7 +355,7 @@ div.sheet-attr input[type="number"]{
 
 div.sheet-attr button[type="roll"].sheet-large{
     font-size: 1.5em;
-    margin-bottom: 2px;
+    margin-bottom: -3px;
     border-radius: 15px;
 }
 
@@ -431,6 +449,7 @@ div.sheet-condition{
 div.sheet-condition span{
   padding-left: 5px;
   font-weight: bold;
+  font-size: 12px;
 }
 
 /* prof SECTION */
@@ -443,6 +462,10 @@ div.sheet-prof > div:nth-child(1) > label:nth-child(1){
   width: 80px;
 }
 
+div.sheet-prof > div:nth-child(1){
+  padding: 5px 1px;
+}
+
 div.sheet-prof > div:nth-child(2) > label:nth-child(1) {
  padding: 0px;
 }
@@ -455,8 +478,16 @@ div.sheet-prof .sheet-init{
   padding-right: 2px;
 }
 
+div.sheet-prof .sheet-init button{
+  width: 63px;
+  margin-left: 0px;
+  padding-right: 7px;
+  padding-left: 2px;
+}
+
+
 div.sheet-prof .sheet-moxie{
-  width: 50px;
+  width: 62px;
 }
 
 .sheet-prof > div:nth-child(2) > label:nth-child(1) {
@@ -537,6 +568,27 @@ div.sheet-saves div.sheet-mb20{
 
 
 
+/* BULK SECTION */
+
+div.sheet-bulk{
+  grid-area:bulk;
+  width: 156px;
+  height: 80px;
+}
+
+/* INVENTORY SECTION */
+
+div.sheet-inventory{
+  grid-area:inventory;
+  width: 156px;
+}
+
+div.sheet-inventory textarea{
+  width: 95%;
+  height: 95%;
+  margin-bottom: 0px;
+}
+
 /* ammo SECTION */
 
 div.sheet-ammo.sheet-grid{
@@ -624,7 +676,8 @@ div.sheet-page2 textarea{
 /*  ------------ Tabs ---------- */
 
 input.sheet-tab1:checked ~ div.sheet-tab1,
-input.sheet-tab2:checked ~ div.sheet-tab2{
+input.sheet-tab2:checked ~ div.sheet-tab2,
+span.sheet-version{
   display: grid;
 }
 
@@ -670,4 +723,95 @@ input.sheet-tab2 + span::before{
 
 div.sheet-tab-content{
   display: none;
+}
+
+/*------------------------------------*\
+  #ROLL TEMPLATES
+\*------------------------------------*/
+
+/* Smaller margins - remove these if you want the huge default left margin */
+.sheet-rolltemplate-stargate {
+  margin-left: -37px;
+}
+.withoutavatars .sheet-rolltemplate-stargate {
+  margin-left: -7px;
+}
+
+.sheet-rolltemplate-stargate .sheet-container {
+  border: 3px solid black;
+  border-radius: 3px;
+}
+
+/* Header formatting - title and subtitle */
+.sheet-rolltemplate-stargate .sheet-header {
+  background-color: var(--header-bg-color);
+  color: var(--header-text-color);
+  text-align: left;
+  text-transform: capitalize;
+  padding: 5px;
+  border-bottom: 2px solid black;
+}
+.sheet-rolltemplate-stargate .sheet-title {
+  font-size:1.2em;
+  font-weight: bold;
+}
+.sheet-rolltemplate-stargate .sheet-subtitle {
+  font-size:.9em;
+}
+
+/* example colors */
+.sheet-rolltemplate-stargate .sheet-container {
+  /* this is the default color */
+  --header-bg-color: #a83521;
+  --header-text-color: #FFF;
+}
+
+/* alt template colors */
+.sheet-rolltemplate-stargate .sheet-container.sheet-color-green {
+  --header-bg-color: #008000;
+}
+.sheet-rolltemplate-stargate .sheet-container.sheet-color-black {
+  --header-bg-color: #000;
+}
+.sheet-rolltemplate-stargate .sheet-container.sheet-color-white {
+  --header-bg-color: #FFF;
+  --header-text-color: #000;
+}
+
+/* Allprops part */
+.sheet-rolltemplate-stargate .sheet-content {
+  display: grid;
+  background: #FFF;
+  /* Header formatting - modify the column layout below */
+  grid-template-columns: auto auto;
+  /* Line height to match default roll template */
+  line-height:1.4em;
+}
+.sheet-rolltemplate-stargate .sheet-content > div {
+  padding: 5px;
+}
+
+/* Left column */
+.sheet-rolltemplate-stargate .sheet-content .sheet-key {
+  font-weight: bold;
+  padding-right: 10px;
+  text-align: right;
+}
+
+/* Empty rule, use this if you want to change the right column 
+.sheet-rolltemplate-stargate .sheet-value {
+}
+*/
+
+/* Make even-numbered rows grey */
+.sheet-rolltemplate-stargate .sheet-content :nth-child(4n+3),
+.sheet-rolltemplate-stargate .sheet-content :nth-child(4n) {
+  background:#EEE;
+}
+
+/* Description field */
+.sheet-rolltemplate-stargate .sheet-desc {
+  grid-column: span 2;
+  padding: 5px;
+  text-align: center;
 }
\ No newline at end of file
diff --git a/Stargate-RPG/stargate.html b/Stargate-RPG/stargate.html
index ea577d2fa3..dabc489308 100644
--- a/Stargate-RPG/stargate.html
+++ b/Stargate-RPG/stargate.html
@@ -1,7 +1,7 @@
 <input type="radio" name="attr_tab" class="tab tab1" value="1" checked="checked"><span title="Main"></span>
-<input type="radio" name="attr_tab" class="tab tab2" value="2"                  ><span title="Background"></span>
+<input type="radio" name="attr_tab" class="tab tab2" value="2" style="top: -56px;left: 235px;" ><span title="Background"></span><span class="version bold">Sheet Version: 1.4</span>
+
 
-<span class="version bold">Sheet Version: 1.21</span>
 
 <!-- 
 <div>
@@ -51,14 +51,27 @@
         <input name="attr_class" placeholder="class" type="text">
       </div>
       <div class="columnflex nowrap">
-        <label>Level</label>
-        <input name="attr_rank" type="text" placeholder="1" class="w40">
+        <label class="w40">Level</label>
+        <input name="attr_rank" type="number" placeholder="1" class="w40">
       </div>
       <div class="columnflex nowrap">
-        <label>HD</label>
+        <label class="w40" title="Hit Dice">HD</label>
         <input name="attr_hd" type="text" placeholder="d8" title="Hit Dice" class="w40">
       </div>
-
+      <div class="columnflex nowrap">
+        <label class="w30">MP</label>
+        <input name="attr_mp" type="number" placeholder="" title="Mission Points" class="w40">
+      </div>
+      <div class="columnflex nowrap">
+        <label class="w70">Tension Die</label>
+        <select name="attr_td">
+          <option value="d4">d4</option>
+          <option value="d6" selected>d6</option>
+          <option value="d8">d8</option>
+          <option value="d10">d10</option>
+          <option value="d12">d12</option>
+        </select>
+      </div>
     </div>
 
   </div>
@@ -68,32 +81,32 @@
 
   <div class="attr columnflex nowrap spaced center">
     <div class="stat columnflex nowrap center middle">
-      <button name="roll_str" type="roll" value="&{template:default} {{name=**Strength Check**}} {{[[d20+(@{str_mod})]]=[[d20+(@{str_mod})]]}}" class="txt-btn large">STR</button>
+      <button name="roll_str" type="roll" value="&{template:stargate} {{title=Strength Check}} {{subtitle=@{character_name} }} {{[[d20+(@{str_mod})]]=[[d20+(@{str_mod})]]}}" class="txt-btn large">STR</button>
       <input name="attr_str" type="number" value="10">
       <span class="mod" name="attr_str_mod"></span>
     </div>
     <div class="stat columnflex nowrap center middle">
-      <button name="roll_dex" type="roll" value="&{template:default} {{name=**Dexterity Check**}} {{[[d20+(@{dex_mod})]]=[[d20+(@{dex_mod})]]}}" class="txt-btn large">DEX</button>
+      <button name="roll_dex" type="roll" value="&{template:stargate} {{title=Dexterity Check}} {{subtitle=@{character_name} }} {{[[d20+(@{dex_mod})]]=[[d20+(@{dex_mod})]]}}" class="txt-btn large">DEX</button>
       <input name="attr_dex" type="number" value="10">
       <span class="mod" name="attr_dex_mod"></span>
     </div>
     <div class="stat columnflex nowrap center middle">
-      <button name="roll_con" type="roll" value="&{template:default} {{name=**Constitution Check**}} {{[[d20+(@{con_mod})]]=[[d20+(@{con_mod})]]}}" class="txt-btn large">CON</button>
+      <button name="roll_con" type="roll" value="&{template:stargate} {{title=Constitution Check}} {{subtitle=@{character_name} }} {{[[d20+(@{con_mod})]]=[[d20+(@{con_mod})]]}}" class="txt-btn large">CON</button>
       <input name="attr_con" type="number" value="10">
       <span class="mod" name="attr_con_mod"></span>
     </div>
     <div class="stat columnflex nowrap center middle">
-      <button name="roll_int" type="roll" value="&{template:default} {{name=**Intelligence Check**}} {{[[d20+(@{int_mod})]]=[[d20+(@{int_mod})]]}}" class="txt-btn large">INT</button>
+      <button name="roll_int" type="roll" value="&{template:stargate} {{title=Intelligence Check}} {{subtitle=@{character_name} }} {{[[d20+(@{int_mod})]]=[[d20+(@{int_mod})]]}}" class="txt-btn large">INT</button>
       <input name="attr_int" type="number" value="10">
       <span class="mod" name="attr_int_mod"></span>
     </div>
     <div class="stat columnflex nowrap center middle">
-      <button name="roll_wis" type="roll" value="&{template:default} {{name=**Wisdom Check**}} {{[[d20+(@{wis_mod})]]=[[d20+(@{wis_mod})]]}}" class="txt-btn large">WIS</button>
+      <button name="roll_wis" type="roll" value="&{template:stargate} {{title=Wisdom Check}} {{subtitle=@{character_name} }} {{[[d20+(@{wis_mod})]]=[[d20+(@{wis_mod})]]}}" class="txt-btn large">WIS</button>
       <input name="attr_wis" type="number" value="10">
       <span class="mod" name="attr_wis_mod"></span>
     </div>
     <div class="stat columnflex nowrap center middle">
-      <button name="roll_cha" type="roll" value="&{template:default} {{name=**Charisma Check**}} {{[[d20+(@{cha_mod})]]=[[d20+(@{cha_mod})]]}}" class="txt-btn large">CHA</button>
+      <button name="roll_cha" type="roll" value="&{template:stargate} {{title=Charisma Check}} {{subtitle=@{character_name} }} {{[[d20+(@{cha_mod})]]=[[d20+(@{cha_mod})]]}}" class="txt-btn large">CHA</button>
       <input name="attr_cha" type="number" value="10">
       <span class="mod" name="attr_cha_mod"></span>
     </div>
@@ -109,70 +122,70 @@
     <div class="rowflex nowrap">
       <input name="attr_acrobatics_c" type="checkbox" value="1">
       <input name="attr_acrobatics" type="number" value="0" class="w30">
-      <button name="roll_acrobatics" type="roll" class="txt-btn" value="&{template:default} {{name=**Acrobatics Check**}} {{[[d20+(@{acrobatics})]]=[[d20+(@{acrobatics})]]}}">Acrobatics</button>
+      <button name="roll_acrobatics" type="roll" class="txt-btn" value="&{template:stargate} {{title=Acrobatics Check}} {{subtitle=@{character_name} }} {{[[d20+(@{acrobatics})]]=[[d20+(@{acrobatics})]]}}">Acrobatics</button>
       <span>(dex)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_animalhandling_c" type="checkbox" value="1">
       <input name="attr_animalhandling" type="number" value="0" class="w30">
-      <button name="roll_animalhandling" type="roll" class="txt-btn" value="&{template:default} {{name=**Animal Handling Check**}} {{[[d20+(@{animalhandling})]]=[[d20+(@{animalhandling})]]}}">Animal Handling</button>
+      <button name="roll_animalhandling" type="roll" class="txt-btn" value="&{template:stargate} {{title=Animal Handling Check}} {{subtitle=@{character_name} }} {{[[d20+(@{animalhandling})]]=[[d20+(@{animalhandling})]]}}">Animal Handling</button>
       <span>(wis)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_athletics_c" type="checkbox" value="1">
       <input name="attr_athletics" type="number" value="0" class="w30">
-      <button name="roll_athletics" type="roll" class="txt-btn" value="&{template:default} {{name=**Athletics Check**}} {{[[d20+(@{athletics})]]=[[d20+(@{athletics})]]}}">Athletics</button>
+      <button name="roll_athletics" type="roll" class="txt-btn" value="&{template:stargate} {{title=Athletics Check}} {{subtitle=@{character_name} }} {{[[d20+(@{athletics})]]=[[d20+(@{athletics})]]}}">Athletics</button>
       <span>(str)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_culture_c" type="checkbox" value="1">
       <input name="attr_culture" type="number" value="0" class="w30">
-      <button name="roll_culture" type="roll" class="txt-btn" value="&{template:default} {{name=**Culture Check**}} {{[[d20+(@{culture})]]=[[d20+(@{culture})]]}}">Culture</button>
+      <button name="roll_culture" type="roll" class="txt-btn" value="&{template:stargate} {{title=Culture Check}} {{subtitle=@{character_name} }} {{[[d20+(@{culture})]]=[[d20+(@{culture})]]}}">Culture</button>
       <span>(wis)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_deception_c" type="checkbox" value="1">
       <input name="attr_deception" type="number" value="0" class="w30">
-      <button name="roll_deception" type="roll" class="txt-btn" value="&{template:default} {{name=**Deception Check**}} {{[[d20+(@{deception})]]=[[d20+(@{deception})]]}}">Deception</button>
+      <button name="roll_deception" type="roll" class="txt-btn" value="&{template:stargate} {{title=Deception Check}} {{subtitle=@{character_name} }} {{[[d20+(@{deception})]]=[[d20+(@{deception})]]}}">Deception</button>
       <span>(cha)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_engineering_c" type="checkbox" value="1">
       <input name="attr_engineering" type="number" value="0" class="w30">
-      <button name="roll_engineering" type="roll" class="txt-btn" value="&{template:default} {{name=**Engineering Check**}} {{[[d20+(@{engineering})]]=[[d20+(@{engineering})]]}}">engineering</button>
+      <button name="roll_engineering" type="roll" class="txt-btn" value="&{template:stargate} {{title=Engineering Check}} {{subtitle=@{character_name} }} {{[[d20+(@{engineering})]]=[[d20+(@{engineering})]]}}">engineering</button>
       <span>(int)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_history_c" type="checkbox" value="1">
       <input name="attr_history" type="number" value="0" class="w30">
-      <button name="roll_history" type="roll" class="txt-btn" value="&{template:default} {{name=**History Check**}} {{[[d20+(@{history})]]=[[d20+(@{history})]]}}">history</button>
+      <button name="roll_history" type="roll" class="txt-btn" value="&{template:stargate} {{title=History Check}} {{subtitle=@{character_name} }} {{[[d20+(@{history})]]=[[d20+(@{history})]]}}">history</button>
       <span>(int)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_insight_c" type="checkbox" value="1">
       <input name="attr_insight" type="number" value="0" class="w30">
-      <button name="roll_insight" type="roll" class="txt-btn" value="&{template:default} {{name=**Insight Check**}} {{[[d20+(@{insight})]]=[[d20+(@{insight})]]}}">insight</button>
+      <button name="roll_insight" type="roll" class="txt-btn" value="&{template:stargate} {{title=Insight Check}} {{subtitle=@{character_name} }} {{[[d20+(@{insight})]]=[[d20+(@{insight})]]}}">insight</button>
       <span>(wis)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_intimidation_c" type="checkbox" value="1">
       <input name="attr_intimidation" type="number" value="0" class="w30">
-      <button name="roll_intimidation" type="roll" class="txt-btn" value="&{template:default} {{name=**Intimidation Check**}} {{[[d20+(@{intimidation})]]=[[d20+(@{intimidation})]]}}">intimidation</button>
+      <button name="roll_intimidation" type="roll" class="txt-btn" value="&{template:stargate} {{title=Intimidation Check}} {{subtitle=@{character_name} }} {{[[d20+(@{intimidation})]]=[[d20+(@{intimidation})]]}}">intimidation</button>
       <span>(cha)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_investigation_c" type="checkbox" value="1">
       <input name="attr_investigation" type="number" value="0" class="w30">
-      <button name="roll_investigation" type="roll" class="txt-btn" value="&{template:default} {{name=**Investigation Check**}} {{[[d20+(@{investigation})]]=[[d20+(@{investigation})]]}}">investigation</button>
+      <button name="roll_investigation" type="roll" class="txt-btn" value="&{template:stargate} {{title=Investigation Check}} {{subtitle=@{character_name} }} {{[[d20+(@{investigation})]]=[[d20+(@{investigation})]]}}">investigation</button>
       <span>(int)</span>
     </div>
 
@@ -181,70 +194,70 @@
     <div class="rowflex nowrap">
       <input name="attr_medicine_c" type="checkbox" value="1">
       <input name="attr_medicine" type="number" value="0" class="w30">
-      <button name="roll_medicine" type="roll" class="txt-btn" value="&{template:default} {{name=**medicine Check**}} {{[[d20+(@{medicine})]]=[[d20+(@{medicine})]]}}">medicine</button>
+      <button name="roll_medicine" type="roll" class="txt-btn" value="&{template:stargate} {{title=medicine Check}} {{subtitle=@{character_name} }} {{[[d20+(@{medicine})]]=[[d20+(@{medicine})]]}}">medicine</button>
       <span>(wis)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_nature_c" type="checkbox" value="1">
       <input name="attr_nature" type="number" value="0" class="w30">
-      <button name="roll_nature" type="roll" class="txt-btn" value="&{template:default} {{name=**nature Check**}} {{[[d20+(@{nature})]]=[[d20+(@{nature})]]}}">nature</button>
+      <button name="roll_nature" type="roll" class="txt-btn" value="&{template:stargate} {{title=nature Check}} {{subtitle=@{character_name} }} {{[[d20+(@{nature})]]=[[d20+(@{nature})]]}}">nature</button>
       <span>(int)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_perception_c" type="checkbox" value="1">
       <input name="attr_perception" type="number" value="0" class="w30">
-      <button name="roll_perception" type="roll" class="txt-btn" value="&{template:default} {{name=**perception Check**}} {{[[d20+(@{perception})]]=[[d20+(@{perception})]]}}">perception</button>
+      <button name="roll_perception" type="roll" class="txt-btn" value="&{template:stargate} {{title=perception Check}} {{subtitle=@{character_name} }} {{[[d20+(@{perception})]]=[[d20+(@{perception})]]}}">perception</button>
       <span>(wis)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_performance_c" type="checkbox" value="1">
       <input name="attr_performance" type="number" value="0" class="w30">
-      <button name="roll_performance" type="roll" class="txt-btn" value="&{template:default} {{name=**performance Check**}} {{[[d20+(@{performance})]]=[[d20+(@{performance})]]}}">performance</button>
+      <button name="roll_performance" type="roll" class="txt-btn" value="&{template:stargate} {{title=performance Check}} {{subtitle=@{character_name} }} {{[[d20+(@{performance})]]=[[d20+(@{performance})]]}}">performance</button>
       <span>(cha)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_persuasion_c" type="checkbox" value="1">
       <input name="attr_persuasion" type="number" value="0" class="w30">
-      <button name="roll_persuasion" type="roll" class="txt-btn" value="&{template:default} {{name=**Persuasion Check**}} {{[[d20+(@{persuasion})]]=[[d20+(@{persuasion})]]}}">persuasion</button>
+      <button name="roll_persuasion" type="roll" class="txt-btn" value="&{template:stargate} {{title=Persuasion Check}} {{subtitle=@{character_name} }} {{[[d20+(@{persuasion})]]=[[d20+(@{persuasion})]]}}">persuasion</button>
       <span>(cha)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_pilot_c" type="checkbox" value="1">
       <input name="attr_pilot" type="number" value="0" class="w30">
-      <button name="roll_pilot" type="roll" class="txt-btn" value="&{template:default} {{name=**pilot Check**}} {{[[d20+(@{pilot})]]=[[d20+(@{pilot})]]}}">pilot</button>
+      <button name="roll_pilot" type="roll" class="txt-btn" value="&{template:stargate} {{title=pilot Check}} {{subtitle=@{character_name} }} {{[[d20+(@{pilot})]]=[[d20+(@{pilot})]]}}">pilot</button>
       <span>(dex)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_science_c" type="checkbox" value="1">
       <input name="attr_science" type="number" value="0" class="w30">
-      <button name="roll_science" type="roll" class="txt-btn" value="&{template:default} {{name=**science Check**}} {{[[d20+(@{science})]]=[[d20+(@{science})]]}}">science</button>
+      <button name="roll_science" type="roll" class="txt-btn" value="&{template:stargate} {{title=science Check}} {{subtitle=@{character_name} }} {{[[d20+(@{science})]]=[[d20+(@{science})]]}}">science</button>
       <span>(int)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_sleight_c" type="checkbox" value="1">
       <input name="attr_sleight" type="number" value="0" class="w30">
-      <button name="roll_sleight" type="roll" class="txt-btn" value="&{template:default} {{name=**Sleight of Hand Check**}} {{[[d20+(@{sleight})]]=[[d20+(@{sleight})]]}}">Sleight of Hand</button>
+      <button name="roll_sleight" type="roll" class="txt-btn" value="&{template:stargate} {{title=Sleight of Hand Check}} {{subtitle=@{character_name} }} {{[[d20+(@{sleight})]]=[[d20+(@{sleight})]]}}">Sleight of Hand</button>
       <span>(dex)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_stealth_c" type="checkbox" value="1">
       <input name="attr_stealth" type="number" value="0" class="w30">
-      <button name="roll_stealth" type="roll" class="txt-btn" value="&{template:default} {{name=**stealth Check**}} {{[[d20+(@{stealth})]]=[[d20+(@{stealth})]]}}">stealth</button>
+      <button name="roll_stealth" type="roll" class="txt-btn" value="&{template:stargate} {{title=stealth Check}} {{subtitle=@{character_name} }} {{[[d20+(@{stealth})]]=[[d20+(@{stealth})]]}}">stealth</button>
       <span>(dex)</span>
     </div>
 
     <div class="rowflex nowrap">
       <input name="attr_survival_c" type="checkbox" value="1">
       <input name="attr_survival" type="number" value="0" class="w30">
-      <button name="roll_survival" type="roll" class="txt-btn" value="&{template:default} {{name=**survival Check**}} {{[[d20+(@{survival})]]=[[d20+(@{survival})]]}}">survival</button>
+      <button name="roll_survival" type="roll" class="txt-btn" value="&{template:stargate} {{title=survival Check}} {{subtitle=@{character_name} }} {{[[d20+(@{survival})]]=[[d20+(@{survival})]]}}">survival</button>
       <span>(wis)</span>
     </div>
 
@@ -264,8 +277,12 @@
       
     </div>
     <div class="section columnflex nowrap middle center determ">
-      <label class="">determination</label>
-      <input name="attr_determination" type="number" value="" placeholder="" class="stat w70">
+      <label class="txtcenter" title="Temporary Hit Points">Temp HP</label>
+      <div class="rowflex nowrap">
+        <input name="attr_hp_temp" type="number" value="" title="Temporary Hit Points" class="stat w40">
+        <span class="slash">/</span>
+        <input name="attr_hp_temp_max" type="number" value="" title="Temporary Hit Points" class="stat w40"> 
+      </div>
     </div>
   </div>
 
@@ -273,7 +290,7 @@
 <!-- condition -->
 
   <div class="condition section columnflex nowrap spaced">
-    <h2 class="txtcenter">Condition</h2>
+    <h3 class="txtcenter">CONDITION</h3>
     <div class="rowflex nowrap">
       <input name="attr_condition" type="radio" value="0" checked="true">
       <span>Normal</span>
@@ -288,7 +305,7 @@
     </div>
     <div class="rowflex nowrap">
       <input name="attr_condition" type="radio" value="3">
-      <span>disadv attacks saves</span>
+      <span>disadv attacks, saves</span>
     </div>
     <div class="rowflex nowrap">
       <input name="attr_condition" type="radio" value="4">
@@ -313,11 +330,11 @@
       <input name="attr_prof" type="number" value="2" class="stat w40" title="Proficiency Bonus">
     </div>
     <div class="section columnflex nowrap middle center init">
-      <button name="roll_init" type="roll" value="&{template:default} {{name=**Initiative**}} {{ @{character_name} =[[d20+(@{init}) &{tracker}]]}}" class="txt-btn">Initiative</button>
+      <button name="roll_init" type="roll" value="&{template:stargate} {{title=Initiative}} {{subtitle=@{character_name} }} {{ Roll =[[d20+(@{init}) &{tracker}]]}}" class="txt-btn">Initiative</button>
       <input name="attr_init" type="number" value="0" class="stat w40">
     </div>
     <div class="section columnflex nowrap middle center moxie">
-      <button name="roll_moxie" type="roll" value="&{template:default} {{name=**Moxie**}} {{ @{character_name} =[[d20+(@{moxie}) &{tracker}]]}}" class="txt-btn" title="Social Initiative" >Moxie</button>
+      <button name="roll_moxie" type="roll" value="&{template:stargate} {{title=Moxie}} {{subtitle=@{character_name} }} {{ Roll =[[d20+(@{moxie}) &{tracker}]]}}" class="txt-btn" title="Social Initiative" >Moxie</button>
       <input name="attr_moxie" type="number" value="0" class="stat w40" title="Social Initiative">
     </div>
   </div>
@@ -331,8 +348,12 @@
       <input name="attr_ac" type="number" value="10" class="stat w70">
     </div>
     <div class="section columnflex nowrap middle center">
-      <label class="txtcenter">AC extra</label>
-      <input name="attr_ac_extra" type="number" value="10" class="stat w70">
+      <label class="wide">determination</label>
+      <div class="rowflex nowrap">
+        <input name="attr_determination" type="number" value="2" title="determination" class="stat w40">
+        <span class="slash">/</span>
+        <input name="attr_determination_max" type="number" value="2" title="determination" class="stat w40"> 
+      </div>
     </div>
   </div>
 
@@ -345,7 +366,7 @@
       <input name="attr_speed" type="text" value="6m" class="w70 stat">
     </div>
     <div class="section death columnflex nowrap middle center">
-      <label class="bold">Death Saves</label>
+      <button name="roll_deathsave" type="roll" value="&{template:stargate} {{color=black}} {{title=Death Save}} {{subtitle=@{character_name} }} {{Result=[[d20]]}}" class="txt-btn large">Death Save</button>
       <div class="rowflex nowrap">
         <input name="attr_death_success1" type="checkbox" value="1">
         <input name="attr_death_success2" type="checkbox" value="1">
@@ -369,38 +390,46 @@
     <div class="rowflex nowrap">
       <input name="attr_str_save_c" type="checkbox" value="1">
       <input name="attr_str_save" type="number" value="0" class="w30">
-      <button name="roll_str_save" type="roll" class="txt-btn" value=" &{template:default} {{name=**Strength Save**}} {{[[d20+(@{str_save})]]=[[d20+(@{str_save})]]}}">Strength</button>
+      <button name="roll_str_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Strength Save}} {{subtitle=@{character_name} }} {{[[d20+(@{str_save})]]=[[d20+(@{str_save})]]}}">Strength</button>
     </div>
     <div class="rowflex nowrap">
       <input name="attr_dex_save_c" type="checkbox" value="1">
       <input name="attr_dex_save" type="number" value="0" class="w30">
-      <button name="roll_dex_save" type="roll" class="txt-btn" value=" &{template:default} {{name=**Dexterity Save**}} {{[[d20+(@{dex_save})]]=[[d20+(@{dex_save})]]}}">Dexterity</button>
+      <button name="roll_dex_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Dexterity Save}} {{subtitle=@{character_name} }} {{[[d20+(@{dex_save})]]=[[d20+(@{dex_save})]]}}">Dexterity</button>
     </div>
     <div class="rowflex nowrap">
       <input name="attr_con_save_c" type="checkbox" value="1">
       <input name="attr_con_save" type="number" value="0" class="w30">
-      <button name="roll_con_save" type="roll" class="txt-btn" value=" &{template:default} {{name=**Constitution Save**}} {{[[d20+(@{con_save})]]=[[d20+(@{con_save})]]}}">Constitution</button>
+      <button name="roll_con_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Constitution Save}} {{subtitle=@{character_name} }} {{[[d20+(@{con_save})]]=[[d20+(@{con_save})]]}}">Constitution</button>
     </div>
     <div class="rowflex nowrap">
       <input name="attr_int_save_c" type="checkbox" value="1">
       <input name="attr_int_save" type="number" value="0" class="w30">
-      <button name="roll_int_save" type="roll" class="txt-btn" value=" &{template:default} {{name=**Intelligence Save**}} {{[[d20+(@{int_save})]]=[[d20+(@{int_save})]]}}">Intelligence</button>
+      <button name="roll_int_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Intelligence Save}} {{subtitle=@{character_name} }} {{[[d20+(@{int_save})]]=[[d20+(@{int_save})]]}}">Intelligence</button>
     </div>
     <div class="rowflex nowrap">
       <input name="attr_wis_save_c" type="checkbox" value="1">
       <input name="attr_wis_save" type="number" value="0" class="w30">
-      <button name="roll_wis_save" type="roll" class="txt-btn" value=" &{template:default} {{name=**Wisdom Save**}} {{[[d20+(@{wis_save})]]=[[d20+(@{wis_save})]]}}">Wisdom</button>
+      <button name="roll_wis_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Wisdom Save}} {{subtitle=@{character_name} }} {{[[d20+(@{wis_save})]]=[[d20+(@{wis_save})]]}}">Wisdom</button>
     </div>
     <div class="rowflex nowrap mb20">
       <input name="attr_cha_save_c" type="checkbox" value="1">
       <input name="attr_cha_save" type="number" value="0" class="w30">
-      <button name="roll_cha_save" type="roll" class="txt-btn" value=" &{template:default} {{name=**Charisma Save**}} {{[[d20+(@{cha_save})]]=[[d20+(@{cha_save})]]}}">Charisma</button>
+      <button name="roll_cha_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Charisma Save}} {{subtitle=@{character_name} }} {{[[d20+(@{cha_save})]]=[[d20+(@{cha_save})]]}}">Charisma</button>
     </div>
   </div>
 
 
+<!-- bulk -->
+
+  <div class="bulk section columnflex nowrap middle center">
+      <h3>Tactical Vest Bulk</h3>
+      <input name="attr_bulk" type="number" value="8" class="stat w40">
+  </div>
+
 <!-- ammo -->
 
+<!--  
   <div class="ammo grid">
     <div class="section columnflex nowrap middle center">
       <label>Ammo Weapon 1</label>
@@ -419,7 +448,14 @@
       <input name="attr_ammo4" type="number" value="0">
     </div>
   </div>
+-->
 
+<!-- inventory mini -->
+
+  <div class="section inventory columnflex nowrap center">
+    <h4>Inventory</h4>
+    <textarea name="attr_inventory"></textarea>
+  </div>
 
 <!-- attacks -->
 
@@ -434,7 +470,7 @@
 
 <!-- attack1 -->
     <div class="rowflex nowrap">
-      <button name="roll_attack1" type="roll" value="&{template:default} {{name=**@{attack1}**}} {{[[d20+(@{attack1_to_hit})]]=[[d20+(@{attack1_to_hit})]]}} {{Damage=[[@{attack1_dmg}+0]] @{attack1_dmgtype} }}"></button>
+      <button name="roll_attack1" type="roll" value="&{template:stargate} {{title=@{attack1}}} {{subtitle=@{character_name} }} {{[[d20+(@{attack1_to_hit})]]=[[d20+(@{attack1_to_hit})]]}} {{Damage=[[@{attack1_dmg}+0]] @{attack1_dmgtype} }} {{desc=@{attack1_special} }}"></button>
       <input name="attr_attack1" type="text" class="ml15" placeholder="attack/action name">
     </div>
     <div>
@@ -458,7 +494,7 @@
 
 <!-- attack2 -->
     <div class="rowflex nowrap">
-      <button name="roll_attack2" type="roll" value="&{template:default} {{name=**@{attack2}**}} {{[[d20+(@{attack2_to_hit})]]=[[d20+(@{attack2_to_hit})]]}} {{Damage=[[@{attack2_dmg}+0]]}}"></button>
+      <button name="roll_attack2" type="roll" value="&{template:stargate} {{title=@{attack2}}} {{subtitle=@{character_name} }} {{[[d20+(@{attack2_to_hit})]]=[[d20+(@{attack2_to_hit})]]}} {{Damage=[[@{attack2_dmg}+0]]}} {{desc=@{attack2_special} }}"></button>
       <input name="attr_attack2" type="text" class="ml15" placeholder="attack/action name">
     </div>
     <div>
@@ -482,7 +518,7 @@
 
 <!-- attack3 -->
     <div class="rowflex nowrap">
-      <button name="roll_attack3" type="roll" value="&{template:default} {{name=**@{attack3}**}} {{[[d20+(@{attack3_to_hit})]]=[[d20+(@{attack3_to_hit})]]}} {{Damage=[[@{attack3_dmg}+0]]}}"></button>
+      <button name="roll_attack3" type="roll" value="&{template:stargate} {{title=@{attack3}}} {{subtitle=@{character_name} }} {{[[d20+(@{attack3_to_hit})]]=[[d20+(@{attack3_to_hit})]]}} {{Damage=[[@{attack3_dmg}+0]]}} {{desc=@{attack3_special} }}"></button>
       <input name="attr_attack3" type="text" class="ml15" placeholder="attack/action name">
     </div>
     <div>
@@ -506,7 +542,7 @@
 
 <!-- attack4 -->
     <div class="rowflex nowrap">
-      <button name="roll_attack4" type="roll" value="&{template:default} {{name=**@{attack4}**}} {{[[d20+(@{attack4_to_hit})]]=[[d20+(@{attack4_to_hit})]]}} {{Damage=[[@{attack4_dmg}+0]]}}"></button>
+      <button name="roll_attack4" type="roll" value="&{template:stargate} {{title=@{attack4}}} {{subtitle=@{character_name} }} {{[[d20+(@{attack4_to_hit})]]=[[d20+(@{attack4_to_hit})]]}} {{Damage=[[@{attack4_dmg}+0]]}} {{desc=@{attack4_special} }}"></button>
       <input name="attr_attack4" type="text" class="ml15" placeholder="attack/action name">
     </div>
     <div>
@@ -530,7 +566,7 @@
 
 <!-- attack5 -->
     <div class="rowflex nowrap">
-      <button name="roll_attack5" type="roll" value="&{template:default} {{name=**@{attack5}**}} {{[[d20+(@{attack5_to_hit})]]=[[d20+(@{attack5_to_hit})]]}} {{Damage=[[@{attack5_dmg}+0]]}}"></button>
+      <button name="roll_attack5" type="roll" value="&{template:stargate} {{title=@{attack5}}} {{subtitle=@{character_name} }} {{[[d20+(@{attack5_to_hit})]]=[[d20+(@{attack5_to_hit})]]}} {{Damage=[[@{attack5_dmg}+0]]}} {{desc=@{attack5_special} }}"></button>
       <input name="attr_attack5" type="text" class="ml15" placeholder="attack/action name">
     </div>
     <div>
@@ -604,6 +640,26 @@
     <span>Sheet Config/Settings goes here</span> 
 </div>
 -->
+<!--  --------------------------------------------------------------------------------- -->
+<!--  --------------------------- ROLL TEMPLATES -------------------------------------- -->
+<!--  --------------------------------------------------------------------------------- -->
+
+<rolltemplate class="sheet-rolltemplate-stargate">
+  <div class="sheet-container sheet-color-{{color}}">
+    <div class="sheet-header">
+      {{#title}}<div class="sheet-title">{{title}}</div>{{/title}}
+      {{#subtitle}}<div class="sheet-subtitle">{{subtitle}}</div>{{/subtitle}}
+    </div>
+    <div class="sheet-content">
+      {{#allprops() title subtitle desc color}}
+      <div class="sheet-key">{{key}}</div>
+      <div class="sheet-value">{{value}}</div>
+      {{/allprops() title subtitle desc color}}
+      {{#desc}}<div class="sheet-desc">{{desc}}</div>{{/desc}}
+    </div>
+  </div>
+</rolltemplate>
+
 <!--  --------------------------------------------------------------------------------- -->
 <!--  --------------------------- Sheet workers --------------------------------------- -->
 <!--  --------------------------------------------------------------------------------- -->
@@ -743,17 +799,26 @@ on(`change:prof`, eventInfo => {
     console.log("prof change");
     let profold = int(eventInfo.previousValue);
     console.log("eventinfo: " + eventInfo.previousValue);
-    let getlist = ["acrobatics", "animalhandling", "athletics", "culture", "deception", "engineering", "history", "insight", "intimidation", "investigation", "medicine", "nature", "perception", "performance", "persuasion", "pilot", "science", "sleight", "stealth", "survival", "acrobatics_c", "animalhandling_c", "athletics_c", "culture_c", "deception_c", "engineering_c", "history_c", "insight_c", "intimidation_c", "investigation_c", "medicine_c", "nature_c", "perception_c", "performance_c", "persuasion_c", "pilot_c", "science_c", "sleight_c", "stealth_c", "survival_c", "str_save", "dex_save", "con_save", "wis_save", "int_save", "cha_save","str_save_c", "dex_save_c", "con_save_c", "wis_save_c", "int_save_c", "cha_save_c", "prof"];
+    let getlist = ["acrobatics", "animalhandling", "athletics", "culture", "deception", "engineering", "history", "insight", "intimidation", "investigation", "medicine", "nature", "perception", "performance", "persuasion", "pilot", "science", "sleight", "stealth", "survival", "acrobatics_c", "animalhandling_c", "athletics_c", "culture_c", "deception_c", "engineering_c", "history_c", "insight_c", "intimidation_c", "investigation_c", "medicine_c", "nature_c", "perception_c", "performance_c", "persuasion_c", "pilot_c", "science_c", "sleight_c", "stealth_c", "survival_c", "str_save", "dex_save", "con_save", "wis_save", "int_save", "cha_save","str_save_c", "dex_save_c", "con_save_c", "wis_save_c", "int_save_c", "cha_save_c", "prof", "determination", "determination_max"];
 
     getAttrs(getlist, values => {
 
         var update = {};
         let profnew = int(values["prof"]);
         let profdiff = profnew - profold;
+        let determination = int(values["determination"]) + profdiff;
+        let determination_max = int(values["determination_max"]) + profdiff;
 
         //manual fix for when you change proficiency for first time
         if (profnew === 3 && profold ===3)( profdiff = 1);
 
+        determination = int(values["determination"]) + profdiff;
+        determination_max = int(values["determination_max"]) + profdiff;
+        update["determination"] = determination;
+        console.log("det worked");
+        update["determination_max"] = determination_max;
+        console.log("det max worked");
+
         console.log("profold:" + profold + " profnew:" + profnew + " proffdiff: " + profdiff);
 
         let xboxlist = ["acrobatics", "animalhandling", "athletics", "culture", "deception", "engineering", "history", "insight", "intimidation", "investigation", "medicine", "nature", "perception", "performance", "persuasion", "pilot", "science", "sleight", "stealth", "survival","str_save", "dex_save", "con_save", "wis_save", "int_save", "cha_save"];
@@ -796,7 +861,7 @@ statmods.forEach(statmod => {
 
         console.log("old mod: " + oldstatmod);
 
-        let getlist = ["str_mod", "dex_mod", "con_mod", "wis_mod", "int_mod", "cha_mod", "acrobatics", "animalhandling", "athletics", "culture", "deception", "engineering", "history", "insight", "intimidation", "investigation", "medicine", "nature", "perception", "performance", "persuasion", "pilot", "science", "sleight", "stealth", "survival", "str_save", "dex_save", "con_save", "wis_save", "int_save", "cha_save", "prof", "init", "moxie", "ac", "ac_extra"];
+        let getlist = ["str_mod", "dex_mod", "con_mod", "wis_mod", "int_mod", "cha_mod", "acrobatics", "animalhandling", "athletics", "culture", "deception", "engineering", "history", "insight", "intimidation", "investigation", "medicine", "nature", "perception", "performance", "persuasion", "pilot", "science", "sleight", "stealth", "survival", "str_save", "dex_save", "con_save", "wis_save", "int_save", "cha_save", "prof", "init", "moxie", "ac", "ac_extra", "determination","determination_max"];
 
         getAttrs(getlist, values => {
 
@@ -810,7 +875,8 @@ statmods.forEach(statmod => {
                     console.log("oldstatmod: " + oldstatmod + " modnew:" + modnew + " moddiff: " + moddiff);
                     update["athletics"] = int(values["athletics"]) + moddiff;
                     update["str_save"] = int(values["str_save"]) + moddiff;
-                    
+                    update["bulk"] = 8 + modnew;
+
                     setAttrs(update);
                     break;
                 case "con_mod":