diff --git a/Stargate-RPG/Readme.md b/Stargate-RPG/Readme.md
index f0e91834fc..e958fd01f3 100644
--- a/Stargate-RPG/Readme.md
+++ b/Stargate-RPG/Readme.md
@@ -4,7 +4,7 @@ Offical Roll20 Character sheet for "Stargate RPG" by Wyvern Gaming (Full release
 
 ### Changelog
 
-**v.1.4**
+**v.1.41**
 
 * Roll buttons & hover highlight made more distinct
 * roll templates updated, now mentions character name, works better for descriptions
@@ -13,6 +13,12 @@ Offical Roll20 Character sheet for "Stargate RPG" by Wyvern Gaming (Full release
 * 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.
+* Settings-page created
+* toggle for whispering rolls to GM added
+* toggle for showing Character name in rolls created
+* Old "Ammo"-section moved to Settings-page
+* three custom rolls options added to settings page, with examples
+* max/unspent MP added
 
 Stat Additions/Removals:
 
@@ -22,7 +28,7 @@ Stat Additions/Removals:
 * (MP)Mission Points added
 * Bulk tracker
 * Small Inventory section on first page
-* Ammo trackers & `ac_extra` removed
+* `ac_extra` removed
 
 
 **v.1.2 (2020-07-28)**
diff --git a/Stargate-RPG/sheet.json b/Stargate-RPG/sheet.json
index 083eb5dfb0..6523a0573f 100644
--- a/Stargate-RPG/sheet.json
+++ b/Stargate-RPG/sheet.json
@@ -4,5 +4,46 @@
     "authors": "Andreas J.",
     "roll20userid": "1223200",
     "preview": "stargate_preview.png",
-    "instructions": "Offical character sheet for the 'Stargate RPG' by Wyvern Gaming.\n* [Character Sheet Documentation](https://wiki.roll20.net/Stargate)"
-}
\ No newline at end of file
+    "instructions": "Official character sheet for the 'Stargate RPG' by Wyvern Gaming. v.1.4\n* [Character Sheet Documentation](https://wiki.roll20.net/Stargate)",
+    "useroptions": [
+            {
+                    "attribute": "show_name",
+                    "displayname": "Show name in rolls? ",
+                    "type": "select",
+                    "options": [
+                        "Yes|{{subtitle=@{character_name} }}",
+                        "No| "
+                    ],
+                    "default": "{{subtitle=@{character_name} }}",
+                    "description": "Determine if newly created characters displayed their names in rolls by default. GMs can find useful to hide the names of NPCs in some situations. This option can be be later changed on individual sheets from the 'Settings-page.'"
+            },
+            {
+                    "attribute": "whisper",
+                    "displayname": "Whisper Rolls to GM?",
+                    "type": "checkbox",
+                    "value": "/w gm",
+                    "description": "Determine if newly created characters only shows their rolls to the GM by default. Players and GMs can sometime find it useful to hide a roll from the other players if a secret roll needs to be made. This option can be be later changed on individual sheets from the 'Settings-page.'"
+            },
+            {
+                    "attribute": "campaign",
+                    "displayname": "Camapign Name: ",
+                    "type": "text",
+                    "value": "",
+                    "description": "Writes the campaign name on newly created character sheets."
+            },
+            {
+                    "attribute": "td",
+                    "displayname": "Tension die?",
+                    "type": "select",
+                    "options": [
+                        "d4|d4",
+                        "d6|d6",
+                        "d8|d8",
+                        "d10|d10",
+                        "d12|d12"
+                    ],
+                    "default": "d6",
+                    "description": "Determine what the Tension Die is for newly created character."
+            }
+        ]
+}
diff --git a/Stargate-RPG/stargate.css b/Stargate-RPG/stargate.css
index ca4304325c..fbb338055d 100644
--- a/Stargate-RPG/stargate.css
+++ b/Stargate-RPG/stargate.css
@@ -129,14 +129,14 @@ input[type="number"].sheet-stat{
   font-weight: bold;
 }
 
-/* highlights empty fields with light gray */
+/* highlights empty fields with light pink, if the fields have placeholder text */
 textarea:placeholder-shown,
 input[type="text"]:placeholder-shown,
 input[type="number"]:placeholder-shown{
   background-color: #EAC9D1;
 }
 
