diff --git a/Tagmar/tagmar.html b/Tagmar/tagmar.html
index 45a65fc349..555464bf35 100644
--- a/Tagmar/tagmar.html
+++ b/Tagmar/tagmar.html
@@ -17,7 +17,7 @@
 	<div class="sheet-pccharsheet">
         <!--PCs char sheet start-->
         <div class="sheet-buttonforinitiative">
-            <button class="sheet-buttonforinitiativeroll" type="roll" value="?{Jogada para o mestre?|Não, /r|Sim,/gmroll} &{template:tagmar_iniciativa} {{nome=@{nomepersonagem}}} {{iniciativa=[[1d10+@{iniciativa} &{tracker}]]}}" >Iniciativa</button>
+            <button class="sheet-buttonforinitiativeroll" type="roll" value="?{Jogada para o mestre?|Não, /r|Sim,/w gm} &{template:tagmar_iniciativa} {{nome=@{nomepersonagem}}} {{iniciativa=[[1d10+@{iniciativa} &{tracker}]]}}" >Iniciativa</button>
         </div>
 
     <!--Icons for actual status-->
@@ -859,7 +859,7 @@
                             <option type='text' class='sheet-weapondamagetype' value='Karma' > Karma </option>
                         </select>
                         <input type="checkbox" class="sheet-weapontablerow10 sheet-showallweapondamages" name="attr_showdamages" value="1"><span></span>
