diff --git a/3D&T_ALPHA/3D&T_ALPHA.html b/3D&T_ALPHA/3D&T_ALPHA.html
index 9db7aaceb8..757d563080 100644
--- a/3D&T_ALPHA/3D&T_ALPHA.html
+++ b/3D&T_ALPHA/3D&T_ALPHA.html
@@ -22,23 +22,60 @@
 
 
 <!-- COMBATE -->
-<h3 style="background: #204c6f ; border-radius: 5px ; padding: 5px ; text-align: center ; color: white">Combate</h3>
-   <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:100px;"></div><div class="sheet-col"align="center"><label>INICIATIVA</label><br><button type='roll' name="roll_dist" value='&{template:default} {{name= Rolou Iniciativa}}{{@{character_name}}} {{tirou= [[1d6+@{habilidade}+@{bh}+?{Modificador|0} &{tracker}]]  de iniciativa}}'></button></div>
-   <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:100px;"></div><div class="sheet-col"align="center"><label style="text-align: center">FA(PF)</label><br><button type='roll' name="roll_dist" value='&{template:default} {{name=@{character_name} Rolou Ataque FA(PF)}}{{**FA**[[ 1d6cs1cf6 + (@{poder_de_fogo}+@{bpf})+(@{habilidade}+@{bh})+?{Modificador|0} ]]**e FA Crítica**[[6+(2*(@{poder_de_fogo}+@{bpf}))+(@{habilidade}+@{bh})+?{Modificador}]] de longe}}'></button></div>
-   <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:100px;"></div><div class="sheet-col"align="center"><label style="text-align: center">FA</label><br><button type='roll' name="roll_atqp" value='&{template:default} {{name=@{character_name} Rolou Ataque com FA}}{{**FA**[[ 1d6cs1cf6 + (@{forca} + @{bf})+(@{habilidade}+@{bh})+?{Modificador|0} ]]**e FA Crítica**[[6+(2*(@{forca}+@{bf}))+(@{habilidade}+@{bh})+?{Modificador|0}]] próximo}}'></button></div>
-   
-   <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:100px;"></div><div class="sheet-col"align="center"><label style="text-align: center">FD</label><br>
-   <span>Mod.</span><input type="number" name="attr_bdf" value="0" class="sheet-short">
-   <button type='roll' name="roll_def" value='&{template:default} {{name=Rolou Defesa}} {{@{character_name}}} {{=?{Selecione o tipo de DEFESA|
-   Normal,**Normal**[[[[1d6+(@{armadura}+@{ba})+(@{habilidade}+@{bh})]]+@{bdf}]]** e Crítica**[[ [[6+(2*(@{armadura}+@{ba}))+ (@{habilidade} + @{bh})]]+@{bdf}]]|
+<h3 style="background: #204c6f ; border-radius: 5px ; padding: 5px ; text-align: center ; color: white">Combate</h3>  
+<div class="sheet-3colrow">
+	<div class="sheet-col">
+	<h3 style="text-align: center ; color: black">Iniciativa</h3><br/>
+	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:100px;"></div><div class="sheet-col"align="center"><button type='roll' name="roll_inic" value='&{template:3dtiniciativa} {{name= Rolou Iniciativa}}{{character=@{character_name}}} {{type=tirou de iniciativa}} {{iniciativa=[[1d6+@{habilidade}+@{bh}+?{Modificador|0} &{tracker}]]}}'></button></div>
+	</div>
+	
+	<div class="sheet-col">
+	<h3 style="text-align: center ; color: black">Ataques</h3>   
+<div class="sheet-row">
+	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:76px;"></div>
+<span>FA</span>
+ <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:44px;"></div>
+<span>FA(PF)</span>
+</div>
 