-/* higlight selected input */
+/* higlight selected input with gray*/
 textarea:focus,
 input[type="text"]:focus,
 input[type="number"]:focus{
@@ -188,7 +188,7 @@ button[type="roll"].sheet-txt-btn:hover{
 
 .sheet-version{
   float: left;
-  margin-top: -85px;
+  margin-top: -114px;
   width: 240px;
   margin-left: 550px;
   display: flex;
@@ -232,20 +232,7 @@ button[type="roll"].sheet-txt-btn:hover{
 }
 
 
-/* Tabs */
 
-.sheet-character,
-.sheet-journal,
-.sheet-config{
-  display: none;
-}
-
-/* show the selected tab */
-.sheet-tabstoggle[value="character"] ~ div.sheet-character,
-.sheet-tabstoggle[value="journal"] ~ div.sheet-journal,
-.sheet-tabstoggle[value="configuration"] ~ div.sheet-config{
-  display: grid;
-}
 
 
 /* ------------ PAGES ---------- */
@@ -268,7 +255,7 @@ div.sheet-page1 {
   background-size: 700px 700px;
   background-position: center;
   background-color: black;
-  margin-top: -52px;
+  margin-top: -84px;
 }
 
 div.sheet-page2 {
@@ -285,15 +272,27 @@ div.sheet-page2 {
   background-size: 700px 700px;
   background-position: center;
   background-color: black;
-  margin-top: -52px;
+  margin-top: -84px;
   grid-gap: 10px;
   padding: 5px;
 }
 
-div.sheet-config {
+div.sheet-page3 {
   display: grid;
-  width: 50px;
-  height: 1000px;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows:    1fr 1fr;
+  grid-template-areas:"settings changelog"
+                      "ammo     changelog";
+  width: 840px;
+  height: 990px;
+  background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Stargate-RPG/images/bg.png);
+  background-repeat: no-repeat;
+  background-size: 700px 700px;
+  background-position: center;
+  background-color: black;
+  margin-top: -84px;
+  grid-gap: 10px;
+  padding: 5px;
 }
 
 /* ------------ Section Specific ---------- */
@@ -611,26 +610,6 @@ div.sheet-inventory textarea{
   margin-bottom: 0px;
 }
 
-/* ammo SECTION */
-
-div.sheet-ammo.sheet-grid{
-  grid-area:ammo;
-  display: grid;
-  grid-gap: 8px;
-  grid-template-columns: 1fr 1fr;
-  grid-template-rows: 1fr 1fr;
-  padding: 5px 20px 5px 0px;
-}
-
-div.sheet-ammo label{
-  text-align: center;
-  padding: 0px 0px 5px 0px;
-}
-
-div.sheet-ammo div{
-  margin: 7px 1px 7px 1px;
-}
-
 
 /* attacks SECTION */
 
@@ -647,7 +626,7 @@ div.sheet-attacks label{
 }
 
 div.sheet-attacks .sheet-name{
-  padding-left: 65px;
+  padding-left: 42px;
 }
 
 div.sheet-attacks .sheet-dmg-type{
@@ -695,10 +674,70 @@ div.sheet-page2 textarea{
   margin-bottom: 0px;
 }
 
+
+/*  -------- Page 3 -------- */
+
+div.sheet-page3 .sheet-settings label,
+div.sheet-page3 .sheet-changelog label{
+  font-size: 1.4em;
+  font-weight: bold;
+  text-align: center;
+  width: 250px;
+}
+
+
+/* Settings Section */
+
+div.sheet-settings{
+  grid-area:settings;
+}
+
+div.sheet-settings select{
+  width: 60px;
+}
+
+div.sheet-settings div{
+  padding: 10px;
+}
+
+div.sheet-settings span{
+  font-size: 1.3em;
+  margin-right: 10px;
+}
+
+/* Changelog Section */
+
+div.sheet-changelog{
+  grid-area:changelog;
+}
+
+/* ammo SECTION */
+
+div.sheet-ammo.sheet-grid{
+  grid-area:ammo;
+  display: grid;
+  grid-gap: 8px;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+  padding: 5px 20px 5px 0px;
+}
+
+div.sheet-ammo label{
+  text-align: center;
+  padding: 0px 0px 5px 0px;
+}
+
+div.sheet-ammo div{
+  margin: 7px 1px 7px 1px;
+}
+
+
+
 /*  ------------ Tabs ---------- */
 
 input.sheet-tab1:checked ~ div.sheet-tab1,
-input.sheet-tab2:checked ~ div.sheet-tab2{
+input.sheet-tab2:checked ~ div.sheet-tab2,
+input.sheet-tab3:checked ~ div.sheet-tab3{
   display: grid;
 }
 
@@ -742,10 +781,35 @@ input.sheet-tab2 + span::before{
   left: 263px;
 }
 
+
+input.sheet-tab3 + span::before{
+  left: 419px;
+}
+
 div.sheet-tab-content{
   display: none;
 }
 
+
+/* Tabs */
+
+/* 
+.sheet-character,
+.sheet-journal,
+.sheet-config{
+  display: none;
+}
+
+/* show the selected tab */
+/* 
+.sheet-tabstoggle[value="character"] ~ div.sheet-character,
+.sheet-tabstoggle[value="journal"] ~ div.sheet-journal,
+.sheet-tabstoggle[value="configuration"] ~ div.sheet-config{
+  display: grid;
+}
+*/
+
+
 /*------------------------------------*\
   #ROLL TEMPLATES
 \*------------------------------------*/
diff --git a/Stargate-RPG/stargate.html b/Stargate-RPG/stargate.html
index c0b0fe0122..3554cbdf3f 100644
--- a/Stargate-RPG/stargate.html
+++ b/Stargate-RPG/stargate.html
@@ -1,16 +1,8 @@
 <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" style="top: -56px;left: 235px;" ><span title="Background"></span>
+<input type="radio" name="attr_tab" class="tab tab3" value="3" style="top: -88px;left: 392px;" ><span title="Settings"></span>
 
 <span class="version bold">Sheet Version: 1.4</span>
-<!--  
-<span class="version bold">
-  <span>HP:</span>
-  <div>
-    <input name="attr_range" class="rangetest" type="range" min="0" max="10" value="5">
-  </div>
-  <input name="attr_range" class="rangetest" type="number" value="5">
-</span>
--->
 
 <!-- 
 <div>
@@ -31,7 +23,7 @@
     <div class="rowflex nowrap spaced">
 
       <div class="columnflex nowrap">
-        <label>Char name</label>
+        <label style="width:100px;">Character name</label>
         <input name="attr_character_name" type="text">
       </div>
       <div class="columnflex nowrap">
@@ -90,32 +82,32 @@
 
   <div class="attr columnflex nowrap spaced center">
     <div class="stat columnflex nowrap center middle">
-      <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>
+      <button name="roll_str" type="roll" value="@{whisper}&{template:stargate} {{title=Strength Check}} @{show_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:stargate} {{title=Dexterity Check}} {{subtitle=@{character_name} }} {{[[d20+(@{dex_mod})]]=[[d20+(@{dex_mod})]]}}" class="txt-btn large">DEX</button>
+      <button name="roll_dex" type="roll" value="@{whisper}&{template:stargate} {{title=Dexterity Check}} @{show_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:stargate} {{title=Constitution Check}} {{subtitle=@{character_name} }} {{[[d20+(@{con_mod})]]=[[d20+(@{con_mod})]]}}" class="txt-btn large">CON</button>
+      <button name="roll_con" type="roll" value="@{whisper}&{template:stargate} {{title=Constitution Check}} @{show_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:stargate} {{title=Intelligence Check}} {{subtitle=@{character_name} }} {{[[d20+(@{int_mod})]]=[[d20+(@{int_mod})]]}}" class="txt-btn large">INT</button>
+      <button name="roll_int" type="roll" value="@{whisper}&{template:stargate} {{title=Intelligence Check}} @{show_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:stargate} {{title=Wisdom Check}} {{subtitle=@{character_name} }} {{[[d20+(@{wis_mod})]]=[[d20+(@{wis_mod})]]}}" class="txt-btn large">WIS</button>
+      <button name="roll_wis" type="roll" value="@{whisper}&{template:stargate} {{title=Wisdom Check}} @{show_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:stargate} {{title=Charisma Check}} {{subtitle=@{character_name} }} {{[[d20+(@{cha_mod})]]=[[d20+(@{cha_mod})]]}}" class="txt-btn large">CHA</button>
+      <button name="roll_cha" type="roll" value="@{whisper}&{template:stargate} {{title=Charisma Check}} @{show_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>
@@ -131,70 +123,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:stargate} {{title=Acrobatics Check}} {{subtitle=@{character_name} }} {{[[d20+(@{acrobatics})]]=[[d20+(@{acrobatics})]]}}">Acrobatics</button>
+      <button name="roll_acrobatics" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Acrobatics Check}} @{show_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:stargate} {{title=Animal Handling Check}} {{subtitle=@{character_name} }} {{[[d20+(@{animalhandling})]]=[[d20+(@{animalhandling})]]}}">Animal Handling</button>
+      <button name="roll_animalhandling" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Animal Handling Check}} @{show_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:stargate} {{title=Athletics Check}} {{subtitle=@{character_name} }} {{[[d20+(@{athletics})]]=[[d20+(@{athletics})]]}}">Athletics</button>
+      <button name="roll_athletics" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Athletics Check}} @{show_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:stargate} {{title=Culture Check}} {{subtitle=@{character_name} }} {{[[d20+(@{culture})]]=[[d20+(@{culture})]]}}">Culture</button>
+      <button name="roll_culture" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Culture Check}} @{show_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:stargate} {{title=Deception Check}} {{subtitle=@{character_name} }} {{[[d20+(@{deception})]]=[[d20+(@{deception})]]}}">Deception</button>
+      <button name="roll_deception" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Deception Check}} @{show_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:stargate} {{title=Engineering Check}} {{subtitle=@{character_name} }} {{[[d20+(@{engineering})]]=[[d20+(@{engineering})]]}}">engineering</button>
+      <button name="roll_engineering" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Engineering Check}} @{show_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:stargate} {{title=History Check}} {{subtitle=@{character_name} }} {{[[d20+(@{history})]]=[[d20+(@{history})]]}}">history</button>
+      <button name="roll_history" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=History Check}} @{show_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:stargate} {{title=Insight Check}} {{subtitle=@{character_name} }} {{[[d20+(@{insight})]]=[[d20+(@{insight})]]}}">insight</button>
+      <button name="roll_insight" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Insight Check}} @{show_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:stargate} {{title=Intimidation Check}} {{subtitle=@{character_name} }} {{[[d20+(@{intimidation})]]=[[d20+(@{intimidation})]]}}">intimidation</button>
+      <button name="roll_intimidation" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Intimidation Check}} @{show_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:stargate} {{title=Investigation Check}} {{subtitle=@{character_name} }} {{[[d20+(@{investigation})]]=[[d20+(@{investigation})]]}}">investigation</button>
+      <button name="roll_investigation" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Investigation Check}} @{show_name} {{[[d20+(@{investigation})]]=[[d20+(@{investigation})]]}}">investigation</button>
       <span>(int)</span>
     </div>
 