-                        <button type="roll" class="sheet-weapontablerow11" value="&{template:tagmar_rolagem_completa} {{title_battle=@{weaponname}}} {{charname=@{nomepersonagem}}} {{subtags=@{racapersonagem} | @{profissaopersonagem}}} {{subinformacao=@{weapondamagetype}}} {{dano1=[[@{weapon25d}+@{weapondamagebonus}]]}} {{dano2=[[@{weapon50d}+@{weapondamagebonus}]]}} {{dano3=[[@{weapon75d}+@{weapondamagebonus}]]}} {{dano4=[[@{weapon100d}+@{weapondamagebonus}]]}} {{dano5=[[@{weapon125d}+@{weapondamagebonus}]]}} {{dano6=[[@{weapon150d}+@{weapondamagebonus}]]}} {{dano7=[[@{weapon175d}+@{weapondamagebonus}]]}} {{dano8=[[@{weapon200d}+@{weapondamagebonus}]]}} {{dano9=[[@{weapon225d}+@{weapondamagebonus}]]}} {{dano10=[[@{weapon250d}+@{weapondamagebonus}]]}} {{dano11=[[@{weapon275d}+@{weapondamagebonus}]]}} {{dano12=[[@{weapon300d}+@{weapondamagebonus}]]}} {{coluna=[[?{Bônus ou penalidade:|0}+@{weaponbonus}+[[@{weapontotal}+?{Tipo de defesa do alvo?|L, @{weaponL&#125;|M, @{weaponM&#125;|P, @{weaponP&#125;}]]-?{Modificador de defesa?|0} ]]}} {{d20=[[1d20]]}} {{falha=Falha}} {{rotineiro=0% │ 0}} {{facil=25% │ [[@{weapon25d}+@{weapondamagebonus}]]}} {{medio=50% │ [[@{weapon50d}+@{weapondamagebonus}]]}} {{dificil=75% │ [[@{weapon75d}+@{weapondamagebonus}]]}} {{muitodificil=100% │ [[@{weapon100d}+@{weapondamagebonus}]]}} {{muitodificil+=125% │ [[@{weapon125d}+@{weapondamagebonus}]]}} {{critico=Crítico}} {{falha+20=Falha}} {{rotineiro+20=50% │ [[@{weapon50d}+@{weapondamagebonus}]]}} {{facil+20=75% │ [[@{weapon75d}+@{weapondamagebonus}]]}} {{medio+20=100% │ [[@{weapon100d}+@{weapondamagebonus}]]}} {{dificil+20=125% │ [[@{weapon125d}+@{weapondamagebonus}]]}} {{muitodificil+20=150% │ [[@{weapon150d}+@{weapondamagebonus}]]}} {{muitodificil++20=175% │ [[@{weapon175d}+@{weapondamagebonus}]]}} {{critico+20=Crítico}} {{falha+40=Falha}} {{rotineiro+40=100% │ [[@{weapon100d}+@{weapondamagebonus}]]}} {{facil+40=125% │ [[@{weapon125d}+@{weapondamagebonus}]]}} {{medio+40=150% │ [[@{weapon150d}+@{weapondamagebonus}]]}} {{dificil+40=175% │ [[@{weapon175d}+@{weapondamagebonus}]]}} {{muitodificil+40=200% │ [[@{weapon200d}+@{weapondamagebonus}]]}} {{muitodificil++40=225% │ [[@{weapon225d}+@{weapondamagebonus}]]}} {{critico+40=Crítico}} {{descricao=@{atackextrainformations}}}" ></button>
+                        <button type="roll" class="sheet-weapontablerow11" value="&{template:tagmar_rolagem_completa} {{title_battle=@{weaponname}}} {{charname=@{nomepersonagem}}} {{subtags=@{racapersonagem} | @{profissaopersonagem}}} {{subinformacao=@{weapondamagetype}}} {{dano1=[[@{weapon25d}+@{weapondamagebonus}]]}} {{dano2=[[@{weapon50d}+@{weapondamagebonus}]]}} {{dano3=[[@{weapon75d}+@{weapondamagebonus}]]}} {{dano4=[[@{weapon100d}+@{weapondamagebonus}]]}} {{dano5=[[@{weapon125d}+@{weapondamagebonus}]]}} {{dano6=[[@{weapon150d}+@{weapondamagebonus}]]}} {{dano7=[[@{weapon175d}+@{weapondamagebonus}]]}} {{dano8=[[@{weapon200d}+@{weapondamagebonus}]]}} {{dano9=[[@{weapon225d}+@{weapondamagebonus}]]}} {{dano10=[[@{weapon250d}+@{weapondamagebonus}]]}} {{dano11=[[@{weapon275d}+@{weapondamagebonus}]]}} {{dano12=[[@{weapon300d}+@{weapondamagebonus}]]}} {{coluna=[[?{Bônus ou penalidade|0}+@{weaponbonus}+[[@{weapontotal}+?{Tipo de defesa do alvo?|L, @{weaponL&#125;|M, @{weaponM&#125;|P, @{weaponP&#125;}]]-?{Modificador de defesa?|0} ]]}} {{d20=[[1d20]]}} {{falha=Falha}} {{rotineiro=0% │ 0}} {{facil=25% │ [[@{weapon25d}+@{weapondamagebonus}]]}} {{medio=50% │ [[@{weapon50d}+@{weapondamagebonus}]]}} {{dificil=75% │ [[@{weapon75d}+@{weapondamagebonus}]]}} {{muitodificil=100% │ [[@{weapon100d}+@{weapondamagebonus}]]}} {{muitodificil+=125% │ [[@{weapon125d}+@{weapondamagebonus}]]}} {{critico=Crítico}} {{falha+20=Falha}} {{rotineiro+20=50% │ [[@{weapon50d}+@{weapondamagebonus}]]}} {{facil+20=75% │ [[@{weapon75d}+@{weapondamagebonus}]]}} {{medio+20=100% │ [[@{weapon100d}+@{weapondamagebonus}]]}} {{dificil+20=125% │ [[@{weapon125d}+@{weapondamagebonus}]]}} {{muitodificil+20=150% │ [[@{weapon150d}+@{weapondamagebonus}]]}} {{muitodificil++20=175% │ [[@{weapon175d}+@{weapondamagebonus}]]}} {{critico+20=Crítico}} {{falha+40=Falha}} {{rotineiro+40=100% │ [[@{weapon100d}+@{weapondamagebonus}]]}} {{facil+40=125% │ [[@{weapon125d}+@{weapondamagebonus}]]}} {{medio+40=150% │ [[@{weapon150d}+@{weapondamagebonus}]]}} {{dificil+40=175% │ [[@{weapon175d}+@{weapondamagebonus}]]}} {{muitodificil+40=200% │ [[@{weapon200d}+@{weapondamagebonus}]]}} {{muitodificil++40=225% │ [[@{weapon225d}+@{weapondamagebonus}]]}} {{critico+40=Crítico}} {{descricao=@{atackextrainformations}}}" ></button>
                         <!--Hidden weapon damages. Shown on click of row 10-->
                         <div class='sheet-weapontablelinehidden'>
                             <div class="sheet-weapontablerow21 weapontablefirstline"><label class="sheet-selectedweapons sheet-damageandbonus">Bônus dano<span class="sheet-tooltip">Técnica, efeito mágico, atributo, etc.</span></label></div> <!--Coluna deslocada-->
@@ -1138,7 +1138,7 @@
                 <label class="sheet-npc_attacktableinput sheet-npc_attacktableheader2">200</label>
             </div>
             <fieldset class="repeating_npc-attacktable">
