From 49777ad2f3d4869ebdb536a93db70153c87f566f Mon Sep 17 00:00:00 2001
From: Spirito35 <spirito35220@gmail.com>
Date: Sat, 7 Jun 2025 16:29:35 +0200
Subject: [PATCH] Major Update, fix RollTemplate

---
 .../Gundam-Mobile-Suit-RPG.html               | 254 +++++++++---------
 1 file changed, 127 insertions(+), 127 deletions(-)

diff --git a/Gundam-Mobile-Suit-RPG/Gundam-Mobile-Suit-RPG.html b/Gundam-Mobile-Suit-RPG/Gundam-Mobile-Suit-RPG.html
index 5929139a80..4d573ced36 100644
--- a/Gundam-Mobile-Suit-RPG/Gundam-Mobile-Suit-RPG.html
+++ b/Gundam-Mobile-Suit-RPG/Gundam-Mobile-Suit-RPG.html
@@ -1,7 +1,7 @@
 <!-- Custom Character Sheet ordered by BattleInc -->
 <!-- Made by Spirito, www.spirito.fr, Spirito#6973, spirito35220@gmail.com -->
 
-<rolltemplate class="sheet-rolltemplate-battleinc">
+<rolltemplate class="sheet-rolltemplate-gundam">
   <div class="sheet-template-header sheet-bloc-header">
     <div class="sheet-header-bloc">
       <span class="sheet-headerstyle1">{{name}}</span>
@@ -118,7 +118,7 @@
   </div>
 </rolltemplate>
 
