diff --git a/TormentaRPG_Tabbed/TormentaRPG_Tabbed.html b/TormentaRPG_Tabbed/TormentaRPG_Tabbed.html
index 6ec7495eb4..0cf6045cc5 100644
--- a/TormentaRPG_Tabbed/TormentaRPG_Tabbed.html
+++ b/TormentaRPG_Tabbed/TormentaRPG_Tabbed.html
@@ -77,11 +77,11 @@
             <div class="sheet-col" style="width:210px; padding-top: 5px">
             <div class="sheet-atrib">
                 <div class="sheet-3-colrow">
-                    <div class="sheet-row">
+                    <div class="sheet-row" style="margin-top: 10px">
                         <input type="hidden" name="attr_none_mod" value="0">
-                        <div class="sheet-col" style="padding-top: 18px; padding-left:12px"><span>HABILIDADES</span></div>
-                        <div class="sheet-col" style="padding-left: 27px; padding-top: 18px"><span>VALOR</span></div>
-                        <div class="sheet-col" style="padding-left: 20px; text-align: center"><span>MOD. DE<br>HABILIDADE</span></div>
+                        <div class="sheet-col" style="padding-top: 0px; padding-left:12px"><span>HABILIDADES</span></div>
+                        <div class="sheet-col" style="padding-left: 27px; padding-top: 0px"><span>VALOR</span></div>
+                        <div class="sheet-col" style="margin-top: -13px; padding-left: 8px; text-align: center"><span>MOD. DE<br>HABILIDADE</span></div>
                     </div>
                     <div class="sheet-row" style="padding-top: 2px">
                         <div class="sheet-col">
@@ -153,12 +153,12 @@
             </div>
         </div>
             <div class="sheet-col" style="width:520px">
-            <div class="sheet-row" style="font-size: 0.66em">
-                <div class="sheet-col" style="padding-top: 23px; padding-left:110px"><label>ATUAL</label></div>
+            <div class="sheet-row" style="font-size: 0.66em; margin-top: -10px">
+                <div class="sheet-col" style="padding-top: 23px; padding-left:105px"><label>ATUAL</label></div>
                 <div class="sheet-col" style="padding-top: 23px; padding-left:30px"><label>TOTAL</label></div>
-                <div class="sheet-col" style="padding-top: 23px; padding-left:123px"><label>ATUAL</label></div>
+                <div class="sheet-col" style="padding-top: 23px; padding-left:120px"><label>ATUAL</label></div>
                 <div class="sheet-col" style="padding-top: 23px; padding-left:28px"><label>TOTAL</label></div>
-                <div class="sheet-col" style="padding-top: 23px; padding-left:31px"><label>PONTOS DE AÇÃO</label></div>
+                <div class="sheet-col" style="padding-top: 23px; padding-left:28px"><label>PONTOS DE AÇÃO</label></div>
             </div>
             <div class="sheet-row">
                 <div class="sheet-col" style="font-size: 0.7em; padding-left:5px">
@@ -184,13 +184,13 @@
                 </div>
             </div>
             <div class="sheet-row" style="padding-top: 15px;font-size: 0.63em">
-                <div class="sheet-col" style="padding-left:112px; font-size: 1.15em; text-align:center"><span>TOTAL</span></div>
-                <div class="sheet-col" style="padding-left:60px; line-height:10px; text-align:center"><span>1/2 DO<br>NÍVEL</span></div>
-                <div class="sheet-col" style="padding-left:17px; line-height:10px; text-align:center"><span>MOD. DE<br>HABILIDADE</span></div>
-                <div class="sheet-col" style="padding-left:3px; line-height:10px; text-align:center"><span>BÔNUS DE<br>ARMADURA</span></div>
+                <div class="sheet-col" style="padding-top: 9px; padding-left:105px; font-size: 1.15em; text-align:center"><span>TOTAL</span></div>
+                <div class="sheet-col" style="padding-left:65px; line-height:10px; text-align:center"><span>1/2 DO<br>NÍVEL</span></div>
+                <div class="sheet-col" style="padding-left:19px; line-height:10px; text-align:center"><span>MOD. DE<br>HABILIDADE</span></div>
+                <div class="sheet-col" style="padding-left:10px; line-height:10px; text-align:center"><span>BÔNUS DE<br>ARMADURA</span></div>
                 <div class="sheet-col" style="padding-left:11px; line-height:10px; text-align:center"><span>BÔNUS DE<br>ESCUDO</span></div>