@@ -203,70 +195,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:stargate} {{title=medicine Check}} {{subtitle=@{character_name} }} {{[[d20+(@{medicine})]]=[[d20+(@{medicine})]]}}">medicine</button>
+      <button name="roll_medicine" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=medicine Check}} @{show_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:stargate} {{title=nature Check}} {{subtitle=@{character_name} }} {{[[d20+(@{nature})]]=[[d20+(@{nature})]]}}">nature</button>
+      <button name="roll_nature" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=nature Check}} @{show_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:stargate} {{title=perception Check}} {{subtitle=@{character_name} }} {{[[d20+(@{perception})]]=[[d20+(@{perception})]]}}">perception</button>
+      <button name="roll_perception" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=perception Check}} @{show_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:stargate} {{title=performance Check}} {{subtitle=@{character_name} }} {{[[d20+(@{performance})]]=[[d20+(@{performance})]]}}">performance</button>
+      <button name="roll_performance" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=performance Check}} @{show_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:stargate} {{title=Persuasion Check}} {{subtitle=@{character_name} }} {{[[d20+(@{persuasion})]]=[[d20+(@{persuasion})]]}}">persuasion</button>
+      <button name="roll_persuasion" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Persuasion Check}} @{show_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:stargate} {{title=pilot Check}} {{subtitle=@{character_name} }} {{[[d20+(@{pilot})]]=[[d20+(@{pilot})]]}}">pilot</button>
+      <button name="roll_pilot" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=pilot Check}} @{show_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:stargate} {{title=science Check}} {{subtitle=@{character_name} }} {{[[d20+(@{science})]]=[[d20+(@{science})]]}}">science</button>
+      <button name="roll_science" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=science Check}} @{show_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:stargate} {{title=Sleight of Hand Check}} {{subtitle=@{character_name} }} {{[[d20+(@{sleight})]]=[[d20+(@{sleight})]]}}">Sleight of Hand</button>
+      <button name="roll_sleight" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=Sleight of Hand Check}} @{show_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:stargate} {{title=stealth Check}} {{subtitle=@{character_name} }} {{[[d20+(@{stealth})]]=[[d20+(@{stealth})]]}}">stealth</button>
+      <button name="roll_stealth" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=stealth Check}} @{show_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:stargate} {{title=survival Check}} {{subtitle=@{character_name} }} {{[[d20+(@{survival})]]=[[d20+(@{survival})]]}}">survival</button>
+      <button name="roll_survival" type="roll" class="txt-btn" value="@{whisper}&{template:stargate} {{title=survival Check}} @{show_name} {{[[d20+(@{survival})]]=[[d20+(@{survival})]]}}">survival</button>
       <span>(wis)</span>
     </div>
 
