diff --git a/TormentaRPG-PDF_Based/fichaTormenta.css b/TormentaRPG-PDF_Based/fichaTormenta.css
index 3ae1ec4e34..e2875a2c1f 100644
--- a/TormentaRPG-PDF_Based/fichaTormenta.css
+++ b/TormentaRPG-PDF_Based/fichaTormenta.css
@@ -174,6 +174,8 @@ body {
         .sheet-tormenta_charsheet .sheet-classes .sheet-classes_list .sheet-class_item .sheet-class_column input[type=text] {
           text-align: left;
           padding: 3px 7px 0; }
+    .sheet-tormenta_charsheet .sheet-classes .sheet-class_hidden {
+      display: none; }
   .sheet-tormenta_charsheet .sheet-middle {
     padding-top: 40px; }
     .sheet-tormenta_charsheet .sheet-middle .sheet-attributes {
@@ -841,27 +843,39 @@ body {
           font-size: 9px;
           color: #222;
           text-align: center; }
+    .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .repcontrol .btn {
+      display: block;
+      height: 30px;
+      margin: 0;
+      padding: 0 5px;
+      background: #222;
+      border: 0;
+      border-radius: 0;
+      line-height: 30px;
+      font-size: 12px;
+      color: #FFF;
+      text-align: center;
+      transition: .3s; }
+      .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .repcontrol .btn:hover {
+        background: #c15353; }
     .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item:last-of-type .sheet-weapon_macro {
       padding-bottom: 0; }
     .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col {
       display: inline-block;
       vertical-align: bottom; }
-      .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(1) {
+      .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(2) {
         width: 255px; }
-        .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(1) .sheet-weapons_item {
+        .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(2) .sheet-weapons_item {
           width: calc(100% - 40px);
           margin-left: 10px; }
-      .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(2) {
-        width: 80px;
-        margin-left: 10px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(3) {
-        width: 150px;
+        width: 80px;
         margin-left: 10px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(4) {
         width: 150px;
         margin-left: 10px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(5) {
-        width: 80px;
+        width: 150px;
         margin-left: 10px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(6) {
         width: 80px;
@@ -870,9 +884,12 @@ body {
         width: 80px;
         margin-left: 10px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(8) {
-        width: 95px;
+        width: 80px;
         margin-left: 10px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(9) {
+        width: 95px;
+        margin-left: 10px; }
+      .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col:nth-of-type(10) {
         width: 80px;
         margin-left: 10px; }
       .sheet-tormenta_charsheet .sheet-middle .sheet-weapons .sheet-weapons_list .sheet-weapons_item_col .sheet-weapons_title {
diff --git a/TormentaRPG-PDF_Based/fichaTormenta.jpg b/TormentaRPG-PDF_Based/fichaTormenta.jpg
index 0189dae776..4f51c3c666 100644
Binary files a/TormentaRPG-PDF_Based/fichaTormenta.jpg and b/TormentaRPG-PDF_Based/fichaTormenta.jpg differ
diff --git a/TormentaRPG-PDF_Based/fichaTormentaHtml.html b/TormentaRPG-PDF_Based/fichaTormentaHtml.html
index 4c2fb857fa..c4dec5c769 100644
--- a/TormentaRPG-PDF_Based/fichaTormentaHtml.html
+++ b/TormentaRPG-PDF_Based/fichaTormentaHtml.html
@@ -208,9 +208,13 @@
                 </li>
             </ul>
             
-            <input title="nivel" type="hidden" name="attr_nivel" value="[[(@{class-0-nivel} + @{class-1-nivel} + @{class-2-nivel} + @{class-3-nivel} + @{class-4-nivel} + @{class-5-nivel})]]">
-            <input title="bba" type="hidden" name="attr_bba" value="[[(@{class-0-bba} + @{class-1-bba} + @{class-2-bba} + @{class-3-bba} + @{class-4-bba} + @{class-5-bba})]]">
-            <input title="meio-nivel" type="hidden" name="attr_meio-nivel" value="[[floor((@{class-0-nivel} + @{class-1-nivel} + @{class-2-nivel} + @{class-3-nivel} + @{class-4-nivel} + @{class-5-nivel})/2)]]">
+            <div class="sheet-class_hidden">
+                <input title="nivel" type="number" name="attr_nivel" value="[[(@{class1-level} + @{class2-level} + @{class3-level} + @{class4-level} + @{class5-level})]]">
+
+                <input title="bba" type="number" name="attr_bba" value="[[(@{class1-bba} + @{class2-bba} + @{class3-bba} + @{class4-bba} + @{class5-bba})]]">
+
+                <input title="meio-nivel" type="number" name="attr_meio-nivel" value="[[floor(@{nivel}/2)]]">
+            </div>
         </div>
 
         <div class="sheet-middle">
@@ -396,7 +400,7 @@
                     <div class="sheet-armor_class_column">
                         <label>
                             <div class="sheet-armor_class_label"><br>Total</div>
-                            <input type="number" class="sheet-no_spin" name="attr_ca-total" title="ca-total" value="(10 + @{meio-nivel} + @{ca-armor} + @{DES-mod} + @{tamanho} + @{ca-other1} + @{ca-other2} + @{ca-other3} + @{ca-temp})" disabled>
+                            <input type="number" class="sheet-no_spin" name="attr_ca-total" title="ca-total" value="(10 + @{meio-nivel} + @{ca-armor} + @{DES-mod} + @{character_size} + @{ca-other1} + @{ca-other2} + @{ca-other3} + @{ca-temp})" disabled>
                         </label>
 
                         <div class="sheet-armor_class_separator">=</div>
@@ -439,7 +443,7 @@
                     <div class="sheet-armor_class_column">
                         <label>
                             <div class="sheet-armor_class_label">Mod de<br>Tamanho</div>
-                            <input type="number" class="sheet-no_spin" value="@{tamanho}" disabled>
+                            <input type="number" class="sheet-no_spin" value="@{character_size}" disabled>
                         </label>
 
                         <div class="sheet-armor_class_separator">+</div>
@@ -499,7 +503,7 @@
 
                             <div class="sheet-vitals_column">
                                 <div class="sheet-vitals_label"><br>Totais</div>
-                                <input type="number" class="sheet-no_spin" name="attr_pvs_totais" title="pvs_totais" value="[[(@{class-0-pv} + @{class-1-pv} + @{class-2-pv} + @{class-3-pv} + @{class-4-pv} + @{class-5-pv})]]" disabled>
+                                <input type="number" class="sheet-no_spin" name="attr_pvs_totais" title="pvs_totais" value="[[(@{class1-hp} + @{class2-hp} + @{class3-hp} + @{class4-hp} + @{class5-hp})]]" disabled>
                             </div>
                         </li>
 
@@ -810,12 +814,12 @@
                             
                             <div class="sheet-attack_column">
                                 <select name="attr_attack_cac_modifier" title="attr_attack_cac_modifier" class="sheet-no_select">
-                                    <option value="0" selected>For: 1</option>
-                                    <option value="0">Des: 1</option>
-                                    <option value="0">Con: 1</option>
-                                    <option value="0">Int: 1</option>
-                                    <option value="0">Sab: 1</option>
-                                    <option value="0">Car: 1</option>
+                                    <option value="[[@{FOR-mod}]]" selected>For</option>
+                                    <option value="[[@{DES-mod}]]">Des</option>
+                                    <option value="[[@{CON-mod}]]">Con</option>
+                                    <option value="[[{@INT-mod}]]">Int</option>
+                                    <option value="[[{@SAB-mod}]]">Sab</option>
+                                    <option value="[[@{CAR-mod}]]">Car</option>
                                 </select>
                             </div>
                             
@@ -865,12 +869,12 @@
                             
                             <div class="sheet-attack_column">
                                 <select name="attr_attack_distancia_modifier" title="attr_attack_distancia_modifier" class="sheet-no_select">
-                                    <option value="0">For: 1</option>
-                                    <option value="0" selected>Des: 1</option>
-                                    <option value="0">Con: 1</option>
-                                    <option value="0">Int: 1</option>
-                                    <option value="0">Sab: 1</option>
-                                    <option value="0">Car: 1</option>
+                                    <option value="[[@{FOR-mod}]]">For</option>
+                                    <option value="[[{@DES-mod}]]" selected>Des</option>
+                                    <option value="[[@{CON-mod}]]">Con</option>
+                                    <option value="[[{@INT-mod}]]">Int</option>
+                                    <option value="[[{@SAB-mod}]]">Sab</option>
+                                    <option value="[[@{CAR-mod}]]">Car</option>
                                 </select>
                             </div>
                             
@@ -1151,12 +1155,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_acrobacia_modifier" class="sheet-no_select" title="acrobacia_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0" selected>Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[{@DES-mod}]]" selected>Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1197,12 +1201,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_adestrar_modifier" class="sheet-no_select" title="adestrar_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -1243,12 +1247,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_atletismo_modifier" class="sheet-no_select" title="atletismo_modifier">
-                                <option value="0" selected>For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]" selected>For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1290,12 +1294,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_atuacao1_modifier" class="sheet-no_select" title="atuacao1_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -1337,12 +1341,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_atuacao2_modifier" class="sheet-no_select" title="atuacao2_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -1383,12 +1387,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_cavalgar_modifier" class="sheet-no_select" title="cavalgar_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0" selected>Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[{@DES-mod}]]" selected>Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1430,12 +1434,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_conhecimento1_modifier" class="sheet-no_select" title="conhecimento1_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0" selected>Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[@{INT-mod}]]" selected>Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1477,12 +1481,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_conhecimento2_modifier" class="sheet-no_select" title="conhecimento2_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0" selected>Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[@{INT-mod}]]" selected>Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1523,12 +1527,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_cura_modifier" class="sheet-no_select" title="cura_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0" selected>Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]" selected>Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1569,12 +1573,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_diplomacia_modifier" class="sheet-no_select" title="diplomacia_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -1615,12 +1619,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_enganacao_modifier" class="sheet-no_select" title="enganacao_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -1661,12 +1665,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_furtividade_modifier" class="sheet-no_select" title="furtividade_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0" selected>Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[{@DES-mod}]]" selected>Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1707,12 +1711,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_identificar_modifier" class="sheet-no_select" title="identificar_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0" selected>Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[@{INT-mod}]]" selected>Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1753,12 +1757,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_iniciativa_modifier" class="sheet-no_select" title="iniciativa_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0" selected>Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[{@DES-mod}]]" selected>Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1799,12 +1803,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_intimidacao_modifier" class="sheet-no_select" title="intimidacao_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -1845,12 +1849,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_intuicao_modifier" class="sheet-no_select" title="intuicao_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0" selected>Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]" selected>Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1891,12 +1895,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_jogatina_modifier" class="sheet-no_select" title="jogatina_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -1937,12 +1941,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_ladinagem_modifier" class="sheet-no_select" title="ladinagem_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0" selected>Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[{@DES-mod}]]" selected>Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -1983,12 +1987,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_meditacao_modifier" class="sheet-no_select" title="meditacao_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0" selected>Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]" selected>Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -2029,12 +2033,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_obter_modifier" class="sheet-no_select" title="obter_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0" selected>Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]" selected>Car</option>
                             </select>
                         </div>
 
@@ -2076,12 +2080,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_oficio1_modifier" class="sheet-no_select" title="oficio1_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0" selected>Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[@{INT-mod}]]" selected>Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -2123,12 +2127,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_oficio2_modifier" class="sheet-no_select" title="oficio2_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0" selected>Int: 1</option>
-                                <option value="0">Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[@{INT-mod}]]" selected>Int</option>
+                                <option value="[[{@SAB-mod}]]">Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -2169,12 +2173,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_percepcao_modifier" class="sheet-no_select" title="percepcao_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0" selected>Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]" selected>Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -2215,12 +2219,12 @@
 
                         <div class="sheet-skills_column">
                             <select name="attr_sobrevivencia_modifier" class="sheet-no_select" title="sobrevivencia_modifier">