-   Surpreso,**Foi Supreendido(a)  Normal**[[ [[1d6 + (@{armadura} + @{ba})]]+@{bdf}]]** e Crítica**[[ [[6 + (2 * (@{armadura} + @{ba}))]]+@{bdf}]]|
+<div class="sheet-row">
+	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:70px;"></div>
+<button type='roll' name="roll_ataquepf" value='&{template:3dtataque} {{name=@{character_name}}} {{subtags=Ataca de perto}} {{ataque-pa=[[1d6cs>6+(@{forca}+@{bf}+@{habilidade}+@{bh})+?{Modificador|0})]]}} {{dano=[[(@{forca}+@{bf}+@{habilidade}+@{bh})+?{Modificador|0}) [mods] ]]}} {{danocrit=[[6+(2*(@{forca}+@{bf}))+(@{habilidade}+@{bh})+?{Modificador|0}) [crit]  ]]}}'></button>
+ <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:40px;"></div>
+<button type='roll' name="ataque" value='&{template:3dtataque} {{name=@{character_name}}} {{subtags=Ataca a distância}} {{ataque-dist=[[1d6cs>6+(@{poder_de_fogo}+@{bpf}+@{habilidade}+@{bh})+?{Modificador|0})]]}} {{dano=[[(@{poder_de_fogo}+@{bpf}+@{habilidade}+@{bh})+?{Modificador|0}) [mods] ]]}} {{danocrit=[[6+(2*(@{poder_de_fogo}+@{bpf}))+(@{habilidade}+@{bh})+?{Modificador|0}) [crit] ]]}}'></button>
+</div>
 
-   Indefeso,**Pego Indefeso(a)**[[@{armadura}+@{ba}]]|}}}'></button> 
- 
+</div>
+
+	
+	<div class="sheet-col">
+	<h3 style="text-align: center ; color: black">Defesas</h3>
+	<div class="sheet-row">
+	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
+<span>Norm.</span>
+ <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:15px;"></div>
+<span>Surp.</span>
+<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:20px;"></div>
+<span>Ind.</span>
+</div>
+
+<div class="sheet-row">
+	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
+<button type='roll' name="roll_ataquepf" value='&{template:3dtdef} {{name=@{character_name}}} {{subtags=Defende}} {{defesa-pa=[[1d6cs>6+(@{armadura}+@{ba})+(@{habilidade}+@{bh})+?{Modificador|0})]]}} {{dano=[[(@{armadura}+@{ba})+(@{habilidade}+@{bh})+?{Modificador|0}) [mods]]]}} {{danocrit=[[6+(2*(@{armadura}+@{ba}))+ (@{habilidade} + @{bh})+?{Modificador|0}) [crit]  ]]}}'></button>
+
+ <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:20px;"></div>
+<button type='roll' name="roll_ataquepf" value='&{template:3dtdef} {{name=@{character_name}}} {{subtags=Supreendido}} {{defesa-pa=[[1d6cs>6+(@{armadura} + @{ba})+?{Modificador|0}]]}} {{dano=[[(@{armadura}+@{ba})+(@{habilidade}+@{bh})+?{Modificador|0}) [mods]]]}} {{danocrit=[[6+(2*(@{armadura} + @{ba})+?{Modificador|0}) [crit]  ]]}}
+'></button>
+
+<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:15px;"></div>
+<button type='roll' name="roll_ataquepf" value='&{template:3dtdef} {{name=@{character_name}}} {{subtags=Está Indefeso}} {{defesa-pa=[[(@{armadura}+@{ba})+?{Modificador|0}]]}} {{dano=[[(@{armadura}+@{ba})+?{Modificador|0}]]}}'></button>
+
+</div>
+
+</div>
+</div>
    
-   
- </div>
+
     <hr>
 	<div class="sheet-2colrow">
     <div class="sheet-col">
@@ -56,32 +93,32 @@
 </div>
 <!-- Força -->
 <div class="sheet-row">
-      <label style="width:150px">Força</label><input type="number" name="attr_forca" value="0" class="sheet-short"><button type='roll' name="roll_forca" value='&{template:default} {{name= Teste de Força!}} {{@{character_name}}}   {{tirou= [[1d6cs<[[@{forca}+@{bf}+?{Modificador|0}]]cf>[[@{forca}+@{bf}+?{Modificador|0}]]]]no teste}}'></button>
-		<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
-	 <input type="number" name="attr_bf" value="0" class="sheet-short"><br>
+      <label style="width:150px">Força</label><input type="number" name="attr_forca" value="0" class="sheet-short"><button type='roll' name="roll_forca" value='&{template:3dtatributo} {{name= Teste de Força}} {{character=@{character_name}}} {{type=Usando Força}} {{ability=[[1d6]]}} {{atributo=[[@{forca}+@{bf}+?{Modificador|0}]]}}'></button>
+      <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
+	  <input type="number" name="attr_bf" value="0" class="sheet-short"><br>
 	</div>  
 <!-- Habilidade -->	  
 <div class="sheet-row">