@@ -339,11 +331,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:stargate} {{title=Initiative}} {{subtitle=@{character_name} }} {{ Roll =[[d20+(@{init}) &{tracker}]]}}" class="txt-btn">Initiative</button>
+      <button name="roll_init" type="roll" value="@{whisper}&{template:stargate} {{title=Initiative}} @{show_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:stargate} {{title=Moxie}} {{subtitle=@{character_name} }} {{ Roll =[[d20+(@{moxie}) &{tracker}]]}}" class="txt-btn" title="Social Initiative" >Moxie</button>
+      <button name="roll_moxie" type="roll" value="@{whisper}&{template:stargate} {{title=Moxie}} @{show_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>
@@ -375,7 +367,7 @@
       <input name="attr_speed" type="text" value="6m" class="w70 stat">
     </div>
     <div class="section death columnflex nowrap middle center">
-      <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>
+      <button name="roll_deathsave" type="roll" value="@{whisper}&{template:stargate} {{color=black}} {{title=Death Save}} @{show_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">
@@ -399,32 +391,32 @@
     <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:stargate} {{title=Strength Save}} {{subtitle=@{character_name} }} {{[[d20+(@{str_save})]]=[[d20+(@{str_save})]]}}">Strength</button>
+      <button name="roll_str_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Strength Save}} @{show_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:stargate} {{title=Dexterity Save}} {{subtitle=@{character_name} }} {{[[d20+(@{dex_save})]]=[[d20+(@{dex_save})]]}}">Dexterity</button>
+      <button name="roll_dex_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Dexterity Save}} @{show_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:stargate} {{title=Constitution Save}} {{subtitle=@{character_name} }} {{[[d20+(@{con_save})]]=[[d20+(@{con_save})]]}}">Constitution</button>
+      <button name="roll_con_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Constitution Save}} @{show_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:stargate} {{title=Intelligence Save}} {{subtitle=@{character_name} }} {{[[d20+(@{int_save})]]=[[d20+(@{int_save})]]}}">Intelligence</button>
+      <button name="roll_int_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Intelligence Save}} @{show_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:stargate} {{title=Wisdom Save}} {{subtitle=@{character_name} }} {{[[d20+(@{wis_save})]]=[[d20+(@{wis_save})]]}}">Wisdom</button>
+      <button name="roll_wis_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Wisdom Save}} @{show_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:stargate} {{title=Charisma Save}} {{subtitle=@{character_name} }} {{[[d20+(@{cha_save})]]=[[d20+(@{cha_save})]]}}">Charisma</button>
+      <button name="roll_cha_save" type="roll" class="txt-btn" value=" &{template:stargate} {{title=Charisma Save}} @{show_name} {{[[d20+(@{cha_save})]]=[[d20+(@{cha_save})]]}}">Charisma</button>
     </div>
   </div>
 