-                                <option value="0">For: 1</option>
-                                <option value="0">Des: 1</option>
-                                <option value="0">Con: 1</option>
-                                <option value="0">Int: 1</option>
-                                <option value="0" selected>Sab: 1</option>
-                                <option value="0">Car: 1</option>
+                                <option value="[[@{FOR-mod}]]">For</option>
+                                <option value="[[@{DES-mod}]]">Des</option>
+                                <option value="[[@{CON-mod}]]">Con</option>
+                                <option value="[[{@INT-mod}]]">Int</option>
+                                <option value="[[{@SAB-mod}]]" selected>Sab</option>
+                                <option value="[[@{CAR-mod}]]">Car</option>
                             </select>
                         </div>
 
@@ -2472,8 +2476,8 @@
         
         <div class="sheet-middle">
             <div class="sheet-weapons">
-                <ul class="sheet-weapons_list">
-                    <li class="sheet-weapons_item_title">
+                <div class="sheet-weapons_list">
+                    <div class="sheet-weapons_item_title">
                         <div class="sheet-weapons_item_col">
                             <div class="sheet-weapons_title">Armas / Ataques</div>
                         </div>
@@ -2509,12 +2513,12 @@
                         <div class="sheet-weapons_item_col">
                             <div class="sheet-weapons_col_title"><br>Munição</div>
                         </div>