-                <div class="sheet-col" style="padding-left:11px; line-height:10px; text-align:center"><span>MOD. DE<br>TAMANHO</span></div>
-                <div class="sheet-col" style="padding-left:15px; line-height:10px; text-align:center"><span><br>OUTROS</span></div>
+                <div class="sheet-col" style="padding-left:15px; line-height:10px; text-align:center"><span>MOD. DE<br>TAMANHO</span></div>
+                <div class="sheet-col" style="padding-left:18px; line-height:10px; text-align:center"><span><br>OUTROS</span></div>
             </div>
             <div class="sheet-row">
                 <div class="sheet-col"  style="font-size:0.7em; padding-left:5px">
@@ -227,11 +227,11 @@
                 </div>
             </div>
             <div class="sheet-row" style="font-size: 0.63em">
-                <div class="sheet-col" style="padding-left:14px; font-size: 1.15em; text-align:center"><span><br>RESISTÊNCIAS</span></div>
-                <div class="sheet-col" style="padding-left:24px; font-size: 1.15em; text-align:center"><span><br>TOTAL</span></div>
+                <div class="sheet-col" style="padding-top: 8px; padding-left:14px; font-size: 1.15em; text-align:center"><span><br>RESISTÊNCIAS</span></div>
+                <div class="sheet-col" style="padding-top: 8px; padding-left:29px; font-size: 1.15em; text-align:center"><span><br>TOTAL</span></div>
                 <div class="sheet-col" style="padding-left:30px; line-height: 11px; text-align:center"><span><br>1/2 DO<br>NÍVEL</span></div>
-                <div class="sheet-col" style="padding-left:15px; line-height: 11px; text-align:center"><span><br>MOD. DE<br>HABILIDADE</span></div>
-                <div class="sheet-col" style="padding-left:13px; line-height: 11px; text-align:center"><span><br><br>OUTROS</span></div>
+                <div class="sheet-col" style="padding-left:20px; line-height: 11px; text-align:center"><span><br>MOD. DE<br>HABILIDADE</span></div>
+                <div class="sheet-col" style="padding-left:16px; line-height: 11px; text-align:center"><span><br><br>OUTROS</span></div>
             </div>
             <div class="sheet-row">
                 <div class="sheet-col" style="font-size:0.7em">
@@ -306,7 +306,7 @@
                 <div class="sheet-col">
                     <div class="sheet-atrib"><input type="text" name="attr_XP" style="border-top:0px;border-left:0px;border-right:0px;font-size:1.2em"></div>
                 </div>
-                <div class="sheet-col" style="margin-left:6px">
+                <div class="sheet-col" style="margin-left:3px">
                     <div class="sheet-atrib"><input type="text" name="attr_XP_max" style="border-top:0px;border-right:0px;border-left:0px;font-size:1.2em"></div>
                 </div>
             </div>
@@ -323,11 +323,11 @@
                 <div class="sheet-col">
                     <div class="sheet-row" style="font-size: 0.7em; line-height:10px">
                         <div class="sheet-col" style="padding-left:75px"><span><br>ATAQUES</span></div>