@@ -438,26 +430,7 @@
 
 <!-- ammo -->
 
-<!--  
-  <div class="ammo grid">
-    <div class="section columnflex nowrap middle center">
-      <label>Ammo Weapon 1</label>
-      <input name="attr_ammo1" type="number" value="0">
-    </div>
-    <div class="section columnflex nowrap middle center">
-      <label>Ammo Weapon 2</label>
-      <input name="attr_ammo2" type="number" value="0">
-    </div>
-    <div class="section columnflex nowrap middle center">
-      <label>Ammo Weapon 3</label>
-      <input name="attr_ammo3" type="number" value="0">
-    </div>
-    <div class="section columnflex nowrap middle center">
-      <label>Ammo Weapon 4</label>
-      <input name="attr_ammo4" type="number" value="0">
-    </div>
-  </div>
--->
+
 
 <!-- inventory mini -->
 
@@ -469,18 +442,18 @@
 <!-- attacks -->
 
   <div class="attacks section">
-    <span class="name bold">Attack name</span>
+    <span class="name bold">Attack/Action Name</span>
     <span class="bold">to hit</span>
     <span class="bold pl20">dmg</span>
     <span class="bold dmg-type">type</span>
     <span class="bold">range</span>
-    <span class="bold">reload</span>
+    <span class="bold">Cap/Reload</span>
     <span class="bold pl20">special</span>
 
 <!-- attack1 -->
     <div class="rowflex nowrap">