-	  <label style="width:150px">Habilidade</label><input type="number" name="attr_habilidade" value="0" class="sheet-short"><button type='roll' name="roll_habilidade" value='&{template:default} {{name= Teste de Habilidade!}} {{@{character_name}}}  {{tirou= [[1d6cs<[[@{habilidade}+@{bh}+?{Modificador|0}]]cf>[[@{habilidade}+@{bh}+?{Modificador|0}]]]]no teste}}'></button>
-	  	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
+	  <label style="width:150px">Habilidade</label><input type="number" name="attr_habilidade" value="0" class="sheet-short"><button type='roll' name="roll_habilidade" value='&{template:3dtatributo} {{name= Teste de Habilidade}} {{character=@{character_name}}} {{type=Usando Habilidade}} {{ability=[[1d6]]}} {{atributo=[[@{habilidade}+@{bh}+?{Modificador|0}]]}}'></button>
+      <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
 	  <input type="number" name="attr_bh" value="0" class="sheet-short"><br>
 	</div>  
 <!-- Resistencia --> 
  <div class="sheet-row">
-	  <label style="width:150px">Resistência</label><input type="number" name="attr_resistencia" value="0" class="sheet-short"><button type='roll' name="roll_resistencia" value='&{template:default} {{name= Teste de Resistência!}} {{@{character_name}}} {{tirou= [[1d6cs<[[@{resistencia}+@{br}+?{Modificador|0}}]]cf>[[@{resistencia}+@{br}+?{Modificador|0}}]]]] no teste}}'></button>
-	  	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
+	  <label style="width:150px">Resistência</label><input type="number" name="attr_resistencia" value="0" class="sheet-short"><button type='roll' name="roll_resistencia" value='&{template:3dtatributo} {{name= Teste de Resistência}} {{character=@{character_name}}} {{type=Usando Resitência}} {{ability=[[1d6]]}} {{atributo=[[@{resistencia}+@{br}+?{Modificador|0}]]}}'></button>
+	  <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
 	  <input type="number" name="attr_br" value="0" class="sheet-short"><br>
 	  </div>
 <!-- Armaduras --> 
 <div class="sheet-row">
-	  <label style="width:150px">Armadura</label><input type="number" name="attr_armadura" value="0" class="sheet-short"><button type='roll' name="roll_armadura" value='&{template:default} {{name= Teste de Armadura!}} {{@{character_name}}} {{tirou= [[1d6cs<[[@{armadura}+@{ba}+?{Modificador|0}]]cf>[[@{armadura}+@{ba}+?{Modificador|0}]]]] no teste}}'></button>
-	 	<div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
-	 <input type="number" name="attr_ba" value="0" class="sheet-short"><br>
+	  <label style="width:150px">Armadura</label><input type="number" name="attr_armadura" value="0" class="sheet-short"><button type='roll' name="roll_armadura" value='&{template:3dtatributo} {{name= Teste de Armadura}} {{character=@{character_name}}} {{type=Usando Armadura}} {{ability=[[1d6]]}} {{atributo=[[@{armadura}+@{ba}+?{Modificador|0}]]}}'></button>
+	  <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
+	  <input type="number" name="attr_ba" value="0" class="sheet-short"><br>
 	  </div>
 <!-- Poder de Fogo --> 
 <div class="sheet-row">
-	  <label style="width:150px">Poder de Fogo</label><input type="number" name="attr_poder_de_fogo" value="0" class="sheet-short"><button type='roll' name="roll_poder_de_fogo" value='&{template:default} {{name= Teste de Poder de Fogo!}} {{@{character_name}}} {{tirou= [[1d6cs<[[@{poder_de_fogo}+@{bpf}+?{Modificador|0}}]]cf>[[@{poder_de_fogo}+@{bpf}+?{Modificador|0}}]]]] no teste}}'></button>
-	    <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
+	  <label style="width:150px">Poder de Fogo</label><input type="number" name="attr_poder_de_fogo" value="0" class="sheet-short"><button type='roll' name="roll_poder_de_fogo" value='&{template:3dtatributo} {{name= Teste de Poder de Fogo}} {{character=@{character_name}}} {{type=Usando Poder de Fogo}} {{ability=[[1d6]]}} {{atributo=[[@{poder_de_fogo}+@{bpf}+?{Modificador|0}]]}}'></button>
+	  <div class="sheet-item sheet-small sheet-black" style="display: inline-block; width:50px;"></div>
 	  <input type="number" name="attr_bpf" value="0" class="sheet-short"><br>
 	  </div>
 <!-- Pontos de Vida -->
@@ -114,7 +151,7 @@
 <span>Nome</span><br/>
 	    <input type="number" name="attr_custo"  value="0" class="sheet-short">
         <input type="text" name="attr_pericia" style="width:310px"/>