-                        <div class="sheet-col" style="padding-left:85px"><span><br>TOTAL</span></div>
-                        <div class="sheet-col" style="padding-left:15px; font-size:0.9em; text-align:center"><span>BÔNUS BASE<br>DE ATAQUE</span></div>
-                        <div class="sheet-col" style="padding-left:5px; font-size:0.9em; text-align:center"><span>MOD. DE<br>HABILIDADE</span></div>
-                        <div class="sheet-col" style="padding-left:12px; font-size:0.9em; text-align:center"><span>MOD. DE<br>TAMANHO</span></div>
-                        <div class="sheet-col" style="padding-left:16px; font-size:0.9em"><span><br>OUTROS</span></div>
+                        <div class="sheet-col" style="padding-left:88px"><span><br>TOTAL</span></div>
+                        <div class="sheet-col" style="padding-left:20px; font-size:0.9em; text-align:center"><span>BÔNUS BASE<br>DE ATAQUE</span></div>
+                        <div class="sheet-col" style="padding-left:7px; font-size:0.9em; text-align:center"><span>MOD. DE<br>HABILIDADE</span></div>
+                        <div class="sheet-col" style="padding-left:13px; font-size:0.9em; text-align:center"><span>MOD. DE<br>TAMANHO</span></div>
+                        <div class="sheet-col" style="padding-left:20px; font-size:0.9em"><span><br>OUTROS</span></div>
                     </div>
                     <div class="sheet-row">
                         <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{rolagem=[[1d20+@{CorpoaCorpo}]]}} {{ataque=Corpo-a-Corpo}}"><div class="sheet-block" style="font-size:0.8em; width: 150px; padding-top:10px; padding-bottom: 10px"><span>CORPO-A-CORPO</span></div></button>
@@ -355,14 +355,17 @@
                     </div>
                     <div class="sheet-row" style="padding-top:20px; padding-left:5px; font-size: 0.7em; line-height:10px">
                         <div class="sheet-col"><div class="sheet-block" style="font-size:1.45em; width: 120px; padding-top:10px; padding-bottom: 10px"><span>ARMAS</span></div></div>
-                        <div class="sheet-col" style="padding-left:10px; font-size:0.9em; text-align:center; margin-top:9px"><span>BÔNUS<br>DE ATAQUE</span></div>
+                        <div class="sheet-col" style="padding-left:12px; font-size:0.9em; text-align:center; margin-top:9px"><span>BÔNUS<br>DE ATAQUE</span></div>
                         <div class="sheet-col" style="padding-left:22px; font-size:0.9em; text-align:center; margin-top:9px"><span><br>DANO</span></div>
                         <div class="sheet-col" style="padding-left:37px; font-size:0.9em; text-align:center; margin-top:9px"><span><br>CRÍTICO</span></div>
-                        <div class="sheet-col" style="padding-left:32px; font-size:0.9em; text-align:center; margin-top:9px"><span><br>DISTÂNCIA</span></div>
-                        <div class="sheet-col" style="padding-left:35px; font-size:0.9em; text-align:center; margin-top:9px"><span><br>TIPO</span></div>
+                        <div class="sheet-col" style="padding-left:35px; font-size:0.9em; text-align:center; margin-top:9px"><span><br>DISTÂNCIA</span></div>
+                        <div class="sheet-col" style="padding-left:38px; font-size:0.9em; text-align:center; margin-top:9px"><span><br>TIPO</span></div>
                     </div>
                     <div class="sheet-row">
                         <fieldset class="repeating_armas">
+                            <input type="hidden" name="attr_ataquemelee" value="{{corpoacorpo=[[1d20cs>@{critrangearma}+(@{CorpoaCorpo})-(@{for_mod})+(@{atributochavearma})+(@{bonusarma})]]}}">
+                            <input type="hidden" name="attr_ataqueranged" value="{{adistancia=[[1d20cs>@{critrangearma}+(@{ADistancia})-(@{des_mod})+(@{atributochavearma})+(@{bonusarma})]]}}">
+                            <input type="hidden" name="attr_tipoataquearma">
                             <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{efeitoarma=@{efeitoarma}}} {{nomearma=@{nomearma}}} {{rangearma=@{rangearma}}} {{corpoacorpo=[[1d20cs>@{critrangearma}+(@{CorpoaCorpo})-(@{for_mod})+(@{atributochavearma})+(@{bonusarma})]]}} {{adistancia=[[1d20cs>@{critrangearma}+(@{ADistancia})-(@{des_mod})+(@{atributochavearma})+(@{bonusarma})]]}} {{crit=[[(@{danoarma})*@{multiplierarma}]]}}  {{dano=[[@{danoarma}]]}} {{tipodano=@{tipoarma}}}" style="margin-left:2px;border-radius: 10px; border:1px solid #ccc; background-color:white">
                                 <div class="sheet-texto" style="line-height:20px;margin-left:-1px;border-bottom: 1px solid black; width:150px;">
                                     <span name="attr_nomearma"></span><input type="hidden" name="attr_nomearma">