-                    </li>
+                    </div>
                    
-                    <li class="sheet-weapons_item">
-                        <fieldset class="repeating_weapon">
+                    <fieldset class="repeating_weapon">
+                        <div class="sheet-weapons_item">
                             <div class="sheet-weapons_item_col">
-                                <button name="attr_weapon-roll" class="sheet-weapons_roll" type="roll" value="@{macro-texto}"></button>
+                                <button name="attr_weapon-roll" class="sheet-weapons_roll" type="roll" value="@{weapon_macro}"></button>
 
                                 <input type="text" name="attr_weapon_name" title="repeating_weapon_X_name" placeholder="Nome da arma" class="sheet-weapons_item">
                             </div>
@@ -2570,9 +2574,9 @@
 
                                 <textarea name="attr_weapon_macro" title="repeating_weapon_X_macro" class="sheet-weapons_item sheet-weapons_item_textarea">/em está atacando com @{weapon_name}&#x00A;&#x00A;Resultado do Ataque: [[1d20 + @{weapon_arma_mod} + @{weapon_bonus_ataque}]]&#x00A;Resultado do Dano: [[@{weapon_bonus_dano} + @{weapon_arma_dano_mod}]]&#x00A;Crítico: @{weapon_crit}&#x00A;Tipo de Dano: @{weapon_type}</textarea>
                             </div>
-                        </fieldset>
-                    </li>
-                </ul>
+                        </div>
+                    </fieldset>
+                </div>
             </div>
         </div>