-		<button type='roll' name="roll_AtaqueD" value='&{template:default} {{name= Teste de Perícia!}} {{@{character_name}}} {{fez teste de= @{pericia}}} {{tirou= [[1d6cs<[[@{habilidade}+@{bh}+?{Modificador|0}]]cf>[[@{habilidade}+@{bh}+?{Modificador|0}]]]]no teste}}'></button><br/>
+		<button type='roll' name="roll_pericia" value='&{template:3dtatributo} {{name= Teste de Perícia!}} {{character=@{character_name}}} {{type=fez teste de @{pericia}}} {{ability=[[1d6]]}} {{atributo=[[@{forca}+@{bf}+?{Modificador|0}]]}}'></button>
 		<span>Descrição</span>
 		<textarea name="attr_desc_per" class="sheet-resize" style="min-height:38px; width:390px"></textarea>    		
        
@@ -331,7 +368,7 @@
 		</select>
 		<input type="number" name="attr_bat2" value="0" class="sheet-short">
 		<input type="number" name="attr_dadosm" value="0">
-		<button type='roll' name="roll_AtaqueD" value='&{template:default} {{name= Conjurou Magia!}} {{@{character_name} conjura}} {{Magia=@{magia}}}  {{Escola=@{escola}}} {{Custo=@{custom} PM}} {{PV=@{custopv} por turno}} {{Alcance=@{alcance}}} {{Duração=@{duracao}}}  {{Tirou=[[@{atributo1}+@{atributo2}+[[{@{dadosm}d6}]]+@{bat1}+@{bat2}]] no resultado!!!}}'></button><br>
+		<button type='roll' name="roll_AtaqueD" value='&{template:3dtmagia} {{name= Conjurando Magia!}} {{character=@{character_name} conjura}} {{Magia=@{magia}}}  {{Escola=@{escola}}} {{Custo=@{custom}}} {{PV=@{custopv}}} {{Alcance=@{alcance}}} {{Duração=@{duracao}}}  {{resultado=[[@{atributo1}+@{atributo2}+[[{@{dadosm}d6}]]+@{bat1}+@{bat2}]]}}'></button>
 		<span>Descrição</span>
         <textarea name="attr_desc_mag" class="sheet-resize" style="min-height: 38px; width: 830px"></textarea>        
      </fieldset>
@@ -342,7 +379,8 @@
   <div class="sheet-block-q">    
   </div>	
  </div>
-
+ 
+ 
 <!-- TEMPLATE ATRIBUTOS-->
 <rolltemplate class="sheet-rolltemplate-3dtatributo">
     <div class="bordertop"></div>
@@ -396,107 +434,6 @@
 		
 </rolltemplate>
 