@@ -370,13 +373,13 @@
                             </button>
                             <div class="sheet-texto" style="padding-left: 5px; padding-bottom:5px"><input type="text" style="width:40px" name="attr_bonusarma" value="0"></div>             
                             <div class="sheet-texto" style="padding-left: 5px; padding-bottom:5px; padding-right:5px"><input type="text" style="width:60px" name="attr_danoarma" value="1d6+1"></div>
-                            <div class="sheet-col" style="padding-left:20px; padding-top:10px; border-bottom:1px solid black">
-                                        <span style="font-size:0.95em; line-height:27px;">-20 x</span>
+                            <div class="sheet-col" style="padding-left:10px; padding-top:5px; border-bottom:1px solid black">
+                                        <span style="font-size:0.95em; line-height:27px; padding-left: 10px;">- 20 x</span>
                                     </div>
                                     <div class="sheet-col">
-                                        <div class="sheet-texto" style="padding-top:8px; margin-left: -52px;"><input type="text" style="width:25px" name="attr_critrangearma_fake" value="@{critrangearma}" disabled="true"></div>
+                                        <div class="sheet-texto" style="margin-top:-5px; padding-top:8px; margin-left: -56px;"><input type="text" style="width:25px" name="attr_critrangearma_fake" value="@{critrangearma}" disabled="true"></div>
                                     </div>
-                                    <div class="sheet-col" style="padding-top:8px; margin-left: -15px">
+                                    <div class="sheet-col" style="margin-top:-5px; padding-top:8px; margin-left: -15px">
                                         <div class="sheet-texto"><input type="text" style="width:25px" name="attr_multiplierarma_fake" value="@{multiplierarma}" disabled="true"></div>
                                     </div>
                             <div class="sheet-texto" style="padding-left: 5px; padding-bottom:5px"><input type="text" style="width:60px" name="attr_distanciaarma"></div>
@@ -519,19 +522,19 @@
                     <div class="sheet-row" style="font-size:0.7em; line-height: 10px;">
                         <div class="sheet-col" style="padding-left:174px"><span><br>TOTAL</span></div>
                         <div class="sheet-col" style="font-size:0.9em; padding-left:20px"><span><br>GRAD.</span></div>