-                <button class="sheet-npc_attacktableinput" type="roll" value="?{Jogada para o mestre?|Não, /r|Sim,/w gm} &{template:tagmar_rolagem_completa} {{title_battle=@{npc_movename} (@{npc_at_total})}} {{charname=@{npc_name}}} {{subtags=@{npc_type}}} {{dano1=@{npc_at_25}}} {{dano2=@{npc_at_50}}} {{dano3=@{npc_at_75}}} {{dano4=@{npc_at_100}}} {{dano5=@{npc_at_125}}} {{dano6=@{npc_at_150}}} {{dano7=@{npc_at_175}}} {{dano8=@{npc_at_200}}} {{coluna=[[?{Bônus ou penalidade:|0}+[[@{npc_at_total}+?{Tipo de defesa do alvo?|L, @{npc_at_L&#125;|M, @{npc_at_M&#125;|P, @{npc_at_P&#125;}]]-?{Modificador de defesa?|0} ]]}} {{d20=[[1d20]]}} {{falha=Falha}} {{falha+20=Falha}} {{rotineiro=─ | 0}} {{rotineiro+20=50% | @{npc_at_50} }} {{facil=25% | @{npc_at_25}}} {{facil+20=75% | @{npc_at_75}}} {{medio=50% | @{npc_at_50}}} {{medio+20=100% | @{npc_at_100}}} {{dificil=75% | @{npc_at_75}}} {{dificil+20=125% | @{npc_at_125}}} {{muitodificil=100% | @{npc_at_100}}} {{muitodificil+20=150% | @{npc_at_150}}} {{muitodificil+=125% | @{npc_at_125}}} {{muitodificil++20=175% | @{npc_at_175}}} {{critico=Crítico}} {{critico+20=Crítico}} {{coluna+40= [[20]]}} {{d20+40=[[1d20]]}} {{falha+40=Falha}} {{rotineiro+40=100% | @{npc_at_100}}} {{facil+40=125% | @{npc_at_125}}} {{medio+40=150% | @{npc_at_150}}} {{dificil+40=175% | @{npc_at_175}}} {{muitodificil+40=200% | @{npc_at_200}}} {{muitodificil++40=125%}} {{critico+40=Crítico}}"></button>
+                <button class="sheet-npc_attacktableinput" type="roll" value="?{Jogada para o mestre?|Não, /r|Sim,/w gm} &{template:tagmar_rolagem_completa} {{title_battle=@{npc_movename} (@{npc_at_total})}} {{charname=@{npc_name}}} {{subtags=@{npc_type}}} {{dano1=@{npc_at_25}}} {{dano2=@{npc_at_50}}} {{dano3=@{npc_at_75}}} {{dano4=@{npc_at_100}}} {{dano5=@{npc_at_125}}} {{dano6=@{npc_at_150}}} {{dano7=@{npc_at_175}}} {{dano8=@{npc_at_200}}} {{coluna=[[?{Bônus ou penalidade|0}+[[@{npc_at_total}+?{Tipo de defesa do alvo?|L, @{npc_at_L&#125;|M, @{npc_at_M&#125;|P, @{npc_at_P&#125;}]]-?{Modificador de defesa?|0} ]]}} {{d20=[[1d20]]}} {{falha=Falha}} {{falha+20=Falha}} {{rotineiro=─ | 0}} {{rotineiro+20=50% | @{npc_at_50} }} {{facil=25% | @{npc_at_25}}} {{facil+20=75% | @{npc_at_75}}} {{medio=50% | @{npc_at_50}}} {{medio+20=100% | @{npc_at_100}}} {{dificil=75% | @{npc_at_75}}} {{dificil+20=125% | @{npc_at_125}}} {{muitodificil=100% | @{npc_at_100}}} {{muitodificil+20=150% | @{npc_at_150}}} {{muitodificil+=125% | @{npc_at_125}}} {{muitodificil++20=175% | @{npc_at_175}}} {{critico=Crítico}} {{critico+20=Crítico}} {{coluna+40= [[20]]}} {{d20+40=[[1d20]]}} {{falha+40=Falha}} {{rotineiro+40=100% | @{npc_at_100}}} {{facil+40=125% | @{npc_at_125}}} {{medio+40=150% | @{npc_at_150}}} {{dificil+40=175% | @{npc_at_175}}} {{muitodificil+40=200% | @{npc_at_200}}} {{muitodificil++40=125%}} {{critico+40=Crítico}}"></button>
                 <input class="sheet-npc_attacktableinput sheet-npc_attacktableinput1" type="text" value="Ataque" placeholder="Nome do ataque" name="attr_npc_movename">
                 <input class="sheet-npc_attacktableinput" type="number" value="" placeholder="Total" name="attr_npc_at_total" >
                 <input class="sheet-npc_attacktableinput" type="number" value="" placeholder="L" name="attr_npc_at_L" >