-<!-- TEMPLATE ATAQUES-->
-<rolltemplate class="sheet-rolltemplate-3dtataque1">
-    <div class="bordertop"></div>
-    <div class="container">
-        <!-- Ataques dos Personagens -->
-        <div><h1>{{name}}</h1></div>
-        {{#ataque-pa}}
-		<div class="arrow-container"><div class="arrow-right"></div></div>
-		
-        <div><span class="subheader">{{subtags}}</span></div>
-        <div class="rowcolor"><span class="tcat">Dano:</span> {{ataque-pa}}</div>
-            {{#dano}}
-               {{#^rollWasCrit() ataque-pa}}
-                    {{#rollGreater() dano 0 }}
-                        <div class="rowcolor"></div>
-                    {{/rollGreater() dano 0 }}
-                    {{#rollLess() dano 1 }}
-                        <div class="rowcolor"><span class="tcat">Dano Mínimo: </span><span style="font-weight: bold;"> 1</span> </div>
-                    {{/rollLess() dano 1 }}
-                {{/^rollWasCrit() ataque-pa}}
-                
-                {{#rollWasCrit() ataque-pa}}
-                    <span class="fullcrit">Acerto crítico! </span>
-                    {{#rollGreater() danocrit 0 }}
-                            <div class="rowcolor"><span class="tcat">Dano crítico:</span> {{danocrit}}</div>
-                        {{/rollGreater() danocrit 0 }}
-                        {{#rollLess() danocrit 1 }}
-                            <div class="rowcolor"><span class="tcat">Dano Mínimo:</span><span style="font-weight: bold;"> 1</span> </div>
-                    {{/rollLess() danocrit 1 }}
-                {{/rollWasCrit() ataque-pa}}
-            {{/dano}}		
-        {{/ataque-pa}}
-        {{#ataque-dist}}
-			<div class="arrow-container"><div class="arrow-right"></div></div>
-			
-            <div><span class="subheader">{{subtags}}</span></div>  
-            <div class="rowcolor"><span class="tcat">Dano:</span> {{ataque-dist}}</div>
-            
-            {{#dano}}
-                   {{#^rollWasCrit() ataque-dist}}
-                   
-                        {{#rollGreater() dano 0 }}
-                            <div class="rowcolor"></div>
-                        {{/rollGreater() dano 0 }}
-                        {{#rollLess() dano 1 }}
-                            <div class="rowcolor"><span class="tcat">Dano Mínimo: </span><span style="font-weight: bold;"> 1 (mín.)</span> </div>
-                        {{/rollLess() dano 1 }}
-
-                    {{/^rollWasCrit() ataque-dist}}
-                    {{#rollWasCrit() ataque-dist}}
-                        <span class="fullcrit">Acerto crítico! </span>
-                        {{#rollGreater() danocrit 0 }}
-                                <div class="rowcolor"><span class="tcat">Dano crítico:</span> {{danocrit}}</div>
-                        {{/rollGreater() danocrit 0 }}
-                        {{#rollLess() danocrit 1 }}
-                                <div class="rowcolor"><span class="tcat">Dano Mínimo:</span><span style="font-weight: bold;"> 1 (mín.)</span> </div>
-                        {{/rollLess() danocrit 1 }}
-                    {{/rollWasCrit() ataque-dist}}
-                {{/dano}}
-        {{/ataque-dist}}      
-       
-    </div>
-</rolltemplate>
-
-<!-- TEMPLATE DEFESAS -->
-<rolltemplate class="sheet-rolltemplate-3dtdef1">
-    <div class="bordertop"></div>
-    <div class="container">
-        <!-- Ataques dos Personagens -->
-        <div><h1>{{name}}</h1></div>
-        {{#defesa-pa}}
-		<div class="arrow-container"><div class="arrow-right"></div></div>
-		
-        <div><span class="subheader">{{subtags}}</span></div>
-        <div class="rowcolor"><span class="tcat">Defendeu:</span> {{defesa-pa}}</div>
-            {{#dano}}
-               {{#^rollWasCrit() defesa-pa}}
-                    {{#rollGreater() dano 0 }}
-                        <div class="rowcolor"></div>
-                    {{/rollGreater() dano 0 }}
-                    {{#rollLess() dano 1 }}
-                        <div class="rowcolor"><span class="tcat">Defesa Mínimo: </span><span style="font-weight: bold;"> 1</span> </div>
-                    {{/rollLess() dano 1 }}
-                {{/^rollWasCrit() defesa-pa}}
-                
-                {{#rollWasCrit() defesa-pa}}
-                    <span class="fullcrit">Acerto crítico! </span>
-                    {{#rollGreater() danocrit 0 }}
-                            <div class="rowcolor"><span class="tcat">Defendeu crítico:</span> {{danocrit}}</div>
-                        {{/rollGreater() danocrit 0 }}
-                        {{#rollLess() danocrit 1 }}
-                            <div class="rowcolor"><span class="tcat">Defesa Mínimo:</span><span style="font-weight: bold;"> 1</span> </div>
-                    {{/rollLess() danocrit 1 }}
-                {{/rollWasCrit() defesa-pa}}
-            {{/dano}}		
-        {{/defesa-pa}}        
-    </div>
-</rolltemplate>
-
-
-
 <!-- TEMPLATE ATAQUES-->
 <rolltemplate class="sheet-rolltemplate-3dtataque">
     <div class="bordertop"></div>
@@ -584,7 +521,7 @@
                 {{#rollWasCrit() defesa-pa}}
                     <span class="fullcrit">Acerto crítico! </span>
                     {{#rollGreater() danocrit 0 }}
-                            <div class="rowcolor"><span class="tcat">Defentou crítico:</span> {{danocrit}}</div>
+                            <div class="rowcolor"><span class="tcat">Defendeu crítico:</span> {{danocrit}}</div>
                         {{/rollGreater() danocrit 0 }}
                         {{#rollLess() danocrit 1 }}
                             <div class="rowcolor"><span class="tcat">Defesa Mínimo:</span><span style="font-weight: bold;"> 1</span> </div>
@@ -597,3 +534,5 @@
 
 
 
+
+