diff --git a/Ordem Paranormal/Fonts/DanteMTStd-Bold.otf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-Bold.otf
similarity index 100%
rename from Ordem Paranormal/Fonts/DanteMTStd-Bold.otf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-Bold.otf
diff --git a/Ordem Paranormal/Fonts/DanteMTStd-BoldItalic.otf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-BoldItalic.otf
similarity index 100%
rename from Ordem Paranormal/Fonts/DanteMTStd-BoldItalic.otf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-BoldItalic.otf
diff --git a/Ordem Paranormal/Fonts/DanteMTStd-Italic.otf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-Italic.otf
similarity index 100%
rename from Ordem Paranormal/Fonts/DanteMTStd-Italic.otf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-Italic.otf
diff --git a/Ordem Paranormal/Fonts/DanteMTStd-Regular.otf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-Regular.otf
similarity index 100%
rename from Ordem Paranormal/Fonts/DanteMTStd-Regular.otf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/DanteMTStd-Regular.otf
diff --git a/Ordem Paranormal/Fonts/Iowan Old Style.ttc b/Ordem Paranormal - Oficial Jambo Editora/Fonts/Iowan Old Style.ttc
similarity index 100%
rename from Ordem Paranormal/Fonts/Iowan Old Style.ttc
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/Iowan Old Style.ttc
diff --git a/Ordem Paranormal/Fonts/Raizen.otf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/Raizen.otf
similarity index 100%
rename from Ordem Paranormal/Fonts/Raizen.otf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/Raizen.otf
diff --git a/Ordem Paranormal/Fonts/SourceSansPro-Bold.otf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/SourceSansPro-Bold.otf
similarity index 100%
rename from Ordem Paranormal/Fonts/SourceSansPro-Bold.otf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/SourceSansPro-Bold.otf
diff --git a/Ordem Paranormal/Fonts/SourceSansPro-Regular.otf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/SourceSansPro-Regular.otf
similarity index 100%
rename from Ordem Paranormal/Fonts/SourceSansPro-Regular.otf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/SourceSansPro-Regular.otf
diff --git a/Ordem Paranormal/Fonts/Spiral Initials.ttf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/Spiral Initials.ttf
similarity index 100%
rename from Ordem Paranormal/Fonts/Spiral Initials.ttf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/Spiral Initials.ttf
diff --git a/Ordem Paranormal/Fonts/Tormenta20x.ttf b/Ordem Paranormal - Oficial Jambo Editora/Fonts/Tormenta20x.ttf
similarity index 100%
rename from Ordem Paranormal/Fonts/Tormenta20x.ttf
rename to Ordem Paranormal - Oficial Jambo Editora/Fonts/Tormenta20x.ttf
diff --git a/Ordem Paranormal/assets/AtributosOPBolinha.png b/Ordem Paranormal - Oficial Jambo Editora/assets/AtributosOPBolinha.png
similarity index 100%
rename from Ordem Paranormal/assets/AtributosOPBolinha.png
rename to Ordem Paranormal - Oficial Jambo Editora/assets/AtributosOPBolinha.png
diff --git a/Ordem Paranormal/assets/Escudo.png b/Ordem Paranormal - Oficial Jambo Editora/assets/Escudo.png
similarity index 100%
rename from Ordem Paranormal/assets/Escudo.png
rename to Ordem Paranormal - Oficial Jambo Editora/assets/Escudo.png
diff --git a/Ordem Paranormal/assets/Logo OrdemParanormal.png b/Ordem Paranormal - Oficial Jambo Editora/assets/Logo OrdemParanormal.png
similarity index 100%
rename from Ordem Paranormal/assets/Logo OrdemParanormal.png
rename to Ordem Paranormal - Oficial Jambo Editora/assets/Logo OrdemParanormal.png
diff --git a/Ordem Paranormal/assets/OrdoRealitas.png b/Ordem Paranormal - Oficial Jambo Editora/assets/OrdoRealitas.png
similarity index 100%
rename from Ordem Paranormal/assets/OrdoRealitas.png
rename to Ordem Paranormal - Oficial Jambo Editora/assets/OrdoRealitas.png
diff --git a/Ordem Paranormal/ordemparanormal.css b/Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.css
similarity index 96%
rename from Ordem Paranormal/ordemparanormal.css
rename to Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.css
index 78709447d9..f3706fb746 100644
--- a/Ordem Paranormal/ordemparanormal.css	
+++ b/Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.css	
@@ -50,6 +50,7 @@
 }
 
 .sheet-container-sheet-main {
+    position: relative;
     margin: 0 auto;
     font-family: 'PT Sans', sans-serif;
     font-size: 13px;
@@ -76,7 +77,7 @@
     margin: 0 auto;
     border: 5px solid black;
     padding: 15px;
-    min-width: 856px;
+    min-width: 925px;
 }
 
 .sheet-rituals-title {
@@ -107,10 +108,22 @@
 .sheet-rituals-dt-input{
     border: 3px solid black;
     height: 39px !important;
+    font-size: 20px !important;
 }
 
 .sheet-main{
     width: 1000px;
+    overflow: hidden;
+    position: relative;
+}
+
+.sheet-ordo-bg {
+    opacity: 0.2;
+    position: absolute;
+    left: 75px;
+    top: 150px;
+    width: 100%;
+    height: auto;
 }
 
 .sheet-main * {
@@ -264,10 +277,10 @@
     text-align: center;
 }
 
-.sheet-for-position {position: relative; top: 137px; left: 55px; height: 65px; width: 65px;}
-.sheet-agi-position {position: relative; top: -30px; left: 203px; height: 65px;  width: 65px;}
-.sheet-int-position {position: relative; top: 6px; left: 355px; height: 65px;  width: 65px;}
-.sheet-pre-position {position: relative; top: 120px; left: 99px; height: 65px;  width: 65px;}
+.sheet-for-position {position: relative; top: 140px; left: 75px; height: 65px; width: 65px;}
+.sheet-agi-position {position: relative; top: -10px; left: 215px; height: 65px;  width: 65px;}
+.sheet-int-position {position: relative; top: 11px; left: 357px; height: 65px;  width: 65px;}
+.sheet-pre-position {position: relative; top: 117px; left: 120px; height: 65px;  width: 65px;}
 .sheet-vig-position {position: relative; top: 55px; left: 310px; height: 65px;  width: 65px;}
 
 .sheet-main .sheet-header-info {
@@ -284,7 +297,7 @@
     width: 100%;
     height: 500px;
     margin-bottom: 10px;
-    background-image: url(https://raw.githubusercontent.com/RoenMidnight/roll20-character-sheets/ordem-paranormal-new-character-sheet/Ordem%20Paranormal/assets/AtributosOP.png);
+    background-image: url(https://raw.githubusercontent.com/RoenMidnight/roll20-character-sheets/ordem-paranormal-new-character-sheet/Ordem%20Paranormal/assets/AtributosOPBolinha.png);
     background-size: 500px;
     background-repeat: no-repeat;
     width: 500px;
@@ -364,6 +377,7 @@
     height: 35px;
     margin-left: -5px;
     margin-bottom: 3px;
+    font-size: 20px;
 }
 
 .sheet-patent input{
@@ -375,6 +389,7 @@
     height: 35px;
     margin-left: -5px;
     margin-bottom: 3px;
+    font-size: 20px;
 }
 
 .sheet-description-grid textarea{
@@ -399,6 +414,7 @@
     display: flex;
     align-content: center;
     align-items: center;
+    margin-bottom: 15px;
 }
 
 .sheet-item-limit input, .sheet-credit-limit input, .sheet-load-limit input{
@@ -408,6 +424,11 @@
     text-align: center;
     margin-left: 5px;
     margin-right: 5px;
+    font-size: 20px;
+}
+
+.sheet-edit-input {
+    background-color: transparent;
 }
 
 .sheet-credit-limit input{
@@ -438,6 +459,9 @@
     margin-bottom: 5px;
 }
 
+.sheet-trilha-span{ background-color: transparent !important; color: black !important; }
+.sheet-class-input{ border: 3px solid black !important; }
+
 .sheet-label-nex-desloc{
     margin-top: 11px !important;
     margin-bottom: 11px !important;
@@ -445,6 +469,7 @@
 
 .sheet-label-with-input input { 
     border: 2px solid; width: 90%;
+    font-size: 20px;
 }
 
 .sheet-nex-desloc, .sheet-nex {
@@ -499,14 +524,16 @@
     border: 2px solid;
     width: 100%;
     height: 50px;
+    font-size: 20px;
 }
 
-.sheet-atuais {
+.sheet-atuais, .sheet-classe-trilha {
     position: relative;
     padding: 5px;
 }
 
-.sheet-atuais:after, .sheet-atuais:before{
+.sheet-atuais:after, .sheet-atuais:before,
+.sheet-classe-trilha:after, .sheet-classe-trilha:before{
     border: .2em solid black;
     border-right-color: black;
     border-right-style: solid;
@@ -530,14 +557,26 @@
     left: 0;
 }
 
-.sheet-atuais label {
+.sheet-classe-trilha:after{
+    border-left: none;
+    right: 5px;
+    top: 5px;
+}
+.sheet-classe-trilha:before{
+    border-right: none;
+    left: 5px;
+    top: 5px;
+}
+
+.sheet-atuais label, .sheet-classe-trilha label {
     font-weight: initial;
     font-size: 12px;
     color: black;
 }
 
-.sheet-atuais input {
+.sheet-atuais input, .sheet-classe-trilha input {
     width: 100%; border: none;
+    font-size: 20px;
 }
 
 .sheet-san-value {
@@ -615,7 +654,7 @@
 .sheet-resist{ display:grid; grid-template-columns: 100px auto; }
 
 .sheet-protec label, .sheet-resist label { margin:0px; color: black;}
-.sheet-protec input, .sheet-resist input { width: 100%; background-color: transparent; border:none; border-bottom:2px solid black;}
+.sheet-protec input, .sheet-resist input { width: 100%; background-color: transparent; border:none; border-bottom:2px solid black; font-size: 20px;}
 
 .sheet-origin, .sheet-class, .sheet-pv-pe, .sheet-def-san{
     margin-bottom: 15px;
@@ -623,7 +662,7 @@
 
 .sheet-nex-desloc { margin-bottom: 25px; }
 
-.sheet-pe-rodada input{ width: 80%; height: 100%; }
+.sheet-pe-rodada input{ width: 80%; height: 100%; font-size: 20px;}
 
 .sheet-pe-label{
     display: block;
@@ -823,8 +862,8 @@ input:checked + .sheet-slider:before {
     display: grid;
     padding-left: 10px;
     padding-right: 10px;
-    column-gap: 7px;
-    grid-template-columns: 24px auto 40px 40px 60px 58px 24px;
+    column-gap: 10px;
+    grid-template-columns: 24px auto 40px 40px 60px 58px 50px 25px;
     grid-template-rows: 24px auto
 }
 
@@ -900,7 +939,7 @@ input:checked + .sheet-slider:before {
 .sheet-attacks-container .sheet-attacksgrid .sheet-moreinfo {
     position: relative;
     margin-top: 7px;
-    grid-column: 1/8;
+    grid-column: 1/9;
     display: flex;
     justify-content: center;
     flex-wrap: wrap;
@@ -1859,8 +1898,8 @@ input:checked + .sheet-slider:before {
 
 input.sheet-fake-mod{
     border: none;
-    height: 65px;
-    width: 65px;
+    height: 55px;
+    width: 55px;
     background-color: transparent;
     justify-content: center;
     align-items: center;
@@ -1994,6 +2033,10 @@ input.sheet-fake-mod{
     width: 100%
 }
 
+.sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-container-ability-power {
+    grid-template-columns: auto 100px 20px;
+}
+
 .sheet-main .repcontainer[data-groupname="repeating_powers"] .sheet-container-ability-power .sheet-buttonshowinfo,
 .sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-container-ability-power .sheet-buttonshowinfo {
     background-color: transparent;
@@ -2083,6 +2126,10 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     border: solid 2px black
 }
 
+.sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-container-ability-power .sheet-extra {
+    grid-column: 1/4;
+}
+
 .sheet-main .repcontainer[data-groupname="repeating_powers"] .sheet-container-ability-power .sheet-extra textarea,
 .sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-container-ability-power .sheet-extra textarea {
     width: 100%;
@@ -2539,7 +2586,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     font-size: 13px
 }
 
-.sheet-rolltemplate-ordem-paranormal-info {
+.sheet-rolltemplate-ordem-paranormal-info,
+.sheet-rolltemplate-ordem-paranormal-skill  {
     font-size: 12px;
     box-sizing: border-box;
     width: 100%;
@@ -2548,14 +2596,16 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     overflow: hidden
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container {
     width: 100%;
     position: relative;
     box-sizing: border-box;
     border: 2px solid black
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container::before {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container::before,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container::before {
     position: absolute;
     content: '';
     background-color: #d3e5f5;
@@ -2572,7 +2622,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     transform: rotate(-90deg)
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container::after {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container::after,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container::after  {
     content: '';
     position: absolute;
     background-color: #d3e5f5;
@@ -2589,7 +2640,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     transform: rotate(180deg)
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox {
     padding: 5px;
     font-family: 'PT Sans';
     position: relative;
@@ -2601,7 +2653,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     row-gap: 5px
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox::before {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox::before,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox::before  {
     position: absolute;
     content: '';
     background-color: #d3e5f5;
@@ -2617,7 +2670,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     left: -16px
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox::after {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox::after,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox::after {
     content: '';
     position: absolute;
     background-color: #d3e5f5;
@@ -2634,7 +2688,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     transform: rotate(90deg)
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-roll-title {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-roll-title,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox .sheet-roll-title {
     font-weight: bold;
     width: 100%;
     min-height: 16px;
@@ -2645,7 +2700,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     text-transform: uppercase
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-info-title {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-info-title,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox .sheet-info-title {
     width: 100%;
     font-style: italic;
     display: flex;
@@ -2655,7 +2711,12 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     font-size: 13px
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-descricao {
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox .sheet-custo span {
+    font-weight: bolder;
+}
+
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-descricao,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox .sheet-descricao {
     box-sizing: border-box;
     width: 100%;
     padding: 10px;
@@ -2665,7 +2726,8 @@ sheet-main .repcontainer[data-groupname="repeating_investigation"] .sheet-contai
     overflow-y: auto
 }
 
-.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-descricao span {
+.sheet-rolltemplate-ordem-paranormal-info .sheet-rollbox-container .sheet-rollbox .sheet-descricao span,
+.sheet-rolltemplate-ordem-paranormal-skill .sheet-rollbox-container .sheet-rollbox .sheet-descricao span {
     margin: 0;
     padding: 0 3px;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/Ordem Paranormal/ordemparanormal.html b/Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.html
similarity index 78%
rename from Ordem Paranormal/ordemparanormal.html
rename to Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.html
index b5ca8e8dea..d9ab4929c4 100644
--- a/Ordem Paranormal/ordemparanormal.html	
+++ b/Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.html	
@@ -1,4 +1,5 @@
 <div class="main">
+    <img src="https://imgsrv.roll20.net?src=https%3A//raw.githubusercontent.com/RoenMidnight/roll20-character-sheets/ordem-paranormal-new-character-sheet/Ordem%2520Paranormal/assets/OrdoRealitas.png" class="sheet-ordo-bg">
     <div class="sheet-container-sheet-main">
         <div class="tabs-container">
             <ul class="sheet-tabs">
@@ -32,7 +33,7 @@
             <div class="left-container">
                 <div class="header-info">
                     <div class="input-with-text-bellow char-name">
-                        <input name="attr_character_name" type="text"  spellcheck="false"  value="">
+                        <input name="attr_character_name" type="text" spellcheck="false"  value="">
                         <span data-i18n="nome">Personagem</span>
                     </div>
                     <div class="input-with-text-bellow char-player">
@@ -45,88 +46,96 @@
                     <div class="sheet-attribute-values sheet-for-position">
                         <div class="sheet-attribute-center">                        
                             <input name="attr_for" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{for}" />
-                            <button tabindex="-1" type="roll" name="attr_roll_for" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Força}}{{theroll=[[@{for}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_forca">FOR</button>
+                            <button tabindex="-1" type="roll" name="attr_roll_for" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Força}}{{theroll=[[@{for}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_forca">FOR</button>
                             <span class="sheet-span-fake-mod" name="attr_fakefor" title="@{for_fake}"></span> 
                         </div>
                     </div>
                     <div class="sheet-attribute-values sheet-agi-position">
                         <div class="sheet-attribute-center">                        
-                            <input name="attr_agi" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{agi_mod}" />
-                            <button tabindex="-1" type="roll" name="attr_roll_agi" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Agilidade}}{{theroll=[[@{agi}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_agilidade">AGI</button>
+                            <input name="attr_agi" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{agi}" />
+                            <button tabindex="-1" type="roll" name="attr_roll_agi" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Agilidade}}{{theroll=[[@{agi}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_agilidade">AGI</button>
                             <span class="sheet-span-fake-mod" name="attr_fakeagi" title="@{agi_fake}"></span> 
                         </div>
                     </div>
                     <div class="sheet-attribute-values sheet-int-position">
                         <div class="sheet-attribute-center">                        
                             <input name="attr_int" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{int}" />
-                            <button tabindex="-1" type="roll" name="attr_roll_int" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Inteligência}}{{theroll=[[@{int}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_intelecto">INT</button>
+                            <button tabindex="-1" type="roll" name="attr_roll_int" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Inteligência}}{{theroll=[[@{int}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_intelecto">INT</button>
                             <span class="sheet-span-fake-mod" name="attr_fakeint" title="@{int_fake}"></span> 
                         </div>
                     </div>
                     <div class="sheet-attribute-values sheet-pre-position">
                         <div class="sheet-attribute-center">                        
-                            <input name="attr_pre" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{pre_mod}" />
-                            <button tabindex="-1" type="roll" name="attr_roll_pre" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Presença}}{{theroll=[[@{pre}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_presenca">PRE</button>
+                            <input name="attr_pre" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{pre}" />
+                            <button tabindex="-1" type="roll" name="attr_roll_pre" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Presença}}{{theroll=[[@{pre}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_presenca">PRE</button>
                             <span class="sheet-span-fake-mod" name="attr_fakepre" title="@{pre_fake}"></span> 
                         </div>
                     </div>
                     <div class="sheet-attribute-values sheet-vig-position">
                         <div class="sheet-attribute-center">                        
-                            <input name="attr_vig" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{vig_mod}" />
-                            <button tabindex="-1" type="roll" name="attr_roll_vig" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Vigor}}{{theroll=[[@{vig}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_vigor">VIG</button>
+                            <input name="attr_vig" type="text" spellcheck="false" maxlength="2" class="fake-mod" title="@{vig}" />
+                            <button tabindex="-1" type="roll" name="attr_roll_vig" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Vigor}}{{theroll=[[@{vig}d20kh1]]}}" class="button-title-attribute" data-i18n="mod_vigor">VIG</button>
                             <span class="sheet-span-fake-mod" name="attr_fakevig" title="@{vig_fake}"></span> 
                         </div>
                     </div>
                 </div> 
                 <!--ORIGEM-->
                 <div class="sheet-label-with-input sheet-origin">
-                    <label class="grid-title pericias-titulo">Origem</label><input type="text">
+                    <label class="grid-title pericias-titulo">Origem</label><input type="text" name="attr_background">
                 </div>
-                <!--CLASSe-->
+                <!--CLASSE-->
                 <div class="sheet-label-with-input sheet-class">
-                    <label>Classe</label><input type="text">
+                    <div>
+                        <label>Classe</label>
+                        <label class="sheet-trilha-span">Trilha</label>
+                    </div>
+                    <div class="sheet-classe-trilha">
+                        <input type="text" class="sheet-class-input" name="attr_classe">                        
+                        <input type="text" name="attr_trilha">
+                    </div>
                 </div>
                 <!--NEX DESLOC-->
                 <div class="sheet-nex-desloc sheet-nex-desloc">
                     <div class="sheet-nex">
                         <div class="sheet-label-with-input sheet-nex-box">
-                            <label class="sheet-label-nex-desloc">NEX</label><input type="text">
+                            <label class="sheet-label-nex-desloc">NEX</label>
+                            <input type="text" name="attr_totalnex">
                         </div>
                         <div class="sheet-pe-rodada">
-                            <input type="text">
+                            <input type="text" name="attr_perodada" readonly>
                             <span>PE/Rodada</span>
                         </div>            
                     </div>
                     <div class="sheet-label-with-input">
                         <label class="sheet-label-nex-desloc">DESL</label>
-                        <input type="text">
+                        <input type="text" name="attr_deslocamento">
                     </div>
                 </div>
                 <!-- PV PE-->
                 <div class="sheet-pv-pe">
                     <div class="sheet-pv-pe-value">
-                        <input type="text">
+                        <input type="text" name="attr_pv">
                         <label class="sheet-big-span">PV</label>
                         <label class="sheet-label-uppercase">Pontos <br>de Vida</label>
                     </div>
                     <div class="sheet-pv-pe-value">
-                        <input type="text">
+                        <input type="text" name="attr_pe">
                         <label class="sheet-big-span">PE</label>
                         <label class="sheet-label-uppercase">Pontos <br>de Esforço</label>
                     </div>
                     <div class="sheet-atuais">
                         <label class="sheet-pv-pe-span">Atuais</label>
-                        <input type="text">
+                        <input type="text" name="attr_pvatuais">
                     </div>
                     <div class="sheet-atuais">
                         <label class="sheet-pv-pe-span">Atuais</label>
-                        <input type="text">
+                        <input type="text" name="attr_pvatuais">
                     </div>
                 </div>
                 <!-- DEF SAN-->
                 <div class="sheet-def-san sheet-def-san">
                     <div class="sheet-defense">
-                        <input class="sheet-big-defense" type="text" readonly="readonly">                    
+                        <input class="sheet-big-defense" type="text" readonly="readonly" name="attr_defense" value="10">                    
                         <div class="sheet-defense-attributes">
                             <label class="sheet-def-title">Defesa</label>
                             <div class="signal">=</div>
@@ -135,19 +144,19 @@
                             <div class="big-signal"><span>AGI</span></div>
                             <div class="signal">+</div>
                             <div class="sheet-defense-input">
-                                <input class="sheet-defense-input" type="text">
+                                <input class="sheet-defense-input" type="text" name="attr_defequip" value="0">
                                 <span>Equip.</span>
                             </div>
                             <div class="signal">+</div>
                             <div class="sheet-defense-input">
-                                <input class="sheet-defense-input" type="text">
+                                <input class="sheet-defense-input" type="text" name="attr_defoutros" value="0">
                                 <span>Outros</span>
                             </div>    
                         </div>            
                     </div>
                     <div>
                         <div class="sheet-san-value">
-                            <input type="text">
+                            <input type="text" name="attr_sanidade">
                             <div>
                                 <label class="sheet-big-span-san">SAN</label>
                                 <label class="sheet-low-span-san">Sanidade</label>
@@ -155,7 +164,7 @@
                         </div>
                         <div class="sheet-atuais">
                             <label class="sheet-pv-pe-span">Atuais</label>
-                            <input type="text">
+                            <input type="text" name="attr_sanatual">
                         </div>
                     </div>
                 </div>
@@ -163,11 +172,11 @@
                 <div class="sheet-prot-resist">
                     <div class="sheet-protec">
                         <label>PROTEÇÃO</label>
-                        <input type="text">
+                        <input type="text" name="attr_protecao">
                     </div>
                     <div class="sheet-resist">
                         <label>RESISTÊNCIAS</label>
-                        <input type="text">
+                        <input type="text" name="attr_resistencias">
                     </div>
                 </div>
                 
@@ -206,14 +215,14 @@
                                     <option value="@{pre}" data-i18n="mod_sabedoria">PRE</option>                                    
                                 </select>                           
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_acrobacia" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Acrobacia}}{{theroll=[[1d20+[[@{acrobaciatotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollacrobacia" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Acrobacia}}{{theroll=[[1d20+[[@{acrobaciatotal}]]]]}}" class="skill-button">
                                         <span class="sup-penalidade" data-i18n="acrobacia">Acrobacia+</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total first" name="attr_acrobaciatotal" maxlength="2" type="text" spellcheck="false" title="@{acrobaciatotal}" value="@{acrobaciaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total first" name="attr_acrobaciabonus" maxlength="2" type="text" spellcheck="false" title="@{acrobaciabonus}" value="@{acrobaciatreino}" disabled="true">
+                                <input class="total first" name="attr_acrobaciabonus" maxlength="2" type="text" spellcheck="false" title="@{acrobaciabonus}" value="@{acrobaciatreino} + @{acrobaciaoutros}" disabled="true">
                                 <div class="signal">+</div>
                                 <select name="attr_acrobaciatreino">
                                     <option value="0" selected>Não Treinado</option>
@@ -232,14 +241,14 @@
                                     <option value="@{pre}" selected data-i18n="mod_presenca">PRE</option>                                    
                                 </select>                          
                                 <div class="skill-name">
-                                    <button type="roll"  name="roll_adestramento" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Adestramento}}{{theroll=[[1d20+[[@{adestramentototal}]]]]}}" class="skill-button">
+                                    <button type="roll"  name="attr_rolladestramento" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Adestramento}}{{theroll=[[1d20+[[@{adestramentototal}]]]]}}" class="skill-button">
                                         <span class="sup-treinada" data-i18n="adestramento">Adestramento*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_adestramentototal" maxlength="2" type="text" spellcheck="false" title="@{adestramentoatributo2}" value="@{adestramentoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total first" name="attr_adestramentobonus" maxlength="2" type="text" spellcheck="false" title="@{adestramentotreino}" value="@{adestramentotreino}" disabled="true">
+                                <input class="total first" name="attr_adestramentobonus" maxlength="2" type="text" spellcheck="false" title="@{adestramentotreino}" value="@{adestramentotreino} + @{adestramentooutros}" disabled="true">
                                 <div class="signal">+</div>
                                 <select name="attr_adestramentotreino">
                                     <option value="0" selected>Não Treinado</option>
@@ -259,14 +268,14 @@
                                     <option value="@{pre}" selected data-i18n="mod_presenca">PRE</option>
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_artes" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Atuação}}{{theroll=[[1d20+[[@{artestotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollartes" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Atuação}}{{theroll=[[1d20+[[@{artestotal}]]]]}}" class="skill-button">
                                         <span data-i18n="artes">Artes*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_artestotal" maxlength="2" type="text" spellcheck="false" title="@{artesatributo2}" value="@{artesatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_artesbonus" maxlength="2" type="text" spellcheck="false" title="@{artestreino}" value="@{artestreino}" disabled="true">
+                                <input class="total last" name="attr_artesbonus" maxlength="2" type="text" spellcheck="false" title="@{artestreino}" value="@{artestreino} + @{artesoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_artestreino">
@@ -288,14 +297,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll"  name="roll_atletismo" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Atletismo}}{{theroll=[[1d20+[[@{atletismototal}]]]]}}" class="skill-button">
+                                    <button type="roll"  name="attr_rollatletismo" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Atletismo}}{{theroll=[[1d20+[[@{atletismototal}]]]]}}" class="skill-button">
                                         <span data-i18n="atletismo">Atletismo</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_atletismototal" maxlength="2" type="text" spellcheck="false" title="@{atletismototal}" value="@{atletismoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_atletismobonus" maxlength="2" type="text" spellcheck="false" title="@{atletismobonus}" value="@{atletismotreino}" disabled="true">
+                                <input class="total last" name="attr_atletismobonus" maxlength="2" type="text" spellcheck="false" title="@{atletismobonus}" value="@{atletismotreino} + @{atletismooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_atletismotreino">
@@ -317,14 +326,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_atualidades" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=atualidades}}{{theroll=[[1d20+[[@{atualidadestotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollatualidades" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=atualidades}}{{theroll=[[1d20+[[@{atualidadestotal}]]]]}}" class="skill-button">
                                         <span class="sup-treinada" data-i18n="atualidades">Atualidades</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_atualidadestotal" maxlength="2" type="text" spellcheck="false" title="@{atualidadestotal}" value="@{atualidadesatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_atualidadesbonus" maxlength="2" type="text" spellcheck="false" title="@{atualidadesbonus}" value="@{atualidadestreino}" disabled="true">
+                                <input class="total last" name="attr_atualidadesbonus" maxlength="2" type="text" spellcheck="false" title="@{atualidadesbonus}" value="@{atualidadestreino} + @{atualidadesoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_atualidadestreino">
@@ -346,14 +355,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_ciencias" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=ciencias}}{{theroll=[[1d20+[[@{cienciastotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollciencias" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=ciencias}}{{theroll=[[1d20+[[@{cienciastotal}]]]]}}" class="skill-button">
                                         <span data-i18n="ciencias">Ciências*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_cienciastotal" maxlength="2" type="text" spellcheck="false" title="@{cienciastotal}" value="@{cienciasatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_cienciasbonus" maxlength="2" type="text" spellcheck="false" title="@{cienciastreino}" value="@{cienciastreino}" disabled="true">
+                                <input class="total last" name="attr_cienciasbonus" maxlength="2" type="text" spellcheck="false" title="@{cienciastreino}" value="@{cienciastreino} + @{cienciasoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_cienciastreino">
@@ -375,14 +384,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_crime" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=crime}}{{theroll=[[1d20+[[@{crimetotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollcrime" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=crime}}{{theroll=[[1d20+[[@{crimetotal}]]]]}}" class="skill-button">
                                         <span data-i18n="crime">Crime*+</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_crimetotal" maxlength="2" type="text" spellcheck="false" title="@{crimetotal}" value="@{crimeatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_crimebonus" maxlength="2" type="text" spellcheck="false" title="@{adestramentototal}" value="@{crimetreino}" disabled="true">
+                                <input class="total last" name="attr_crimebonus" maxlength="2" type="text" spellcheck="false" title="@{adestramentototal}" value="@{crimetreino} + @{crimeoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_crimetreino">
@@ -404,14 +413,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_enganacao" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Enganação}}{{theroll=[[1d20+[[@{enganacaototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rolldiplomacia" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Enganação}}{{theroll=[[1d20+[[@{enganacaototal}]]]]}}" class="skill-button">
                                         <span data-i18n="diplomacia">Diplomacia</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_diplomaciatotal" maxlength="2" type="text" spellcheck="false" title="@{enganacaototal}" value="@{diplomaciaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_diplomaciabonus" maxlength="2" type="text" spellcheck="false" title="@{diplomaciabonus}" value="@{diplomaciatreino}" disabled="true">
+                                <input class="total last" name="attr_diplomaciabonus" maxlength="2" type="text" spellcheck="false" title="@{diplomaciabonus}" value="@{diplomaciatreino} + @{diplomaciaoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_diplomaciatreino">
@@ -427,20 +436,20 @@
                                 <select name="attr_enganacaoatributo2">
                                     <option value="@{for}" data-i18n="mod_forca">FOR</option>
                                     <option value="@{pre}" data-i18n="mod_agilidade">AGI</option>
-                                    <option value="@{vig}" data-i18n="mod_constituicao">CON*</option>
+                                    <option value="@{vig}" data-i18n="mod_vigor">CON</option>
                                     <option value="@{int}" data-i18n="mod_intelecto">INT</option>
-                                    <option value="@{pre}" selected data-i18n="mod_presenca">PRE</option>  
+                                    <option value="@{pre}" selected data-i18n="mod_presenca">PRE*</option>  
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_fortitude" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Fortitude}}{{theroll=[[1d20+[[@{fortitudetotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollenganacao" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Enganação}}{{theroll=[[1d20+[[@{enganacaototal}]]]]}}" class="skill-button">
                                         <span data-i18n="enganacao">Enganação</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_enganacaototal" maxlength="2" type="text" spellcheck="false" title="@{enganacaototal}" value="@{enganacaoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_enganacaobonus" maxlength="2" type="text" spellcheck="false" title="@{enganacaobonus}" value="@{enganacaotreino}" disabled="true">
+                                <input class="total last" name="attr_enganacaobonus" maxlength="2" type="text" spellcheck="false" title="@{enganacaobonus}" value="@{enganacaotreino} + @{enganacaooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_enganacaotreino">
@@ -450,25 +459,25 @@
                                     <option value="15">Expert</option>                                  
                                 </select>  
                                 <div class="signal">+</div>
-                                <input name="attr_enganacaooutros" maxlength="3" type="text" spellcheck="false" title="@{fortitudeoutros}" value="0">
+                                <input name="attr_enganacaooutros" maxlength="3" type="text" spellcheck="false" title="@{enganacaooutros}" value="0">
                                 <!-- Fortitude -->
                                 <select name="attr_fortitudeatributo2">
                                     <option value="@{for}" data-i18n="mod_forca">FOR</option>
                                     <option value="@{pre}" data-i18n="mod_agilidade">AGI</option>
-                                    <option value="@{vig}" selected data-i18n="mod_constituicao">CON*</option>
+                                    <option value="@{vig}" selected data-i18n="mod_vigor">CON*</option>
                                     <option value="@{int}" data-i18n="mod_intelecto">INT</option>
                                     <option value="@{pre}" data-i18n="mod_presenca">PRE</option>  
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_fortitude" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Fortitude}}{{theroll=[[1d20+[[@{fortitudetotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollfortitude" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Fortitude}}{{theroll=[[1d20+[[@{fortitudetotal}]]]]}}" class="skill-button">
                                         <span data-i18n="fortitude">Fortitude</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_fortitudetotal" maxlength="2" type="text" spellcheck="false" title="@{fortitudetotal}" value="@{fortitudeatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_fortitudebonus" maxlength="2" type="text" spellcheck="false" title="@{fortitudebonus}" value="@{fortitudetreino}" disabled="true">
+                                <input class="total last" name="attr_fortitudebonus" maxlength="2" type="text" spellcheck="false" title="@{fortitudebonus}" value="@{fortitudetreino} + @{fortitudeoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_fortitudetreino">
@@ -490,14 +499,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_furtividade" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Furtividade}}{{theroll=[[1d20+[[@{furtividadetotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollfurtividade" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Furtividade}}{{theroll=[[1d20+[[@{furtividadetotal}]]]]}}" class="skill-button">
                                         <span class="sup-penalidade" data-i18n="furtividade">Furtividade+</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_furtividadetotal" maxlength="2" type="text" spellcheck="false" title="@{furtividadetotal}" value="@{furtividadeatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_furtividadebonus" maxlength="2" type="text" spellcheck="false" title="@{furtividadebonus}" value="@{furtividadetreino}" disabled="true">
+                                <input class="total last" name="attr_furtividadebonus" maxlength="2" type="text" spellcheck="false" title="@{furtividadebonus}" value="@{furtividadetreino} + @{furtividadeoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_furtividadetreino">
@@ -519,14 +528,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_iniciativa" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Iniciativa}}{{theroll=[[1d20+[[@{iniciativatotal}]] &{tracker}]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rolliniciativa" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Iniciativa}}{{theroll=[[1d20+[[@{iniciativatotal}]] &{tracker}]]}}" class="skill-button">
                                         <span data-i18n="iniciativa">Iniciativa</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_iniciativatotal" maxlength="2" type="text" spellcheck="false" title="@{iniciativatotal}" value="@{iniciativaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_adestramentototal" maxlength="2" type="text" spellcheck="false" title="@{iniciativabonus}" value="@{iniciativatreino}" disabled="true">
+                                <input class="total last" name="attr_iniciativabonus" maxlength="2" type="text" spellcheck="false" title="@{iniciativabonus}" value="@{iniciativatreino} + @{iniciativaoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_iniciativatreino">
@@ -547,17 +556,17 @@
                                     <option value="@{pre}" selected data-i18n="mod_presenca">PRE</option>                                    
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_intimidacao" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Intimidação}}{{theroll=[[1d20+[[@{intimidacaototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollintimidacao" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Intimidação}}{{theroll=[[1d20+[[@{intimidacaototal}]]]]}}" class="skill-button">
                                         <span data-i18n="intimidacao">Intimidação</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_intimidacaototal" maxlength="2" type="text" spellcheck="false" title="@{intimidacaototal}" value="@{intimidacaoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_adestramentototal" maxlength="2" type="text" spellcheck="false" title="@{iniciativatotal}" value="@{iniciativatreino}" disabled="true">
+                                <input class="total last" name="attr_intimidacaobonus" maxlength="2" type="text" spellcheck="false" title="@{intimidacaobonus}" value="@{intimidacaotreino} + @{intimidacaooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
-                                <select name="attr_iniciativatreino">
+                                <select name="attr_intimidacaotreino">
                                     <option value="0" selected>Não Treinado</option>
                                     <option value="5">Treinado</option>
                                     <option value="10">Veterano</option>
@@ -575,14 +584,14 @@
                                     <option value="@{pre}" selected data-i18n="mod_presenca">PRE*</option>                                    
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_intuicao" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Intuição}}{{theroll=[[1d20+[[@{intuicaototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollintuicao" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Intuição}}{{theroll=[[1d20+[[@{intuicaototal}]]]]}}" class="skill-button">
                                         <span data-i18n="intuicao">Intuição</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_intuicaototal" maxlength="2" type="text" spellcheck="false" title="@{intuicaototal}" value="@{intuicaoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_intuicaobonus" maxlength="2" type="text" spellcheck="false" title="@{intuicaobonus}" value="@{intuicaotreino}" disabled="true">
+                                <input class="total last" name="attr_intuicaobonus" maxlength="2" type="text" spellcheck="false" title="@{intuicaobonus}" value="@{intuicaotreino} + @{intuicaooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_intuicaotreino">
@@ -604,14 +613,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_investigacao" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Investigação}}{{theroll=[[1d20+[[@{investigacaototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollinvestigacao" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Investigação}}{{theroll=[[1d20+[[@{investigacaototal}]]]]}}" class="skill-button">
                                         <span data-i18n="investigacao">Investigação</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_investigacaototal" maxlength="2" type="text" spellcheck="false" title="@{investigacaototal}" value="@{investigacaoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_investigacaobonus" maxlength="2" type="text" spellcheck="false" title="@{investigacaototal}" value="@{investigacaotreino}" disabled="true">
+                                <input class="total last" name="attr_investigacaobonus" maxlength="2" type="text" spellcheck="false" title="@{investigacaototal}" value="@{investigacaotreino} + @{investigacaooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_investigacaotreino">
@@ -633,14 +642,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_luta" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Luta}}{{theroll=[[1d20+[[@{lutatotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollluta" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Luta}}{{theroll=[[1d20+[[@{lutatotal}]]]]}}" class="skill-button">
                                         <span data-i18n="luta">Luta</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_lutatotal" maxlength="2" type="text" spellcheck="false" title="@{lutatotal}" value="@{lutaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_lutabonus" maxlength="2" type="text" spellcheck="false" title="@{lutabonus}" value="@{lutatreino}" disabled="true">
+                                <input class="total last" name="attr_lutabonus" maxlength="2" type="text" spellcheck="false" title="@{lutabonus}" value="@{lutatreino} + @{lutaoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_lutatreino">
@@ -662,14 +671,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_medicina" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=medicina}}{{theroll=[[1d20+[[@{medicinatotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollmedicina" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=medicina}}{{theroll=[[1d20+[[@{medicinatotal}]]]]}}" class="skill-button">
                                         <span class="sup-treinada" data-i18n="medicina">medicina</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_medicinatotal" maxlength="2" type="text" spellcheck="false" title="@{medicinatotal}" value="@{medicinaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_medicinabonus" maxlength="2" type="text" spellcheck="false" title="@{medicinabonus}" value="@{medicinatreino}" disabled="true">
+                                <input class="total last" name="attr_medicinabonus" maxlength="2" type="text" spellcheck="false" title="@{medicinabonus}" value="@{medicinatreino} + @{medicinaoutros}" disabled="true">
                                
                                 <div class="signal">+</div>
                                 <select name="attr_medicinatreino">
@@ -690,14 +699,14 @@
                                     <option value="@{pre}" data-i18n="mod_presenca">PRE</option> 
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_ocultismo" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=ocultismo}}{{theroll=[[1d20+[[@{ocultismototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollocultismo" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=ocultismo}}{{theroll=[[1d20+[[@{ocultismototal}]]]]}}" class="skill-button">
                                         <span class="sup-treinada" data-i18n="ocultismo">ocultismo*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_ocultismototal" maxlength="2" type="text" spellcheck="false" title="@{ocultismototal}" value="@{ocultismoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_adestramentototal" maxlength="2" type="text" spellcheck="false" title="@{ocultismobonus}" value="@{ocultismotreino}" disabled="true">
+                                <input class="total last" name="attr_ocultismobonus" maxlength="2" type="text" spellcheck="false" title="@{ocultismobonus}" value="@{ocultismotreino} + @{ocultismooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_ocultismotreino">
@@ -719,14 +728,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_percepcao" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Percepção}}{{theroll=[[1d20+[[@{percepcaototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollpercepcao" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Percepção}}{{theroll=[[1d20+[[@{percepcaototal}]]]]}}" class="skill-button">
                                         <span data-i18n="percepcao">Percepção</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_percepcaototal" maxlength="2" type="text" spellcheck="false" title="@{percepcaototal}" value="@{percepcaoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_percepcaobonus" maxlength="2" type="text" spellcheck="false" title="@{percepcaotreino}" value="@{percepcaotreino}" disabled="true">
+                                <input class="total last" name="attr_percepcaobonus" maxlength="2" type="text" spellcheck="false" title="@{percepcaotreino}" value="@{percepcaotreino} + @{percepcaooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_percepcaotreino">
@@ -748,14 +757,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_pilotagem" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Pilotagem}}{{theroll=[[1d20+[[@{pilotagemtotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollpilotagem" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Pilotagem}}{{theroll=[[1d20+[[@{pilotagemtotal}]]]]}}" class="skill-button">
                                         <span class="sup-treinada" data-i18n="pilotagem">Pilotagem*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_pilotagemtotal" maxlength="2" type="text" spellcheck="false" title="@{pilotagemtotal}" value="@{pilotagematributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_pilotagembonus" maxlength="2" type="text" spellcheck="false" title="@{pilotagembonus}" value="@{pilotagemtreino}" disabled="true">
+                                <input class="total last" name="attr_pilotagembonus" maxlength="2" type="text" spellcheck="false" title="@{pilotagembonus}" value="@{pilotagemtreino} + @{pilotagemoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_pilotagemtreino">
@@ -777,14 +786,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_pontaria" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Pontaria}}{{theroll=[[1d20+[[@{pontariatotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollpontaria" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Pontaria}}{{theroll=[[1d20+[[@{pontariatotal}]]]]}}" class="skill-button">
                                         <span data-i18n="pontaria">Pontaria</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_pontariatotal" maxlength="2" type="text" spellcheck="false" title="@{pontariatotal}" value="@{pontariaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_pontariatotal" maxlength="2" type="text" spellcheck="false" title="@{pontariaoutros}" value="@{pontariatreino}" disabled="true">
+                                <input class="total last" name="attr_pontariabonus" maxlength="2" type="text" spellcheck="false" title="@{pontariabonus}" value="@{pontariatreino} + @{pontariaoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_pontariatreino">
@@ -797,7 +806,7 @@
                                 <input name="attr_pontariaoutros" maxlength="3" type="text" spellcheck="false" title="@{pontariaoutros}" value="0">
                                 
                                 <!-- Profissão -->
-                                <select name="attr_profissaoatributo2">
+                                <select name="attr_profissao1atributo2">
                                     <option value="@{for}" data-i18n="mod_forca">FOR</option>
                                     <option value="@{pre}" data-i18n="mod_agilidade">AGI</option>
                                     <option value="@{vig}" data-i18n="mod_vigor">VIG</option>
@@ -806,25 +815,25 @@
                                     
                                 </select>
                                 <div class="profissao">
-                                    <button type="roll" name="roll_profissao1" name="roll_profissao1" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Ofício @{profissaonome}}}{{theroll=[[1d20+[[@{profissaototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollprofissao1" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Ofício @{profissao1nome}}}{{theroll=[[1d20+[[@{profissao1total}]]]]}}" class="skill-button">
                                         <span data-i18n="profissao">Profissão*</span>
                                     </button>
-                                    <input class="nome-profissao" name="attr_profissaonome" type="text" spellcheck="false">
+                                    <input class="nome-profissao1" name="attr_profissao1nome" type="text" spellcheck="false">
                                 </div>
                                 <div class="signal"></div>
-                                <input class="total last" name="attr_profissaototal" maxlength="2" type="text" spellcheck="false" title="@{profissaototal}" value="@{profissaoatributo2}" disabled="true">
+                                <input class="total last" name="attr_profissao1total" maxlength="2" type="text" spellcheck="false" title="@{profissao1total}" value="@{profissao1atributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_profissaototal" maxlength="2" type="text" spellcheck="false" title="@{profissaobonus}" value="@{profissaotreino}" disabled="true">
+                                <input class="total last" name="attr_profissao1bonus" maxlength="2" type="text" spellcheck="false" title="@{profissao1bonus}" value="@{profissao1treino} + @{profissao1outros}" disabled="true">
                                 
                                 <div class="signal">+</div>
-                                <select name="attr_profissaotreino">
+                                <select name="attr_profissao1treino">
                                     <option value="0" selected>Não Treinado</option>
                                     <option value="5">Treinado</option>
                                     <option value="10">Veterano</option>
                                     <option value="15">Expert</option>                                  
                                 </select>  
                                 <div class="signal">+</div>
-                                <input name="attr_profissaooutros" maxlength="3" type="text" spellcheck="false" title="@{profissaooutros}" value="0">
+                                <input name="attr_profissao1outros" maxlength="3" type="text" spellcheck="false" title="@{profissao1outros}" value="0">
                                 
                                 <!-- Profissão 2 -->
                                 <select name="attr_profissao2atributo2">
@@ -836,7 +845,7 @@
                                     
                                 </select>
                                 <div class="profissao">
-                                    <button type="roll" name="roll_profissao2" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Ofício @{profissao2nome}}}{{theroll=[[1d20+[[@{profissao2total}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollprofissao2" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Ofício @{profissao2nome}}}{{theroll=[[1d20+[[@{profissao2total}]]]]}}" class="skill-button">
                                         <span data-i18n="profissao">Profissão*</span>
                                     </button>
                                     <input class="nome-profissao" name="attr_profissao2nome" type="text" spellcheck="false">
@@ -844,7 +853,7 @@
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_profissao2total" maxlength="2" type="text" spellcheck="false" title="@{profissao2total}" value="@{profissao2atributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_profissao2bonus" maxlength="2" type="text" spellcheck="false" title="@{profissao2bonus}" value="@{profissao2treino}" disabled="true">
+                                <input class="total last" name="attr_profissao2bonus" maxlength="2" type="text" spellcheck="false" title="@{profissao2bonus}" value="@{profissao2treino} + @{profissao2outros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_profissao2treino">
@@ -866,14 +875,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_reflexos" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Reflexos}}{{theroll=[[1d20+[[@{reflexostotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollreflexos" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Reflexos}}{{theroll=[[1d20+[[@{reflexostotal}]]]]}}" class="skill-button">
                                         <span data-i18n="reflexos">Reflexos</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_reflexostotal" maxlength="2" type="text" spellcheck="false" title="@{reflexostotal}" value="@{reflexosatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_reflexosbonus" maxlength="2" type="text" spellcheck="false" title="@{reflexosbonus}" value="@{reflexostreino}" disabled="true">
+                                <input class="total last" name="attr_reflexosbonus" maxlength="2" type="text" spellcheck="false" title="@{reflexosbonus}" value="@{reflexostreino} + @{reflexosoutros}" disabled="true">
                                
                                 <div class="signal">+</div>
                                 <select name="attr_reflexostreino">
@@ -895,14 +904,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_religiao" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Religião}}{{theroll=[[1d20+[[@{religiaototal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollreligiao" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Religião}}{{theroll=[[1d20+[[@{religiaototal}]]]]}}" class="skill-button">
                                         <span class="sup-treinada" data-i18n="religiao">Religião*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_religiaototal" maxlength="2" type="text" spellcheck="false" title="@{religiaototal}" value="@{religiaoatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_religiaobonus" maxlength="2" type="text" spellcheck="false" title="@{religiaobonus}" value="@{religiaotreino}" disabled="true">
+                                <input class="total last" name="attr_religiaobonus" maxlength="2" type="text" spellcheck="false" title="@{religiaobonus}" value="@{religiaotreino} + @{religiaooutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_religiaotreino">
@@ -924,17 +933,17 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_sobrevivencia" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Sobrevivência}}{{theroll=[[1d20+[[@{sobrevivenciatotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollsobrevivencia" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Sobrevivência}}{{theroll=[[1d20+[[@{sobrevivenciatotal}]]]]}}" class="skill-button">
                                         <span data-i18n="sobrevivencia">Sobrevivência</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_sobrevivenciatotal" maxlength="2" type="text" spellcheck="false" title="@{sobrevivenciatotal}" value="@{sobrevivenciaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_sobrevivenciabonus" maxlength="2" type="text" spellcheck="false" title="@{sobrevivenciabonus}" value="@{sobrevivenciatreino}" disabled="true">
+                                <input class="total last" name="attr_sobrevivenciabonus" maxlength="2" type="text" spellcheck="false" title="@{sobrevivenciabonus}" value="@{sobrevivenciatreino} + @{sobrevivenciaoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
-                                <select name="attr_acrobaciatreino">
+                                <select name="attr_sobrevivenciatreino">
                                     <option value="0" selected>Não Treinado</option>
                                     <option value="5">Treinado</option>
                                     <option value="10">Veterano</option>
@@ -953,17 +962,17 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_tatica" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Tática}}{{theroll=[[1d20+[[@{taticatotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rolltatica" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Tática}}{{theroll=[[1d20+[[@{taticatotal}]]]]}}" class="skill-button">
                                         <span data-i18n="tatica">Tática*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_taticatotal" maxlength="2" type="text" spellcheck="false" title="@{taticatotal}" value="@{taticaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_taticabonus" maxlength="2" type="text" spellcheck="false" title="@{taticabonus}" value="@{taticatreino}" disabled="true">
+                                <input class="total last" name="attr_taticabonus" maxlength="2" type="text" spellcheck="false" title="@{taticabonus}" value="@{taticatreino} + @{taticaoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
-                                <select name="attr_taticatreinoo">
+                                <select name="attr_taticatreino">
                                     <option value="0" selected>Não Treinado</option>
                                     <option value="5">Treinado</option>
                                     <option value="10">Veterano</option>
@@ -982,14 +991,14 @@
                                     
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_tecnologia" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Tecnologia}}{{theroll=[[1d20+[[@{tecnologiatotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rolltecnologia" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Tecnologia}}{{theroll=[[1d20+[[@{tecnologiatotal}]]]]}}" class="skill-button">
                                         <span data-i18n="tecnologia">Tecnologia*</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_tecnologiatotal" maxlength="2" type="text" spellcheck="false" title="@{tecnologiatotal}" value="@{tecnologiaatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_tecnologiabonus" maxlength="2" type="text" spellcheck="false" title="@{tecnologiabonus}" value="@{tecnologiatreino}" disabled="true">
+                                <input class="total last" name="attr_tecnologiabonus" maxlength="2" type="text" spellcheck="false" title="@{tecnologiabonus}" value="@{tecnologiatreino} + @{tecnologiaoutros}" disabled="true">
                                
                                 <div class="signal">+</div>
                                 <select name="attr_tecnologiatreino">
@@ -1010,14 +1019,14 @@
                                     <option value="@{pre}" selected data-i18n="mod_presenca">PRE*</option>                                    
                                 </select>
                                 <div class="skill-name">
-                                    <button type="roll" name="roll_vontade" value="&{ordem-paranormal}{{character=@{character_name}}}{{rollname=Vontade}}{{theroll=[[1d20+[[@{vontadetotal}]]]]}}" class="skill-button">
+                                    <button type="roll" name="attr_rollvontade" value="&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=Vontade}}{{theroll=[[1d20+[[@{vontadetotal}]]]]}}" class="skill-button">
                                         <span data-i18n="vontade">Vontade</span>
                                     </button>
                                 </div>
                                 <div class="signal"></div>
                                 <input class="total last" name="attr_vontadetotal" maxlength="2" type="text" spellcheck="false" title="@{vontadetotal}" value="@{vontadeatributo2}" disabled="true">
                                 <div class="signal">=</div>
-                                <input class="total last" name="attr_vontadebonus" maxlength="2" type="text" spellcheck="false" title="@{vontadebonus}" value="@{vontadetreino}" disabled="true">
+                                <input class="total last" name="attr_vontadebonus" maxlength="2" type="text" spellcheck="false" title="@{vontadebonus}" value="@{vontadetreino} + @{vontadeoutros}" disabled="true">
                                 
                                 <div class="signal">+</div>
                                 <select name="attr_vontadetreino">
@@ -1061,7 +1070,7 @@
                                 <!-- Ataques -->
                                 <fieldset class="repeating_attacks"> 
                                     <div class="attacksgrid">
-                                        <button type="roll" name="roll_attack" class="buttonrollataque dado-simples" value="&{ordem-paranormal-attack}{{character=@{character_name}}}{{attackname=@{nomeataque}}}{{attackroll=[[1d20cs>@{margemcriticoataque}+[[@{ataquepericia}]]+@{bonusataque}+@{ataquetemp}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}+@{dadoextraataque}+@{danotemp}+@{rolltemp}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{dadoextraataque}+@{modatributodano}+@{danoextraataque}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}">T</button> 
+                                        <button type="roll" name="attr_roll_attack" class="buttonrollataque dado-simples" value="&{template:ordem-paranormal-attack}{{character=@{character_name}}}{{attackname=@{nomeataque}}}{{attackroll=[[1d20cs>@{margemcriticoataque}+[[@{ataquepericia}]]+@{bonusataque}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{dadoextraataque}+@{modatributodano}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}">T</button> 
                                         <input name="attr_nomeataque" type="text" spellcheck="false" class="" value="">
                                         <input name="attr_bonusataque" type="text" spellcheck="false" class="" value="0">
                                         <input name="attr_danoataque" type="text" spellcheck="false" class="" value="0">
@@ -1088,9 +1097,9 @@
                                                 </div>
                                                 <div class="inputtextbellow sheet-pericialuta">
                                                     <select name="attr_ataquepericia">
-                                                        <option value="@{artestotal}+@{condicaomodataquecc}+@{condicaomodataque}">Atuação</option>
-                                                        <option value="@{lutatotal}+@{condicaomodataquecc}+@{condicaomodataque}" selected="">Luta</option>
-                                                        <option value="@{pontariatotal}+@{condicaomodataquedis}+@{condicaomodataque}">Pontaria</option>
+                                                        <option value="luta" selected="">Luta</option>
+                                                        <option value="pontaria">Pontaria</option>
+                                                        <option value="ocultismo">Ocultismo</option>
                                                     </select>
                                                     <span class="title" data-i18n="pericia_utilizada">Perícia utilizada</span>
                                                 </div>
@@ -1106,39 +1115,14 @@
                                                 <div class="inputtextbellow">
                                                     <select name="attr_modatributodano">
                                                         <option value="0" selected="">Nenhum</option>
-                                                        <option value="@{for}" data-i18n="forca">Força</option>
-                                                        <option value="@{agi}" data-i18n="destreza">Destreza</option>
-                                                        <option value="@{vig}" data-i18n="constituicao">Constituição</option>
-                                                        <option value="@{int}" data-i18n="inteligencia">Inteligência</option>
-                                                        <option value="@{pre}" data-i18n="sabedoria">Sabedoria</option>
-                                                        <option value="@{car_mod}" data-i18n="carisma">Carisma</option>
+                                                        <option value="@{for}">Força</option>
+                                                        <option value="@{agi}">Agilidade</option>
+                                                        <option value="@{vig}">Vigor</option>
+                                                        <option value="@{int}">Intelecto</option>
+                                                        <option value="@{pre}">Presença</option>
                                                     </select>
                                                     <span class="title" data-i18n="atributo_no_dano">Atributo no Dano</span>
-                                                </div>
-
-                                                <div class="inputtextbellow">
-                                                    <select name="attr_tipocritico">
-                                                        <option value="" selected="">Nenhum</option>
-                                                        <option value="dilacerante" data-i18n="dilacerante">Dilacerante</option>
-                                                        <option value="lancinante" data-i18n="lancinante">Lacerante</option>
-                                                    </select>
-                                                    <span class="title" data-i18n="tipo_critico">Crítico</span>
-                                                </div>
-
-                                                <div class="inputtextbellow ataque_rolagens sheet-tiporolagemum">
-                                                    <button type="roll" name="roll_failure" class="buttonrollataque buttonrollerro dado" value="&{ordem-paranormal-error-chance}{{character=@{character_name}}}{{errorroll=[[1d100]]}}" style="margin: auto !important;">KK</button>                                               
-                                                    <span class="title" data-i18n="chanceDeErro">Chance de Erro</span>
-                                                </div>
-                                                <div class="inputtextbellow ataque_rolagens sheet-tiporolagemdois">
-                                                    <button type="roll" name="roll_attack_best" class="buttonrollataque dado" value="&{ordem-paranormal-attack}{{character=@{character_name}}}{{attackname=@{nomeataque}}}{{attackroll=[[2d20kh1cs>@{margemcriticoataque}+[[@{ataquepericia}]]+@{bonusataque}+@{ataquetemp}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}+@{dadoextraataque}+@{danotemp}+@{rolltemp}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{modatributodano}+@{danoextraataque}+@{dadoextraataque}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}" style="margin: auto !important;">TT</button>                                               
-                                                    <span class="title" data-i18n="melhorDado">Melhor Dado</span>
-                                                </div>
-                                                <div class="inputtextbellow ataque_rolagens sheet-tiporolagemtres">
-                                                    <button type="roll" name="roll_attack_worst" class="buttonrollataque dado" value="&{ordem-paranormal-attack}{{character=@{character_name}}}{{attackname=@{nomeataque}}}{{attackroll=[[2d20kl1cs>@{margemcriticoataque}+[[@{ataquepericia}]]+@{bonusataque}+@{ataquetemp}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}+@{dadoextraataque}+@{danotemp}+@{rolltemp}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{modatributodano}+@{danoextraataque}+@{dadoextraataque}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}" style="margin: auto !important;">tt</button>
-                                                    <span class="title" data-i18n="piorDado">Pior Dado</span>
-                                                </div>    
-
-                                                
+                                                </div>                                                
                                             </div>
                                             <!-- <div class="bottomline"></div> -->
                                         </div>
@@ -1164,7 +1148,7 @@
                 <!-- Habilidades -->
                 <fieldset class="repeating_powers">                     
                     <div class="container-ability-power">
-                        <button type="roll" name="roll_ability" class="buttonshowinfo" value="&{ordem-paranormal-info}{{infoname=@{nameability}}}{{description=@{abilitydescription}}}">q</button>
+                        <button type="roll" name="roll_ability" class="buttonshowinfo" value="&{template:ordem-paranormal-skill}{{infoname=@{powername}}}{{cost=@{powercost}}}{{description=@{powerdescription}}}">q</button>
                         <input name="attr_powername" type="text" spellcheck="false" value=""/>
                         <input name="attr_powercost" type="text" spellcheck="false" class="" value="0">
                         <input type="checkbox" class="hiddencheckbox">
@@ -1186,7 +1170,7 @@
                     </div>
                     <div class="sheet-patent">
                         <span>PATENTE</span>
-                        <input type="text" name="attr_patent">
+                        <input type="text" name="attr_patent" readonly="1">
                     </div>
                 </div>
                 <div class="sheet-itens-info">
@@ -1201,10 +1185,17 @@
                         <span>LIMITE DE CRÉDITO</span>
                         <input type="text" name="attr_credit_limit">
                     </div>
-                    <div class="sheet-load-limit">
-                        <span>CARGA MAX.</span>
-                        <input type="text" name="attr_loadmin">
-                        <input type="text" name="attr_loadmax">
+                    <div>
+                        <div class="sheet-load-limit">
+                            <span>CARGA ATUAL<br>E EXTRA</span>
+                            <input type="text" name="attr_carga" type="text" spellcheck="false" value="0" readonly="1">
+                            <input type="text" name="attr_extraslot" type="text" spellcheck="false" value="0" class="sheet-edit-input">
+                        </div>
+                        <div class="sheet-load-limit">
+                            <span>CARGA MAX.</span>
+                            <input type="text" name="attr_limite" type="text" spellcheck="false" value="@{limite}" readonly="1">
+                            <input type="text" name="attr_maxima" type="text" spellcheck="false" value="@{maxima}" readonly="1">
+                        </div>                        
                     </div>
                 </div>
                 <div class="sheet-equipment">
@@ -1257,7 +1248,7 @@
                 </div>
                 <div class="sheet-dt-ritual">
                     <span class="sheet-rituals-dt-span">Dificuldade do Teste</span>
-                    <input class="sheet-rituals-dt-input" type="text" name="attr_dt">
+                    <input class="sheet-rituals-dt-input" type="text" name="attr_dt" readonly="1">
                 </div>
             </div>
             <div class="content-grid">
@@ -1270,17 +1261,17 @@
                             <fieldset class="repeating_spells1">
                                 
                                 <div class="container-single-spell">
-                                    <button type="roll" name="roll_spell1" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                    <button type="roll" name="roll_spell1" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{tiporitual}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{dt}}}">T</button>
                                     <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                     <input type="checkbox" class="hiddencheckbox">
                                     <span class="hiddencheckboxcover">W</span>
                                     <div class="extra">
                                         <select class="tiporitual" name="attr_tiporitual">
-                                            <option value="conhecimento">CONHECIMENTO</option>
-                                            <option value="energia">ENERGIA</option>
-                                            <option value="morte">MORTE</option>
-                                            <option value="sangue">SANGUE</option>
-                                            <option value="medo">MEDO</option>
+                                            <option value="Conhecimento">CONHECIMENTO</option>
+                                            <option value="Energia">ENERGIA</option>
+                                            <option value="Morte">MORTE</option>
+                                            <option value="Sangue">SANGUE</option>
+                                            <option value="Medo">MEDO</option>
                                         </select>
     
                                         <span  data-i18n="execucao_magia">Execução</span>
@@ -1309,17 +1300,17 @@
                         <div class="sheet-containerspelllist">
                             <fieldset class="repeating_spells3">
                                 <div class="container-single-spell">
-                                    <button type="roll" name="roll_spell3" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                    <button type="roll" name="roll_spell3" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{tiporitual}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{dt}}}">T</button>
                                     <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                     <input type="checkbox" class="hiddencheckbox">
                                     <span class="hiddencheckboxcover">W</span>
                                     <div class="extra">
                                         <select class="tiporitual" name="attr_tiporitual">
-                                            <option value="conhecimento">CONHECIMENTO</option>
-                                            <option value="energia">ENERGIA</option>
-                                            <option value="morte">MORTE</option>
-                                            <option value="sangue">SANGUE</option>
-                                            <option value="medo">MEDO</option>
+                                            <option value="Conhecimento">CONHECIMENTO</option>
+                                            <option value="Energia">ENERGIA</option>
+                                            <option value="Morte">MORTE</option>
+                                            <option value="Sangue">SANGUE</option>
+                                            <option value="Medo">MEDO</option>
                                         </select>
     
                                         <span data-i18n="execucao_magia">Execução</span>
@@ -1348,17 +1339,17 @@
                         <div class="sheet-containerspelllist">
                             <fieldset class="repeating_spells2">
                                 <div class="container-single-spell">
-                                    <button type="roll" name="roll_spell2" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                    <button type="roll" name="roll_spell2" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{tiporitual}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{dt}}}">T</button>
                                     <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                     <input type="checkbox" class="hiddencheckbox">
                                     <span class="hiddencheckboxcover">W</span>
                                     <div class="extra">
                                         <select class="tiporitual" name="attr_tiporitual">
-                                            <option value="conhecimento">CONHECIMENTO</option>
-                                            <option value="energia">ENERGIA</option>
-                                            <option value="morte">MORTE</option>
-                                            <option value="sangue">SANGUE</option>
-                                            <option value="medo">MEDO</option>
+                                            <option value="Conhecimento">CONHECIMENTO</option>
+                                            <option value="Energia">ENERGIA</option>
+                                            <option value="Morte">MORTE</option>
+                                            <option value="Sangue">SANGUE</option>
+                                            <option value="Medo">MEDO</option>
                                         </select>
     
                                         <span data-i18n="execucao_magia">Execução</span>
@@ -1385,17 +1376,17 @@
                         <div class="sheet-containerspelllist">
                             <fieldset class="repeating_spells4">
                                 <div class="container-single-spell">
-                                    <button type="roll" name="roll_spell4" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{spelltipo}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{spellcd}}}">T</button>
+                                    <button type="roll" name="roll_spell4" class="buttonspell" value="&{template:spell}{{character=@{character_name}}}{{spellname=@{namespell}}}{{type=@{tiporitual}}}{{execution=@{spellexecucao}}}{{duration=@{spellduracao}}}{{range=@{spellalcance}}}{{targetarea=@{spellalvoarea}}}{{resistance=@{spellresistencia}}}{{description=@{spelldescription}}}{{cd=@{dt}}}">T</button>
                                     <input name="attr_namespell" type="text" spellcheck="false" value=""/>
                                     <input type="checkbox" class="hiddencheckbox">
                                     <span class="hiddencheckboxcover">W</span>
                                     <div class="extra">
                                         <select class="tiporitual" name="attr_tiporitual">
-                                            <option value="conhecimento">CONHECIMENTO</option>
-                                            <option value="energia">ENERGIA</option>
-                                            <option value="morte">MORTE</option>
-                                            <option value="sangue">SANGUE</option>
-                                            <option value="medo">MEDO</option>
+                                            <option value="Conhecimento">CONHECIMENTO</option>
+                                            <option value="Energia">ENERGIA</option>
+                                            <option value="Morte">MORTE</option>
+                                            <option value="Sangue">SANGUE</option>
+                                            <option value="Medo">MEDO</option>
                                         </select>
     
                                         <span data-i18n="execucao_magia">Execução</span>
@@ -1433,7 +1424,6 @@
             <div class="sheet-investigation-repeating">                
                 <fieldset class="repeating_investigation">                     
                     <div class="container-ability-power">
-                        <button type="roll" name="roll_ability" class="buttonshowinfo" value="&{ordem-paranormal-info}{{infoname=@{nameability}}}{{description=@{abilitydescription}}}">q</button>
                         <input name="attr_casename" type="text" spellcheck="false" value=""/>
                         <input type="checkbox" class="hiddencheckbox">
                         <span class="hiddencheckboxcover">W</span>
@@ -1573,6 +1563,26 @@
     </div>
 </rolltemplate>
 
+<rolltemplate class="sheet-rolltemplate-ordem-paranormal-skill">
+    <div class="sheet-rollbox-container">
+        <div class="rollbox">
+            <div class="roll-title">
+                {{infoname}}
+            </div>
+            {{#cost}}
+            <div class="sheet-custo">
+                <span>Custo: </span>{{cost}}
+            </div>
+            {{/cost}}
+            {{#description}}
+            <div class="descricao">
+                {{description}}
+            </div>
+            {{/description}}
+        </div>
+    </div>
+</rolltemplate>
+
 <rolltemplate class="sheet-rolltemplate-spell">
     <div class="sheet-spell-container">
         <div class="spellbox">
@@ -1585,7 +1595,7 @@
             <div class="spell-grid">
                 {{#type}}
                 <div class="spell-atribute">
-                    <span>Tipo: </span>{{type}}
+                    <span>Elemento: </span>{{type}}
                 </div>
                 {{/type}}
 
@@ -1714,10 +1724,97 @@
             }
 
             setAttrs({[`roll_${stat}`]: stat_value > 0 ? `&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=${dict_atribute[stat]}}}{{theroll=[[@{${stat}}d20kh1]]}}` : `&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=${dict_atribute[stat]}}}{{theroll=[[2d20kl1]]}}`})
+
+            if(stat == 'for'){                    
+                repeatingSumModified("carga","equipment",["equipquantity","equipslot"], "");   
+            }
         });
     });
 });
 
+//Skills
+//Perícias
+['acrobacia','adestramento','artes','atletismo','atualidades','ciencias','crime','diplomacia','enganacao','fortitude','furtividade',
+'iniciativa','intimidacao','intuicao','investigacao','luta','medicina','ocultismo','percepcao','pilotagem','pontaria',
+'profissao1','profissao2','reflexos','religiao','sobrevivencia','tatica','tecnologia','vontade',
+].forEach(skill => {
+    on(`sheet:opened change:for change:agi change:vig change:int change:pre
+    change:${skill}atributo2 change:${skill}treino change:${skill}outros change:${skill}bonus change:protecaopenalidade1 change:protecaopenalidade2 change:protecaopenalidade3 change:penalidades_protecao_carga`, function(){
+    getAttrs([
+        `${skill}atributo2`, `${skill}bonus`, `${skill}outros`, `${skill}treino`,
+        "for", "agi", "int", "pre", "vig",
+        "protecaopenalidade1","protecaopenalidade2","protecaopenalidade3",
+        "penalidades_protecao_carga"
+    ], function(x){
+        const penalidade1 = !isNaN(x[`protecaopenalidade1`]) ? parseInt(x['protecaopenalidade1']) : 0
+        const penalidade2 = !isNaN(x[`protecaopenalidade2`]) ? parseInt(x['protecaopenalidade2']) : 0
+        const penalidade3 = !isNaN(x[`protecaopenalidade3`]) ? parseInt(x['protecaopenalidade3']) : 0
+
+        const penalidadeCarga = !isNaN(x[`penalidades_protecao_carga`]) ? parseInt(x['penalidades_protecao_carga']) : 0
+
+        //const totalPenalidades = penalidade1 + penalidade2 + penalidade3
+
+        let dict_skills = {
+            'acrobacia':"Acrobacia", 'adestramento': "Adestramento", 'artes': "Artes", 'atletismo': "Atletismo", 'atualidades': "Atualidades",
+            'ciencias': "Ciências", 'crime': "Crime", 'diplomacia': "Diplomacia", 'enganacao': "Enganação", 'fortitude': "Fortitude", 'furtividade': "Furtividade",
+            'iniciativa': "Iniciativa", 'intimidacao': "Intimidação", 'intuicao': "Intuição", 'investigacao': 'Investigação', 'luta': "Luta",
+            'medicina': "Medicina", 'ocultismo': "Ocultismo", 'percepcao': "Percepção", 'pilotagem': "Pilotagem", 'pontaria': "Pontaria",
+            'profissao1': "Profissão",'profissao2': "Profissão2", 'reflexos': "Reflexos", 'religiao': "Religião",
+            'sobrevivencia': "Sobrevivência", 'tatica': "Tática", 'tecnologia': "Tecnologia", 'vontade': "Vontade"            
+        }
+
+        let rawAttr = x[`${skill}atributo2`].replace('@{','').replace('}', '').trim();
+        let bonus = x[`${skill}bonus`];
+        let outros = x[`${skill}outros`];
+
+        let skillTotal = `${bonus} - ${penalidadeCarga}`;
+
+        console.log(x[`rawAttr`], x[`${skill}atributo2`], skill);
+        
+        setAttrs({[`roll${skill}`]: x[`${rawAttr}`] > 0 ?
+                `&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=${dict_skills[skill]}}}{{theroll=[[(${x[`${rawAttr}`]})d20kh1+${skillTotal}]]}}` :
+                `&{template:ordem-paranormal}{{character=@{character_name}}}{{rollname=${dict_skills[skill]}}}{{theroll=[[2d20kl1+${skillTotal}]]}}`
+        });
+
+        
+        });
+    });
+});
+
+//PERODADA
+on("sheet:opened change:totalnex", function(e){
+    getAttrs(["totalnex", "perodada"], function(x){
+        let pe_rodada = x["totalnex"] == 99 ? 20 : Math.floor(x["totalnex"]/5);
+        setAttrs({["perodada"]: pe_rodada});
+    });
+});
+
+//DEFESA
+on("sheet:opened change:agi change:defequip change:defoutros", function(e){
+    getAttrs(["agi", "defesa", "defequip", "defoutros"], function(x){
+        let agi = isNaN(parseInt(x["agi"])) ? 0 : parseInt(x["agi"]);
+        let defequip = isNaN(parseInt(x["defequip"])) ? 0 : parseInt(x["defequip"]);
+        let defoutros = isNaN(parseInt(x["defoutros"])) ? 0 : parseInt(x["defoutros"]);
+
+        console.log(agi, defequip, defoutros);
+
+        let defesa_total = 10 + agi + defequip + defoutros;
+        setAttrs({["defense"]: defesa_total});
+    });
+});
+
+//DT
+on("sheet:opened change:pre change:perodada", function(e){
+    getAttrs(["pre", "dt", "perodada"], function(x){
+        let pre = isNaN(parseInt(x["pre"])) ? 0 : parseInt(x["pre"]);
+        let perodada = isNaN(parseInt(x["perodada"])) ? 0 : parseInt(x["perodada"]);
+        
+        let dt_final = 10 + pre + perodada;
+        setAttrs({["dt"]: dt_final});
+    });
+});
+
+
 //Navegação
 on("sheet:opened change:cstype change:resistemp", function(e){
     getAttrs(["cstype"], function(v){            
@@ -1771,6 +1868,146 @@ on("sheet:opened change:cstype change:resistemp", function(e){
             
     });
 });
+
+//ATK E DANO
+on("change:repeating_attacks:danoataque change:repeating_attacks:multiplicadorcriticoataque change:repeating_attacks:danoextraataque change:repeating_attacks:modatributodano", function() {
+    getAttrs([
+        "repeating_attacks_danoataque",
+        "repeating_attacks_multiplicadorcriticoataque",
+        "repeating_attacks_danoextraataque",
+        "repeating_attacks_modatributodano",
+        "for", "agi", "vig", "int", "pre"
+    ], function(v) {
+        let dano = '';
+            
+        if(typeof v.repeating_attacks_danoataque === 'string'){
+            dano = v.repeating_attacks_danoataque;
+        } else {
+            dano = v.repeating_attacks_danoataque.toString();
+        }
+
+        let multiplicador = parseInt(v.repeating_attacks_multiplicadorcriticoataque) - 1;
+        let resultado = dano;
+                
+        for(let i=0; i < multiplicador; i++){
+            resultado = resultado + " + " + dano;
+        }
+
+        console.log("Resultado:"+resultado);
+                        
+        setAttrs({
+            "repeating_attacks_danocriticoataque": resultado
+        });
+    });
+});
+
+on("sheet:opened change:repeating_attacks:ataquepericia", function() {
+    getAttrs([
+        "repeating_attacks_ataquepericia",
+        "repeating_attacks_bonusataque",
+        "repeating_attacks_roll_attack",
+        "for", "agi", "vig", "int", "pre",
+        "lutaatributo2", "lutabonus", "lutaoutros",
+        "pontariaatributo2", "pontariabonus", "pontariaoutros",
+        "ocultismoatributo2", "ocultismobonus", "ocultismooutros"
+    ], function(v) {          
+        getSectionIDs("attacks", function(idarray) {
+            for(var i=0; i < idarray.length; i++) {
+                let dict_skills = {
+                    'luta': "Luta", 'ocultismo': "Ocultismo", 'pontaria': "Pontaria"         
+                }
+        
+                let skill = v.repeating_attacks_ataquepericia;  
+                console.log(skill);     
+                let rawAttr = v[`${skill}atributo2`].replace('@{','').replace('}', '').trim();
+                console.log(rawAttr);
+                let bonus = v[`${skill}bonus`];
+                console.log(bonus);
+                let bonusataque = v.repeating_attacks_bonusataque;
+                console.log(bonusataque);
+
+                console.log("repeating_attacks_"+idarray[i]+"_roll_attack");
+                
+                setAttrs({["repeating_attacks_"+idarray[i]+"_roll_attack"]: v[`${rawAttr}`] > 0 ?
+                        `&{template:ordem-paranormal-attack}{{character=@{character_name}}}{{attackname=@{nomeataque}}}{{attackroll=[[(${v[`${rawAttr}`]})d20kh1cs>@{margemcriticoataque}+[[${bonus}]]+${bonusataque}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{dadoextraataque}+@{modatributodano}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}` :
+                        `&{template:ordem-paranormal-attack}{{character=@{character_name}}}{{attackname=@{nomeataque}}}{{attackroll=[[2d20kl1cs>@{margemcriticoataque}+[[${bonus}]]+${bonusataque}]]}} {{damageroll=[[@{danoataque}+@{modatributodano}+@{danoextraataque}]]}} {{criticaldamageroll=[[@{danocriticoataque}+@{dadoextraataque}+@{modatributodano}]]}}{{typeofdamage=@{ataquetipodedano}}}{{description=@{ataquedescricao}}}`
+                });
+            }
+         });                
+    });
+});
+
+//Patentes
+on("sheet:opened change:prestigypoints", function(e){
+    getAttrs(["prestigypoints", "patent"], function(v){
+        let prestigy = parseInt(v["prestigypoints"]);
+        let pattent = "Recruta";
+
+        if(prestigy > 19){ pattent = "Operador"; }
+        if(prestigy > 49){ pattent = "Agente Especial"; }
+        if(prestigy > 99){ pattent = "Oficial de Operações"; }
+        if(prestigy > 199){ pattent = "Agente de Elite"; }
+        
+        setAttrs({["patent"]: pattent});
+    });
+})
+
+//CARGA
+on("sheet:opened change:extraslot", function(e){
+    repeatingSumModified("carga","equipment",["equipquantity","equipslot"], ""); 
+});
+
+//Calculando carga e seus efeitos:
+on('sheet:opened change:repeating_equipment remove:repeating_equipment', function() {
+    repeatingSumModified("carga","equipment",["equipquantity","equipslot"], "");        
+});
+
+const repeatingSumModified = (destination,section, fields, appendText = '', multiplier = 1) => {
+    if (!Array.isArray(fields)) fields = [fields];
+    getSectionIDs(`repeating_${section}`, idArray => {
+        const attrArray = idArray.reduce( (m,id) => [...m, ...(fields.map(field => `repeating_${section}_${id}_${field}`))],[]);
+
+        let pesoMoeda = 0;
+        let slotExtra = 0;
+        getAttrs(["extraslot"], function(v){
+            slotExtra = parseInt(v.extraslot)
+            pesoMoeda = Math.floor((tibar + tibouro)/1000);                
+        }); 
+
+        getAttrs(["for", ...attrArray], v => {
+            //console.log("===== values of v: "+ JSON.stringify(v) +" =====");
+                // getValue: if not a number, returns 1 if it is 'on' (checkbox), otherwise returns 0..
+            const getValue = (section, id,field) => parseFloat(v[`repeating_${section}_${id}_${field}`]) || (v[`repeating_${section}_${id}_${field}`] === 'on' ? 1 : 0); 
+            const sumTotal = idArray.reduce((total, id) => total + fields.reduce((subtotal,field) => subtotal * getValue(section, id,field),1),0);
+            
+            let for_mod = parseInt(v.for);
+
+            let cargalimit = for_mod > 0 ? (5 * for_mod) :  parseInt(2);
+            cargalimit += slotExtra;
+            let cargamax = cargalimit * 2;
+                                        
+            let setObj = {}
+
+            let finalTotal = (sumTotal * multiplier) + pesoMoeda;
+
+            finalTotal = finalTotal.toString() + appendText;
+
+            //setObj['penalidades_armadura_carga'] = 0;
+
+            setObj[destination] = finalTotal;
+
+            setObj['limite'] = cargalimit;
+            setObj['maxima'] = cargamax;
+            
+            //if(sumTotal * multiplier > cargalimit){
+            //    setObj['penalidades_armadura_carga'] = 5;
+            //    setObj[destination] = finalTotal + "!" ;
+            //}
+
+            setAttrs(setObj);
+        });
+    });
+};
     
 
 </script>
\ No newline at end of file
diff --git a/Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.png b/Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.png
new file mode 100644
index 0000000000..16a3cfd21e
Binary files /dev/null and b/Ordem Paranormal - Oficial Jambo Editora/ordemparanormal.png differ
diff --git a/Ordem Paranormal/sheet.json b/Ordem Paranormal - Oficial Jambo Editora/sheet.json
similarity index 100%
rename from Ordem Paranormal/sheet.json
rename to Ordem Paranormal - Oficial Jambo Editora/sheet.json
diff --git a/Ordem Paranormal/translation.json b/Ordem Paranormal - Oficial Jambo Editora/translation.json
similarity index 98%
rename from Ordem Paranormal/translation.json
rename to Ordem Paranormal - Oficial Jambo Editora/translation.json
index a462aead20..efe46a78f6 100644
--- a/Ordem Paranormal/translation.json	
+++ b/Ordem Paranormal - Oficial Jambo Editora/translation.json	
@@ -7,7 +7,7 @@
     "mod_forca": "FORÇA",
     "mod_agilidade": "AGILIDADE",
     "mod_vigor": "VIGOR",
-    "mod_inteligencia": "INTELECTO",
+    "mod_intelecto": "INTELECTO",
     "mod_presenca": "PRESENÇA",
     "pontos_de_vida": "Pontos de Vida",
     "pv_maximos": "Máximos",
@@ -21,6 +21,7 @@
     "bonus_ataque": "Bônus de Ataque",
     "dano": "Dano",
     "dano_extra": "Dano Extra",
+    "dado_extra": "Dados Extra",
     "critico": "Crítico",
     "descricao_macros": "Descrição / Macros",
     "pericia_utilizada": "Perícia utilizada",
diff --git a/Ordem Paranormal/translations/af.json b/Ordem Paranormal - Oficial Jambo Editora/translations/af.json
similarity index 100%
rename from Ordem Paranormal/translations/af.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/af.json
diff --git a/Ordem Paranormal/translations/ca.json b/Ordem Paranormal - Oficial Jambo Editora/translations/ca.json
similarity index 100%
rename from Ordem Paranormal/translations/ca.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/ca.json
diff --git a/Ordem Paranormal/translations/cs.json b/Ordem Paranormal - Oficial Jambo Editora/translations/cs.json
similarity index 100%
rename from Ordem Paranormal/translations/cs.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/cs.json
diff --git a/Ordem Paranormal/translations/da.json b/Ordem Paranormal - Oficial Jambo Editora/translations/da.json
similarity index 100%
rename from Ordem Paranormal/translations/da.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/da.json
diff --git a/Ordem Paranormal/translations/de.json b/Ordem Paranormal - Oficial Jambo Editora/translations/de.json
similarity index 100%
rename from Ordem Paranormal/translations/de.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/de.json
diff --git a/Ordem Paranormal/translations/el.json b/Ordem Paranormal - Oficial Jambo Editora/translations/el.json
similarity index 100%
rename from Ordem Paranormal/translations/el.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/el.json
diff --git a/Ordem Paranormal/translations/en.json b/Ordem Paranormal - Oficial Jambo Editora/translations/en.json
similarity index 100%
rename from Ordem Paranormal/translations/en.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/en.json
diff --git a/Ordem Paranormal/translations/es.json b/Ordem Paranormal - Oficial Jambo Editora/translations/es.json
similarity index 100%
rename from Ordem Paranormal/translations/es.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/es.json
diff --git a/Ordem Paranormal/translations/fi.json b/Ordem Paranormal - Oficial Jambo Editora/translations/fi.json
similarity index 100%
rename from Ordem Paranormal/translations/fi.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/fi.json
diff --git a/Ordem Paranormal/translations/fr.json b/Ordem Paranormal - Oficial Jambo Editora/translations/fr.json
similarity index 100%
rename from Ordem Paranormal/translations/fr.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/fr.json
diff --git a/Ordem Paranormal/translations/he.json b/Ordem Paranormal - Oficial Jambo Editora/translations/he.json
similarity index 100%
rename from Ordem Paranormal/translations/he.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/he.json
diff --git a/Ordem Paranormal/translations/hu.json b/Ordem Paranormal - Oficial Jambo Editora/translations/hu.json
similarity index 100%
rename from Ordem Paranormal/translations/hu.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/hu.json
diff --git a/Ordem Paranormal/translations/it.json b/Ordem Paranormal - Oficial Jambo Editora/translations/it.json
similarity index 100%
rename from Ordem Paranormal/translations/it.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/it.json
diff --git a/Ordem Paranormal/translations/ja.json b/Ordem Paranormal - Oficial Jambo Editora/translations/ja.json
similarity index 100%
rename from Ordem Paranormal/translations/ja.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/ja.json
diff --git a/Ordem Paranormal/translations/ko.json b/Ordem Paranormal - Oficial Jambo Editora/translations/ko.json
similarity index 100%
rename from Ordem Paranormal/translations/ko.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/ko.json
diff --git a/Ordem Paranormal/translations/nl.json b/Ordem Paranormal - Oficial Jambo Editora/translations/nl.json
similarity index 100%
rename from Ordem Paranormal/translations/nl.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/nl.json
diff --git a/Ordem Paranormal/translations/pb.json b/Ordem Paranormal - Oficial Jambo Editora/translations/pb.json
similarity index 100%
rename from Ordem Paranormal/translations/pb.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/pb.json
diff --git a/Ordem Paranormal/translations/pl.json b/Ordem Paranormal - Oficial Jambo Editora/translations/pl.json
similarity index 100%
rename from Ordem Paranormal/translations/pl.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/pl.json
diff --git a/Ordem Paranormal/translations/pt.json b/Ordem Paranormal - Oficial Jambo Editora/translations/pt.json
similarity index 100%
rename from Ordem Paranormal/translations/pt.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/pt.json
diff --git a/Ordem Paranormal/translations/ru.json b/Ordem Paranormal - Oficial Jambo Editora/translations/ru.json
similarity index 100%
rename from Ordem Paranormal/translations/ru.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/ru.json
diff --git a/Ordem Paranormal/translations/sl.json b/Ordem Paranormal - Oficial Jambo Editora/translations/sl.json
similarity index 100%
rename from Ordem Paranormal/translations/sl.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/sl.json
diff --git a/Ordem Paranormal/translations/sv.json b/Ordem Paranormal - Oficial Jambo Editora/translations/sv.json
similarity index 100%
rename from Ordem Paranormal/translations/sv.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/sv.json
diff --git a/Ordem Paranormal/translations/tr.json b/Ordem Paranormal - Oficial Jambo Editora/translations/tr.json
similarity index 100%
rename from Ordem Paranormal/translations/tr.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/tr.json
diff --git a/Ordem Paranormal/translations/uk.json b/Ordem Paranormal - Oficial Jambo Editora/translations/uk.json
similarity index 100%
rename from Ordem Paranormal/translations/uk.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/uk.json
diff --git a/Ordem Paranormal/translations/zh.json b/Ordem Paranormal - Oficial Jambo Editora/translations/zh.json
similarity index 100%
rename from Ordem Paranormal/translations/zh.json
rename to Ordem Paranormal - Oficial Jambo Editora/translations/zh.json