-                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:10px"><span>MOD. DE<br>HABILIDADE</span></div>
-                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:5px"><span><br>OUTROS</span></div>
+                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:13px"><span>MOD. DE<br>HABILIDADE</span></div>
+                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:9px"><span><br>OUTROS</span></div>
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Acrobacia}} {{rolagem=[[1d20+@{acrobacia}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Acrobacia}} {{rolagem=[[1d20+@{acrobacia}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>ACROBACIA<span style="vertical-align:super; font-size:0.8em">+</span></span><span style="font-size:0.8em"><br>Destreza</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_acrobaciaflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_acrobaciaflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_acrobaciaflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
                             <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_acrobacia" value="(@{graduacao_acrobacia}) + (@{des_mod}) + (@{acrobaciamod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
@@ -550,14 +553,14 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Atletismo}} {{rolagem=[[1d20+@{atletismo}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Atletismo}} {{rolagem=[[1d20+@{atletismo}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>ATLETISMO<span style="vertical-align:super; font-size:0.8em">+</span></span><span style="font-size:0.8em"><br>Força</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_atletismoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_atletismoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_atletismoflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
                             <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_atletismo" value="(@{graduacao_atletismo}) + (@{for_mod}) + (@{atletismomod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
@@ -567,7 +570,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_atletismofor" value="@{for_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_atletismodes" value="@{for_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -576,16 +579,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Cavalgar}} {{rolagem=[[1d20+@{cavalgar}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
-                                <span>CAVALGAR</span><span style="font-size:0.8em"><br>Destreza</span>
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Cavalgar}} {{rolagem=[[1d20+@{cavalgar}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
+                                <span>CAVALGAR<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Destreza</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_cavalgarflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_cavalgarflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_cavalgarflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_cavalgar" value="(@{graduacao_cavalgar}) + (@{des_mod}) + (@{cavalgarmod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_cavalgar" value="(@{graduacao_cavalgar}) + (@{des_mod}) + (@{cavalgarmod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -602,16 +605,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Cura}} {{rolagem=[[1d20+@{cura}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
-                                <span>CURA</span><span style="font-size:0.8em"><br>Sabedoria</span>
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Cura}} {{rolagem=[[1d20+@{cura}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
+                                <span>CURA<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Sabedoria</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_curaflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_curaflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_curaflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_cura" value="(@{graduacao_cura}) + (@{sab_mod}) + (@{curamod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_cura" value="(@{graduacao_cura}) + (@{sab_mod}) + (@{curamod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -619,7 +622,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_curasab" value="@{sab_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_curades" value="@{sab_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -628,16 +631,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Enganacao}} {{rolagem=[[1d20+@{enganacao}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
-                                <span>ENGANAÇÃO</span><span style="font-size:0.8em"><br>Carisma</span>
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Enganação}} {{rolagem=[[1d20+@{enganacao}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
+                                <span>ENGANAÇÃO<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Carisma</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_enganacaoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_enganacaoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_enganacaoflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_enganacao" value="(@{graduacao_enganacao}) + (@{car_mod}) + (@{enganacaomod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_enganacao" value="(@{graduacao_enganacao}) + (@{car_mod}) + (@{enganacaomod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -645,7 +648,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_enganacaocar" value="@{car_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_enganacaodes" value="@{car_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -654,16 +657,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Identificar Magia}} {{rolagem=[[1d20+@{identificar_magia}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Identificar Magia}} {{rolagem=[[1d20+@{identificar_magia}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>IDENTIFICAR MAGIA<span style="vertical-align:super; font-size:0.8em">*</span></span><span style="font-size:0.8em"><br>Inteligência</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_identificar_magiaflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_identificar_magiaflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_identificar_magiaflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_identificar_magia" value="@{identificar_magiaflag}*((@{graduacao_identificar_magia}) + (@{int_mod}) + (@{identificar_magiamod}))" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_identificar_magia" value="(@{graduacao_identificar_magia}) + (@{int_mod}) + (@{identificar_magiamod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -671,7 +674,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_identificar_magiaint" value="@{int_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_identificar_magiades" value="@{int_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -680,16 +683,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Intimidação}} {{rolagem=[[1d20+@{intimidacao}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
-                                <span>INTIMIDAÇÃO</span><span style="font-size:0.8em"><br>Carisma</span>
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Intimidação}} {{rolagem=[[1d20+@{intimidacao}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
+                                <span>INTIMIDAÇÃO<span style="vertical-align:super; font-size:0.8em">*</span></span><span style="font-size:0.8em"><br>Carisma</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_intimidacaoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_intimidacaoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_intimidacaoflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_intimidacao" value="(@{graduacao_intimidacao}) + (@{car_mod}) + (@{intimidacaomod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_intimidacao" value="(@{graduacao_intimidacao}) + (@{car_mod}) + (@{intimidacaomod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -697,7 +700,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_intimidacaocar" value="@{car_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_intimidacaodes" value="@{car_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -706,16 +709,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Ladinagem}} {{rolagem=[[1d20+@{ladinagem}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Ladinagem}} {{rolagem=[[1d20+@{ladinagem}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>LADINAGEM<span style="vertical-align:super; font-size:0.8em">*+</span></span><span style="font-size:0.8em"><br>Destreza</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_ladinagemflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_ladinagemflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_ladinagemflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_ladinagem" value="@{ladinagemflag}*((@{graduacao_ladinagem}) + (@{des_mod}) + (@{ladinagemmod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2))" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_ladinagem" value="(@{graduacao_ladinagem}) + (@{des_mod}) + (@{ladinagemmod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -732,14 +735,14 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Ofício}} {{rolagem=[[1d20+@{oficio}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Ofício}} {{rolagem=[[1d20+@{oficio}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px;">   
                                 <span>OFÍCIO<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Inteligência</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_oficioflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_oficioflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_oficioflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
                             <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_oficio" value="((@{graduacao_oficio}) + (@{int_mod}) + (@{oficiomod}))" disabled="true"> </div>
                         </div>
@@ -755,7 +758,7 @@
                         <div class="sheet-col" style="margin-left:-2px">
                             <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_oficiomod" value="0"> </div>
                         </div>
-                        <input class="oficiosubflag" style="margin-left:-50px" type="checkbox" name="attr_oficiosubflag"><span>l</span>
+                        <input class="oficiosubflag" style="margin-left:-50px;" type="checkbox" name="attr_oficiosubflag"><span style="line-height:13px">l</span>
                         <div class="suboficio">
                             <fieldset class="repeating_oficio">
                                 <div class="sheet-row"  style="margin-top:10px; margin-bottom:10px">
@@ -776,16 +779,16 @@
                     </div>
                     <div class="sheet-row" style="margin-top: -14px">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Sobrevivência}} {{rolagem=[[1d20+@{sobrevivencia}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Sobrevivência}} {{rolagem=[[1d20+@{sobrevivencia}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>SOBREVIVÊNCIA<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Sabedoria</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_sobrevivenciaflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_sobrevivenciaflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_sobrevivenciaflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_sobrevivencia" value="(@{graduacao_sobrevivencia}) + (@{sab_mod}) + (@{sobrevivenciamod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_sobrevivencia" value="(@{graduacao_sobrevivencia}) + (@{sab_mod}) + (@{sobrevivenciamod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -793,7 +796,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_sobrevivenciasab" value="@{sab_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_sobrevivenciades" value="@{sab_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -805,21 +808,21 @@
                     <div class="sheet-row" style="font-size:0.7em; line-height: 10px;">
                         <div class="sheet-col" style="padding-left:172px"><span><br>TOTAL</span></div>
                         <div class="sheet-col" style="font-size:0.9em; padding-left:20px"><span><br>GRAD.</span></div>
-                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:10px"><span>MOD. DE<br>HABILIDADE</span></div>
-                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:5px"><span><br>OUTROS</span></div>
+                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:13px"><span>MOD. DE<br>HABILIDADE</span></div>
+                        <div class="sheet-col" style="text-align:center;font-size:0.9em; padding-left:9px"><span><br>OUTROS</span></div>
                     </div>
                     <div class="sheet-row" style="margin-left:-1px">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Adestrar Animais}} {{rolagem=[[1d20+@{adestrar_animais}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Adestrar Animais}} {{rolagem=[[1d20+@{adestrar_animais}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>ADESTRAR ANIMAIS<span style="vertical-align:super; font-size:0.8em">*</span></span><span style="font-size:0.8em"><br>Carisma</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_adestrar_animaisflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_adestrar_animaisflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_adestrar_animaisflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_adestrar_animais" value="@{adestrar_animaisflag}*((@{graduacao_adestrar_animais}) + (@{car_mod}) + (@{adestrar_animaismod}))" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_adestrar_animais" value="(@{graduacao_adestrar_animais}) + (@{car_mod}) + (@{adestrar_animaismod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -827,7 +830,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_adestrar_animaiscar" value="@{car_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_adestrar_animaisdes" value="@{car_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -836,14 +839,14 @@
                     </div>
                     <div class="sheet-row" style="margin-left:-1px">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Atuação}} {{rolagem=[[1d20+@{atuacao}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Atuação}} {{rolagem=[[1d20+@{atuacao}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px;">   
                                 <span>ATUAÇÃO<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Carisma</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_atuacaoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_atuacaoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_atuacaoflag" value="1"><span style="line-height:18px">3</span>
                         <div class="sheet-col" style="margin-left:-39px; padding-top:5px">
                             <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_atuacao" value="((@{graduacao_atuacao}) + (@{car_mod}) + (@{atuacaomod}))" disabled="true"> </div>
                         </div>
@@ -859,7 +862,7 @@
                         <div class="sheet-col" style="margin-left:-2px">
                             <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_atuacaomod" value="0"> </div>
                         </div>
-                        <input class="atuacaosubflag" style="margin-left:-50px" type="checkbox" name="attr_atuacaosubflag"><span>l</span>
+                        <input class="atuacaosubflag" style="margin-left:-50px" type="checkbox" name="attr_atuacaosubflag"><span style="line-height:13px">l</span>
                         <div class="subatuacao">
                             <fieldset class="repeating_atuacao">
                                 <div class="sheet-row"  style="margin-top:10px; margin-bottom:10px">
@@ -880,14 +883,14 @@
                     </div>
                     <div class="sheet-row" style="margin-top: -14px; margin-left:-1px">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Conhecimento}} {{rolagem=[[1d20+@{conhecimento}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Conhecimento}} {{rolagem=[[1d20+@{conhecimento}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px;">   
                                 <span>CONHECIMENTO<span style="vertical-align:super; font-size:0.8em"></span>*</span><span style="font-size:0.8em"><br>Inteligência</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_conhecimentoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_conhecimentoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_conhecimentoflag" value="1"><span style="line-height:18px">3</span>
                         <div class="sheet-col" style="margin-left:-39px; padding-top:5px">
                             <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_conhecimento" value="@{conhecimentoflag}*((@{graduacao_conhecimento}) + (@{int_mod}) + (@{conhecimentomod}))" disabled="true"> </div>
                         </div>
@@ -903,7 +906,7 @@
                         <div class="sheet-col" style="margin-left:-2px">
                             <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_conhecimentomod" value="0"> </div>
                         </div>
-                        <input class="conhecimentosubflag" style="margin-left:-50px" type="checkbox" name="attr_conhecimentosubflag"><span>l</span>
+                        <input class="conhecimentosubflag" style="margin-left:-50px" type="checkbox" name="attr_conhecimentosubflag"><span style="line-height:13px">l</span>
                         <div class="subconhecimento">
                             <fieldset class="repeating_conhecimento">
                                 <div class="sheet-row"  style="margin-top:10px; margin-bottom:10px">
@@ -924,16 +927,16 @@
                     </div>
                     <div class="sheet-row" style="margin-top: -14px">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Diplomacia}} {{rolagem=[[1d20+@{diplomacia}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
-                                <span>DIPLOMACIA</span><span style="font-size:0.8em"><br>Carisma</span>
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Diplomacia}} {{rolagem=[[1d20+@{diplomacia}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
+                                <span>DIPLOMACIA<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Carisma</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_diplomaciaflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_diplomaciaflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_diplomaciaflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_diplomacia" value="(@{graduacao_diplomacia}) + (@{car_mod}) + (@{diplomaciamod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_diplomacia" value="(@{graduacao_diplomacia}) + (@{car_mod}) + (@{diplomaciamod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -941,7 +944,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_diplomaciacar" value="@{car_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_diplomaciades" value="@{car_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -950,16 +953,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Furtividade}} {{rolagem=[[1d20+@{furtividade}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Furtividade}} {{rolagem=[[1d20+@{furtividade}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>FURTIVIDADE<span style="vertical-align:super; font-size:0.8em">+</span></span><span style="font-size:0.8em"><br>Destreza</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_furtividadeflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_furtividadeflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_furtividadeflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_furtividade" value="(@{graduacao_furtividade}) + (@{des_mod}) + (@{furtividademod}) + (@{furt_mod_tam}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_furtividade" value="(@{graduacao_furtividade}) + (@{des_mod}) + (@{furtividademod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -976,16 +979,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Iniciativa}} {{rolagem=[[1d20+@{iniciativa} &{tracker}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Iniciativa}} {{rolagem=[[1d20+@{iniciativa} &{tracker}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>INICIATIVA<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Destreza</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_iniciativaflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_iniciativaflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_iniciativaflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_iniciativa" value="(@{graduacao_iniciativa}) + (@{des_mod}) + (@{iniciativamod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_iniciativa" value="(@{graduacao_iniciativa}) + (@{des_mod}) + (@{iniciativamod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -1002,16 +1005,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Intuição}} {{rolagem=[[1d20+@{intuicao}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Intuição}} {{rolagem=[[1d20+@{intuicao}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>INTUIÇÃO<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Sabedoria</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_intuicaoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_intuicaoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_intuicaoflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_intuicao" value="(@{graduacao_intuicao}) + (@{sab_mod}) + (@{intuicaomod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_intuicao" value="(@{graduacao_intuicao}) + (@{sab_mod}) + (@{intuicaomod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -1019,7 +1022,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_intuicaosab" value="@{sab_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_intuicaodes" value="@{sab_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -1028,16 +1031,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Obter Informação}} {{rolagem=[[1d20+@{obter_informacao}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Obter Informação}} {{rolagem=[[1d20+@{obter_informacao}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>OBTER INFORMAÇÃO<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Carisma</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_obter_informacaoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_obter_informacaoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_obter_informacaoflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_obter_informacao" value="(@{graduacao_obter_informacao}) + (@{car_mod}) + (@{obter_informacaomod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_obter_informacao" value="(@{graduacao_obter_informacao}) + (@{car_mod}) + (@{obter_informacaomod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -1045,7 +1048,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_obter_informacaocar" value="@{car_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_obter_informacaodes" value="@{car_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -1054,16 +1057,16 @@
                     </div>
                     <div class="sheet-row">
                         <div class="sheet-col">
-                            <button type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Percepção}} {{rolagem=[[1d20+@{percepcao}]]}}">
-                            <div class="sheet-block" style="padding-top:5px; line-height:10px; font-size:0.65em; width: 120px; margin-top:-35px">   
+                            <button style="margin-top:5px; height:37px;" type="roll" value="&{template:trpg} {{nome=@{Char_Name}}} {{teste=Percepção}} {{rolagem=[[1d20+@{percepcao}]]}}">
+                            <div class="sheet-block" style="line-height:10px; font-size:0.65em; width: 120px">   
                                 <span>PERCEPÇÃO<span style="vertical-align:super; font-size:0.8em"></span></span><span style="font-size:0.8em"><br>Sabedoria</span>
                             </div>    
                             </button>
                         </div>
                         <input type="hidden" name="attr_percepcaoflag" value="0">
-                        <input class="treinadaflag" type="checkbox" name="attr_percepcaoflag" value="1"><span>3</span>
+                        <input class="treinadaflag" type="checkbox" name="attr_percepcaoflag" value="1"><span style="line-height:18px;">3</span>
                         <div class="sheet-col" style="margin-left:-40px; padding-top:5px">
-                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_percepcao" value="(@{graduacao_percepcao}) + (@{sab_mod}) + (@{percepcaomod})" disabled="true"> </div>
+                            <div class="sheet-texto"><input type="text" style="height:35px; width:40px" name="attr_percepcao" value="(@{graduacao_percepcao}) + (@{sab_mod}) + (@{percepcaomod}) + (@{armadura_redutor}) + (@{escudo_redutor}) - (@{redutorcarga} * 2)" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>=</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -1071,7 +1074,7 @@
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
-                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_percepcaosab" value="@{sab_mod}" disabled="true"> </div>
+                            <div class="sheet-texto" style="padding-top:5px"><input type="text" style="height:35px; width:40px" name="attr_percepcaodes" value="@{sab_mod}" disabled="true"> </div>
                         </div>
                         <div class="sheet-col" style="padding-top: 15px; margin-left: -3px"><span>+</span></div>
                         <div class="sheet-col" style="margin-left:-2px">
@@ -3271,4 +3274,4 @@ on("sheet:opened remove:repeating_equipamento change:repeating_equipamento:equip
         {{/rollTotal() danoflagmagia 1}}
     </div>
     <div class="trpg-footer"></div>
-</rolltemplate>
\ No newline at end of file
+</rolltemplate>