-      <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">
+      <button name="roll_attack1" type="roll" value="@{whisper}&{template:stargate} {{title=@{attack1}}} @{show_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="Sidearm(Beretta M9)">
     </div>
     <div>
       <input name="attr_attack1_to_hit" type="text" class="w40" placeholder="4">
@@ -489,13 +462,13 @@
       <input name="attr_attack1_dmg" type="text" class="w70 mr15" placeholder="1d6">
     </div>
     <div>
-      <input name="attr_attack1_dmgtype" type="text" class="w50">
+      <input name="attr_attack1_dmgtype" type="text" class="w50" placeholder="piercing">
     </div>
     <div>
-      <input name="attr_attack1_range" type="text" class="w50">
+      <input name="attr_attack1_range" type="text" class="w50" placeholder="50/100">
     </div>
     <div>
-      <input name="attr_attack1_reload" type="text" class="w50">
+      <input name="attr_attack1_reload" type="text" class="w50" placeholder="15/1">
     </div>
     <div>
       <input name="attr_attack1_special" type="text" class="w110 mr15">
@@ -503,7 +476,7 @@
 
 <!-- attack2 -->
     <div class="rowflex nowrap">
-      <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>
+      <button name="roll_attack2" type="roll" value="@{whisper}&{template:stargate} {{title=@{attack2}}} @{show_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>
@@ -527,7 +500,7 @@
 
 <!-- attack3 -->
     <div class="rowflex nowrap">
-      <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>
+      <button name="roll_attack3" type="roll" value="@{whisper}&{template:stargate} {{title=@{attack3}}} @{show_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>
@@ -551,7 +524,7 @@
 
 <!-- attack4 -->
     <div class="rowflex nowrap">
-      <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>
+      <button name="roll_attack4" type="roll" value="@{whisper}&{template:stargate} {{title=@{attack4}}} @{show_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>
@@ -575,7 +548,7 @@
 
 <!-- attack5 -->
     <div class="rowflex nowrap">
-      <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>
+      <button name="roll_attack5" type="roll" value="@{whisper}&{template:stargate} {{title=@{attack5}}} @{show_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>
@@ -606,7 +579,7 @@
 <!--  --------------------------------------------------------------------------------- -->
 <div class="tab-content tab2 page2">
 
-  <div class="section racial_abilities columnflex nowra center">
+  <div class="section racial_abilities columnflex nowrap center">
     <label>Racial Abilities</label>
     <textarea name="attr_racial"></textarea>
   </div>
@@ -643,12 +616,96 @@
 <!--  --------------------------- PAGE 3 ---------------------------------------------- -->
 <!--  --------------------------------------------------------------------------------- -->
 