-<rolltemplate class="sheet-rolltemplate-battleinc-description">
+<rolltemplate class="sheet-rolltemplate-gundam-description">
   <div class="sheet-template-header sheet-bloc-header">
     {{#name}}<span class="sheet-headerstyle1">{{name}}</span>{{/name}} {{#source}}<span class="sheet-headerstyle2">{{source}}</span>{{/source}} {{#description}}
     <div id="Description Table" class="sheet-description">{{description}}</div>
@@ -313,7 +313,7 @@
         <div class="sheet-standardbox sheet-standardbox3">
           <div class="sheet-oneline">
             <div class="sheet-button-div-holder">
-              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:battleinc} {{name=Strength}} {{roll=[[1d20+@{str}]]}} {{roll1=[[1d20+@{str}]]}} {{roll2=[[1d20+@{str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
+              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:gundam} {{name=Strength}} {{roll=[[1d20+@{str}]]}} {{roll1=[[1d20+@{str}]]}} {{roll2=[[1d20+@{str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
               <h3>STR</h3>
             </div>
             <input class="sheet-inputchar" type="number" value="0" name="attr_str" readonly />
@@ -325,7 +325,7 @@
         <div class="sheet-standardbox sheet-standardbox3">
           <div class="sheet-oneline">
             <div class="sheet-button-div-holder">
-              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:battleinc} {{name=Dexterity}} {{roll=[[1d20+@{dex}]]}} {{roll1=[[1d20+@{dex}]]}} {{roll2=[[1d20+@{dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
+              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:gundam} {{name=Dexterity}} {{roll=[[1d20+@{dex}]]}} {{roll1=[[1d20+@{dex}]]}} {{roll2=[[1d20+@{dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
               <h3>DEX</h3>
             </div>
             <input class="sheet-inputchar" type="number" value="0" name="attr_dex" readonly />
@@ -337,7 +337,7 @@
         <div class="sheet-standardbox sheet-standardbox3">
           <div class="sheet-oneline">
             <div class="sheet-button-div-holder">
-              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:battleinc} {{name=Constitution}} {{roll=[[1d20+@{con}]]}} {{roll1=[[1d20+@{con}]]}} {{roll2=[[1d20+@{con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
+              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:gundam} {{name=Constitution}} {{roll=[[1d20+@{con}]]}} {{roll1=[[1d20+@{con}]]}} {{roll2=[[1d20+@{con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
               <h3>CON</h3>
             </div>
             <input class="sheet-inputchar" type="number" value="0" name="attr_con" readonly />
@@ -349,7 +349,7 @@
         <div class="sheet-standardbox sheet-standardbox3">
           <div class="sheet-oneline">
             <div class="sheet-button-div-holder">
-              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:battleinc} {{name=Intelligence}} {{roll=[[1d20+@{int}]]}} {{roll1=[[1d20+@{int}]]}} {{roll2=[[1d20+@{int}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
+              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:gundam} {{name=Intelligence}} {{roll=[[1d20+@{int}]]}} {{roll1=[[1d20+@{int}]]}} {{roll2=[[1d20+@{int}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
               <h3>INT</h3>
             </div>
             <input class="sheet-inputchar" type="number" value="0" name="attr_int" readonly />
@@ -361,7 +361,7 @@
         <div class="sheet-standardbox sheet-standardbox3">
           <div class="sheet-oneline">
             <div class="sheet-button-div-holder">
-              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:battleinc} {{name=Wisdom}} {{roll=[[1d20+@{wis}]]}} {{roll1=[[1d20+@{wis}]]}} {{roll2=[[1d20+@{wis}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
+              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:gundam} {{name=Wisdom}} {{roll=[[1d20+@{wis}]]}} {{roll1=[[1d20+@{wis}]]}} {{roll2=[[1d20+@{wis}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
               <h3>WIS</h3>
             </div>
             <input class="sheet-inputchar" type="number" value="0" name="attr_wis" readonly />
@@ -373,7 +373,7 @@
         <div class="sheet-standardbox sheet-standardbox3">
           <div class="sheet-oneline">
             <div class="sheet-button-div-holder">
-              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:battleinc} {{name=Charisma}} {{roll=[[1d20+@{cha}]]}} {{roll1=[[1d20+@{cha}]]}} {{roll2=[[1d20+@{cha}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
+              <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:gundam} {{name=Charisma}} {{roll=[[1d20+@{cha}]]}} {{roll1=[[1d20+@{cha}]]}} {{roll2=[[1d20+@{cha}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Statistics}}"></button>
               <h3>CHA</h3>
             </div>
             <input class="sheet-inputchar" type="number" value="0" name="attr_cha" readonly />
@@ -452,7 +452,7 @@
               <input type="checkbox" value="1" name="attr_saving_str_active" />
               <input type="number" step="0.01" value="0" name="attr_saving_str_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_saving_str" value="@{global-privacy-status} &{template:battleinc} {{name=Strength Save}} {{roll=[[1d20+@{saving_str_value}]]}} {{roll1=[[1d20+@{saving_str_value}]]}} {{roll2=[[1d20+@{saving_str_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_saving_str" value="@{global-privacy-status} &{template:gundam} {{name=Strength Save}} {{roll=[[1d20+@{saving_str_value}]]}} {{roll1=[[1d20+@{saving_str_value}]]}} {{roll2=[[1d20+@{saving_str_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
                 <h4>Save&nbsp;Strength</h4>
               </div>
             </div>
@@ -462,7 +462,7 @@
               <input type="checkbox" value="1" name="attr_saving_dex_active" />
               <input type="number" step="0.01" value="0" name="attr_saving_dex_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_saving_dex" value="@{global-privacy-status} &{template:battleinc} {{name=Dexterity Save}} {{roll=[[1d20+@{saving_dex_value}]]}} {{roll1=[[1d20+@{saving_dex_value}]]}} {{roll2=[[1d20+@{saving_dex_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_saving_dex" value="@{global-privacy-status} &{template:gundam} {{name=Dexterity Save}} {{roll=[[1d20+@{saving_dex_value}]]}} {{roll1=[[1d20+@{saving_dex_value}]]}} {{roll2=[[1d20+@{saving_dex_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
                 <h4>Save&nbsp;Dexterity</h4>
               </div>
             </div>
@@ -472,7 +472,7 @@
               <input type="checkbox" value="1" name="attr_saving_con_active" />
               <input type="number" step="0.01" value="0" name="attr_saving_con_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_saving_con" value="@{global-privacy-status} &{template:battleinc} {{name=Constitution Save}} {{roll=[[1d20+@{saving_con_value}]]}} {{roll1=[[1d20+@{saving_con_value}]]}} {{roll2=[[1d20+@{saving_con_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_saving_con" value="@{global-privacy-status} &{template:gundam} {{name=Constitution Save}} {{roll=[[1d20+@{saving_con_value}]]}} {{roll1=[[1d20+@{saving_con_value}]]}} {{roll2=[[1d20+@{saving_con_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
                 <h4>Save&nbsp;Constitution</h4>
               </div>
             </div>
@@ -482,7 +482,7 @@
               <input type="checkbox" value="1" name="attr_saving_int_active" />
               <input type="number" step="0.01" value="0" name="attr_saving_int_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_saving_int" value="@{global-privacy-status} &{template:battleinc} {{name=Intelligence Save}} {{roll=[[1d20+@{saving_int_value}]]}} {{roll1=[[1d20+@{saving_int_value}]]}} {{roll2=[[1d20+@{saving_int_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_saving_int" value="@{global-privacy-status} &{template:gundam} {{name=Intelligence Save}} {{roll=[[1d20+@{saving_int_value}]]}} {{roll1=[[1d20+@{saving_int_value}]]}} {{roll2=[[1d20+@{saving_int_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
                 <h4>Save&nbsp;Intelligence</h4>
               </div>
             </div>
@@ -492,7 +492,7 @@
               <input type="checkbox" value="1" name="attr_saving_wis_active" />
               <input type="number" step="0.01" value="0" name="attr_saving_wis_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_saving_wis" value="@{global-privacy-status} &{template:battleinc} {{name=Wisdom Save}} {{roll=[[1d20+@{saving_wis_value}]]}} {{roll1=[[1d20+@{saving_wis_value}]]}} {{roll2=[[1d20+@{saving_wis_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_saving_wis" value="@{global-privacy-status} &{template:gundam} {{name=Wisdom Save}} {{roll=[[1d20+@{saving_wis_value}]]}} {{roll1=[[1d20+@{saving_wis_value}]]}} {{roll2=[[1d20+@{saving_wis_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
                 <h4>Save&nbsp;Wisdom</h4>
               </div>
             </div>
@@ -502,7 +502,7 @@
               <input type="checkbox" value="1" name="attr_saving_cha_active" />
               <input type="number" step="0.01" value="0" name="attr_saving_cha_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_saving_cha" value="@{global-privacy-status} &{template:battleinc} {{name=Charisma Save}} {{roll=[[1d20+@{saving_cha_value}]]}} {{roll1=[[1d20+@{saving_cha_value}]]}} {{roll2=[[1d20+@{saving_cha_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_saving_cha" value="@{global-privacy-status} &{template:gundam} {{name=Charisma Save}} {{roll=[[1d20+@{saving_cha_value}]]}} {{roll1=[[1d20+@{saving_cha_value}]]}} {{roll2=[[1d20+@{saving_cha_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Save}}"></button>
                 <h4>Save&nbsp;Charisma</h4>
               </div>
             </div>
@@ -552,7 +552,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_athletics_value" />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_athletics" value="@{global-privacy-status} &{template:battleinc} {{name=Athletics}} {{roll=[[1d20+@{athletics_value}]]}} {{roll1=[[1d20+@{athletics_value}]]}} {{roll2=[[1d20+@{athletics_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_athletics" value="@{global-privacy-status} &{template:gundam} {{name=Athletics}} {{roll=[[1d20+@{athletics_value}]]}} {{roll1=[[1d20+@{athletics_value}]]}} {{roll2=[[1d20+@{athletics_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Athletics</h4>
               </div>
             </div>
@@ -571,7 +571,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_acrobatics_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_acrobatics" value="@{global-privacy-status} &{template:battleinc} {{name=Acrobatics}} {{roll=[[1d20+@{acrobatics_value}]]}} {{roll1=[[1d20+@{acrobatics_value}]]}} {{roll2=[[1d20+@{acrobatics_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_acrobatics" value="@{global-privacy-status} &{template:gundam} {{name=Acrobatics}} {{roll=[[1d20+@{acrobatics_value}]]}} {{roll1=[[1d20+@{acrobatics_value}]]}} {{roll2=[[1d20+@{acrobatics_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Acrobatics</h4>
               </div>
             </div>
@@ -590,7 +590,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_sleightofhand_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_sleightofhand" value="@{global-privacy-status} &{template:battleinc} {{name=Sleightofhand}} {{roll=[[1d20+@{sleightofhand_value}]]}} {{roll1=[[1d20+@{sleightofhand_value}]]}} {{roll2=[[1d20+@{sleightofhand_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_sleightofhand" value="@{global-privacy-status} &{template:gundam} {{name=Sleightofhand}} {{roll=[[1d20+@{sleightofhand_value}]]}} {{roll1=[[1d20+@{sleightofhand_value}]]}} {{roll2=[[1d20+@{sleightofhand_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Sleight&nbsp;of&nbsp;Hand</h4>
               </div>
             </div>
@@ -609,7 +609,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_stealth_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_stealth" value="@{global-privacy-status} &{template:battleinc} {{name=Stealth}} {{roll=[[1d20+@{stealth_value}]]}} {{roll1=[[1d20+@{stealth_value}]]}} {{roll2=[[1d20+@{stealth_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_stealth" value="@{global-privacy-status} &{template:gundam} {{name=Stealth}} {{roll=[[1d20+@{stealth_value}]]}} {{roll1=[[1d20+@{stealth_value}]]}} {{roll2=[[1d20+@{stealth_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Stealth</h4>
               </div>
             </div>
@@ -628,7 +628,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_computeruse_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_computeruse" value="@{global-privacy-status} &{template:battleinc} {{name=Computeruse}} {{roll=[[1d20+@{computeruse_value}]]}} {{roll1=[[1d20+@{computeruse_value}]]}} {{roll2=[[1d20+@{computeruse_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_computeruse" value="@{global-privacy-status} &{template:gundam} {{name=Computeruse}} {{roll=[[1d20+@{computeruse_value}]]}} {{roll1=[[1d20+@{computeruse_value}]]}} {{roll2=[[1d20+@{computeruse_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Computer&nbsp;Use</h4>
               </div>
             </div>
@@ -647,7 +647,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_repair_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_repair" value="@{global-privacy-status} &{template:battleinc} {{name=Repair}} {{roll=[[1d20+@{repair_value}]]}} {{roll1=[[1d20+@{repair_value}]]}} {{roll2=[[1d20+@{repair_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_repair" value="@{global-privacy-status} &{template:gundam} {{name=Repair}} {{roll=[[1d20+@{repair_value}]]}} {{roll1=[[1d20+@{repair_value}]]}} {{roll2=[[1d20+@{repair_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Repair</h4>
               </div>
             </div>
@@ -666,7 +666,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_history_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_history" value="@{global-privacy-status} &{template:battleinc} {{name=History}} {{roll=[[1d20+@{history_value}]]}} {{roll1=[[1d20+@{history_value}]]}} {{roll2=[[1d20+@{history_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_history" value="@{global-privacy-status} &{template:gundam} {{name=History}} {{roll=[[1d20+@{history_value}]]}} {{roll1=[[1d20+@{history_value}]]}} {{roll2=[[1d20+@{history_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>History</h4>
               </div>
             </div>
@@ -685,7 +685,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_investigation_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_investigation" value="@{global-privacy-status} &{template:battleinc} {{name=Investigation}} {{roll=[[1d20+@{investigation_value}]]}} {{roll1=[[1d20+@{investigation_value}]]}} {{roll2=[[1d20+@{investigation_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_investigation" value="@{global-privacy-status} &{template:gundam} {{name=Investigation}} {{roll=[[1d20+@{investigation_value}]]}} {{roll1=[[1d20+@{investigation_value}]]}} {{roll2=[[1d20+@{investigation_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Investigation</h4>
               </div>
             </div>
@@ -704,7 +704,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_nature_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_nature" value="@{global-privacy-status} &{template:battleinc} {{name=Nature}} {{roll=[[1d20+@{nature_value}]]}} {{roll1=[[1d20+@{nature_value}]]}} {{roll2=[[1d20+@{nature_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_nature" value="@{global-privacy-status} &{template:gundam} {{name=Nature}} {{roll=[[1d20+@{nature_value}]]}} {{roll1=[[1d20+@{nature_value}]]}} {{roll2=[[1d20+@{nature_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Nature</h4>
               </div>
             </div>
@@ -723,7 +723,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_drive_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_drive" value="@{global-privacy-status} &{template:battleinc} {{name=Drive}} {{roll=[[1d20+@{drive_value}]]}} {{roll1=[[1d20+@{drive_value}]]}} {{roll2=[[1d20+@{drive_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_drive" value="@{global-privacy-status} &{template:gundam} {{name=Drive}} {{roll=[[1d20+@{drive_value}]]}} {{roll1=[[1d20+@{drive_value}]]}} {{roll2=[[1d20+@{drive_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Drive</h4>
               </div>
             </div>
@@ -742,7 +742,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_insight_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_insight" value="@{global-privacy-status} &{template:battleinc} {{name=Insight}} {{roll=[[1d20+@{insight_value}]]}} {{roll1=[[1d20+@{insight_value}]]}} {{roll2=[[1d20+@{insight_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_insight" value="@{global-privacy-status} &{template:gundam} {{name=Insight}} {{roll=[[1d20+@{insight_value}]]}} {{roll1=[[1d20+@{insight_value}]]}} {{roll2=[[1d20+@{insight_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Insight</h4>
               </div>
             </div>
@@ -761,7 +761,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_medicine_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_medicine" value="@{global-privacy-status} &{template:battleinc} {{name=Medicine}} {{roll=[[1d20+@{medicine_value}]]}} {{roll1=[[1d20+@{medicine_value}]]}} {{roll2=[[1d20+@{medicine_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_medicine" value="@{global-privacy-status} &{template:gundam} {{name=Medicine}} {{roll=[[1d20+@{medicine_value}]]}} {{roll1=[[1d20+@{medicine_value}]]}} {{roll2=[[1d20+@{medicine_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Medicine</h4>
               </div>
             </div>
@@ -780,7 +780,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_perception_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_perception" value="@{global-privacy-status} &{template:battleinc} {{name=Perception}} {{roll=[[1d20+@{perception_value}]]}} {{roll1=[[1d20+@{perception_value}]]}} {{roll2=[[1d20+@{perception_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_perception" value="@{global-privacy-status} &{template:gundam} {{name=Perception}} {{roll=[[1d20+@{perception_value}]]}} {{roll1=[[1d20+@{perception_value}]]}} {{roll2=[[1d20+@{perception_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Perception</h4>
               </div>
             </div>
@@ -799,7 +799,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_survival_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_survival" value="@{global-privacy-status} &{template:battleinc} {{name=Survival}} {{roll=[[1d20+@{survival_value}]]}} {{roll1=[[1d20+@{survival_value}]]}} {{roll2=[[1d20+@{survival_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_survival" value="@{global-privacy-status} &{template:gundam} {{name=Survival}} {{roll=[[1d20+@{survival_value}]]}} {{roll1=[[1d20+@{survival_value}]]}} {{roll2=[[1d20+@{survival_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Survival</h4>
               </div>
             </div>
@@ -818,7 +818,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_deception_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_deception" value="@{global-privacy-status} &{template:battleinc} {{name=Deception}} {{roll=[[1d20+@{deception_value}]]}} {{roll1=[[1d20+@{deception_value}]]}} {{roll2=[[1d20+@{deception_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_deception" value="@{global-privacy-status} &{template:gundam} {{name=Deception}} {{roll=[[1d20+@{deception_value}]]}} {{roll1=[[1d20+@{deception_value}]]}} {{roll2=[[1d20+@{deception_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Deception</h4>
               </div>
             </div>
@@ -837,7 +837,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_intimidation_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_intimidation" value="@{global-privacy-status} &{template:battleinc} {{name=Intimidation}} {{roll=[[1d20+@{intimidation_value}]]}} {{roll1=[[1d20+@{intimidation_value}]]}} {{roll2=[[1d20+@{intimidation_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_intimidation" value="@{global-privacy-status} &{template:gundam} {{name=Intimidation}} {{roll=[[1d20+@{intimidation_value}]]}} {{roll1=[[1d20+@{intimidation_value}]]}} {{roll2=[[1d20+@{intimidation_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Intimidation</h4>
               </div>
             </div>
@@ -856,7 +856,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_persuasion_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_persuasion" value="@{global-privacy-status} &{template:battleinc} {{name=Persuasion}} {{roll=[[1d20+@{persuasion_value}]]}} {{roll1=[[1d20+@{persuasion_value}]]}} {{roll2=[[1d20+@{persuasion_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_persuasion" value="@{global-privacy-status} &{template:gundam} {{name=Persuasion}} {{roll=[[1d20+@{persuasion_value}]]}} {{roll1=[[1d20+@{persuasion_value}]]}} {{roll2=[[1d20+@{persuasion_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Persuasion</h4>
               </div>
             </div>
@@ -875,7 +875,7 @@
               </select>
               <input type="number" step="0.01" value="1" name="attr_performance_value" readonly />
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_performance" value="@{global-privacy-status} &{template:battleinc} {{name=Performance}} {{roll=[[1d20+@{performance_value}]]}} {{roll1=[[1d20+@{performance_value}]]}} {{roll2=[[1d20+@{performance_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_performance" value="@{global-privacy-status} &{template:gundam} {{name=Performance}} {{roll=[[1d20+@{performance_value}]]}} {{roll1=[[1d20+@{performance_value}]]}} {{roll2=[[1d20+@{performance_value}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Skill}}"></button>
                 <h4>Performance</h4>
               </div>
             </div>
@@ -955,7 +955,7 @@
           <div class="sheet-oneline">
             <fieldset class="repeating_proficiencies">
               <div class="sheet-proficiencies">
-                <button type="roll" class="sheet-button-description" name="roll_proficiencies" value="@{global-privacy-status} &{template:battleinc} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{proficiency_value}]]}} {{roll1=[[1d20+@{proficiency_value}]]}} {{roll2=[[1d20+@{proficiency_value}]]}} {{name=@{proficiency_name}}} {{charactername=@{character_name}}} {{category=Proficiency}} {{prof=@{proficiency_type}}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_proficiencies" value="@{global-privacy-status} &{template:gundam} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{proficiency_value}]]}} {{roll1=[[1d20+@{proficiency_value}]]}} {{roll2=[[1d20+@{proficiency_value}]]}} {{name=@{proficiency_name}}} {{charactername=@{character_name}}} {{category=Proficiency}} {{prof=@{proficiency_type}}}"></button>
 
                 <input class="sheet-left" type="text" placeholder="Nom" name="attr_proficiency_name" />
 
@@ -1079,7 +1079,7 @@
               <input class="sheet-inputchar" type="number" step="0.01" value="1" name="attr_initiative" readonly />
 
               <div class="sheet-button-div-holder">
-                <button type="roll" class="sheet-button-description" name="roll_initiative" value="@{global-privacy-status} &{template:battleinc} {{name=Initiative}} {{roll=[[1d20+@{initiative}&{tracker}]]}} {{charactername=@{character_name}}} {{standard=1}} {{category=Test}}"></button>
+                <button type="roll" class="sheet-button-description" name="roll_initiative" value="@{global-privacy-status} &{template:gundam} {{name=Initiative}} {{roll=[[1d20+@{initiative}&{tracker}]]}} {{charactername=@{character_name}}} {{standard=1}} {{category=Test}}"></button>
                 <h4>Initiative</h4>
               </div>
             </div>
@@ -1326,9 +1326,9 @@
               <div class="sheet-talent-card sheet-talent1-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent1-details}]]}} {{name=@{talent1-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent1-attackbonus}]]}} {{roll1=[[1d20+@{talent1-attackbonus}]]}} {{roll2=[[1d20+@{talent1-attackbonus}]]}} {{usage=@{talent1-usetime}}} {{duration=@{talent1-duration}}} {{range=@{talent1-range}}} {{target=@{talent1-target}}} {{charge=@{talent1-charges}}} {{dmg1=[[@{talent1-dmg1}+0]]}} {{dmg2=[[@{talent1-dmg2}+0]]}} {{dmg1type=@{talent1-dmg1-type}}} {{dmg2type=@{talent1-dmg2-type}}} {{save=[[@{talent1-save}]]}} {{savecomp=@{talent1-save-ability}}} {{saveeffect=@{talent1-saveeffects}}} {{button=@{talent1-button}}} {{desc=@{talent1-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent1-details}]]}} {{name=@{talent1-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent1-attackbonus}]]}} {{roll1=[[1d20+@{talent1-attackbonus}]]}} {{roll2=[[1d20+@{talent1-attackbonus}]]}} {{usage=@{talent1-usetime}}} {{duration=@{talent1-duration}}} {{range=@{talent1-range}}} {{target=@{talent1-target}}} {{charge=@{talent1-charges}}} {{dmg1=[[@{talent1-dmg1}+0]]}} {{dmg2=[[@{talent1-dmg2}+0]]}} {{dmg1type=@{talent1-dmg1-type}}} {{dmg2type=@{talent1-dmg2-type}}} {{save=[[@{talent1-save}]]}} {{savecomp=@{talent1-save-ability}}} {{saveeffect=@{talent1-saveeffects}}} {{button=@{talent1-button}}} {{desc=@{talent1-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent1-description)" name="attr_talent1-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent1-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent1-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent1-name"></span>
 
@@ -1451,9 +1451,9 @@
               <div class="sheet-talent-card sheet-talent2-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent2-details}]]}} {{name=@{talent2-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent2-attackbonus}]]}} {{roll1=[[1d20+@{talent2-attackbonus}]]}} {{roll2=[[1d20+@{talent2-attackbonus}]]}} {{usage=@{talent2-usetime}}} {{duration=@{talent2-duration}}} {{range=@{talent2-range}}} {{target=@{talent2-target}}} {{charge=@{talent2-charges}}} {{dmg1=[[@{talent2-dmg1}+0]]}} {{dmg2=[[@{talent2-dmg2}+0]]}} {{dmg1type=@{talent2-dmg1-type}}} {{dmg2type=@{talent2-dmg2-type}}} {{save=[[@{talent2-save}]]}} {{savecomp=@{talent2-save-ability}}} {{saveeffect=@{talent2-saveeffects}}} {{button=@{talent2-button}}} {{desc=@{talent2-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent2-details}]]}} {{name=@{talent2-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent2-attackbonus}]]}} {{roll1=[[1d20+@{talent2-attackbonus}]]}} {{roll2=[[1d20+@{talent2-attackbonus}]]}} {{usage=@{talent2-usetime}}} {{duration=@{talent2-duration}}} {{range=@{talent2-range}}} {{target=@{talent2-target}}} {{charge=@{talent2-charges}}} {{dmg1=[[@{talent2-dmg1}+0]]}} {{dmg2=[[@{talent2-dmg2}+0]]}} {{dmg1type=@{talent2-dmg1-type}}} {{dmg2type=@{talent2-dmg2-type}}} {{save=[[@{talent2-save}]]}} {{savecomp=@{talent2-save-ability}}} {{saveeffect=@{talent2-saveeffects}}} {{button=@{talent2-button}}} {{desc=@{talent2-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent2-description)" name="attr_talent2-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent2-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent2-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent2-name"></span>
 
@@ -1576,9 +1576,9 @@
               <div class="sheet-talent-card sheet-talent3-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent3-details}]]}} {{name=@{talent3-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent3-attackbonus}]]}} {{roll1=[[1d20+@{talent3-attackbonus}]]}} {{roll2=[[1d20+@{talent3-attackbonus}]]}} {{usage=@{talent3-usetime}}} {{duration=@{talent3-duration}}} {{range=@{talent3-range}}} {{target=@{talent3-target}}} {{charge=@{talent3-charges}}} {{dmg1=[[@{talent3-dmg1}+0]]}} {{dmg2=[[@{talent3-dmg2}+0]]}} {{dmg1type=@{talent3-dmg1-type}}} {{dmg2type=@{talent3-dmg2-type}}} {{save=[[@{talent3-save}]]}} {{savecomp=@{talent3-save-ability}}} {{saveeffect=@{talent3-saveeffects}}} {{button=@{talent3-button}}} {{desc=@{talent3-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent3-details}]]}} {{name=@{talent3-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent3-attackbonus}]]}} {{roll1=[[1d20+@{talent3-attackbonus}]]}} {{roll2=[[1d20+@{talent3-attackbonus}]]}} {{usage=@{talent3-usetime}}} {{duration=@{talent3-duration}}} {{range=@{talent3-range}}} {{target=@{talent3-target}}} {{charge=@{talent3-charges}}} {{dmg1=[[@{talent3-dmg1}+0]]}} {{dmg2=[[@{talent3-dmg2}+0]]}} {{dmg1type=@{talent3-dmg1-type}}} {{dmg2type=@{talent3-dmg2-type}}} {{save=[[@{talent3-save}]]}} {{savecomp=@{talent3-save-ability}}} {{saveeffect=@{talent3-saveeffects}}} {{button=@{talent3-button}}} {{desc=@{talent3-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent3-description)" name="attr_talent3-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent3-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent3-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent3-name"></span>
 
@@ -1701,9 +1701,9 @@
               <div class="sheet-talent-card sheet-talent4-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent4-details}]]}} {{name=@{talent4-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent4-attackbonus}]]}} {{roll1=[[1d20+@{talent4-attackbonus}]]}} {{roll2=[[1d20+@{talent4-attackbonus}]]}} {{usage=@{talent4-usetime}}} {{duration=@{talent4-duration}}} {{range=@{talent4-range}}} {{target=@{talent4-target}}} {{charge=@{talent4-charges}}} {{dmg1=[[@{talent4-dmg1}+0]]}} {{dmg2=[[@{talent4-dmg2}+0]]}} {{dmg1type=@{talent4-dmg1-type}}} {{dmg2type=@{talent4-dmg2-type}}} {{save=[[@{talent4-save}]]}} {{savecomp=@{talent4-save-ability}}} {{saveeffect=@{talent4-saveeffects}}} {{button=@{talent4-button}}} {{desc=@{talent4-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent4-details}]]}} {{name=@{talent4-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent4-attackbonus}]]}} {{roll1=[[1d20+@{talent4-attackbonus}]]}} {{roll2=[[1d20+@{talent4-attackbonus}]]}} {{usage=@{talent4-usetime}}} {{duration=@{talent4-duration}}} {{range=@{talent4-range}}} {{target=@{talent4-target}}} {{charge=@{talent4-charges}}} {{dmg1=[[@{talent4-dmg1}+0]]}} {{dmg2=[[@{talent4-dmg2}+0]]}} {{dmg1type=@{talent4-dmg1-type}}} {{dmg2type=@{talent4-dmg2-type}}} {{save=[[@{talent4-save}]]}} {{savecomp=@{talent4-save-ability}}} {{saveeffect=@{talent4-saveeffects}}} {{button=@{talent4-button}}} {{desc=@{talent4-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent4-description)" name="attr_talent4-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent4-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent4-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent4-name"></span>
 
@@ -1826,9 +1826,9 @@
               <div class="sheet-talent-card sheet-talent5-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent5-details}]]}} {{name=@{talent5-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent5-attackbonus}]]}} {{roll1=[[1d20+@{talent5-attackbonus}]]}} {{roll2=[[1d20+@{talent5-attackbonus}]]}} {{usage=@{talent5-usetime}}} {{duration=@{talent5-duration}}} {{range=@{talent5-range}}} {{target=@{talent5-target}}} {{charge=@{talent5-charges}}} {{dmg1=[[@{talent5-dmg1}+0]]}} {{dmg2=[[@{talent5-dmg2}+0]]}} {{dmg1type=@{talent5-dmg1-type}}} {{dmg2type=@{talent5-dmg2-type}}} {{save=[[@{talent5-save}]]}} {{savecomp=@{talent5-save-ability}}} {{saveeffect=@{talent5-saveeffects}}} {{button=@{talent5-button}}} {{desc=@{talent5-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent5-details}]]}} {{name=@{talent5-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent5-attackbonus}]]}} {{roll1=[[1d20+@{talent5-attackbonus}]]}} {{roll2=[[1d20+@{talent5-attackbonus}]]}} {{usage=@{talent5-usetime}}} {{duration=@{talent5-duration}}} {{range=@{talent5-range}}} {{target=@{talent5-target}}} {{charge=@{talent5-charges}}} {{dmg1=[[@{talent5-dmg1}+0]]}} {{dmg2=[[@{talent5-dmg2}+0]]}} {{dmg1type=@{talent5-dmg1-type}}} {{dmg2type=@{talent5-dmg2-type}}} {{save=[[@{talent5-save}]]}} {{savecomp=@{talent5-save-ability}}} {{saveeffect=@{talent5-saveeffects}}} {{button=@{talent5-button}}} {{desc=@{talent5-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent5-description)" name="attr_talent5-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent5-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent5-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent5-name"></span>
 
@@ -1951,9 +1951,9 @@
               <div class="sheet-talent-card sheet-talent6-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent6-details}]]}} {{name=@{talent6-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent6-attackbonus}]]}} {{roll1=[[1d20+@{talent6-attackbonus}]]}} {{roll2=[[1d20+@{talent6-attackbonus}]]}} {{usage=@{talent6-usetime}}} {{duration=@{talent6-duration}}} {{range=@{talent6-range}}} {{target=@{talent6-target}}} {{charge=@{talent6-charges}}} {{dmg1=[[@{talent6-dmg1}+0]]}} {{dmg2=[[@{talent6-dmg2}+0]]}} {{dmg1type=@{talent6-dmg1-type}}} {{dmg2type=@{talent6-dmg2-type}}} {{save=[[@{talent6-save}]]}} {{savecomp=@{talent6-save-ability}}} {{saveeffect=@{talent6-saveeffects}}} {{button=@{talent6-button}}} {{desc=@{talent6-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent6-details}]]}} {{name=@{talent6-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent6-attackbonus}]]}} {{roll1=[[1d20+@{talent6-attackbonus}]]}} {{roll2=[[1d20+@{talent6-attackbonus}]]}} {{usage=@{talent6-usetime}}} {{duration=@{talent6-duration}}} {{range=@{talent6-range}}} {{target=@{talent6-target}}} {{charge=@{talent6-charges}}} {{dmg1=[[@{talent6-dmg1}+0]]}} {{dmg2=[[@{talent6-dmg2}+0]]}} {{dmg1type=@{talent6-dmg1-type}}} {{dmg2type=@{talent6-dmg2-type}}} {{save=[[@{talent6-save}]]}} {{savecomp=@{talent6-save-ability}}} {{saveeffect=@{talent6-saveeffects}}} {{button=@{talent6-button}}} {{desc=@{talent6-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent6-description)" name="attr_talent6-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent6-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent6-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent6-name"></span>
 
@@ -2076,9 +2076,9 @@
               <div class="sheet-talent-card sheet-talent7-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent7-details}]]}} {{name=@{talent7-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent7-attackbonus}]]}} {{roll1=[[1d20+@{talent7-attackbonus}]]}} {{roll2=[[1d20+@{talent7-attackbonus}]]}} {{usage=@{talent7-usetime}}} {{duration=@{talent7-duration}}} {{range=@{talent7-range}}} {{target=@{talent7-target}}} {{charge=@{talent7-charges}}} {{dmg1=[[@{talent7-dmg1}+0]]}} {{dmg2=[[@{talent7-dmg2}+0]]}} {{dmg1type=@{talent7-dmg1-type}}} {{dmg2type=@{talent7-dmg2-type}}} {{save=[[@{talent7-save}]]}} {{savecomp=@{talent7-save-ability}}} {{saveeffect=@{talent7-saveeffects}}} {{button=@{talent7-button}}} {{desc=@{talent7-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent7-details}]]}} {{name=@{talent7-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent7-attackbonus}]]}} {{roll1=[[1d20+@{talent7-attackbonus}]]}} {{roll2=[[1d20+@{talent7-attackbonus}]]}} {{usage=@{talent7-usetime}}} {{duration=@{talent7-duration}}} {{range=@{talent7-range}}} {{target=@{talent7-target}}} {{charge=@{talent7-charges}}} {{dmg1=[[@{talent7-dmg1}+0]]}} {{dmg2=[[@{talent7-dmg2}+0]]}} {{dmg1type=@{talent7-dmg1-type}}} {{dmg2type=@{talent7-dmg2-type}}} {{save=[[@{talent7-save}]]}} {{savecomp=@{talent7-save-ability}}} {{saveeffect=@{talent7-saveeffects}}} {{button=@{talent7-button}}} {{desc=@{talent7-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent7-description)" name="attr_talent7-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent7-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent7-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent7-name"></span>
 
@@ -2201,9 +2201,9 @@
               <div class="sheet-talent-card sheet-talent8-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent8-details}]]}} {{name=@{talent8-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent8-attackbonus}]]}} {{roll1=[[1d20+@{talent8-attackbonus}]]}} {{roll2=[[1d20+@{talent8-attackbonus}]]}} {{usage=@{talent8-usetime}}} {{duration=@{talent8-duration}}} {{range=@{talent8-range}}} {{target=@{talent8-target}}} {{charge=@{talent8-charges}}} {{dmg1=[[@{talent8-dmg1}+0]]}} {{dmg2=[[@{talent8-dmg2}+0]]}} {{dmg1type=@{talent8-dmg1-type}}} {{dmg2type=@{talent8-dmg2-type}}} {{save=[[@{talent8-save}]]}} {{savecomp=@{talent8-save-ability}}} {{saveeffect=@{talent8-saveeffects}}} {{button=@{talent8-button}}} {{desc=@{talent8-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent8-details}]]}} {{name=@{talent8-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent8-attackbonus}]]}} {{roll1=[[1d20+@{talent8-attackbonus}]]}} {{roll2=[[1d20+@{talent8-attackbonus}]]}} {{usage=@{talent8-usetime}}} {{duration=@{talent8-duration}}} {{range=@{talent8-range}}} {{target=@{talent8-target}}} {{charge=@{talent8-charges}}} {{dmg1=[[@{talent8-dmg1}+0]]}} {{dmg2=[[@{talent8-dmg2}+0]]}} {{dmg1type=@{talent8-dmg1-type}}} {{dmg2type=@{talent8-dmg2-type}}} {{save=[[@{talent8-save}]]}} {{savecomp=@{talent8-save-ability}}} {{saveeffect=@{talent8-saveeffects}}} {{button=@{talent8-button}}} {{desc=@{talent8-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent8-description)" name="attr_talent8-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent8-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent8-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent8-name"></span>
 
@@ -2326,9 +2326,9 @@
               <div class="sheet-talent-card sheet-talent17-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent17-details}]]}} {{name=@{talent17-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent17-attackbonus}]]}} {{roll1=[[1d20+@{talent17-attackbonus}]]}} {{roll2=[[1d20+@{talent17-attackbonus}]]}} {{usage=@{talent17-usetime}}} {{duration=@{talent17-duration}}} {{range=@{talent17-range}}} {{target=@{talent17-target}}} {{charge=@{talent17-charges}}} {{dmg1=[[@{talent17-dmg1}+0]]}} {{dmg2=[[@{talent17-dmg2}+0]]}} {{dmg1type=@{talent17-dmg1-type}}} {{dmg2type=@{talent17-dmg2-type}}} {{save=[[@{talent17-save}]]}} {{savecomp=@{talent17-save-ability}}} {{saveeffect=@{talent17-saveeffects}}} {{button=@{talent17-button}}} {{desc=@{talent17-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent17-details}]]}} {{name=@{talent17-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent17-attackbonus}]]}} {{roll1=[[1d20+@{talent17-attackbonus}]]}} {{roll2=[[1d20+@{talent17-attackbonus}]]}} {{usage=@{talent17-usetime}}} {{duration=@{talent17-duration}}} {{range=@{talent17-range}}} {{target=@{talent17-target}}} {{charge=@{talent17-charges}}} {{dmg1=[[@{talent17-dmg1}+0]]}} {{dmg2=[[@{talent17-dmg2}+0]]}} {{dmg1type=@{talent17-dmg1-type}}} {{dmg2type=@{talent17-dmg2-type}}} {{save=[[@{talent17-save}]]}} {{savecomp=@{talent17-save-ability}}} {{saveeffect=@{talent17-saveeffects}}} {{button=@{talent17-button}}} {{desc=@{talent17-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent17-description)" name="attr_talent17-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent17-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent17-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent17-name"></span>
 
@@ -2451,9 +2451,9 @@
               <div class="sheet-talent-card sheet-talent18-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent18-details}]]}} {{name=@{talent18-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent18-attackbonus}]]}} {{roll1=[[1d20+@{talent18-attackbonus}]]}} {{roll2=[[1d20+@{talent18-attackbonus}]]}} {{usage=@{talent18-usetime}}} {{duration=@{talent18-duration}}} {{range=@{talent18-range}}} {{target=@{talent18-target}}} {{charge=@{talent18-charges}}} {{dmg1=[[@{talent18-dmg1}+0]]}} {{dmg2=[[@{talent18-dmg2}+0]]}} {{dmg1type=@{talent18-dmg1-type}}} {{dmg2type=@{talent18-dmg2-type}}} {{save=[[@{talent18-save}]]}} {{savecomp=@{talent18-save-ability}}} {{saveeffect=@{talent18-saveeffects}}} {{button=@{talent18-button}}} {{desc=@{talent18-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent18-details}]]}} {{name=@{talent18-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent18-attackbonus}]]}} {{roll1=[[1d20+@{talent18-attackbonus}]]}} {{roll2=[[1d20+@{talent18-attackbonus}]]}} {{usage=@{talent18-usetime}}} {{duration=@{talent18-duration}}} {{range=@{talent18-range}}} {{target=@{talent18-target}}} {{charge=@{talent18-charges}}} {{dmg1=[[@{talent18-dmg1}+0]]}} {{dmg2=[[@{talent18-dmg2}+0]]}} {{dmg1type=@{talent18-dmg1-type}}} {{dmg2type=@{talent18-dmg2-type}}} {{save=[[@{talent18-save}]]}} {{savecomp=@{talent18-save-ability}}} {{saveeffect=@{talent18-saveeffects}}} {{button=@{talent18-button}}} {{desc=@{talent18-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent18-description)" name="attr_talent18-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent18-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent18-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent18-name"></span>
 
@@ -2576,9 +2576,9 @@
               <div class="sheet-talent-card sheet-talent11-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent11-details}]]}} {{name=@{talent11-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent11-attackbonus}]]}} {{roll1=[[1d20+@{talent11-attackbonus}]]}} {{roll2=[[1d20+@{talent11-attackbonus}]]}} {{usage=@{talent11-usetime}}} {{duration=@{talent11-duration}}} {{range=@{talent11-range}}} {{target=@{talent11-target}}} {{charge=@{talent11-charges}}} {{dmg1=[[@{talent11-dmg1}+0]]}} {{dmg2=[[@{talent11-dmg2}+0]]}} {{dmg1type=@{talent11-dmg1-type}}} {{dmg2type=@{talent11-dmg2-type}}} {{save=[[@{talent11-save}]]}} {{savecomp=@{talent11-save-ability}}} {{saveeffect=@{talent11-saveeffects}}} {{button=@{talent11-button}}} {{desc=@{talent11-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent11-details}]]}} {{name=@{talent11-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent11-attackbonus}]]}} {{roll1=[[1d20+@{talent11-attackbonus}]]}} {{roll2=[[1d20+@{talent11-attackbonus}]]}} {{usage=@{talent11-usetime}}} {{duration=@{talent11-duration}}} {{range=@{talent11-range}}} {{target=@{talent11-target}}} {{charge=@{talent11-charges}}} {{dmg1=[[@{talent11-dmg1}+0]]}} {{dmg2=[[@{talent11-dmg2}+0]]}} {{dmg1type=@{talent11-dmg1-type}}} {{dmg2type=@{talent11-dmg2-type}}} {{save=[[@{talent11-save}]]}} {{savecomp=@{talent11-save-ability}}} {{saveeffect=@{talent11-saveeffects}}} {{button=@{talent11-button}}} {{desc=@{talent11-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent11-description)" name="attr_talent11-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent11-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent11-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent11-name"></span>
 
@@ -2701,9 +2701,9 @@
               <div class="sheet-talent-card sheet-talent12-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent12-details}]]}} {{name=@{talent12-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent12-attackbonus}]]}} {{roll1=[[1d20+@{talent12-attackbonus}]]}} {{roll2=[[1d20+@{talent12-attackbonus}]]}} {{usage=@{talent12-usetime}}} {{duration=@{talent12-duration}}} {{range=@{talent12-range}}} {{target=@{talent12-target}}} {{charge=@{talent12-charges}}} {{dmg1=[[@{talent12-dmg1}+0]]}} {{dmg2=[[@{talent12-dmg2}+0]]}} {{dmg1type=@{talent12-dmg1-type}}} {{dmg2type=@{talent12-dmg2-type}}} {{save=[[@{talent12-save}]]}} {{savecomp=@{talent12-save-ability}}} {{saveeffect=@{talent12-saveeffects}}} {{button=@{talent12-button}}} {{desc=@{talent12-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent12-details}]]}} {{name=@{talent12-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent12-attackbonus}]]}} {{roll1=[[1d20+@{talent12-attackbonus}]]}} {{roll2=[[1d20+@{talent12-attackbonus}]]}} {{usage=@{talent12-usetime}}} {{duration=@{talent12-duration}}} {{range=@{talent12-range}}} {{target=@{talent12-target}}} {{charge=@{talent12-charges}}} {{dmg1=[[@{talent12-dmg1}+0]]}} {{dmg2=[[@{talent12-dmg2}+0]]}} {{dmg1type=@{talent12-dmg1-type}}} {{dmg2type=@{talent12-dmg2-type}}} {{save=[[@{talent12-save}]]}} {{savecomp=@{talent12-save-ability}}} {{saveeffect=@{talent12-saveeffects}}} {{button=@{talent12-button}}} {{desc=@{talent12-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent12-description)" name="attr_talent12-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent12-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent12-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent12-name"></span>
 
@@ -2826,9 +2826,9 @@
               <div class="sheet-talent-card sheet-talent13-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent13-details}]]}} {{name=@{talent13-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent13-attackbonus}]]}} {{roll1=[[1d20+@{talent13-attackbonus}]]}} {{roll2=[[1d20+@{talent13-attackbonus}]]}} {{usage=@{talent13-usetime}}} {{duration=@{talent13-duration}}} {{range=@{talent13-range}}} {{target=@{talent13-target}}} {{charge=@{talent13-charges}}} {{dmg1=[[@{talent13-dmg1}+0]]}} {{dmg2=[[@{talent13-dmg2}+0]]}} {{dmg1type=@{talent13-dmg1-type}}} {{dmg2type=@{talent13-dmg2-type}}} {{save=[[@{talent13-save}]]}} {{savecomp=@{talent13-save-ability}}} {{saveeffect=@{talent13-saveeffects}}} {{button=@{talent13-button}}} {{desc=@{talent13-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent13-details}]]}} {{name=@{talent13-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent13-attackbonus}]]}} {{roll1=[[1d20+@{talent13-attackbonus}]]}} {{roll2=[[1d20+@{talent13-attackbonus}]]}} {{usage=@{talent13-usetime}}} {{duration=@{talent13-duration}}} {{range=@{talent13-range}}} {{target=@{talent13-target}}} {{charge=@{talent13-charges}}} {{dmg1=[[@{talent13-dmg1}+0]]}} {{dmg2=[[@{talent13-dmg2}+0]]}} {{dmg1type=@{talent13-dmg1-type}}} {{dmg2type=@{talent13-dmg2-type}}} {{save=[[@{talent13-save}]]}} {{savecomp=@{talent13-save-ability}}} {{saveeffect=@{talent13-saveeffects}}} {{button=@{talent13-button}}} {{desc=@{talent13-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent13-description)" name="attr_talent13-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent13-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent13-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent13-name"></span>
 
@@ -2951,9 +2951,9 @@
               <div class="sheet-talent-card sheet-talent14-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent14-details}]]}} {{name=@{talent14-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent14-attackbonus}]]}} {{roll1=[[1d20+@{talent14-attackbonus}]]}} {{roll2=[[1d20+@{talent14-attackbonus}]]}} {{usage=@{talent14-usetime}}} {{duration=@{talent14-duration}}} {{range=@{talent14-range}}} {{target=@{talent14-target}}} {{charge=@{talent14-charges}}} {{dmg1=[[@{talent14-dmg1}+0]]}} {{dmg2=[[@{talent14-dmg2}+0]]}} {{dmg1type=@{talent14-dmg1-type}}} {{dmg2type=@{talent14-dmg2-type}}} {{save=[[@{talent14-save}]]}} {{savecomp=@{talent14-save-ability}}} {{saveeffect=@{talent14-saveeffects}}} {{button=@{talent14-button}}} {{desc=@{talent14-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent14-details}]]}} {{name=@{talent14-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent14-attackbonus}]]}} {{roll1=[[1d20+@{talent14-attackbonus}]]}} {{roll2=[[1d20+@{talent14-attackbonus}]]}} {{usage=@{talent14-usetime}}} {{duration=@{talent14-duration}}} {{range=@{talent14-range}}} {{target=@{talent14-target}}} {{charge=@{talent14-charges}}} {{dmg1=[[@{talent14-dmg1}+0]]}} {{dmg2=[[@{talent14-dmg2}+0]]}} {{dmg1type=@{talent14-dmg1-type}}} {{dmg2type=@{talent14-dmg2-type}}} {{save=[[@{talent14-save}]]}} {{savecomp=@{talent14-save-ability}}} {{saveeffect=@{talent14-saveeffects}}} {{button=@{talent14-button}}} {{desc=@{talent14-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent14-description)" name="attr_talent14-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent14-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent14-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent14-name"></span>
 
@@ -3076,9 +3076,9 @@
               <div class="sheet-talent-card sheet-talent15-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent15-details}]]}} {{name=@{talent15-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent15-attackbonus}]]}} {{roll1=[[1d20+@{talent15-attackbonus}]]}} {{roll2=[[1d20+@{talent15-attackbonus}]]}} {{usage=@{talent15-usetime}}} {{duration=@{talent15-duration}}} {{range=@{talent15-range}}} {{target=@{talent15-target}}} {{charge=@{talent15-charges}}} {{dmg1=[[@{talent15-dmg1}+0]]}} {{dmg2=[[@{talent15-dmg2}+0]]}} {{dmg1type=@{talent15-dmg1-type}}} {{dmg2type=@{talent15-dmg2-type}}} {{save=[[@{talent15-save}]]}} {{savecomp=@{talent15-save-ability}}} {{saveeffect=@{talent15-saveeffects}}} {{button=@{talent15-button}}} {{desc=@{talent15-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent15-details}]]}} {{name=@{talent15-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent15-attackbonus}]]}} {{roll1=[[1d20+@{talent15-attackbonus}]]}} {{roll2=[[1d20+@{talent15-attackbonus}]]}} {{usage=@{talent15-usetime}}} {{duration=@{talent15-duration}}} {{range=@{talent15-range}}} {{target=@{talent15-target}}} {{charge=@{talent15-charges}}} {{dmg1=[[@{talent15-dmg1}+0]]}} {{dmg2=[[@{talent15-dmg2}+0]]}} {{dmg1type=@{talent15-dmg1-type}}} {{dmg2type=@{talent15-dmg2-type}}} {{save=[[@{talent15-save}]]}} {{savecomp=@{talent15-save-ability}}} {{saveeffect=@{talent15-saveeffects}}} {{button=@{talent15-button}}} {{desc=@{talent15-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent15-description)" name="attr_talent15-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent15-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent15-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent15-name"></span>
 
@@ -3201,9 +3201,9 @@
               <div class="sheet-talent-card sheet-talent16-hideshow-div2">
                 <div class="sheet-talent-card2">
                   <div style="grid-column: 1/3" class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent16-details}]]}} {{name=@{talent16-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent16-attackbonus}]]}} {{roll1=[[1d20+@{talent16-attackbonus}]]}} {{roll2=[[1d20+@{talent16-attackbonus}]]}} {{usage=@{talent16-usetime}}} {{duration=@{talent16-duration}}} {{range=@{talent16-range}}} {{target=@{talent16-target}}} {{charge=@{talent16-charges}}} {{dmg1=[[@{talent16-dmg1}+0]]}} {{dmg2=[[@{talent16-dmg2}+0]]}} {{dmg1type=@{talent16-dmg1-type}}} {{dmg2type=@{talent16-dmg2-type}}} {{save=[[@{talent16-save}]]}} {{savecomp=@{talent16-save-ability}}} {{saveeffect=@{talent16-saveeffects}}} {{button=@{talent16-button}}} {{desc=@{talent16-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent16-details}]]}} {{name=@{talent16-name}}} {{charactername=@{character_name}}} {{category=Spell}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent16-attackbonus}]]}} {{roll1=[[1d20+@{talent16-attackbonus}]]}} {{roll2=[[1d20+@{talent16-attackbonus}]]}} {{usage=@{talent16-usetime}}} {{duration=@{talent16-duration}}} {{range=@{talent16-range}}} {{target=@{talent16-target}}} {{charge=@{talent16-charges}}} {{dmg1=[[@{talent16-dmg1}+0]]}} {{dmg2=[[@{talent16-dmg2}+0]]}} {{dmg1type=@{talent16-dmg1-type}}} {{dmg2type=@{talent16-dmg2-type}}} {{save=[[@{talent16-save}]]}} {{savecomp=@{talent16-save-ability}}} {{saveeffect=@{talent16-saveeffects}}} {{button=@{talent16-button}}} {{desc=@{talent16-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="[Description](~show-talent16-description)" name="attr_talent16-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-talent16-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-talent16-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span style="text-align: left !important" class="sheet-talent-name" name="attr_talent16-name"></span>
 
@@ -3428,7 +3428,7 @@
                 </div>
 
                 <div class="sheet-cogs-container sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:battleinc-description} {{name=@{features-names}}} {{charactername=@{character_name}}} {{category=Description}} {{source=@{features-source}}} {{description=@{personality-traits}}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll_str" value="@{global-privacy-status} &{template:gundam-description} {{name=@{features-names}}} {{charactername=@{character_name}}} {{category=Description}} {{source=@{features-source}}} {{description=@{personality-traits}}}"></button>
                   <span class="sheet-cogs-icon">w</span>
                 </div>
 
@@ -3598,7 +3598,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor1_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor1-name} Strength}} {{roll=[[1d20+@{mobilearmor1-str}]]}} {{roll1=[[1d20+@{mobilearmor1-str}]]}} {{roll2=[[1d20+@{mobilearmor1-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor1_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor1-name} Strength}} {{roll=[[1d20+@{mobilearmor1-str}]]}} {{roll1=[[1d20+@{mobilearmor1-str}]]}} {{roll2=[[1d20+@{mobilearmor1-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>STR</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor1-str" readonly />
@@ -3612,7 +3612,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor1_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor1-name} Dexterity}} {{roll=[[1d20+@{mobilearmor1-dex}]]}} {{roll1=[[1d20+@{mobilearmor1-dex}]]}} {{roll2=[[1d20+@{mobilearmor1-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor1_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor1-name} Dexterity}} {{roll=[[1d20+@{mobilearmor1-dex}]]}} {{roll1=[[1d20+@{mobilearmor1-dex}]]}} {{roll2=[[1d20+@{mobilearmor1-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>DEX</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor1-dex" readonly />
@@ -3626,7 +3626,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor1_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor1-name} Constitution}} {{roll=[[1d20+@{mobilearmor1-con}]]}} {{roll1=[[1d20+@{mobilearmor1-con}]]}} {{roll2=[[1d20+@{mobilearmor1-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor1_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor1-name} Constitution}} {{roll=[[1d20+@{mobilearmor1-con}]]}} {{roll1=[[1d20+@{mobilearmor1-con}]]}} {{roll2=[[1d20+@{mobilearmor1-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>CON</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor1-con" readonly />
@@ -3657,9 +3657,9 @@
                   <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                   <div class="sheet-mobilearmor-attacks-line1">
 
-                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                     
                     <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                     <div class="sheet-cogs-container">
@@ -3829,7 +3829,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor2_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor2-name} Strength}} {{roll=[[1d20+@{mobilearmor2-str}]]}} {{roll1=[[1d20+@{mobilearmor2-str}]]}} {{roll2=[[1d20+@{mobilearmor2-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor2_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor2-name} Strength}} {{roll=[[1d20+@{mobilearmor2-str}]]}} {{roll1=[[1d20+@{mobilearmor2-str}]]}} {{roll2=[[1d20+@{mobilearmor2-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>STR</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor2-str" readonly />
@@ -3843,7 +3843,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor2_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor2-name} Dexterity}} {{roll=[[1d20+@{mobilearmor2-dex}]]}} {{roll1=[[1d20+@{mobilearmor2-dex}]]}} {{roll2=[[1d20+@{mobilearmor2-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor2_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor2-name} Dexterity}} {{roll=[[1d20+@{mobilearmor2-dex}]]}} {{roll1=[[1d20+@{mobilearmor2-dex}]]}} {{roll2=[[1d20+@{mobilearmor2-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>DEX</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor2-dex" readonly />
@@ -3857,7 +3857,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor2_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor2-name} Constitution}} {{roll=[[1d20+@{mobilearmor2-con}]]}} {{roll1=[[1d20+@{mobilearmor2-con}]]}} {{roll2=[[1d20+@{mobilearmor2-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor2_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor2-name} Constitution}} {{roll=[[1d20+@{mobilearmor2-con}]]}} {{roll1=[[1d20+@{mobilearmor2-con}]]}} {{roll2=[[1d20+@{mobilearmor2-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>CON</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor2-con" readonly />
@@ -3888,9 +3888,9 @@
                   <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                   <div class="sheet-mobilearmor-attacks-line1">
 
-                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                     
                     <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                     <div class="sheet-cogs-container">
@@ -4060,7 +4060,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor3_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor3-name} Strength}} {{roll=[[1d20+@{mobilearmor3-str}]]}} {{roll1=[[1d20+@{mobilearmor3-str}]]}} {{roll2=[[1d20+@{mobilearmor3-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor3_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor3-name} Strength}} {{roll=[[1d20+@{mobilearmor3-str}]]}} {{roll1=[[1d20+@{mobilearmor3-str}]]}} {{roll2=[[1d20+@{mobilearmor3-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>STR</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor3-str" readonly />
@@ -4074,7 +4074,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor3_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor3-name} Dexterity}} {{roll=[[1d20+@{mobilearmor3-dex}]]}} {{roll1=[[1d20+@{mobilearmor3-dex}]]}} {{roll2=[[1d20+@{mobilearmor3-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor3_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor3-name} Dexterity}} {{roll=[[1d20+@{mobilearmor3-dex}]]}} {{roll1=[[1d20+@{mobilearmor3-dex}]]}} {{roll2=[[1d20+@{mobilearmor3-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>DEX</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor3-dex" readonly />
@@ -4088,7 +4088,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor3_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor3-name} Constitution}} {{roll=[[1d20+@{mobilearmor3-con}]]}} {{roll1=[[1d20+@{mobilearmor3-con}]]}} {{roll2=[[1d20+@{mobilearmor3-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor3_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor3-name} Constitution}} {{roll=[[1d20+@{mobilearmor3-con}]]}} {{roll1=[[1d20+@{mobilearmor3-con}]]}} {{roll2=[[1d20+@{mobilearmor3-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>CON</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor3-con" readonly />
@@ -4119,9 +4119,9 @@
                   <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                   <div class="sheet-mobilearmor-attacks-line1">
 
-                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                     
                     <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                     <div class="sheet-cogs-container">
@@ -4291,7 +4291,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor4_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor4-name} Strength}} {{roll=[[1d20+@{mobilearmor4-str}]]}} {{roll1=[[1d20+@{mobilearmor4-str}]]}} {{roll2=[[1d20+@{mobilearmor4-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor4_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor4-name} Strength}} {{roll=[[1d20+@{mobilearmor4-str}]]}} {{roll1=[[1d20+@{mobilearmor4-str}]]}} {{roll2=[[1d20+@{mobilearmor4-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>STR</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor4-str" readonly />
@@ -4305,7 +4305,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor4_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor4-name} Dexterity}} {{roll=[[1d20+@{mobilearmor4-dex}]]}} {{roll1=[[1d20+@{mobilearmor4-dex}]]}} {{roll2=[[1d20+@{mobilearmor4-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor4_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor4-name} Dexterity}} {{roll=[[1d20+@{mobilearmor4-dex}]]}} {{roll1=[[1d20+@{mobilearmor4-dex}]]}} {{roll2=[[1d20+@{mobilearmor4-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>DEX</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor4-dex" readonly />
@@ -4319,7 +4319,7 @@
               <div class="sheet-oneline">
                 <div class="sheet-statistics">
                   <div class="sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor4_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor4-name} Constitution}} {{roll=[[1d20+@{mobilearmor4-con}]]}} {{roll1=[[1d20+@{mobilearmor4-con}]]}} {{roll2=[[1d20+@{mobilearmor4-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll__mobilearmor4_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor4-name} Constitution}} {{roll=[[1d20+@{mobilearmor4-con}]]}} {{roll1=[[1d20+@{mobilearmor4-con}]]}} {{roll2=[[1d20+@{mobilearmor4-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                     <h3>CON</h3>
                   </div>
                   <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor4-con" readonly />
@@ -4350,9 +4350,9 @@
                   <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                   <div class="sheet-mobilearmor-attacks-line1">
 
-                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                     
                     <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                     <div class="sheet-cogs-container">
@@ -4522,7 +4522,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor5_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor5-name} Strength}} {{roll=[[1d20+@{mobilearmor5-str}]]}} {{roll1=[[1d20+@{mobilearmor5-str}]]}} {{roll2=[[1d20+@{mobilearmor5-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor5_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor5-name} Strength}} {{roll=[[1d20+@{mobilearmor5-str}]]}} {{roll1=[[1d20+@{mobilearmor5-str}]]}} {{roll2=[[1d20+@{mobilearmor5-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>STR</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor5-str" readonly />
@@ -4536,7 +4536,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor5_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor5-name} Dexterity}} {{roll=[[1d20+@{mobilearmor5-dex}]]}} {{roll1=[[1d20+@{mobilearmor5-dex}]]}} {{roll2=[[1d20+@{mobilearmor5-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor5_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor5-name} Dexterity}} {{roll=[[1d20+@{mobilearmor5-dex}]]}} {{roll1=[[1d20+@{mobilearmor5-dex}]]}} {{roll2=[[1d20+@{mobilearmor5-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>DEX</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor5-dex" readonly />
@@ -4550,7 +4550,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor5_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor5-name} Constitution}} {{roll=[[1d20+@{mobilearmor5-con}]]}} {{roll1=[[1d20+@{mobilearmor5-con}]]}} {{roll2=[[1d20+@{mobilearmor5-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor5_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor5-name} Constitution}} {{roll=[[1d20+@{mobilearmor5-con}]]}} {{roll1=[[1d20+@{mobilearmor5-con}]]}} {{roll2=[[1d20+@{mobilearmor5-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>CON</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor5-con" readonly />
@@ -4581,9 +4581,9 @@
                 <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                 <div class="sheet-mobilearmor-attacks-line1">
 
-                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                   <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                   
                   <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                   <div class="sheet-cogs-container">
@@ -4753,7 +4753,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor6_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor6-name} Strength}} {{roll=[[1d20+@{mobilearmor6-str}]]}} {{roll1=[[1d20+@{mobilearmor6-str}]]}} {{roll2=[[1d20+@{mobilearmor6-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor6_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor6-name} Strength}} {{roll=[[1d20+@{mobilearmor6-str}]]}} {{roll1=[[1d20+@{mobilearmor6-str}]]}} {{roll2=[[1d20+@{mobilearmor6-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>STR</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor6-str" readonly />
@@ -4767,7 +4767,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor6_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor6-name} Dexterity}} {{roll=[[1d20+@{mobilearmor6-dex}]]}} {{roll1=[[1d20+@{mobilearmor6-dex}]]}} {{roll2=[[1d20+@{mobilearmor6-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor6_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor6-name} Dexterity}} {{roll=[[1d20+@{mobilearmor6-dex}]]}} {{roll1=[[1d20+@{mobilearmor6-dex}]]}} {{roll2=[[1d20+@{mobilearmor6-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>DEX</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor6-dex" readonly />
@@ -4781,7 +4781,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor6_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor6-name} Constitution}} {{roll=[[1d20+@{mobilearmor6-con}]]}} {{roll1=[[1d20+@{mobilearmor6-con}]]}} {{roll2=[[1d20+@{mobilearmor6-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor6_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor6-name} Constitution}} {{roll=[[1d20+@{mobilearmor6-con}]]}} {{roll1=[[1d20+@{mobilearmor6-con}]]}} {{roll2=[[1d20+@{mobilearmor6-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>CON</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor6-con" readonly />
@@ -4812,9 +4812,9 @@
                 <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                 <div class="sheet-mobilearmor-attacks-line1">
 
-                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                   <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                   
                   <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                   <div class="sheet-cogs-container">
@@ -4984,7 +4984,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor7_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor7-name} Strength}} {{roll=[[1d20+@{mobilearmor7-str}]]}} {{roll1=[[1d20+@{mobilearmor7-str}]]}} {{roll2=[[1d20+@{mobilearmor7-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor7_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor7-name} Strength}} {{roll=[[1d20+@{mobilearmor7-str}]]}} {{roll1=[[1d20+@{mobilearmor7-str}]]}} {{roll2=[[1d20+@{mobilearmor7-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>STR</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor7-str" readonly />
@@ -4998,7 +4998,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor7_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor7-name} Dexterity}} {{roll=[[1d20+@{mobilearmor7-dex}]]}} {{roll1=[[1d20+@{mobilearmor7-dex}]]}} {{roll2=[[1d20+@{mobilearmor7-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor7_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor7-name} Dexterity}} {{roll=[[1d20+@{mobilearmor7-dex}]]}} {{roll1=[[1d20+@{mobilearmor7-dex}]]}} {{roll2=[[1d20+@{mobilearmor7-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>DEX</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor7-dex" readonly />
@@ -5012,7 +5012,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor7_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor7-name} Constitution}} {{roll=[[1d20+@{mobilearmor7-con}]]}} {{roll1=[[1d20+@{mobilearmor7-con}]]}} {{roll2=[[1d20+@{mobilearmor7-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor7_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor7-name} Constitution}} {{roll=[[1d20+@{mobilearmor7-con}]]}} {{roll1=[[1d20+@{mobilearmor7-con}]]}} {{roll2=[[1d20+@{mobilearmor7-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>CON</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor7-con" readonly />
@@ -5043,9 +5043,9 @@
                 <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                 <div class="sheet-mobilearmor-attacks-line1">
 
-                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                   <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                   
                   <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                   <div class="sheet-cogs-container">
@@ -5215,7 +5215,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor8_str" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor8-name} Strength}} {{roll=[[1d20+@{mobilearmor8-str}]]}} {{roll1=[[1d20+@{mobilearmor8-str}]]}} {{roll2=[[1d20+@{mobilearmor8-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor8_str" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor8-name} Strength}} {{roll=[[1d20+@{mobilearmor8-str}]]}} {{roll1=[[1d20+@{mobilearmor8-str}]]}} {{roll2=[[1d20+@{mobilearmor8-str}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>STR</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor8-str" readonly />
@@ -5229,7 +5229,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor8_dex" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor8-name} Dexterity}} {{roll=[[1d20+@{mobilearmor8-dex}]]}} {{roll1=[[1d20+@{mobilearmor8-dex}]]}} {{roll2=[[1d20+@{mobilearmor8-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor8_dex" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor8-name} Dexterity}} {{roll=[[1d20+@{mobilearmor8-dex}]]}} {{roll1=[[1d20+@{mobilearmor8-dex}]]}} {{roll2=[[1d20+@{mobilearmor8-dex}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>DEX</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor8-dex" readonly />
@@ -5243,7 +5243,7 @@
             <div class="sheet-oneline">
               <div class="sheet-statistics">
                 <div class="sheet-button-div-holder">
-                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor8_con" value="@{global-privacy-status} &{template:battleinc} {{name=@{mobilearmor8-name} Constitution}} {{roll=[[1d20+@{mobilearmor8-con}]]}} {{roll1=[[1d20+@{mobilearmor8-con}]]}} {{roll2=[[1d20+@{mobilearmor8-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
+                  <button type="roll" class="sheet-button-description" name="roll__mobilearmor8_con" value="@{global-privacy-status} &{template:gundam} {{name=@{mobilearmor8-name} Constitution}} {{roll=[[1d20+@{mobilearmor8-con}]]}} {{roll1=[[1d20+@{mobilearmor8-con}]]}} {{roll2=[[1d20+@{mobilearmor8-con}]]}} {{charactername=@{character_name}}} {{@{global-advantage-status}=1}} {{category=Mobile Armor}}"></button>
                   <h3>CON</h3>
                 </div>
                 <input class="sheet-inputchar" type="number" value="0" name="attr_mobilearmor8-con" readonly />
@@ -5274,9 +5274,9 @@
                 <input class="sheet-hidden sheet-cogs-hideshow" type="checkbox" name="attr_sheet-cogs-hideshow" />
                 <div class="sheet-mobilearmor-attacks-line1">
 
-                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-button-attack" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{mobile-armor-attack-details}]]}} {{name=@{mobilearmor-attack-name}}} {{charactername=@{character_name}}} {{category=Mobile Armor Attack}} {{@{global-advantage-status}=1}} {{roll=[[@{mobile-armor-attack-atk}]]}} {{roll1=[[@{mobile-armor-attack-atk}]]}} {{roll2=[[@{mobile-armor-attack-atk}]]}} {{range=@{mobile-armor-attack-range}}} {{dmg1=[[@{mobile-armor-attack-dmg}]]}} {{dmg2=[[0]]}} {{dmg1type=@{mobile-armor-attack-dmgtype}}} {{button=@{mobilearmor-button}}} {{desc=@{mobilearmor-attack-description}}}"></button>
                   <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_mobilearmor-button" />
-                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
+                  <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{mobilearmor-attack-description}}}"></button>
                   
                   <input class="sheet-left" type="text" placeholder="Weapon Name" name="attr_mobilearmor-attack-name" />
                   <div class="sheet-cogs-container">
@@ -5659,9 +5659,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -5780,9 +5780,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -5901,9 +5901,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -6022,9 +6022,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -6143,9 +6143,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -6264,9 +6264,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -6385,9 +6385,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -6506,9 +6506,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -6627,9 +6627,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>
 
@@ -6748,9 +6748,9 @@
                   <input class="sheet-checkbox-active" type="checkbox" value="1" name="attr_talent-active" />
 
                   <div class="sheet-talent-card-line4 sheet-button-div-holder">
-                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:battleinc} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-button-description" name="roll_talent" value="@{global-privacy-status} &{template:gundam} {{details=[[@{talent-details}]]}} {{name=@{talent-name}}} {{charactername=@{character_name}}} {{category=At Will}} {{@{global-advantage-status}=1}} {{roll=[[1d20+@{talent-attackbonus}]]}} {{roll1=[[1d20+@{talent-attackbonus}]]}} {{roll2=[[1d20+@{talent-attackbonus}]]}} {{usage=@{talent-usetime}}} {{duration=@{talent-duration}}} {{range=@{talent-range}}} {{target=@{talent-target}}} {{charge=@{talent-charges}}} {{dmg1=[[@{talent-dmg1}]]}} {{dmg2=[[@{talent-dmg2}]]}} {{dmg1type=@{talent-dmg1-type}}} {{dmg2type=@{talent-dmg2-type}}} {{save=[[@{talent-save}]]}} {{savecomp=@{talent-save-ability}}} {{saveeffect=@{talent-saveeffects}}} {{button=@{talent-button}}} {{desc=@{talent-description}}}"></button>
                     <input style="grid-column: 1/-1" class="sheet-hidden" type="text" value="" name="attr_talent-button" />
-                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:battleinc-description} {{name=Description}} {{description=@{talent-description}}}"></button>
+                    <button type="roll" class="sheet-hidden" name="roll_show-description" value="@{global-privacy-status} &{template:gundam-description} {{name=Description}} {{description=@{talent-description}}}"></button>
 
                     <span class="sheet-talent-name" style="text-align: left !important" name="attr_talent-name"></span>