-<!--
-<div class="sheet-config">
-    <h2>Config/Settings</h2>
-    <span>Sheet Config/Settings goes here</span> 
+
+<div class="tab-content tab3 page3">
+
+  <div class="section settings columnflex nowrap center">
+    <label>Settings</label>
+
+    <div class="rowflex nowrap">
+      <span>Whisper rolls?</span>
+      <input name="attr_whisper" type="checkbox" value="/w gm">
+    </div>
+    <div class="rowflex nowrap">
+      <span>Show name in rolls?</span>
+      <select name="attr_show_name">
+        <option value="{{subtitle=@{character_name} }}">Yes</option>
+        <option value=" ">No</option>
+      </select>
+    </div>
+    <div class="rowflex nowrap">
+      <span>Mission Points(MP):</span>
+      <input name="attr_mp" type="number" placeholder="" title="Mission Points" class="w40">
+      /
+      <input name="attr_mp_max" type="number" placeholder="" title="Total Mission Points" class="w40">
+    </div>
+    <div class="rowflex nowrap">
+      <span>Custom roll</span>
+    </div>
+    <div class="rowflex nowrap">
+      <button name="roll_custom1" type="roll" value="@{whisper}@{custom1}"></button>
+      <input type="text" name="attr_custom1" value="&{template:stargate} {{color=green}} {{title=Heal}} @{show_name}  {{Healing=[[2d6+@{wis}]]}} {{desc=Heals someone with a medic kit. }}">
+    </div>
+    <div class="rowflex nowrap">
+      <button name="roll_custom2" type="roll" value="@{whisper}@{custom2}"></button>
+      <input type="text" name="attr_custom2" value="&{template:stargate} {{color=white}} {{title=Scientific Discovery}} @{show_name}  {{DC=[[8+@{wis}+@{prof}]] Wisdom or Intelligence Save}} {{desc=Archeologist: As an action you can cause a target emotional and mental distress by using cultural taboos against them. If the target fails a Wisdom save (DC 8+ Intelligence modifier + Proficiency Bonus) you may spend a number of Eureka points. The target is stunned for a number of rounds equal to the Eureka points spent. A target that passes its save is immune to this ability for 24 hours (and possibly very upset). }}">
+    </div>
+    <div class="rowflex nowrap">
+      <button name="roll_custom3" type="roll" value="@{whisper}@{custom3}"></button>
+      <input type="text" name="attr_custom3" value="&{template:stargate} {{color=white}} {{title=Tension Die (@{td})}} @{show_name}  {{Roll=[[@{td}]]}} {{desc=Rolls the cuyrrent tension die. }}">
+    </div>
+  </div>
+
+  <div class="section changelog columnflex nowrap center">
+    <label>Changelog v.1.41</label>
+    <span>* Roll buttons & hover highlight made more distinct<br>
+      * roll templates updated, now mentions character name, works better for descriptions<br>
+      * Init & moxie now rolls only once<br>
+      * 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<br>
+      * Skills set as default to zero<br>
+      * Default speed set to 6m, deafult HP removed.<br>
+      * Important fields that need to be filled out, are higlighted in red while empty<br>
+      * Settings-page created, toggle for whispering rolls to GM added<br>
+      * toggle for showing Chracter name in rolls created<br>
+      * Old Ammo section moved to Settings-page<br>
+      * three custom rolls options added to settings page, with examples<br>
+      * max/unspent MP added<br>
+    </span>
+    <br>
+    <label>Stat Additions/Removals:</label>
+    <br>
+<span>* determination now have a max value, moved next to AC<br>
+* `hp_temp` added, next to `hp`<br>
+* Tension die added, can be added to rolls with `@{td}`<br>
+* (MP)Mission Points added<br>
+* Bulk tracker<br>
+* Small Inventory section on first page<br>
+* `ac_extra` removed<br>
+</span>
+  </div>
+
+  
+  <div class="ammo grid">
+    <div class="section columnflex nowrap middle center">
+      <label>Ammo Weapon 1</label>
+      <input name="attr_ammo1" type="number" value="0">
+    </div>
+    <div class="section columnflex nowrap middle center">
+      <label>Ammo Weapon 2</label>
+      <input name="attr_ammo2" type="number" value="0">
+    </div>
+    <div class="section columnflex nowrap middle center">
+      <label>Ammo Weapon 3</label>
+      <input name="attr_ammo3" type="number" value="0">
+    </div>
+    <div class="section columnflex nowrap middle center">
+      <label>Ammo Weapon 4</label>
+      <input name="attr_ammo4" type="number" value="0">
+    </div>
+  </div>
+
 </div>
--->
+
 <!--  --------------------------------------------------------------------------------- -->
 <!--  --------------------------- ROLL TEMPLATES -------------------------------------- -->
 <!--  --------------------------------------------------------------------------------- -->