diff --git a/Pathfinder (Spanish)/pathfinder-sp.css b/Pathfinder (Spanish)/pathfinder-sp.css
index 7d41e953e1..974a33eea9 100644
--- a/Pathfinder (Spanish)/pathfinder-sp.css	
+++ b/Pathfinder (Spanish)/pathfinder-sp.css	
@@ -1,22 +1,21 @@
 .sheet-desc-show:not(:checked)~.sheet-desc,
 .sheet-macro-text-show:not(:checked)~.sheet-macro-text,
 .sheet-sect-show:not(:checked)~.sheet-sect,
-.sheet-options-show:not(:checked)~.sheet-options {
-	display: none;
+.sheet-options-show:not(:checked)~.sheet-options,
+.sheet-buffs-show:not(:checked)~.sheet-buffs,
+.sheet-buffs2-show:not(:checked)~.sheet-buffs2 {
+    display: none;
 }
-
 .sheet-table {
 	display: table;
 	width: 100%;
 }
-
 .sheet-small-label {
 	font-size: 85% !important;
 	font-style: italic;
 	font-weight: bold;
 	color: #000;
 }
-
 .sheet-secondary-table-name,
 .sheet-table-name {
 	display: table-caption;
@@ -26,11 +25,9 @@
 	background-color: #000;
 	width: 100%;
 }
-
 .sheet-secondary-table-name {
 	background-color: #4a6486 !important;
 }
-
 .sheet-table-header {
 	display: table-cell;
 	text-align: center;
@@ -39,12 +36,10 @@
 	vertical-align: bottom;
 	background-color: #d3d3d3;
 }
-
 .sheet-table-data {
 	display: table-cell;
 	vertical-align: middle;
 }
-
 .sheet-table-data label {
 	font-size: 13px;
 	font-weight: normal;
@@ -52,25 +47,20 @@
 	margin: 0 auto;
 	color: black;
 }
-
 .sheet-center {
 	text-align: center;
 }
-
 .sheet-left {
 	text-align: left;
 }
-
 .sheet-right {
 	text-align: right;
 }
-
 .sheet-table-row {
 	display: table-row;
 	vertical-align: bottom;
 	width: 100%;    
 }
-
 .sheet-table-row-name {
 	display: table-cell;
 	text-align: center;
@@ -79,53 +69,51 @@
 	background-color: #000;
 	font-weight: bold;
 }
-
 .sheet-label {
 	font-weight: bold;
 	text-align: center;
 	color: #000;
 }
-
 .sheet-roll-check {
 	min-width:70px;
 	text-align: center;
 }
 
+.sheet-select-small {
+	font-size: .90em;
+	height: 26px;
+	padding: 0;
+}
+
 input[type="text"], input[type="number"] {
 	background-color: transparent;
 	border: 0 solid #000;
 	border-bottom-width: 1px;
 }
-
 input[type="text"]:disabled, input[type="number"]:disabled {
 	background-color: rgba(74, 100, 134, 0.28);
 	border: 0 solid #000;
 	color: #222;
 }
-
 input[type="text"], select {
 	width: 100%;
 	margin: 0;
 }
-
 div[class^="sheet-section"] {
 	visibility: hidden;
 	opacity: 0;
 	max-height: 0;
 	overflow: hidden;
 }
-
 div[class^="sheet-npc"] {
 	visibility: hidden;
 	opacity: 0;
 	max-height: 0;
 	overflow: hidden;
 }
-
 b[title],span[title] {
 	cursor: help;
 }
-
 input.sheet-spells_level-tab99:checked ~ div[class^="sheet-section"],
 input.sheet-tab99:checked ~ div[class^="sheet-section"] {
 	max-height: 999999px;
@@ -134,11 +122,9 @@ input.sheet-tab99:checked ~ div[class^="sheet-section"] {
 	transition: opacity 0.5s linear 0s;
 	overflow: auto;
 }
-
 .sheet-tab {
 	border-radius: 7px 7px 0 0;
 }
-
 input.sheet-tab {
 	width: 70px;
 	height: 20px;
@@ -147,11 +133,9 @@ input.sheet-tab {
 	opacity: 0;
 	z-index: 9999;
 }
-
 input.sheet-tab:first-child {
 	margin-left:0px;
 }
-
 input.sheet-skill-tab,
 input.sheet-spell_level,
 input.sheet-spellclass {
@@ -159,7 +143,6 @@ input.sheet-spellclass {
 	height: 20px;*/
 	margin-left: 0;
 }
-
 span.sheet-tab {
 	text-align: center;
 	display: inline-block;
@@ -173,12 +156,10 @@ span.sheet-tab {
 	position: relative;
 	margin-left: -75px;
 }
-
 span.sheet-skill-tab,
 span.sheet-spellclass {
 	width: 100px;
 }
-
 input.sheet-tab::before {
 	content: attr(title);
 	text-align: center;
@@ -189,12 +170,10 @@ input.sheet-tab::before {
 	color: #FFF;
 	font-weight: bold;
 }
-
 input.sheet-tab:checked::before {
 	background: #808080;
 	color: #FFF;
 }
-
 .sheet-header-row {
 	width: 100%;
 	background-color: #000;
@@ -203,7 +182,6 @@ input.sheet-tab:checked::before {
 	min-height: 1em;
 	margin-bottom: 0.5em;
 }
-
 input.sheet-tab1:checked ~ div.sheet-section-core,
 input.sheet-tab2:checked ~ div.sheet-section-class,
 input.sheet-tab3:checked ~ div.sheet-section-defenses,
@@ -238,7 +216,6 @@ input.sheet-spellclass-tab2:checked ~ div.sheet-section-spellclass-2 {
 	transition: opacity 0.5s linear 0s;
 	overflow: hidden;
 }
-
 input.sheet-tab1:checked + span.sheet-tab1,
 input.sheet-tab2:checked + span.sheet-tab2,
 input.sheet-tab3:checked + span.sheet-tab3,
@@ -254,7 +231,6 @@ input.sheet-tab11:checked + span.sheet-tab11,
 input.sheet-skills-tab1:checked + span.sheet-skills-tab1,
 input.sheet-skills-tab2:checked + span.sheet-skills-tab2,
 input.sheet-skills-tab3:checked + span.sheet-skills-tab3,
-input.sheet-skills-tab4:checked + span.sheet-skills-tab4,
 input.sheet-spells_level-tab0:checked + span.sheet-spells_level-tab0,
 input.sheet-spells_level-tab1:checked + span.sheet-spells_level-tab1,
 input.sheet-spells_level-tab2:checked + span.sheet-spells_level-tab2,
@@ -272,47 +248,40 @@ input.sheet-spellclass-tab2:checked + span.sheet-spellclass-tab2 {
 	background: #000;
 	color: #FFF;
 }
-
 .sheet-tab11 {
-	display:none !important;
+    display:none !important;
 }
-
 .sheet-pictos {
 	font-family: "Pictos";
 	font-size: 14px;
 }
-
 .sheet-text-button {
 	font-size: 100%;
 	color: #FFF;
 	background-color: #000;
 	border: 0;
 }
-
 button,
 button:hover,
 button:active
 {
 	background-image: none;
 }
-
+/*show and hide*/
 input[type="checkbox"] + span:not(.sheet-not-sheet-show)::before {
-	margin-right: 4px;
-	line-height: 14px;
-	text-align: center;
 	display: inline-block;
-	vertical-align: middle;
-	content: "[mostrar]";
+	content: '►';
 	width: 14px;
-	height: 14px;
-	font-size: 12px;
+	height: 16px;
+	font-size: .85em;
 }
-
 input[type="checkbox"]:checked + span:not(.sheet-not-sheet-show)::before {
-    content: "[ocultar]";
+    content: '▼';
 }
-
-input[name*="condition"]:checked + b:not(.sheet-offCase) {
+input[name*="condition"]:checked + b:not(.sheet-offCase),
+input[name*="notes"]:checked + b:not(.sheet-offCase),
+input[name*="iterative"]:checked + b:not(.sheet-offCase),
+input[name*="equipped"]:checked + b:not(.sheet-offCase) {
 	background-color: #4a6486;
 	color: #FFF;
 	border-radius: 5px;
@@ -321,54 +290,59 @@ input[name*="condition"]:checked + b:not(.sheet-offCase) {
 	padding-top: 1px;
 }
 
+/*repeating item counter*/
+.sheet-repeating-fields {
+    counter-reset: sheet-rep-items -1;
+}
+input[type="checkbox"].sheet-counted + span:not(.sheet-not-sheet-show)::before {
+    counter-increment: sheet-rep-items;
+    content: counter(sheet-rep-items) '. ►' !important;
+	width: auto !important;
+}
+input[type="checkbox"].sheet-counted:checked + span:not(.sheet-not-sheet-show)::before {
+    counter-increment: sheet-rep-items;
+    content: counter(sheet-rep-items) '. ▼' !important;
+	width: auto !important;
+}
+/* end repeating item counter*/
 .sheet-no-pad-right {
 	padding-right: 0 !important;
 }
-
 hr {
 	border-color: #000;
 	margin:5px 0;
 }
-
 .sheet-npc-hr {
 	padding: 0;
 	margin: 0;
 }
-
 .sheet-margin-bottom {
-	margin-bottom: 15px;
+	margin-bottom: 5px;
 }
-
 .sheet-margin-top {
-	margin-top: 15px;
+	margin-top: 5px;
 }
-
 textarea {
 	box-sizing: border-box;
+	height:100px;
 }
-
 .sheet-spellrange-header {
 	width: 15%;
 }
-
 .sheet-spellrange-data {
 	width: 100% !important;
 	text-align: center !important;
 }
-
 .sheet-iterative-attack-value {
 	width:24% !important;
 }
-
 .sheet-iterative-macro {
 	width:90% !important;
 }
-
 .sheet-iterative_attack_section {
 	margin-bottom:0.5em !important;
 	margin-left: 2px !important;
 }
-
 .sheet-footer {
 	text-align: center; 
 	font-size: xx-small; 
@@ -376,7 +350,6 @@ textarea {
 	border: 1px #000 solid;
 	border-radius: 3px;
 }
-
 .sheet-skill-macro-text {
 	max-height: 1.85em;
 	overflow: hidden;
@@ -384,7 +357,11 @@ textarea {
 	resize: none;
 	margin: 0;
 }
-
+.sheet-repeating-weapon-macro-text {
+	height: 25px;
+	overflow: hidden;
+	margin: 0;
+}
 .charsheet .sheet-weapon-notes {
     max-height: 2.15em;
     overflow: hidden;
@@ -392,18 +369,15 @@ textarea {
     resize: none;
     margin: 0;
 }
-
 .charsheet .repcontainer .repitem {
 	padding: 5px !important;
 	margin: 5px !important;
 	border: 2px solid #CCCCCC !important;
 	border-radius: 3px !important;	
 }
-
 .charsheet button[type=roll] {
     margin: 2px 2px 0 2px !important;
 }
-
 /*Roll Templates*/
 /*Spells*/
 .sheet-rolltemplate-pf_spell table {
@@ -418,43 +392,57 @@ textarea {
 	box-shadow: 2px 2px 5px #000;
 	overflow: hidden;
 }
-
 .sheet-rolltemplate-pf_spell .sheet-header {
 	background-color: #000;
 	border: 1px solid #000;
-	margin: 2px 25px 2px 25px;
 	color: #FFF;
 	font-family: "Helvetica Neue",Helvetica,sans-serif;
 	font-size: 1.1em;
 	font-weight: bold;
   	text-align: left;
 }
-
+.sheet-rolltemplate-pf_spell .sheet-header-table {
+	display:table; 
+	width:100%;
+}
+.sheet-rolltemplate-pf_spell .sheet-header-middle {
+	display:table-cell; 
+	vertical-align:middle;
+}	
 .sheet-rolltemplate-pf_spell .sheet-header-image {
 	float: right;
+	display: table-cell;
 	padding: 2px 0px 2px 2px;
 	vertical-align: middle;
+	min-width: 30px;
+}
+.sheet-rolltemplate-pf_spell .sheet-subtitle {
+	background-color: #000;
+	border: 1px solid #000;
+	color: #FFF;
+	font-family: "Helvetica Neue",Helvetica,sans-serif;
+	font-size: 1em;
+	font-weight:normal;
+  	text-align: left;
+}
+.sheet-rolltemplate-pf_spell img {
+	vertical-align:middle;
 }
-
 .sheet-rolltemplate-pf_spell .sheet-header a {
 	color: #FFF;
 	text-decoration: underline;
 }
-
 .sheet-rolltemplate-pf_spell td {
 	padding: 1px 1px 1px 5px;
 	line-height: 1.1em;
 	text-align: left;
 }
-
 .sheet-rolltemplate-pf_spell tr:nth-child(even) {
 	background-color: #D3D3D3;
 }
-
 .sheet-rolltemplate-pf_spell .sheet-tcat {
   	font-weight: bold;
 }
-
 .sheet-rolltemplate-pf_spell .inlinerollresult  {
 	background-color: transparent;
 	border: none;
@@ -463,22 +451,18 @@ textarea {
 	text-align: center;
 	padding:0px;
 }
-
 .sheet-rolltemplate-pf_spell .inlinerollresult.fullcrit {
 	color: #3FB315;
 	border: none;
 }
-
 .sheet-rolltemplate-pf_spell .inlinerollresult.fullfail {
 	color: #B31515;
 	border: none;
 }
-
 .sheet-rolltemplate-pf_spell .inlinerollresult.importantroll {
 	color: #4A57ED;
 	border: none;
 }
-
 /* Attacks */
 .sheet-rolltemplate-pf_attack table {
 	width: 100%;
@@ -492,10 +476,8 @@ textarea {
 	box-shadow:2px 2px 5px #000;
 	overflow: hidden;
 }
-
 .sheet-rolltemplate-pf_attack .sheet-header {
 	background-color: #000;
-	margin: 2px 25px 2px 25px;
 	border: 1px solid #000;
 	color: #FFF;
 	font-family:"Helvetica Neue",Helvetica,sans-serif;
@@ -503,18 +485,37 @@ textarea {
 	font-weight: bold;
 	padding: 5px;
 }
-
+.sheet-rolltemplate-pf_attack .sheet-header-table {
+	display:table; 
+	width:100%;
+}
+.sheet-rolltemplate-pf_attack .sheet-header-middle {
+	display:table-cell; 
+	vertical-align:middle;
+}	
 .sheet-rolltemplate-pf_attack .sheet-header-image {
 	float: right;
+	display: table-cell;
 	padding: 2px 0px 2px 2px;
 	vertical-align: middle;
+	min-width: 30px;
+}
+.sheet-rolltemplate-pf_attack .sheet-subtitle {
+	background-color: #000;
+	border: 1px solid #000;
+	color: #FFF;
+	font-family: "Helvetica Neue",Helvetica,sans-serif;
+	font-size: 1em;
+	font-weight:normal;
+  	text-align: left;
+}
+.sheet-rolltemplate-pf_attack img {
+	vertical-align:middle;
 }
-
 .sheet-rolltemplate-pf_attack .sheet-header a {
 	color: #FFF;
 	text-decoration: underline;
 }
-
 .sheet-rolltemplate-pf_attack td {
 	padding: 1px 1px 1px 5px;
 	line-height: 1.1em;
@@ -523,11 +524,9 @@ textarea {
 .sheet-rolltemplate-pf_attack tr:nth-child(odd) {
 	background-color: #D3D3D3;
 }
-
 .sheet-rolltemplate-pf_attack td:nth-child(odd) {
-	text-align: left;;
+	text-align: left;
 }
-
 .sheet-rolltemplate-pf_attack .inlinerollresult  {
 	color: #FFF;
 	background-color: #000;
@@ -538,22 +537,18 @@ textarea {
 	margin-left: 1px;
 	padding:0px;
 }
-
 .sheet-rolltemplate-pf_attack .inlinerollresult.fullcrit {
 	color: #FFF;
 	background-color: #3FB315;
 }
-
 .sheet-rolltemplate-pf_attack .inlinerollresult.fullfail {
 	color: #FFF;
 	background-color: #B31515;
 }
-
 .sheet-rolltemplate-pf_attack .inlinerollresult.importantroll {
 	color: #FFF;
 	background-color: #4A57ED;
 }
-
 /* Defense */
 .sheet-rolltemplate-pf_defense table {
 	width: 100%;
@@ -567,28 +562,45 @@ textarea {
 	box-shadow:2px 2px 5px #000;
 	overflow: hidden;
 }
-
 .sheet-rolltemplate-pf_defense .sheet-header {
 	background-color: #000;
-	margin: 2px 25px 2px 25px;
 	border: 1px solid #000;
 	color: #FFF;
 	font-family:"Helvetica Neue",Helvetica,sans-serif;
 	font-size: 1.1em;
 	padding: 5px;
 }
-
+.sheet-rolltemplate-pf_defense .sheet-header-table {
+	display:table; 
+	width:100%;
+}
+.sheet-rolltemplate-pf_defense .sheet-header-middle {
+	display:table-cell; 
+	vertical-align:middle;
+}	
 .sheet-rolltemplate-pf_defense .sheet-header-image {
 	float: right;
+	display: table-cell;
 	padding: 2px 0px 2px 2px;
 	vertical-align: middle;
+	min-width: 30px;
+}
+.sheet-rolltemplate-pf_defense .sheet-subtitle {
+	background-color: #000;
+	border: 1px solid #000;
+	color: #FFF;
+	font-family: "Helvetica Neue",Helvetica,sans-serif;
+	font-size: 1em;
+	font-weight:normal !important;
+  	text-align: left;
+}
+.sheet-rolltemplate-pf_defense img {
+	vertical-align:middle;
 }
-
 .sheet-rolltemplate-pf_defense .sheet-header a {
 	color: #FFF;
 	text-decoration: underline;
 }
-
 .sheet-rolltemplate-pf_defense td {
 	padding: 1px 1px 1px 5px;
 	line-height: 1.1em;
@@ -597,12 +609,10 @@ textarea {
 .sheet-rolltemplate-pf_defense tr:nth-child(odd) {
 	background-color: #D3D3D3;
 }
-
 .sheet-rolltemplate-pf_defense td:nth-child(odd) {
 	text-align: left;
 	font-weight:bold;
 }
-
 .sheet-rolltemplate-pf_defense .inlinerollresult  {
 	color: #FFF;
 	background-color: #000;
@@ -613,22 +623,18 @@ textarea {
 	margin-left: 1px;
 	padding:0px;
 }
-
 .sheet-rolltemplate-pf_defense .inlinerollresult.fullcrit {
 	color: #FFF;
 	background-color: #3FB315;
 }
-
 .sheet-rolltemplate-pf_defense .inlinerollresult.fullfail {
 	color: #FFF;
 	background-color: #B31515;
 }
-
 .sheet-rolltemplate-pf_defense .inlinerollresult.importantroll {
 	color: #FFF;
 	background-color: #4A57ED;
 }
-
 /* Generic */
 .sheet-rolltemplate-pf_generic table {
 	width: 100%;
@@ -642,28 +648,45 @@ textarea {
 	box-shadow:2px 2px 5px #000;
 	overflow: hidden;
 }
-
 .sheet-rolltemplate-pf_generic .sheet-header {
 	background-color: #000;
-	margin: 2px 25px 2px 25px;
 	border: 1px solid #000;
 	color: #FFF;
 	font-family:"Helvetica Neue",Helvetica,sans-serif;
 	font-size: 1.1em;
 	padding: 5px;
 }
-
+.sheet-rolltemplate-pf_generic .sheet-header-table {
+	display:table; 
+	width:100%;
+}
+.sheet-rolltemplate-pf_generic .sheet-header-middle {
+	display:table-cell; 
+	vertical-align:middle;
+}	
 .sheet-rolltemplate-pf_generic .sheet-header-image {
 	float: right;
+	display: table-cell;
 	padding: 2px 0px 2px 2px;
 	vertical-align: middle;
+	min-width: 30px;
+}
+.sheet-rolltemplate-pf_generic .sheet-subtitle {
+	background-color: #000;
+	border: 1px solid #000;
+	color: #FFF;
+	font-family: "Helvetica Neue",Helvetica,sans-serif;
+	font-size: 1em;
+	font-weight:normal !important;
+  	text-align: left;
+}
+.sheet-rolltemplate-pf_generic img {
+	vertical-align:middle;
 }
-
 .sheet-rolltemplate-pf_generic .sheet-header a {
 	color: #FFF;
 	text-decoration: underline;
 }
-
 .sheet-rolltemplate-pf_generic td {
 	padding: 1px 1px 1px 5px;
 	line-height: 1.1em;
@@ -673,12 +696,10 @@ textarea {
 .sheet-rolltemplate-pf_generic tr:nth-child(odd) {
 	background-color: #D3D3D3;
 }
-
 .sheet-rolltemplate-pf_generic td:nth-child(odd) {
 	text-align: left;
 	font-weight:bold;
 }
-
 .sheet-rolltemplate-pf_generic .inlinerollresult  {
 	color: #FFF;
 	background-color: #000;
@@ -689,22 +710,18 @@ textarea {
 	margin-left: 1px;
 	padding:0px;
 }
-
 .sheet-rolltemplate-pf_generic .inlinerollresult.fullcrit {
 	color: #FFF;
 	background-color: #3FB315;
 }
-
 .sheet-rolltemplate-pf_generic .inlinerollresult.fullfail {
 	color: #FFF;
 	background-color: #B31515;
 }
-
 .sheet-rolltemplate-pf_generic .inlinerollresult.importantroll {
 	color: #FFF;
 	background-color: #4A57ED;
 }
-
 /* Block Text */
 .sheet-rolltemplate-pf_block table {
 	width: 100%;
@@ -718,38 +735,53 @@ textarea {
 	box-shadow:2px 2px 5px #000;
 	overflow: hidden;
 }
-
 .sheet-rolltemplate-pf_block .sheet-header {
 	background-color: #000;
-	margin: 2px 25px 2px 25px;
 	border: 1px solid #000;
 	color: #FFF;
 	font-family:"Helvetica Neue",Helvetica,sans-serif;
 	font-size: 1.1em;
 	padding: 5px;
 }
-
+.sheet-rolltemplate-pf_block .sheet-header-table {
+	display:table; 
+	width:100%;
+}
+.sheet-rolltemplate-pf_block .sheet-header-middle {
+	display:table-cell; 
+	vertical-align:middle;
+}	
 .sheet-rolltemplate-pf_block .sheet-header-image {
 	float: right;
+	display: table-cell;
 	padding: 2px 0px 2px 2px;
 	vertical-align: middle;
+	min-width: 30px;
+}
+.sheet-rolltemplate-pf_block .sheet-subtitle {
+	background-color: #000;
+	border: 1px solid #000;
+	color: #FFF;
+	font-family: "Helvetica Neue",Helvetica,sans-serif;
+	font-size: 1em;
+	font-weight:normal !important;
+  	text-align: left;
+}
+.sheet-rolltemplate-pf_block img {
+	vertical-align:middle;
 }
-
 .sheet-rolltemplate-pf_block .sheet-header a {
 	color: #FFF;
 	text-decoration: underline;
 }
-
 .sheet-rolltemplate-pf_block td {
 	padding: 1px 1px 1px 5px;
 	line-height: 1.1em;
 	text-align:left;
 }
-
 .sheet-rolltemplate-pf_block tr:nth-child(odd) {
 	background-color: #D3D3D3;
 }
-
 .sheet-rolltemplate-pf_block .inlinerollresult  {
 	color: #FFF;
 	background-color: #000;
@@ -760,17 +792,14 @@ textarea {
 	margin-left: 1px;
 	padding:0px;
 }
-
 .sheet-rolltemplate-pf_block .inlinerollresult.fullcrit {
 	color: #3FB315;
 	border: none;
 }
-
 .sheet-rolltemplate-pf_block .inlinerollresult.fullfail {
 	color: #B31515;
 	border: none;
 }
-
 .sheet-rolltemplate-pf_block .inlinerollresult.importantroll {
 	color: #4A57ED;
 	border: none;
diff --git a/Pathfinder (Spanish)/pathfinder-sp.html b/Pathfinder (Spanish)/pathfinder-sp.html
index 2025f593e8..f16f407707 100644
--- a/Pathfinder (Spanish)/pathfinder-sp.html	
+++ b/Pathfinder (Spanish)/pathfinder-sp.html	
@@ -1,6 +1,15 @@
-<div style="display:none;">
+<div>
     <b style="color:red;font-size:150%;">Atención: </b>
+    <input type="checkbox" class="sheet-sect-show" title="@{attention-show}" name="attr_attention-show" value="1" style="opacity:0; width:64px; height:16px;position:relative; top:0; left:0; margin:-32px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
+	<div class="sheet-footer sheet-sect" ​style="text-align:left; padding:5px; margin:5px;">
+		<ol>
+			<li>Barras de botones ya no son necesarios y se han eliminado. Botones dentro de las secciones que se repiten ahora trabajan directamente y se pueden arrastrar a la barra rápida macro. Para conocer el id / nombre del botón , arrastrar / soltar el botón a la barra rápida macro.</li>
+			<li>Todas las macros de habilidad que utilizan <b>repitiendo atributos</b> debe ser editado para incluir "<b>$</b>". por ejemplo @{repeating_foo_X _...} debería denominarse @ donde {repeating_foo_ $ X _...} "<b>X</b>" es la fila de la sección de repetición.</li>
+			<li>Para las llamadas macro a <b>rollos botón</b> en filas que se repiten, se debe hacer lo anterior ($) y debe agregar "_roll" hasta el final. Para los ataques, añadir "attack-roll".</li>
+		</ol>
+	</div>
 </div>
+
 <div class="sheet-table sheet-header">
     <div class="sheet-table-row">
         <div class="sheet-table-data sheet-center"><img src="http://paizo.com/image/content/Logos/PathfinderRPGLogo_500.jpeg" style="max-height: 40px;" alt="Pathfinder RPG Character Sheet" /></div>
@@ -411,67 +420,6 @@
     <div>
         <b>Rasgos de Clase&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
         <input type="checkbox" class="sheet-sect-show" title="@{class-features-show}" name="attr_class-features-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-        <div class="sheet-table sheet-sect">
-            <span class="sheet-table-name">Botones de Rasgos de Clase</span>
-            <div class="sheet-table-row">
-                <span class="sheet-table-header">0</span>
-                <span class="sheet-table-header">1</span>
-                <span class="sheet-table-header">2</span>
-                <span class="sheet-table-header">3</span>
-                <span class="sheet-table-header">4</span>
-                <span class="sheet-table-header">5</span>
-                <span class="sheet-table-header">6</span>
-                <span class="sheet-table-header">7</span>
-                <span class="sheet-table-header">8</span>
-                <span class="sheet-table-header">9</span>
-                <span class="sheet-table-header">10</span>
-                <span class="sheet-table-header">11</span>
-                <span class="sheet-table-header">12</span>
-                <span class="sheet-table-header">13</span>
-                <span class="sheet-table-header">14</span>
-                <span class="sheet-table-header">15</span>
-                <span class="sheet-table-header">16</span>
-                <span class="sheet-table-header">17</span>
-                <span class="sheet-table-header">18</span>
-                <span class="sheet-table-header">19</span>
-                <span class="sheet-table-header">20</span>
-                <span class="sheet-table-header">21</span>
-                <span class="sheet-table-header">22</span>
-                <span class="sheet-table-header">23</span>
-                <span class="sheet-table-header">24</span>
-                <span class="sheet-table-header">25</span>
-                <span class="sheet-table-header">26</span>
-            </div>
-            <div class="sheet-table-row">
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_0_Display" title="%{selected|repeating_class-ability_0_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_0_class-number}}} {{name=@{repeating_class-ability_0_name}}} {{description = @{repeating_class-ability_0_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_1_Display" title="%{selected|repeating_class-ability_1_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_1_class-number}}} {{name=@{repeating_class-ability_1_name}}} {{description = @{repeating_class-ability_1_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_2_Display" title="%{selected|repeating_class-ability_2_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_2_class-number}}} {{name=@{repeating_class-ability_2_name}}} {{description = @{repeating_class-ability_2_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_3_Display" title="%{selected|repeating_class-ability_3_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_3_class-number}}} {{name=@{repeating_class-ability_3_name}}} {{description = @{repeating_class-ability_3_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_4_Display" title="%{selected|repeating_class-ability_4_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_4_class-number}}} {{name=@{repeating_class-ability_4_name}}} {{description = @{repeating_class-ability_4_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_5_Display" title="%{selected|repeating_class-ability_5_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_5_class-number}}} {{name=@{repeating_class-ability_5_name}}} {{description = @{repeating_class-ability_5_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_6_Display" title="%{selected|repeating_class-ability_6_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_6_class-number}}} {{name=@{repeating_class-ability_6_name}}} {{description = @{repeating_class-ability_6_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_7_Display" title="%{selected|repeating_class-ability_7_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_7_class-number}}} {{name=@{repeating_class-ability_7_name}}} {{description = @{repeating_class-ability_7_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_8_Display" title="%{selected|repeating_class-ability_8_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_8_class-number}}} {{name=@{repeating_class-ability_8_name}}} {{description = @{repeating_class-ability_8_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_9_Display" title="%{selected|repeating_class-ability_9_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_9_class-number}}} {{name=@{repeating_class-ability_9_name}}} {{description = @{repeating_class-ability_9_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_10_Display" title="%{selected|repeating_class-ability_10_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_10_class-number}}} {{name=@{repeating_class-ability_10_name}}} {{description = @{repeating_class-ability_10_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_11_Display" title="%{selected|repeating_class-ability_11_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_11_class-number}}} {{name=@{repeating_class-ability_11_name}}} {{description = @{repeating_class-ability_11_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_12_Display" title="%{selected|repeating_class-ability_12_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_12_class-number}}} {{name=@{repeating_class-ability_12_name}}} {{description = @{repeating_class-ability_12_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_13_Display" title="%{selected|repeating_class-ability_13_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_13_class-number}}} {{name=@{repeating_class-ability_13_name}}} {{description = @{repeating_class-ability_13_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_14_Display" title="%{selected|repeating_class-ability_14_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_14_class-number}}} {{name=@{repeating_class-ability_14_name}}} {{description = @{repeating_class-ability_14_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_15_Display" title="%{selected|repeating_class-ability_15_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_15_class-number}}} {{name=@{repeating_class-ability_15_name}}} {{description = @{repeating_class-ability_15_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_16_Display" title="%{selected|repeating_class-ability_16_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_16_class-number}}} {{name=@{repeating_class-ability_16_name}}} {{description = @{repeating_class-ability_16_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_17_Display" title="%{selected|repeating_class-ability_17_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_17_class-number}}} {{name=@{repeating_class-ability_17_name}}} {{description = @{repeating_class-ability_17_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_18_Display" title="%{selected|repeating_class-ability_18_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_18_class-number}}} {{name=@{repeating_class-ability_18_name}}} {{description = @{repeating_class-ability_18_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_19_Display" title="%{selected|repeating_class-ability_19_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_19_class-number}}} {{name=@{repeating_class-ability_19_name}}} {{description = @{repeating_class-ability_19_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_20_Display" title="%{selected|repeating_class-ability_20_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_20_class-number}}} {{name=@{repeating_class-ability_20_name}}} {{description = @{repeating_class-ability_20_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_21_Display" title="%{selected|repeating_class-ability_21_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_21_class-number}}} {{name=@{repeating_class-ability_21_name}}} {{description = @{repeating_class-ability_21_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_22_Display" title="%{selected|repeating_class-ability_22_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_22_class-number}}} {{name=@{repeating_class-ability_22_name}}} {{description = @{repeating_class-ability_22_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_23_Display" title="%{selected|repeating_class-ability_23_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_23_class-number}}} {{name=@{repeating_class-ability_23_name}}} {{description = @{repeating_class-ability_23_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_24_Display" title="%{selected|repeating_class-ability_24_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_24_class-number}}} {{name=@{repeating_class-ability_24_name}}} {{description = @{repeating_class-ability_24_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_25_Display" title="%{selected|repeating_class-ability_25_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_25_class-number}}} {{name=@{repeating_class-ability_25_name}}} {{description = @{repeating_class-ability_25_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_class-ability_26_Display" title="%{selected|repeating_class-ability_26_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{repeating_class-ability_26_class-number}}} {{name=@{repeating_class-ability_26_name}}} {{description = @{repeating_class-ability_26_short-description}}}"></button></span>
-            </div>
-        </div>
         <br>
         <div class="sheet-table sheet-sect">
             <span class="sheet-table-name">Rasgos de Clase</span>
@@ -489,9 +437,9 @@
         </div>
         <div class="sheet-table sheet-sect">
             <fieldset class="repeating_class-ability">
-                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
                 <span class="sheet-table-data sheet-center" style="width:10%;">
-                    <select title="@{repeating_class-ability_X_class-number}" name="attr_class-number">
+                    <select title="@{repeating_class-ability_$X_class-number}" name="attr_class-number">
                         <option value="" selected>Selecc. Clase</option>
                         <option value="@{class-0-name}">0</option>
                         <option value="@{class-1-name}">1</option>
@@ -500,20 +448,20 @@
                         <option value="@{class-4-name}">4</option>
                     </select>
                 </span>
-                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_X_class-name}" type="text" name="attr_class-name" value="@{class-number}" disabled></span>
-                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_X_name}" type="text" name="attr_name" placeholder="Nombre Rasgo"></span>
-                <span class="sheet-table-data sheet-center" style="width:28%;"><input title="@{repeating_class-ability_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
-                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_class-ability_X_used}" type="number" name="attr_used" value="0"></span>
+                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_$X_class-name}" type="text" name="attr_class-name" value="@{class-number}" disabled></span>
+                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_$X_name}" type="text" name="attr_name" placeholder="Nombre Rasgo"></span>
+                <span class="sheet-table-data sheet-center" style="width:28%;"><input title="@{repeating_class-ability_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_class-ability_$X_used}" type="number" name="attr_used" value="0"></span>
                 <span class="sheet-table-data sheet-center" style="width:2%;vertical-align:middle;font-size:150%;">/</span>
-                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_class-ability_X_used|max}" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
-                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_class-ability_$X_used|max}" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
+                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_class-ability_$X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
                 <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-desc-show" title="@{repeating_class-ability_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                <textarea class="sheet-desc" title="@{repeating_class-ability_X_description}" name="attr_description"></textarea>
+                <input type="checkbox" class="sheet-desc-show" title="@{repeating_class-ability_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                <textarea class="sheet-desc" title="@{repeating_class-ability_$X_description}" name="attr_description"></textarea>
                 <br>
                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_class-ability_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                <textarea class="sheet-macro-text" title="@{repeating_class-ability_X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{class-number}}} {{name=@{name}}} {{description = @{short-description}}}</textarea>
+                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_class-ability_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                <textarea class="sheet-macro-text" title="@{repeating_class-ability_$X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{Class=**Class**: @{class-number}}} {{name=@{name}}} {{description = @{short-description}}}</textarea>
             </fieldset>
         </div>
     </div>
@@ -1119,87 +1067,6 @@
 	<div>
 		<b>Ataques&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
 		<input type="checkbox" class="sheet-sect-show" title="@{attacks-show}" name="attr_attacks-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-		<div class="sheet-sect">
-			<div class="sheet-table">
-				<span class="sheet-table-name">Botones de Ataque</span>
-				<div class="sheet-table-row">
-					<span class="sheet-table-header">0</span>
-					<span class="sheet-table-header">1</span>
-					<span class="sheet-table-header">2</span>
-					<span class="sheet-table-header">3</span>
-					<span class="sheet-table-header">4</span>
-					<span class="sheet-table-header">5</span>
-					<span class="sheet-table-header">6</span>
-					<span class="sheet-table-header">7</span>
-					<span class="sheet-table-header">8</span>
-					<span class="sheet-table-header">9</span>
-					<span class="sheet-table-header">10</span>
-					<span class="sheet-table-header">11</span>
-					<span class="sheet-table-header">12</span>
-					<span class="sheet-table-header">13</span>
-					<span class="sheet-table-header">14</span>
-					<span class="sheet-table-header">15</span>
-					<span class="sheet-table-header">16</span>
-					<span class="sheet-table-header">17</span>
-					<span class="sheet-table-header">18</span>
-					<span class="sheet-table-header">19</span>
-					<span class="sheet-table-header">20</span>
-					<span class="sheet-table-header">21</span>
-					<span class="sheet-table-header">22</span>
-					<span class="sheet-table-header">23</span>
-					<span class="sheet-table-header">24</span>
-					<span class="sheet-table-header">25</span>
-					<span class="sheet-table-header">26</span>
-				</div>
-				<div class="sheet-table-row">
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_0_Attack" title="%{selected|repeating_weapon_0_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_0_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_0_crit-target} + [[ (@{repeating_weapon_0_proficiency} + (((@{repeating_weapon_0_enhance} + @{repeating_weapon_0_masterwork}) + abs(@{repeating_weapon_0_enhance} - @{repeating_weapon_0_masterwork})) / 2) + @{repeating_weapon_0_attack} + @{repeating_weapon_0_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_0_damage-dice-num}d@{repeating_weapon_0_damage-die} + [[ (@{repeating_weapon_0_enhance} + @{repeating_weapon_0_damage} + @{repeating_weapon_0_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_0_proficiency} + (((@{repeating_weapon_0_enhance} + @{repeating_weapon_0_masterwork}) + abs(@{repeating_weapon_0_enhance} - @{repeating_weapon_0_masterwork})) / 2) + @{repeating_weapon_0_attack} + @{repeating_weapon_0_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_0_damage-dice-num} ]] * ([[ @{repeating_weapon_0_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_0_damage-die} + [[ ([[ (@{repeating_weapon_0_enhance} + @{repeating_weapon_0_damage} + @{repeating_weapon_0_damage-ability}) ]] * (@{repeating_weapon_0_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_0_type}}} {{description=@{repeating_weapon_0_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_1_Attack" title="%{selected|repeating_weapon_1_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_1_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_1_crit-target} + [[ (@{repeating_weapon_1_proficiency} + (((@{repeating_weapon_1_enhance} + @{repeating_weapon_1_masterwork}) + abs(@{repeating_weapon_1_enhance} - @{repeating_weapon_1_masterwork})) / 2) + @{repeating_weapon_1_attack} + @{repeating_weapon_1_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_1_damage-dice-num}d@{repeating_weapon_1_damage-die} + [[ (@{repeating_weapon_1_enhance} + @{repeating_weapon_1_damage} + @{repeating_weapon_1_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_1_proficiency} + (((@{repeating_weapon_1_enhance} + @{repeating_weapon_1_masterwork}) + abs(@{repeating_weapon_1_enhance} - @{repeating_weapon_1_masterwork})) / 2) + @{repeating_weapon_1_attack} + @{repeating_weapon_1_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_1_damage-dice-num} ]] * ([[ @{repeating_weapon_1_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_1_damage-die} + [[ ([[ (@{repeating_weapon_1_enhance} + @{repeating_weapon_1_damage} + @{repeating_weapon_1_damage-ability}) ]] * (@{repeating_weapon_1_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_1_type}}} {{description=@{repeating_weapon_1_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_2_Attack" title="%{selected|repeating_weapon_2_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_2_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_2_crit-target} + [[ (@{repeating_weapon_2_proficiency} + (((@{repeating_weapon_2_enhance} + @{repeating_weapon_2_masterwork}) + abs(@{repeating_weapon_2_enhance} - @{repeating_weapon_2_masterwork})) / 2) + @{repeating_weapon_2_attack} + @{repeating_weapon_2_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_2_damage-dice-num}d@{repeating_weapon_2_damage-die} + [[ (@{repeating_weapon_2_enhance} + @{repeating_weapon_2_damage} + @{repeating_weapon_2_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_2_proficiency} + (((@{repeating_weapon_2_enhance} + @{repeating_weapon_2_masterwork}) + abs(@{repeating_weapon_2_enhance} - @{repeating_weapon_2_masterwork})) / 2) + @{repeating_weapon_2_attack} + @{repeating_weapon_2_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_2_damage-dice-num} ]] * ([[ @{repeating_weapon_2_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_2_damage-die} + [[ ([[ (@{repeating_weapon_2_enhance} + @{repeating_weapon_2_damage} + @{repeating_weapon_2_damage-ability}) ]] * (@{repeating_weapon_2_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_2_type}}} {{description=@{repeating_weapon_2_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_3_Attack" title="%{selected|repeating_weapon_3_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_3_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_3_crit-target} + [[ (@{repeating_weapon_3_proficiency} + (((@{repeating_weapon_3_enhance} + @{repeating_weapon_3_masterwork}) + abs(@{repeating_weapon_3_enhance} - @{repeating_weapon_3_masterwork})) / 2) + @{repeating_weapon_3_attack} + @{repeating_weapon_3_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_3_damage-dice-num}d@{repeating_weapon_3_damage-die} + [[ (@{repeating_weapon_3_enhance} + @{repeating_weapon_3_damage} + @{repeating_weapon_3_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_3_proficiency} + (((@{repeating_weapon_3_enhance} + @{repeating_weapon_3_masterwork}) + abs(@{repeating_weapon_3_enhance} - @{repeating_weapon_3_masterwork})) / 2) + @{repeating_weapon_3_attack} + @{repeating_weapon_3_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_3_damage-dice-num} ]] * ([[ @{repeating_weapon_3_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_3_damage-die} + [[ ([[ (@{repeating_weapon_3_enhance} + @{repeating_weapon_3_damage} + @{repeating_weapon_3_damage-ability}) ]] * (@{repeating_weapon_3_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_3_type}}} {{description=@{repeating_weapon_3_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_4_Attack" title="%{selected|repeating_weapon_4_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_4_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_4_crit-target} + [[ (@{repeating_weapon_4_proficiency} + (((@{repeating_weapon_4_enhance} + @{repeating_weapon_4_masterwork}) + abs(@{repeating_weapon_4_enhance} - @{repeating_weapon_4_masterwork})) / 2) + @{repeating_weapon_4_attack} + @{repeating_weapon_4_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_4_damage-dice-num}d@{repeating_weapon_4_damage-die} + [[ (@{repeating_weapon_4_enhance} + @{repeating_weapon_4_damage} + @{repeating_weapon_4_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_4_proficiency} + (((@{repeating_weapon_4_enhance} + @{repeating_weapon_4_masterwork}) + abs(@{repeating_weapon_4_enhance} - @{repeating_weapon_4_masterwork})) / 2) + @{repeating_weapon_4_attack} + @{repeating_weapon_4_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_4_damage-dice-num} ]] * ([[ @{repeating_weapon_4_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_4_damage-die} + [[ ([[ (@{repeating_weapon_4_enhance} + @{repeating_weapon_4_damage} + @{repeating_weapon_4_damage-ability}) ]] * (@{repeating_weapon_4_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_4_type}}} {{description=@{repeating_weapon_4_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_5_Attack" title="%{selected|repeating_weapon_5_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_5_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_5_crit-target} + [[ (@{repeating_weapon_5_proficiency} + (((@{repeating_weapon_5_enhance} + @{repeating_weapon_5_masterwork}) + abs(@{repeating_weapon_5_enhance} - @{repeating_weapon_5_masterwork})) / 2) + @{repeating_weapon_5_attack} + @{repeating_weapon_5_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_5_damage-dice-num}d@{repeating_weapon_5_damage-die} + [[ (@{repeating_weapon_5_enhance} + @{repeating_weapon_5_damage} + @{repeating_weapon_5_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_5_proficiency} + (((@{repeating_weapon_5_enhance} + @{repeating_weapon_5_masterwork}) + abs(@{repeating_weapon_5_enhance} - @{repeating_weapon_5_masterwork})) / 2) + @{repeating_weapon_5_attack} + @{repeating_weapon_5_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_5_damage-dice-num} ]] * ([[ @{repeating_weapon_5_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_5_damage-die} + [[ ([[ (@{repeating_weapon_5_enhance} + @{repeating_weapon_5_damage} + @{repeating_weapon_5_damage-ability}) ]] * (@{repeating_weapon_5_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_5_type}}} {{description=@{repeating_weapon_5_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_6_Attack" title="%{selected|repeating_weapon_6_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_6_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_6_crit-target} + [[ (@{repeating_weapon_6_proficiency} + (((@{repeating_weapon_6_enhance} + @{repeating_weapon_6_masterwork}) + abs(@{repeating_weapon_6_enhance} - @{repeating_weapon_6_masterwork})) / 2) + @{repeating_weapon_6_attack} + @{repeating_weapon_6_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_6_damage-dice-num}d@{repeating_weapon_6_damage-die} + [[ (@{repeating_weapon_6_enhance} + @{repeating_weapon_6_damage} + @{repeating_weapon_6_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_6_proficiency} + (((@{repeating_weapon_6_enhance} + @{repeating_weapon_6_masterwork}) + abs(@{repeating_weapon_6_enhance} - @{repeating_weapon_6_masterwork})) / 2) + @{repeating_weapon_6_attack} + @{repeating_weapon_6_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_6_damage-dice-num} ]] * ([[ @{repeating_weapon_6_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_6_damage-die} + [[ ([[ (@{repeating_weapon_6_enhance} + @{repeating_weapon_6_damage} + @{repeating_weapon_6_damage-ability}) ]] * (@{repeating_weapon_6_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_6_type}}} {{description=@{repeating_weapon_6_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_7_Attack" title="%{selected|repeating_weapon_7_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_7_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_7_crit-target} + [[ (@{repeating_weapon_7_proficiency} + (((@{repeating_weapon_7_enhance} + @{repeating_weapon_7_masterwork}) + abs(@{repeating_weapon_7_enhance} - @{repeating_weapon_7_masterwork})) / 2) + @{repeating_weapon_7_attack} + @{repeating_weapon_7_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_7_damage-dice-num}d@{repeating_weapon_7_damage-die} + [[ (@{repeating_weapon_7_enhance} + @{repeating_weapon_7_damage} + @{repeating_weapon_7_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_7_proficiency} + (((@{repeating_weapon_7_enhance} + @{repeating_weapon_7_masterwork}) + abs(@{repeating_weapon_7_enhance} - @{repeating_weapon_7_masterwork})) / 2) + @{repeating_weapon_7_attack} + @{repeating_weapon_7_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_7_damage-dice-num} ]] * ([[ @{repeating_weapon_7_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_7_damage-die} + [[ ([[ (@{repeating_weapon_7_enhance} + @{repeating_weapon_7_damage} + @{repeating_weapon_7_damage-ability}) ]] * (@{repeating_weapon_7_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_7_type}}} {{description=@{repeating_weapon_7_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_8_Attack" title="%{selected|repeating_weapon_8_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_8_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_8_crit-target} + [[ (@{repeating_weapon_8_proficiency} + (((@{repeating_weapon_8_enhance} + @{repeating_weapon_8_masterwork}) + abs(@{repeating_weapon_8_enhance} - @{repeating_weapon_8_masterwork})) / 2) + @{repeating_weapon_8_attack} + @{repeating_weapon_8_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_8_damage-dice-num}d@{repeating_weapon_8_damage-die} + [[ (@{repeating_weapon_8_enhance} + @{repeating_weapon_8_damage} + @{repeating_weapon_8_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_8_proficiency} + (((@{repeating_weapon_8_enhance} + @{repeating_weapon_8_masterwork}) + abs(@{repeating_weapon_8_enhance} - @{repeating_weapon_8_masterwork})) / 2) + @{repeating_weapon_8_attack} + @{repeating_weapon_8_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_8_damage-dice-num} ]] * ([[ @{repeating_weapon_8_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_8_damage-die} + [[ ([[ (@{repeating_weapon_8_enhance} + @{repeating_weapon_8_damage} + @{repeating_weapon_8_damage-ability}) ]] * (@{repeating_weapon_8_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_8_type}}} {{description=@{repeating_weapon_8_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_9_Attack" title="%{selected|repeating_weapon_9_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_9_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_9_crit-target} + [[ (@{repeating_weapon_9_proficiency} + (((@{repeating_weapon_9_enhance} + @{repeating_weapon_9_masterwork}) + abs(@{repeating_weapon_9_enhance} - @{repeating_weapon_9_masterwork})) / 2) + @{repeating_weapon_9_attack} + @{repeating_weapon_9_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_9_damage-dice-num}d@{repeating_weapon_9_damage-die} + [[ (@{repeating_weapon_9_enhance} + @{repeating_weapon_9_damage} + @{repeating_weapon_9_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_9_proficiency} + (((@{repeating_weapon_9_enhance} + @{repeating_weapon_9_masterwork}) + abs(@{repeating_weapon_9_enhance} - @{repeating_weapon_9_masterwork})) / 2) + @{repeating_weapon_9_attack} + @{repeating_weapon_9_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_9_damage-dice-num} ]] * ([[ @{repeating_weapon_9_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_9_damage-die} + [[ ([[ (@{repeating_weapon_9_enhance} + @{repeating_weapon_9_damage} + @{repeating_weapon_9_damage-ability}) ]] * (@{repeating_weapon_9_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_9_type}}} {{description=@{repeating_weapon_9_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_10_Attack" title="%{selected|repeating_weapon_10_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_10_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_10_crit-target} + [[ (@{repeating_weapon_10_proficiency} + (((@{repeating_weapon_10_enhance} + @{repeating_weapon_10_masterwork}) + abs(@{repeating_weapon_10_enhance} - @{repeating_weapon_10_masterwork})) / 2) + @{repeating_weapon_10_attack} + @{repeating_weapon_10_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_10_damage-dice-num}d@{repeating_weapon_10_damage-die} + [[ (@{repeating_weapon_10_enhance} + @{repeating_weapon_10_damage} + @{repeating_weapon_10_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_10_proficiency} + (((@{repeating_weapon_10_enhance} + @{repeating_weapon_10_masterwork}) + abs(@{repeating_weapon_10_enhance} - @{repeating_weapon_10_masterwork})) / 2) + @{repeating_weapon_10_attack} + @{repeating_weapon_10_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_10_damage-dice-num} ]] * ([[ @{repeating_weapon_10_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_10_damage-die} + [[ ([[ (@{repeating_weapon_10_enhance} + @{repeating_weapon_10_damage} + @{repeating_weapon_10_damage-ability}) ]] * (@{repeating_weapon_10_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_10_type}}} {{description=@{repeating_weapon_10_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_11_Attack" title="%{selected|repeating_weapon_11_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_11_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_11_crit-target} + [[ (@{repeating_weapon_11_proficiency} + (((@{repeating_weapon_11_enhance} + @{repeating_weapon_11_masterwork}) + abs(@{repeating_weapon_11_enhance} - @{repeating_weapon_11_masterwork})) / 2) + @{repeating_weapon_11_attack} + @{repeating_weapon_11_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_11_damage-dice-num}d@{repeating_weapon_11_damage-die} + [[ (@{repeating_weapon_11_enhance} + @{repeating_weapon_11_damage} + @{repeating_weapon_11_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_11_proficiency} + (((@{repeating_weapon_11_enhance} + @{repeating_weapon_11_masterwork}) + abs(@{repeating_weapon_11_enhance} - @{repeating_weapon_11_masterwork})) / 2) + @{repeating_weapon_11_attack} + @{repeating_weapon_11_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_11_damage-dice-num} ]] * ([[ @{repeating_weapon_11_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_11_damage-die} + [[ ([[ (@{repeating_weapon_11_enhance} + @{repeating_weapon_11_damage} + @{repeating_weapon_11_damage-ability}) ]] * (@{repeating_weapon_11_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_11_type}}} {{description=@{repeating_weapon_11_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_12_Attack" title="%{selected|repeating_weapon_12_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_12_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_12_crit-target} + [[ (@{repeating_weapon_12_proficiency} + (((@{repeating_weapon_12_enhance} + @{repeating_weapon_12_masterwork}) + abs(@{repeating_weapon_12_enhance} - @{repeating_weapon_12_masterwork})) / 2) + @{repeating_weapon_12_attack} + @{repeating_weapon_12_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_12_damage-dice-num}d@{repeating_weapon_12_damage-die} + [[ (@{repeating_weapon_12_enhance} + @{repeating_weapon_12_damage} + @{repeating_weapon_12_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_12_proficiency} + (((@{repeating_weapon_12_enhance} + @{repeating_weapon_12_masterwork}) + abs(@{repeating_weapon_12_enhance} - @{repeating_weapon_12_masterwork})) / 2) + @{repeating_weapon_12_attack} + @{repeating_weapon_12_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_12_damage-dice-num} ]] * ([[ @{repeating_weapon_12_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_12_damage-die} + [[ ([[ (@{repeating_weapon_12_enhance} + @{repeating_weapon_12_damage} + @{repeating_weapon_12_damage-ability}) ]] * (@{repeating_weapon_12_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_12_type}}} {{description=@{repeating_weapon_12_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_13_Attack" title="%{selected|repeating_weapon_13_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_13_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_13_crit-target} + [[ (@{repeating_weapon_13_proficiency} + (((@{repeating_weapon_13_enhance} + @{repeating_weapon_13_masterwork}) + abs(@{repeating_weapon_13_enhance} - @{repeating_weapon_13_masterwork})) / 2) + @{repeating_weapon_13_attack} + @{repeating_weapon_13_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_13_damage-dice-num}d@{repeating_weapon_13_damage-die} + [[ (@{repeating_weapon_13_enhance} + @{repeating_weapon_13_damage} + @{repeating_weapon_13_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_13_proficiency} + (((@{repeating_weapon_13_enhance} + @{repeating_weapon_13_masterwork}) + abs(@{repeating_weapon_13_enhance} - @{repeating_weapon_13_masterwork})) / 2) + @{repeating_weapon_13_attack} + @{repeating_weapon_13_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_13_damage-dice-num} ]] * ([[ @{repeating_weapon_13_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_13_damage-die} + [[ ([[ (@{repeating_weapon_13_enhance} + @{repeating_weapon_13_damage} + @{repeating_weapon_13_damage-ability}) ]] * (@{repeating_weapon_13_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_13_type}}} {{description=@{repeating_weapon_13_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_14_Attack" title="%{selected|repeating_weapon_14_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_14_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_14_crit-target} + [[ (@{repeating_weapon_14_proficiency} + (((@{repeating_weapon_14_enhance} + @{repeating_weapon_14_masterwork}) + abs(@{repeating_weapon_14_enhance} - @{repeating_weapon_14_masterwork})) / 2) + @{repeating_weapon_14_attack} + @{repeating_weapon_14_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_14_damage-dice-num}d@{repeating_weapon_14_damage-die} + [[ (@{repeating_weapon_14_enhance} + @{repeating_weapon_14_damage} + @{repeating_weapon_14_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_14_proficiency} + (((@{repeating_weapon_14_enhance} + @{repeating_weapon_14_masterwork}) + abs(@{repeating_weapon_14_enhance} - @{repeating_weapon_14_masterwork})) / 2) + @{repeating_weapon_14_attack} + @{repeating_weapon_14_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_14_damage-dice-num} ]] * ([[ @{repeating_weapon_14_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_14_damage-die} + [[ ([[ (@{repeating_weapon_14_enhance} + @{repeating_weapon_14_damage} + @{repeating_weapon_14_damage-ability}) ]] * (@{repeating_weapon_14_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_14_type}}} {{description=@{repeating_weapon_14_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_15_Attack" title="%{selected|repeating_weapon_15_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_15_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_15_crit-target} + [[ (@{repeating_weapon_15_proficiency} + (((@{repeating_weapon_15_enhance} + @{repeating_weapon_15_masterwork}) + abs(@{repeating_weapon_15_enhance} - @{repeating_weapon_15_masterwork})) / 2) + @{repeating_weapon_15_attack} + @{repeating_weapon_15_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_15_damage-dice-num}d@{repeating_weapon_15_damage-die} + [[ (@{repeating_weapon_15_enhance} + @{repeating_weapon_15_damage} + @{repeating_weapon_15_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_15_proficiency} + (((@{repeating_weapon_15_enhance} + @{repeating_weapon_15_masterwork}) + abs(@{repeating_weapon_15_enhance} - @{repeating_weapon_15_masterwork})) / 2) + @{repeating_weapon_15_attack} + @{repeating_weapon_15_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_15_damage-dice-num} ]] * ([[ @{repeating_weapon_15_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_15_damage-die} + [[ ([[ (@{repeating_weapon_15_enhance} + @{repeating_weapon_15_damage} + @{repeating_weapon_15_damage-ability}) ]] * (@{repeating_weapon_15_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_15_type}}} {{description=@{repeating_weapon_15_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_16_Attack" title="%{selected|repeating_weapon_16_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_16_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_16_crit-target} + [[ (@{repeating_weapon_16_proficiency} + (((@{repeating_weapon_16_enhance} + @{repeating_weapon_16_masterwork}) + abs(@{repeating_weapon_16_enhance} - @{repeating_weapon_16_masterwork})) / 2) + @{repeating_weapon_16_attack} + @{repeating_weapon_16_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_16_damage-dice-num}d@{repeating_weapon_16_damage-die} + [[ (@{repeating_weapon_16_enhance} + @{repeating_weapon_16_damage} + @{repeating_weapon_16_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_16_proficiency} + (((@{repeating_weapon_16_enhance} + @{repeating_weapon_16_masterwork}) + abs(@{repeating_weapon_16_enhance} - @{repeating_weapon_16_masterwork})) / 2) + @{repeating_weapon_16_attack} + @{repeating_weapon_16_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_16_damage-dice-num} ]] * ([[ @{repeating_weapon_16_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_16_damage-die} + [[ ([[ (@{repeating_weapon_16_enhance} + @{repeating_weapon_16_damage} + @{repeating_weapon_16_damage-ability}) ]] * (@{repeating_weapon_16_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_16_type}}} {{description=@{repeating_weapon_16_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_17_Attack" title="%{selected|repeating_weapon_17_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_17_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_17_crit-target} + [[ (@{repeating_weapon_17_proficiency} + (((@{repeating_weapon_17_enhance} + @{repeating_weapon_17_masterwork}) + abs(@{repeating_weapon_17_enhance} - @{repeating_weapon_17_masterwork})) / 2) + @{repeating_weapon_17_attack} + @{repeating_weapon_17_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_17_damage-dice-num}d@{repeating_weapon_17_damage-die} + [[ (@{repeating_weapon_17_enhance} + @{repeating_weapon_17_damage} + @{repeating_weapon_17_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_17_proficiency} + (((@{repeating_weapon_17_enhance} + @{repeating_weapon_17_masterwork}) + abs(@{repeating_weapon_17_enhance} - @{repeating_weapon_17_masterwork})) / 2) + @{repeating_weapon_17_attack} + @{repeating_weapon_17_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_17_damage-dice-num} ]] * ([[ @{repeating_weapon_17_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_17_damage-die} + [[ ([[ (@{repeating_weapon_17_enhance} + @{repeating_weapon_17_damage} + @{repeating_weapon_17_damage-ability}) ]] * (@{repeating_weapon_17_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_17_type}}} {{description=@{repeating_weapon_17_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_18_Attack" title="%{selected|repeating_weapon_18_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_18_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_18_crit-target} + [[ (@{repeating_weapon_18_proficiency} + (((@{repeating_weapon_18_enhance} + @{repeating_weapon_18_masterwork}) + abs(@{repeating_weapon_18_enhance} - @{repeating_weapon_18_masterwork})) / 2) + @{repeating_weapon_18_attack} + @{repeating_weapon_18_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_18_damage-dice-num}d@{repeating_weapon_18_damage-die} + [[ (@{repeating_weapon_18_enhance} + @{repeating_weapon_18_damage} + @{repeating_weapon_18_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_18_proficiency} + (((@{repeating_weapon_18_enhance} + @{repeating_weapon_18_masterwork}) + abs(@{repeating_weapon_18_enhance} - @{repeating_weapon_18_masterwork})) / 2) + @{repeating_weapon_18_attack} + @{repeating_weapon_18_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_18_damage-dice-num} ]] * ([[ @{repeating_weapon_18_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_18_damage-die} + [[ ([[ (@{repeating_weapon_18_enhance} + @{repeating_weapon_18_damage} + @{repeating_weapon_18_damage-ability}) ]] * (@{repeating_weapon_18_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_18_type}}} {{description=@{repeating_weapon_18_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_19_Attack" title="%{selected|repeating_weapon_19_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_19_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_19_crit-target} + [[ (@{repeating_weapon_19_proficiency} + (((@{repeating_weapon_19_enhance} + @{repeating_weapon_19_masterwork}) + abs(@{repeating_weapon_19_enhance} - @{repeating_weapon_19_masterwork})) / 2) + @{repeating_weapon_19_attack} + @{repeating_weapon_19_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_19_damage-dice-num}d@{repeating_weapon_19_damage-die} + [[ (@{repeating_weapon_19_enhance} + @{repeating_weapon_19_damage} + @{repeating_weapon_19_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_19_proficiency} + (((@{repeating_weapon_19_enhance} + @{repeating_weapon_19_masterwork}) + abs(@{repeating_weapon_19_enhance} - @{repeating_weapon_19_masterwork})) / 2) + @{repeating_weapon_19_attack} + @{repeating_weapon_19_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_19_damage-dice-num} ]] * ([[ @{repeating_weapon_19_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_19_damage-die} + [[ ([[ (@{repeating_weapon_19_enhance} + @{repeating_weapon_19_damage} + @{repeating_weapon_19_damage-ability}) ]] * (@{repeating_weapon_19_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_19_type}}} {{description=@{repeating_weapon_19_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_20_Attack" title="%{selected|repeating_weapon_20_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_20_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_20_crit-target} + [[ (@{repeating_weapon_20_proficiency} + (((@{repeating_weapon_20_enhance} + @{repeating_weapon_20_masterwork}) + abs(@{repeating_weapon_20_enhance} - @{repeating_weapon_20_masterwork})) / 2) + @{repeating_weapon_20_attack} + @{repeating_weapon_20_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_20_damage-dice-num}d@{repeating_weapon_20_damage-die} + [[ (@{repeating_weapon_20_enhance} + @{repeating_weapon_20_damage} + @{repeating_weapon_20_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_20_proficiency} + (((@{repeating_weapon_20_enhance} + @{repeating_weapon_20_masterwork}) + abs(@{repeating_weapon_20_enhance} - @{repeating_weapon_20_masterwork})) / 2) + @{repeating_weapon_20_attack} + @{repeating_weapon_20_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_20_damage-dice-num} ]] * ([[ @{repeating_weapon_20_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_20_damage-die} + [[ ([[ (@{repeating_weapon_20_enhance} + @{repeating_weapon_20_damage} + @{repeating_weapon_20_damage-ability}) ]] * (@{repeating_weapon_20_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_20_type}}} {{description=@{repeating_weapon_20_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_21_Attack" title="%{selected|repeating_weapon_21_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_21_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_21_crit-target} + [[ (@{repeating_weapon_21_proficiency} + (((@{repeating_weapon_21_enhance} + @{repeating_weapon_21_masterwork}) + abs(@{repeating_weapon_21_enhance} - @{repeating_weapon_21_masterwork})) / 2) + @{repeating_weapon_21_attack} + @{repeating_weapon_21_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_21_damage-dice-num}d@{repeating_weapon_21_damage-die} + [[ (@{repeating_weapon_21_enhance} + @{repeating_weapon_21_damage} + @{repeating_weapon_21_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_21_proficiency} + (((@{repeating_weapon_21_enhance} + @{repeating_weapon_21_masterwork}) + abs(@{repeating_weapon_21_enhance} - @{repeating_weapon_21_masterwork})) / 2) + @{repeating_weapon_21_attack} + @{repeating_weapon_21_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_21_damage-dice-num} ]] * ([[ @{repeating_weapon_21_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_21_damage-die} + [[ ([[ (@{repeating_weapon_21_enhance} + @{repeating_weapon_21_damage} + @{repeating_weapon_21_damage-ability}) ]] * (@{repeating_weapon_21_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_21_type}}} {{description=@{repeating_weapon_21_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_22_Attack" title="%{selected|repeating_weapon_22_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_22_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_22_crit-target} + [[ (@{repeating_weapon_22_proficiency} + (((@{repeating_weapon_22_enhance} + @{repeating_weapon_22_masterwork}) + abs(@{repeating_weapon_22_enhance} - @{repeating_weapon_22_masterwork})) / 2) + @{repeating_weapon_22_attack} + @{repeating_weapon_22_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_22_damage-dice-num}d@{repeating_weapon_22_damage-die} + [[ (@{repeating_weapon_22_enhance} + @{repeating_weapon_22_damage} + @{repeating_weapon_22_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_22_proficiency} + (((@{repeating_weapon_22_enhance} + @{repeating_weapon_22_masterwork}) + abs(@{repeating_weapon_22_enhance} - @{repeating_weapon_22_masterwork})) / 2) + @{repeating_weapon_22_attack} + @{repeating_weapon_22_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_22_damage-dice-num} ]] * ([[ @{repeating_weapon_22_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_22_damage-die} + [[ ([[ (@{repeating_weapon_22_enhance} + @{repeating_weapon_22_damage} + @{repeating_weapon_22_damage-ability}) ]] * (@{repeating_weapon_22_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_22_type}}} {{description=@{repeating_weapon_22_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_23_Attack" title="%{selected|repeating_weapon_23_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_23_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_23_crit-target} + [[ (@{repeating_weapon_23_proficiency} + (((@{repeating_weapon_23_enhance} + @{repeating_weapon_23_masterwork}) + abs(@{repeating_weapon_23_enhance} - @{repeating_weapon_23_masterwork})) / 2) + @{repeating_weapon_23_attack} + @{repeating_weapon_23_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_23_damage-dice-num}d@{repeating_weapon_23_damage-die} + [[ (@{repeating_weapon_23_enhance} + @{repeating_weapon_23_damage} + @{repeating_weapon_23_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_23_proficiency} + (((@{repeating_weapon_23_enhance} + @{repeating_weapon_23_masterwork}) + abs(@{repeating_weapon_23_enhance} - @{repeating_weapon_23_masterwork})) / 2) + @{repeating_weapon_23_attack} + @{repeating_weapon_23_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_23_damage-dice-num} ]] * ([[ @{repeating_weapon_23_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_23_damage-die} + [[ ([[ (@{repeating_weapon_23_enhance} + @{repeating_weapon_23_damage} + @{repeating_weapon_23_damage-ability}) ]] * (@{repeating_weapon_23_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_23_type}}} {{description=@{repeating_weapon_23_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_24_Attack" title="%{selected|repeating_weapon_24_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_24_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_24_crit-target} + [[ (@{repeating_weapon_24_proficiency} + (((@{repeating_weapon_24_enhance} + @{repeating_weapon_24_masterwork}) + abs(@{repeating_weapon_24_enhance} - @{repeating_weapon_24_masterwork})) / 2) + @{repeating_weapon_24_attack} + @{repeating_weapon_24_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_24_damage-dice-num}d@{repeating_weapon_24_damage-die} + [[ (@{repeating_weapon_24_enhance} + @{repeating_weapon_24_damage} + @{repeating_weapon_24_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_24_proficiency} + (((@{repeating_weapon_24_enhance} + @{repeating_weapon_24_masterwork}) + abs(@{repeating_weapon_24_enhance} - @{repeating_weapon_24_masterwork})) / 2) + @{repeating_weapon_24_attack} + @{repeating_weapon_24_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_24_damage-dice-num} ]] * ([[ @{repeating_weapon_24_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_24_damage-die} + [[ ([[ (@{repeating_weapon_24_enhance} + @{repeating_weapon_24_damage} + @{repeating_weapon_24_damage-ability}) ]] * (@{repeating_weapon_24_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_24_type}}} {{description=@{repeating_weapon_24_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_25_Attack" title="%{selected|repeating_weapon_25_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_25_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_25_crit-target} + [[ (@{repeating_weapon_25_proficiency} + (((@{repeating_weapon_25_enhance} + @{repeating_weapon_25_masterwork}) + abs(@{repeating_weapon_25_enhance} - @{repeating_weapon_25_masterwork})) / 2) + @{repeating_weapon_25_attack} + @{repeating_weapon_25_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_25_damage-dice-num}d@{repeating_weapon_25_damage-die} + [[ (@{repeating_weapon_25_enhance} + @{repeating_weapon_25_damage} + @{repeating_weapon_25_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_25_proficiency} + (((@{repeating_weapon_25_enhance} + @{repeating_weapon_25_masterwork}) + abs(@{repeating_weapon_25_enhance} - @{repeating_weapon_25_masterwork})) / 2) + @{repeating_weapon_25_attack} + @{repeating_weapon_25_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_25_damage-dice-num} ]] * ([[ @{repeating_weapon_25_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_25_damage-die} + [[ ([[ (@{repeating_weapon_25_enhance} + @{repeating_weapon_25_damage} + @{repeating_weapon_25_damage-ability}) ]] * (@{repeating_weapon_25_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_25_type}}} {{description=@{repeating_weapon_25_notes}}} @{macro_options}"></button></span>
-					<span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_weapon_26_Attack" title="%{selected|repeating_weapon_26_Attack}" value="&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_weapon_26_name}}} {{attack=[[ 1d20cs>@{repeating_weapon_26_crit-target} + [[ (@{repeating_weapon_26_proficiency} + (((@{repeating_weapon_26_enhance} + @{repeating_weapon_26_masterwork}) + abs(@{repeating_weapon_26_enhance} - @{repeating_weapon_26_masterwork})) / 2) + @{repeating_weapon_26_attack} + @{repeating_weapon_26_attack-type} + @{armor-proficiency}) ]] ]]}} {{damage=[[ @{repeating_weapon_26_damage-dice-num}d@{repeating_weapon_26_damage-die} + [[ (@{repeating_weapon_26_enhance} + @{repeating_weapon_26_damage} + @{repeating_weapon_26_damage-ability}) ]] ]]}} {{crit_confirm=[[ 1d20 + [[ (@{repeating_weapon_26_proficiency} + (((@{repeating_weapon_26_enhance} + @{repeating_weapon_26_masterwork}) + abs(@{repeating_weapon_26_enhance} - @{repeating_weapon_26_masterwork})) / 2) + @{repeating_weapon_26_attack} + @{repeating_weapon_26_attack-type} + @{armor-proficiency}) ]] ]]}} {{crit_damage=[[ [[ ([[ @{repeating_weapon_26_damage-dice-num} ]] * ([[ @{repeating_weapon_26_crit-multiplier} ]] - 1)) ]]d@{repeating_weapon_26_damage-die} + [[ ([[ (@{repeating_weapon_26_enhance} + @{repeating_weapon_26_damage} + @{repeating_weapon_26_damage-ability}) ]] * (@{repeating_weapon_26_crit-multiplier} - 1)) ]] ]]}} {{type=@{repeating_weapon_26_type}}} {{description=@{repeating_weapon_26_notes}}} @{macro_options}"></button></span>
-				</div>
-			</div>
-		<div>
-			<b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-			<input type="checkbox" class="sheet-options-show" title="@{options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span> 			
-			<input type="hidden" name="attr_var_melee_notes" value="{{melee_notes=@{melee-attack-notes}}}"/>
-			<input type="hidden" name="attr_var_ranged_notes" value="{{ranged_notes=@{ranged-attack-notes}}}"/>
-			<input type="hidden" name="attr_var_CMB_notes" value="{{CMB_notes=@{CMB-notes}}}"/>
-			<input type="hidden" name="attr_var_attack_notes" value="{{attack_notes=@{attack-notes}}}"/>
-			<div class="sheet-table sheet-options" style="margin-top: 0.5em;">
-				<div class="sheet-table-row sheet-table-header">
-					<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><b title="Include these additional notes on all pre-set button attacks.">Incluir notas?</b></span>
-					<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_melee_notes" value="@{var_melee_notes}" title="@{toggle_melee_notes}"/><b title="Include Melee attack notes"> Notas C/C</b></label></span>
-					<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_ranged_notes" value="@{var_ranged_notes}" title="@{toggle_ranged_notes}"/><b title="Include Ranged attack notes"> Notas A Distancia</b></label></span>
-					<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_CMB_notes" value="@{var_CMB_notes}" title="@{toggle_CMB_notes}"/><b title="Include CMB notes"> Notas BMC</b></label></span>
-					<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_attack_notes" value="@{var_attack_notes}" title="@{toggle_attack_notes}"/><b title="Include Attack notes"> Notas Ataque</b></label></span>
-				</div>
-			</div>
-			<input type="hidden" name="attr_macro_options" value="@{toggle_melee_notes} @{toggle_ranged_notes} @{toggle_CMB_notes} @{toggle_attack_notes}"/>
-		</div>
-		</div>
 		<br>
 		<div class="sheet-table sheet-sect">
 			<span class="sheet-table-name">Ataques</span>
@@ -1208,13 +1075,13 @@
 			<fieldset class="repeating_weapon">
 				<div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" min="0" name="attr_enhance" title="@{repeating_weapon_X_enhance}"><br>Mejora</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_X_masterwork}" value="1"><br>Mtr</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_name" title="@{repeating_weapon_X_name}" placeholder="Nombre"><br>Nombre</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_attack" title="@{repeating_weapon_X_attack}" placeholder="Modificadores"><br>Mod. Ataque</span>
+						<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_attack-roll" value="@{macro-text}"></button></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" min="0" name="attr_enhance" title="@{repeating_weapon_$X_enhance}"><br>Mejora</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_$X_masterwork}" value="1"><br>Mtr</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_name" title="@{repeating_weapon_$X_name}" placeholder="Nombre"><br>Nombre</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_attack" title="@{repeating_weapon_$X_attack}" placeholder="Modificadores"><br>Mod. Ataque</span>
                         <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-                            <select title="@{repeating_weapon_X_attack-type}" name="attr_attack-type">
+                            <select title="@{repeating_weapon_$X_attack-type}" name="attr_attack-type">
 	                            <option value="0" selected>Ninguno</option>
 	                            <option value="@{attk-melee}">C/C</option>
 	                            <option value="@{attk-ranged}">A Distancia</option>
@@ -1222,13 +1089,13 @@
                             </select>
                             <br>Tipo
                         </span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-attack" title="@{repeating_weapon_X_total-attack}" value="(@{proficiency} + (((@{enhance} + [[ @{masterwork} ]]) + abs(@{enhance} - [[ @{masterwork} ]])) / 2) + [[ @{attack} ]] + [[ @{attack-type} ]] + [[ @{armor-proficiency} ]])" disabled><br>ATC</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_X_damage-dice-num}" min="0"><br>Dado</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-attack" title="@{repeating_weapon_$X_total-attack}" value="(@{proficiency} + (((@{enhance} + [[ @{masterwork} ]]) + abs(@{enhance} - [[ @{masterwork} ]])) / 2) + [[ @{attack} ]] + [[ @{attack-type} ]] + [[ @{armor-proficiency} ]])" disabled><br>ATC</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_$X_damage-dice-num}" min="0"><br>Dado</span>
 						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;">d</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-die" title="@{repeating_weapon_X_damage-die}" min="0"><br>Dado</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_damage" title="@{repeating_weapon_X_damage}" placeholder="Modificadores Daño"><br>Mod. Daño</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-die" title="@{repeating_weapon_$X_damage-die}" min="0"><br>Dado</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_damage" title="@{repeating_weapon_$X_damage}" placeholder="Modificadores Daño"><br>Mod. Daño</span>
                         <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;">
-                            <select title="@{repeating_weapon_X_damage-ability}" name="attr_damage-ability">
+                            <select title="@{repeating_weapon_$X_damage-ability}" name="attr_damage-ability">
 	                            <option value="0 - [[ @{condition-sickened} ]]" selected>Ninguna</option>
 	                            <option value="floor(0.5 * @{STR-mod}) - [[ @{condition-sickened} ]]">1/2 FUE</option>
 	                            <option value="floor(0.5 * @{DEX-mod}) - [[ @{condition-sickened} ]]">1/2 DES</option>
@@ -1257,30 +1124,30 @@
                             </select>
                             <br>Daño Caract.
                         </span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-damage" title="@{repeating_weapon_X_total-damage}" value="(@{enhance} + [[ @{damage} ]] + [[ @{damage-ability} ]])" disabled><br>DÑO</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-damage" title="@{repeating_weapon_$X_total-damage}" value="(@{enhance} + [[ @{damage} ]] + [[ @{damage-ability} ]])" disabled><br>DÑO</span>
 					</div>
 				</div>
 				<div class="sheet-table">
 					<div class="sheet-table-row">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-target" title="@{repeating_weapon_X_crit-target}" min="0" max="20"><br>Crit</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-target" title="@{repeating_weapon_$X_crit-target}" min="0" max="20"><br>Crit</span>
 						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;"><b>/x</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_X_crit-multiplier}" min="0"><br>Multipl.</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_range" title="@{repeating_weapon_X_range}" value="0" min="0"><br>Rango</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_type" title="@{repeating_weapon_X_type}" placeholder="Tipo Daño"><br>Tipo</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_weight" title="@{repeating_weapon_X_weight}" value="0" step="any" min="0"><br>Peso</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_ammo" title="@{repeating_weapon_X_ammo}" value="0"><br>Munic.</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_$X_crit-multiplier}" min="0"><br>Multipl.</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_range" title="@{repeating_weapon_$X_range}" value="0" min="0"><br>Rango</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_type" title="@{repeating_weapon_$X_type}" placeholder="Tipo Daño"><br>Tipo</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_weight" title="@{repeating_weapon_$X_weight}" value="0" step="any" min="0"><br>Peso</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_ammo" title="@{repeating_weapon_$X_ammo}" value="0"><br>Munic.</span>
                         <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-                            <select title="@{repeating_weapon_X_proficiency}" name="attr_proficiency">
+                            <select title="@{repeating_weapon_$X_proficiency}" name="attr_proficiency">
 	                            <option value="0">Sí</option>
 	                            <option value="-4" selected>No</option>
                             </select>
                             <br>Competencia
                         </span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><textarea class="sheet-weapon-notes" name="attr_notes" title="@{repeating_weapon_X_notes}" placeholder="Notas del Arma"></textarea><br>Notas</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><textarea class="sheet-weapon-notes" name="attr_notes" title="@{repeating_weapon_$X_notes}" placeholder="Notas del Arma"></textarea><br>Notas</span>
 					</div>
 				</div>
 				<b>Ataques Repetitivos&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-				<input type="checkbox" class="sheet-sect-show" title="@{repeating_weapon_X_iterative-attacks-show}" name="attr_iterative-attacks-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<input type="checkbox" class="sheet-sect-show" title="@{repeating_weapon_$X_iterative-attacks-show}" name="attr_iterative-attacks-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
 				<div class="sheet-table sheet-sect sheet-iterative_attack_section">
 					<span class="sheet-table-name">Ataques Repetitivos</span>
 					<div class="sheet-table-row">
@@ -1291,105 +1158,105 @@
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack2" title="@{repeating_weapon_X_toggle_iterative_attack2}" value="@{var_iterative_attack2_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack2" title="@{repeating_weapon_$X_toggle_iterative_attack2}" value="@{var_iterative_attack2_macro}"/>
 	                            <b title="Include a second attack to your weapon?">Incluir 2º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack2_value" title="@{repeating_weapon_X_iterative_attack2_value}" value="-5" max="0"/>
+							<input type="number" name="attr_iterative_attack2_value" title="@{repeating_weapon_$X_iterative_attack2_value}" value="-5" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack2_macro" title="@{repeating_weapon_X_var_iterative_attack2_macro}" value="{{attack2=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack2_value} ]] ]]}} {{damage2=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm2=[[ 1d20 + [[ @{total-attack} + @{iterative_attack2_value} ]] ]]}} {{crit_damage2=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack2_macro" title="@{repeating_weapon_$X_var_iterative_attack2_macro}" value="{{attack2=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack2_value} ]] ]]}} {{damage2=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm2=[[ 1d20 + [[ @{total-attack} + @{iterative_attack2_value} ]] ]]}} {{crit_damage2=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 		                </span>
 						<input type="hidden" name="attr_var_iterative_attack2" value="{{attack2=@{iterative_attack2_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack3" title="@{repeating_weapon_X_toggle_iterative_attack3}" value="@{var_iterative_attack3_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack3" title="@{repeating_weapon_$X_toggle_iterative_attack3}" value="@{var_iterative_attack3_macro}"/>
 	                            <b title="Include a third attack to your weapon?">IIncluir 3º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center sheet-small-label">
-							<input type="number" name="attr_iterative_attack3_value" title="@{repeating_weapon_X_iterative_attack3_value}" value="-10" max="0"/>
+							<input type="number" name="attr_iterative_attack3_value" title="@{repeating_weapon_$X_iterative_attack3_value}" value="-10" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center sheet-small-label">
-                            <input type="text" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_X_var_iterative_attack3_macro}" value="{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack3_value} ]] ]]}} {{damage3=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm3=[[ 1d20 + [[ @{total-attack} + @{iterative_attack3_value} ]] ]]}} {{crit_damage3=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_$X_var_iterative_attack3_macro}" value="{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack3_value} ]] ]]}} {{damage3=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm3=[[ 1d20 + [[ @{total-attack} + @{iterative_attack3_value} ]] ]]}} {{crit_damage3=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 		                </span>
 						<input type="hidden" name="attr_var_iterative_attack3" value="{{attack3=@{iterative_attack3_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack4" title="@{repeating_weapon_X_toggle_iterative_attack4}" value="@{var_iterative_attack4_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack4" title="@{repeating_weapon_$X_toggle_iterative_attack4}" value="@{var_iterative_attack4_macro}"/>
 	                            <b title="Include a fourth attack to your weapon?">Incluir 4º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack4_value" title="@{repeating_weapon_X_iterative_attack4_value}" value="-15" max="0"/>
+							<input type="number" name="attr_iterative_attack4_value" title="@{repeating_weapon_$X_iterative_attack4_value}" value="-15" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_X_var_iterative_attack4_macro}" value="{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack4_value} ]] ]]}} {{damage4=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm4=[[ 1d20 + [[ @{total-attack} + @{iterative_attack4_value} ]] ]]}} {{crit_damage4=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_$X_var_iterative_attack4_macro}" value="{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack4_value} ]] ]]}} {{damage4=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm4=[[ 1d20 + [[ @{total-attack} + @{iterative_attack4_value} ]] ]]}} {{crit_damage4=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack4" value="{{attack4=@{iterative_attack4_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack5" title="@{repeating_weapon_X_toggle_iterative_attack5}" value="@{var_iterative_attack5_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack5" title="@{repeating_weapon_$X_toggle_iterative_attack5}" value="@{var_iterative_attack5_macro}"/>
 	                            <b title="Include a fifth attack to your weapon?">Incluir 5º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack5_value" title="@{repeating_weapon_X_iterative_attack5_value}" value="-20" max="0"/>
+							<input type="number" name="attr_iterative_attack5_value" title="@{repeating_weapon_$X_iterative_attack5_value}" value="-20" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_X_var_iterative_attack5_macro}" value="{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack5_value} ]] ]]}} {{damage5=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm5=[[ 1d20 + [[ @{total-attack} + @{iterative_attack5_value} ]] ]]}} {{crit_damage5=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_$X_var_iterative_attack5_macro}" value="{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack5_value} ]] ]]}} {{damage5=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm5=[[ 1d20 + [[ @{total-attack} + @{iterative_attack5_value} ]] ]]}} {{crit_damage5=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack5" value="{{attack5=@{iterative_attack5_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack6" title="@{repeating_weapon_X_toggle_iterative_attack6}" value="@{var_iterative_attack6_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack6" title="@{repeating_weapon_$X_toggle_iterative_attack6}" value="@{var_iterative_attack6_macro}"/>
 	                            <b title="Include a sixth attack to your weapon?">Incluir 6º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack6_value" title="@{repeating_weapon_X_iterative_attack6_value}" value="-25" max="0"/>
+							<input type="number" name="attr_iterative_attack6_value" title="@{repeating_weapon_$X_iterative_attack6_value}" value="-25" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_X_var_iterative_attack6_macro}" value="{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack6_value} ]] ]]}} {{damage6=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm6=[[ 1d20 + [[ @{total-attack} + @{iterative_attack6_value} ]] ]]}} {{crit_damage6=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_$X_var_iterative_attack6_macro}" value="{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack6_value} ]] ]]}} {{damage6=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm6=[[ 1d20 + [[ @{total-attack} + @{iterative_attack6_value} ]] ]]}} {{crit_damage6=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack6" value="{{attack6=@{iterative_attack6_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack7" title="@{repeating_weapon_X_toggle_iterative_attack7}" value="@{var_iterative_attack7_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack7" title="@{repeating_weapon_$X_toggle_iterative_attack7}" value="@{var_iterative_attack7_macro}"/>
 	                            <b title="Include a seventh attack to your weapon?">Incluir 7º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack7_value" title="@{repeating_weapon_X_iterative_attack7_value}" value="-30" max="0"/>
+							<input type="number" name="attr_iterative_attack7_value" title="@{repeating_weapon_$X_iterative_attack7_value}" value="-30" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_X_var_iterative_attack7_macro}" value="{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack7_value} ]] ]]}} {{damage7=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm7=[[ 1d20 + [[ @{total-attack} + @{iterative_attack7_value} ]] ]]}} {{crit_damage7=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_$X_var_iterative_attack7_macro}" value="{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack7_value} ]] ]]}} {{damage7=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm7=[[ 1d20 + [[ @{total-attack} + @{iterative_attack7_value} ]] ]]}} {{crit_damage7=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack7" value="{{attack7=@{iterative_attack7_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack8" title="@{repeating_weapon_X_toggle_iterative_attack8}" value="@{var_iterative_attack8_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack8" title="@{repeating_weapon_$X_toggle_iterative_attack8}" value="@{var_iterative_attack8_macro}"/>
 	                            <b title="Include an eighth attack to your weapon?">Incluir 8º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack8_value" title="@{repeating_weapon_X_iterative_attack8_value}" value="-35" max="0"/>
+							<input type="number" name="attr_iterative_attack8_value" title="@{repeating_weapon_$X_iterative_attack8_value}" value="-35" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_X_var_iterative_attack8_macro}" value="{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm8=[[ 1d20 + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{crit_damage8=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_$X_var_iterative_attack8_macro}" value="{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm8=[[ 1d20 + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{crit_damage8=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack8" value="{{attack8=@{iterative_attack8_macro}}}"/>
 					</div>
@@ -1405,17 +1272,17 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><b title="Include these additional notes with this attack roll.">Incluir notas?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_melee_notes" value="@{var_melee_notes}" title="@{repeating_weapon_X_toggle_melee_notes}" checked/><b title="Include Melee attack notes"> Notas C/C</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_ranged_notes" value="@{var_ranged_notes}" title="@{repeating_weapon_X_toggle_ranged_notes}"/><b title="Include Ranged attack notes"> Notas A Distancia</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_CMB_notes" value="@{var_CMB_notes}" title="@{repeating_weapon_X_CMB_toggle_notes}"/><b title="Include CMB notes"> Notas BMC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_attack_notes" value="@{var_attack_notes}" title="@{repeating_weapon_X_toggle_attack_notes}"/><b title="Include Attack notes"> Notas Ataque</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_melee_notes" value="@{var_melee_notes}" title="@{repeating_weapon_$X_toggle_melee_notes}" checked/><b title="Include Melee attack notes"> Notas C/C</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_ranged_notes" value="@{var_ranged_notes}" title="@{repeating_weapon_$X_toggle_ranged_notes}"/><b title="Include Ranged attack notes"> Notas A Distancia</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_CMB_notes" value="@{var_CMB_notes}" title="@{repeating_weapon_$X_CMB_toggle_notes}"/><b title="Include CMB notes"> Notas BMC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_attack_notes" value="@{var_attack_notes}" title="@{repeating_weapon_$X_toggle_attack_notes}"/><b title="Include Attack notes"> Notas Ataque</b></label></span>
 					</div>		
 				</div>
 				<input type="hidden" name="attr_macro_options" value="@{toggle_melee_notes} @{toggle_ranged_notes} @{toggle_CMB_notes} @{toggle_attack_notes}"/>
 			</div>
 				<b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-				<input type="checkbox" class="sheet-macro-text-show" title="@{repeating_weapon_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_weapon_X_macro-text}" name="attr_macro-text">&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{attack=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} ]] ]]}} {{damage=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm=[[ 1d20 + [[ @{total-attack} ]] ]]}} {{crit_damage=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}} {{type=@{type}}} {{description=@{notes}}} @{iterative_attacks} @{macro_options}</textarea>
+				<input type="checkbox" class="sheet-macro-text-show" title="@{repeating_weapon_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_weapon_$X_macro-text}" name="attr_macro-text">&{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{attack=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} ]] ]]}} {{damage=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm=[[ 1d20 + [[ @{total-attack} ]] ]]}} {{crit_damage=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}} {{type=@{type}}} {{description=@{notes}}} @{iterative_attacks} @{macro_options}</textarea>
 			</fieldset>
 		</div>
 	</div>
@@ -5425,67 +5292,6 @@
     <div>
         <b>Dotes&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
         <input type="checkbox" class="sheet-sect-show" title="@{feats-show}" name="attr_feats-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-        <div class="sheet-table sheet-sect">
-            <span class="sheet-table-name">Botones de Dotes</span>
-            <div class="sheet-table-row">
-                <span class="sheet-table-header">0</span>
-                <span class="sheet-table-header">1</span>
-                <span class="sheet-table-header">2</span>
-                <span class="sheet-table-header">3</span>
-                <span class="sheet-table-header">4</span>
-                <span class="sheet-table-header">5</span>
-                <span class="sheet-table-header">6</span>
-                <span class="sheet-table-header">7</span>
-                <span class="sheet-table-header">8</span>
-                <span class="sheet-table-header">9</span>
-                <span class="sheet-table-header">10</span>
-                <span class="sheet-table-header">11</span>
-                <span class="sheet-table-header">12</span>
-                <span class="sheet-table-header">13</span>
-                <span class="sheet-table-header">14</span>
-                <span class="sheet-table-header">15</span>
-                <span class="sheet-table-header">16</span>
-                <span class="sheet-table-header">17</span>
-                <span class="sheet-table-header">18</span>
-                <span class="sheet-table-header">19</span>
-                <span class="sheet-table-header">20</span>
-                <span class="sheet-table-header">21</span>
-                <span class="sheet-table-header">22</span>
-                <span class="sheet-table-header">23</span>
-                <span class="sheet-table-header">24</span>
-                <span class="sheet-table-header">25</span>
-                <span class="sheet-table-header">26</span>
-            </div>
-            <div class="sheet-table-row">
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_0_Display" title="%{selected|repeating_feat_0_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_0_name}}} {{description = @{repeating_feat_0_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_1_Display" title="%{selected|repeating_feat_1_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_1_name}}} {{description = @{repeating_feat_1_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_2_Display" title="%{selected|repeating_feat_2_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_2_name}}} {{description = @{repeating_feat_2_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_3_Display" title="%{selected|repeating_feat_3_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_3_name}}} {{description = @{repeating_feat_3_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_4_Display" title="%{selected|repeating_feat_4_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_4_name}}} {{description = @{repeating_feat_4_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_5_Display" title="%{selected|repeating_feat_5_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_5_name}}} {{description = @{repeating_feat_5_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_6_Display" title="%{selected|repeating_feat_6_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_6_name}}} {{description = @{repeating_feat_6_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_7_Display" title="%{selected|repeating_feat_7_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_7_name}}} {{description = @{repeating_feat_7_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_8_Display" title="%{selected|repeating_feat_8_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_8_name}}} {{description = @{repeating_feat_8_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_9_Display" title="%{selected|repeating_feat_9_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_9_name}}} {{description = @{repeating_feat_9_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_10_Display" title="%{selected|repeating_feat_10_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_10_name}}} {{description = @{repeating_feat_10_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_11_Display" title="%{selected|repeating_feat_11_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_11_name}}} {{description = @{repeating_feat_11_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_12_Display" title="%{selected|repeating_feat_12_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_12_name}}} {{description = @{repeating_feat_12_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_13_Display" title="%{selected|repeating_feat_13_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_13_name}}} {{description = @{repeating_feat_13_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_14_Display" title="%{selected|repeating_feat_14_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_14_name}}} {{description = @{repeating_feat_14_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_15_Display" title="%{selected|repeating_feat_15_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_15_name}}} {{description = @{repeating_feat_15_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_16_Display" title="%{selected|repeating_feat_16_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_16_name}}} {{description = @{repeating_feat_16_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_17_Display" title="%{selected|repeating_feat_17_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_17_name}}} {{description = @{repeating_feat_17_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_18_Display" title="%{selected|repeating_feat_18_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_18_name}}} {{description = @{repeating_feat_18_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_19_Display" title="%{selected|repeating_feat_19_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_19_name}}} {{description = @{repeating_feat_19_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_20_Display" title="%{selected|repeating_feat_20_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_20_name}}} {{description = @{repeating_feat_20_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_21_Display" title="%{selected|repeating_feat_21_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_21_name}}} {{description = @{repeating_feat_21_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_22_Display" title="%{selected|repeating_feat_22_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_22_name}}} {{description = @{repeating_feat_22_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_23_Display" title="%{selected|repeating_feat_23_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_23_name}}} {{description = @{repeating_feat_23_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_24_Display" title="%{selected|repeating_feat_24_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_24_name}}} {{description = @{repeating_feat_24_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_25_Display" title="%{selected|repeating_feat_25_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_25_name}}} {{description = @{repeating_feat_25_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_feat_26_Display" title="%{selected|repeating_feat_26_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_feat_26_name}}} {{description = @{repeating_feat_26_short-description}}}"></button></span>
-            </div>
-        </div>
         <br>
         <div class="sheet-table sheet-sect">
             <span class="sheet-table-name">Dotes</span>
@@ -5501,20 +5307,20 @@
         </div>
         <div class="sheet-table sheet-sect">
             <fieldset class="repeating_feat">
-                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                <span class="sheet-table-data sheet-center" style="width:23%;"><input title="@{repeating_feat_X_name}" type="text" name="attr_name" placeholder="Nombre Dote"></span>
-                <span class="sheet-table-data sheet-center" style="width:45%;"><input title="@{repeating_feat_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
-                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_feat_X_used}" type="number" name="attr_used" value="0"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                <span class="sheet-table-data sheet-center" style="width:23%;"><input title="@{repeating_feat_$X_name}" type="text" name="attr_name" placeholder="Nombre Dote"></span>
+                <span class="sheet-table-data sheet-center" style="width:45%;"><input title="@{repeating_feat_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_feat_$X_used}" type="number" name="attr_used" value="0"></span>
                 <span class="sheet-table-data sheet-center" style="width:2%;vertical-align:middle;font-size:150%;">/</span>
-                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_feat_X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
-                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_feat_X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_feat_$X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
+                <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
                 <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-desc-show" title="@{repeating_feat_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                <textarea class="sheet-desc" title="@{repeating_feat_X_description}" name="attr_description"></textarea>
+                <input type="checkbox" class="sheet-desc-show" title="@{repeating_feat_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                <textarea class="sheet-desc" title="@{repeating_feat_$X_description}" name="attr_description"></textarea>
                 <br>
                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_feat_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                <textarea class="sheet-macro-text" title="@{repeating_feat_X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}}  {{name=@{name}}} {{description=@{short-description}}}</textarea>
+                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_feat_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                <textarea class="sheet-macro-text" title="@{repeating_feat_$X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}}  {{name=@{name}}} {{description=@{short-description}}}</textarea>
             </fieldset>
         </div>
     </div>
@@ -5621,67 +5427,6 @@
     <div>
         <b>Equipo&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
         <input type="checkbox" class="sheet-sect-show" title="@{inventory-show}" name="attr_inventory-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-        <div class="sheet-table sheet-sect">
-            <span class="sheet-table-name">Botones de Equipo</span>
-            <div class="sheet-table-row">
-                <span class="sheet-table-header">0</span>
-                <span class="sheet-table-header">1</span>
-                <span class="sheet-table-header">2</span>
-                <span class="sheet-table-header">3</span>
-                <span class="sheet-table-header">4</span>
-                <span class="sheet-table-header">5</span>
-                <span class="sheet-table-header">6</span>
-                <span class="sheet-table-header">7</span>
-                <span class="sheet-table-header">8</span>
-                <span class="sheet-table-header">9</span>
-                <span class="sheet-table-header">10</span>
-                <span class="sheet-table-header">11</span>
-                <span class="sheet-table-header">12</span>
-                <span class="sheet-table-header">13</span>
-                <span class="sheet-table-header">14</span>
-                <span class="sheet-table-header">15</span>
-                <span class="sheet-table-header">16</span>
-                <span class="sheet-table-header">17</span>
-                <span class="sheet-table-header">18</span>
-                <span class="sheet-table-header">19</span>
-                <span class="sheet-table-header">20</span>
-                <span class="sheet-table-header">21</span>
-                <span class="sheet-table-header">22</span>
-                <span class="sheet-table-header">23</span>
-                <span class="sheet-table-header">24</span>
-                <span class="sheet-table-header">25</span>
-                <span class="sheet-table-header">26</span>
-            </div>
-            <div class="sheet-table-row">
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_0_Display" title="%{selected|repeating_item_0_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_0_name}}} {{description = @{repeating_item_0_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_1_Display" title="%{selected|repeating_item_1_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_1_name}}} {{description = @{repeating_item_1_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_2_Display" title="%{selected|repeating_item_2_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_2_name}}} {{description = @{repeating_item_2_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_3_Display" title="%{selected|repeating_item_3_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_3_name}}} {{description = @{repeating_item_3_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_4_Display" title="%{selected|repeating_item_4_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_4_name}}} {{description = @{repeating_item_4_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_5_Display" title="%{selected|repeating_item_5_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_5_name}}} {{description = @{repeating_item_5_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_6_Display" title="%{selected|repeating_item_6_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_6_name}}} {{description = @{repeating_item_6_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_7_Display" title="%{selected|repeating_item_7_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_7_name}}} {{description = @{repeating_item_7_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_8_Display" title="%{selected|repeating_item_8_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_8_name}}} {{description = @{repeating_item_8_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_9_Display" title="%{selected|repeating_item_9_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_9_name}}} {{description = @{repeating_item_9_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_10_Display" title="%{selected|repeating_item_10_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_10_name}}} {{description = @{repeating_item_10_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_11_Display" title="%{selected|repeating_item_11_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_11_name}}} {{description = @{repeating_item_11_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_12_Display" title="%{selected|repeating_item_12_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_12_name}}} {{description = @{repeating_item_12_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_13_Display" title="%{selected|repeating_item_13_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_13_name}}} {{description = @{repeating_item_13_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_14_Display" title="%{selected|repeating_item_14_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_14_name}}} {{description = @{repeating_item_14_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_15_Display" title="%{selected|repeating_item_15_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_15_name}}} {{description = @{repeating_item_15_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_16_Display" title="%{selected|repeating_item_16_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_16_name}}} {{description = @{repeating_item_16_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_17_Display" title="%{selected|repeating_item_17_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_17_name}}} {{description = @{repeating_item_17_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_18_Display" title="%{selected|repeating_item_18_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_18_name}}} {{description = @{repeating_item_18_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_19_Display" title="%{selected|repeating_item_19_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_19_name}}} {{description = @{repeating_item_19_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_20_Display" title="%{selected|repeating_item_20_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_20_name}}} {{description = @{repeating_item_20_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_21_Display" title="%{selected|repeating_item_21_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_21_name}}} {{description = @{repeating_item_21_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_22_Display" title="%{selected|repeating_item_22_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_22_name}}} {{description = @{repeating_item_22_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_23_Display" title="%{selected|repeating_item_23_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_23_name}}} {{description = @{repeating_item_23_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_24_Display" title="%{selected|repeating_item_24_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_24_name}}} {{description = @{repeating_item_24_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_25_Display" title="%{selected|repeating_item_25_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_25_name}}} {{description = @{repeating_item_25_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_item_26_Display" title="%{selected|repeating_item_26_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_item_26_name}}} {{description = @{repeating_item_26_short-description}}}"></button></span>
-            </div>
-        </div>
         <br>
         <div class="sheet-table sheet-sect">
             <span class="sheet-table-name">Equipo</span>
@@ -5697,20 +5442,20 @@
         </div>
         <div class="sheet-table sheet-sect">
             <fieldset class="repeating_item">
-                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                <span class="sheet-table-data sheet-center" style="width:23%;"><input title="@{repeating_item_X_name}" type="text" name="attr_name" placeholder="Nombre del Objeto"></span>
-                <span class="sheet-table-data sheet-center" style="width:55%;"><input title="@{repeating_item_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
-                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_item_X_qty}" type="number" name="attr_qty" value="0"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                <span class="sheet-table-data sheet-center" style="width:23%;"><input title="@{repeating_item_$X_name}" type="text" name="attr_name" placeholder="Nombre del Objeto"></span>
+                <span class="sheet-table-data sheet-center" style="width:55%;"><input title="@{repeating_item_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_item_$X_qty}" type="number" name="attr_qty" value="0"></span>
                 <span class="sheet-table-data sheet-center" style="width:2%;vertical-align:middle;font-size:150%;">/</span>
-                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_item_X_qty|max" type="number" name="attr_qty_max" value="0"></span>
-                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_item_X_weight}" type="number" name="attr_weight" value="0" step="any" min="0"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_item_$X_qty|max" type="number" name="attr_qty_max" value="0"></span>
+                <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_item_$X_weight}" type="number" name="attr_weight" value="0" step="any" min="0"></span>
                 <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-desc-show" title="@{repeating_item_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                <textarea class="sheet-desc" title="@{repeating_item_X_description}" name="attr_description"></textarea>
+                <input type="checkbox" class="sheet-desc-show" title="@{repeating_item_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                <textarea class="sheet-desc" title="@{repeating_item_$X_description}" name="attr_description"></textarea>
                 <br>
                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_item_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                <textarea class="sheet-macro-text" title="@{repeating_item_X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
+                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_item_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                <textarea class="sheet-macro-text" title="@{repeating_item_$X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
             </fieldset>
         </div>
     </div>
@@ -6414,67 +6159,6 @@
             <input type="radio" name="attr_spells_tab" value="99" title="All Spells" class="sheet-tab sheet-spell_level sheet-spells_level-tab99">
             <span class="sheet-tab sheet-spell_level sheet-spells_level-tab99">Todos los Conjuros</span>
             <div class="sheet-section sheet-section-level-0">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 0</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_0_Cast" title="%{selected|repeating_lvl-0-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_0_name}}} {{school=@{repeating_lvl-0-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_0_cast-time}}} {{components=@{repeating_lvl-0-spells_0_components}}} {{range=@{repeating_lvl-0-spells_0_range}}} {{targets=@{repeating_lvl-0-spells_0_targets}}} {{duration=@{repeating_lvl-0-spells_0_duration}}} {{saving_throw=@{repeating_lvl-0-spells_0_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_0_sr}}} {{description=@{repeating_lvl-0-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_1_Cast" title="%{selected|repeating_lvl-0-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_1_name}}} {{school=@{repeating_lvl-0-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_1_cast-time}}} {{components=@{repeating_lvl-0-spells_1_components}}} {{range=@{repeating_lvl-0-spells_1_range}}} {{targets=@{repeating_lvl-0-spells_1_targets}}} {{duration=@{repeating_lvl-0-spells_1_duration}}} {{saving_throw=@{repeating_lvl-0-spells_1_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_1_sr}}} {{description=@{repeating_lvl-0-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_2_Cast" title="%{selected|repeating_lvl-0-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_2_name}}} {{school=@{repeating_lvl-0-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_2_cast-time}}} {{components=@{repeating_lvl-0-spells_2_components}}} {{range=@{repeating_lvl-0-spells_2_range}}} {{targets=@{repeating_lvl-0-spells_2_targets}}} {{duration=@{repeating_lvl-0-spells_2_duration}}} {{saving_throw=@{repeating_lvl-0-spells_2_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_2_sr}}} {{description=@{repeating_lvl-0-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_3_Cast" title="%{selected|repeating_lvl-0-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_3_name}}} {{school=@{repeating_lvl-0-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_3_cast-time}}} {{components=@{repeating_lvl-0-spells_3_components}}} {{range=@{repeating_lvl-0-spells_3_range}}} {{targets=@{repeating_lvl-0-spells_3_targets}}} {{duration=@{repeating_lvl-0-spells_3_duration}}} {{saving_throw=@{repeating_lvl-0-spells_3_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_3_sr}}} {{description=@{repeating_lvl-0-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_4_Cast" title="%{selected|repeating_lvl-0-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_4_name}}} {{school=@{repeating_lvl-0-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_4_cast-time}}} {{components=@{repeating_lvl-0-spells_4_components}}} {{range=@{repeating_lvl-0-spells_4_range}}} {{targets=@{repeating_lvl-0-spells_4_targets}}} {{duration=@{repeating_lvl-0-spells_4_duration}}} {{saving_throw=@{repeating_lvl-0-spells_4_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_4_sr}}} {{description=@{repeating_lvl-0-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_5_Cast" title="%{selected|repeating_lvl-0-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_5_name}}} {{school=@{repeating_lvl-0-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_5_cast-time}}} {{components=@{repeating_lvl-0-spells_5_components}}} {{range=@{repeating_lvl-0-spells_5_range}}} {{targets=@{repeating_lvl-0-spells_5_targets}}} {{duration=@{repeating_lvl-0-spells_5_duration}}} {{saving_throw=@{repeating_lvl-0-spells_5_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_5_sr}}} {{description=@{repeating_lvl-0-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_6_Cast" title="%{selected|repeating_lvl-0-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_6_name}}} {{school=@{repeating_lvl-0-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_6_cast-time}}} {{components=@{repeating_lvl-0-spells_6_components}}} {{range=@{repeating_lvl-0-spells_6_range}}} {{targets=@{repeating_lvl-0-spells_6_targets}}} {{duration=@{repeating_lvl-0-spells_6_duration}}} {{saving_throw=@{repeating_lvl-0-spells_6_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_6_sr}}} {{description=@{repeating_lvl-0-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_7_Cast" title="%{selected|repeating_lvl-0-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_7_name}}} {{school=@{repeating_lvl-0-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_7_cast-time}}} {{components=@{repeating_lvl-0-spells_7_components}}} {{range=@{repeating_lvl-0-spells_7_range}}} {{targets=@{repeating_lvl-0-spells_7_targets}}} {{duration=@{repeating_lvl-0-spells_7_duration}}} {{saving_throw=@{repeating_lvl-0-spells_7_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_7_sr}}} {{description=@{repeating_lvl-0-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_8_Cast" title="%{selected|repeating_lvl-0-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_8_name}}} {{school=@{repeating_lvl-0-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_8_cast-time}}} {{components=@{repeating_lvl-0-spells_8_components}}} {{range=@{repeating_lvl-0-spells_8_range}}} {{targets=@{repeating_lvl-0-spells_8_targets}}} {{duration=@{repeating_lvl-0-spells_8_duration}}} {{saving_throw=@{repeating_lvl-0-spells_8_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_8_sr}}} {{description=@{repeating_lvl-0-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_9_Cast" title="%{selected|repeating_lvl-0-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_9_name}}} {{school=@{repeating_lvl-0-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_9_cast-time}}} {{components=@{repeating_lvl-0-spells_9_components}}} {{range=@{repeating_lvl-0-spells_9_range}}} {{targets=@{repeating_lvl-0-spells_9_targets}}} {{duration=@{repeating_lvl-0-spells_9_duration}}} {{saving_throw=@{repeating_lvl-0-spells_9_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_9_sr}}} {{description=@{repeating_lvl-0-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_10_Cast" title="%{selected|repeating_lvl-0-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_10_name}}} {{school=@{repeating_lvl-0-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_10_cast-time}}} {{components=@{repeating_lvl-0-spells_10_components}}} {{range=@{repeating_lvl-0-spells_10_range}}} {{targets=@{repeating_lvl-0-spells_10_targets}}} {{duration=@{repeating_lvl-0-spells_10_duration}}} {{saving_throw=@{repeating_lvl-0-spells_10_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_10_sr}}} {{description=@{repeating_lvl-0-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_11_Cast" title="%{selected|repeating_lvl-0-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_11_name}}} {{school=@{repeating_lvl-0-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_11_cast-time}}} {{components=@{repeating_lvl-0-spells_11_components}}} {{range=@{repeating_lvl-0-spells_11_range}}} {{targets=@{repeating_lvl-0-spells_11_targets}}} {{duration=@{repeating_lvl-0-spells_11_duration}}} {{saving_throw=@{repeating_lvl-0-spells_11_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_11_sr}}} {{description=@{repeating_lvl-0-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_12_Cast" title="%{selected|repeating_lvl-0-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_12_name}}} {{school=@{repeating_lvl-0-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_12_cast-time}}} {{components=@{repeating_lvl-0-spells_12_components}}} {{range=@{repeating_lvl-0-spells_12_range}}} {{targets=@{repeating_lvl-0-spells_12_targets}}} {{duration=@{repeating_lvl-0-spells_12_duration}}} {{saving_throw=@{repeating_lvl-0-spells_12_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_12_sr}}} {{description=@{repeating_lvl-0-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_13_Cast" title="%{selected|repeating_lvl-0-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_13_name}}} {{school=@{repeating_lvl-0-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_13_cast-time}}} {{components=@{repeating_lvl-0-spells_13_components}}} {{range=@{repeating_lvl-0-spells_13_range}}} {{targets=@{repeating_lvl-0-spells_13_targets}}} {{duration=@{repeating_lvl-0-spells_13_duration}}} {{saving_throw=@{repeating_lvl-0-spells_13_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_13_sr}}} {{description=@{repeating_lvl-0-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_14_Cast" title="%{selected|repeating_lvl-0-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_14_name}}} {{school=@{repeating_lvl-0-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_14_cast-time}}} {{components=@{repeating_lvl-0-spells_14_components}}} {{range=@{repeating_lvl-0-spells_14_range}}} {{targets=@{repeating_lvl-0-spells_14_targets}}} {{duration=@{repeating_lvl-0-spells_14_duration}}} {{saving_throw=@{repeating_lvl-0-spells_14_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_14_sr}}} {{description=@{repeating_lvl-0-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_15_Cast" title="%{selected|repeating_lvl-0-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_15_name}}} {{school=@{repeating_lvl-0-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_15_cast-time}}} {{components=@{repeating_lvl-0-spells_15_components}}} {{range=@{repeating_lvl-0-spells_15_range}}} {{targets=@{repeating_lvl-0-spells_15_targets}}} {{duration=@{repeating_lvl-0-spells_15_duration}}} {{saving_throw=@{repeating_lvl-0-spells_15_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_15_sr}}} {{description=@{repeating_lvl-0-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_16_Cast" title="%{selected|repeating_lvl-0-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_16_name}}} {{school=@{repeating_lvl-0-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_16_cast-time}}} {{components=@{repeating_lvl-0-spells_16_components}}} {{range=@{repeating_lvl-0-spells_16_range}}} {{targets=@{repeating_lvl-0-spells_16_targets}}} {{duration=@{repeating_lvl-0-spells_16_duration}}} {{saving_throw=@{repeating_lvl-0-spells_16_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_16_sr}}} {{description=@{repeating_lvl-0-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_17_Cast" title="%{selected|repeating_lvl-0-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_17_name}}} {{school=@{repeating_lvl-0-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_17_cast-time}}} {{components=@{repeating_lvl-0-spells_17_components}}} {{range=@{repeating_lvl-0-spells_17_range}}} {{targets=@{repeating_lvl-0-spells_17_targets}}} {{duration=@{repeating_lvl-0-spells_17_duration}}} {{saving_throw=@{repeating_lvl-0-spells_17_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_17_sr}}} {{description=@{repeating_lvl-0-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_18_Cast" title="%{selected|repeating_lvl-0-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_18_name}}} {{school=@{repeating_lvl-0-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_18_cast-time}}} {{components=@{repeating_lvl-0-spells_18_components}}} {{range=@{repeating_lvl-0-spells_18_range}}} {{targets=@{repeating_lvl-0-spells_18_targets}}} {{duration=@{repeating_lvl-0-spells_18_duration}}} {{saving_throw=@{repeating_lvl-0-spells_18_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_18_sr}}} {{description=@{repeating_lvl-0-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_19_Cast" title="%{selected|repeating_lvl-0-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_19_name}}} {{school=@{repeating_lvl-0-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_19_cast-time}}} {{components=@{repeating_lvl-0-spells_19_components}}} {{range=@{repeating_lvl-0-spells_19_range}}} {{targets=@{repeating_lvl-0-spells_19_targets}}} {{duration=@{repeating_lvl-0-spells_19_duration}}} {{saving_throw=@{repeating_lvl-0-spells_19_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_19_sr}}} {{description=@{repeating_lvl-0-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_20_Cast" title="%{selected|repeating_lvl-0-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_20_name}}} {{school=@{repeating_lvl-0-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_20_cast-time}}} {{components=@{repeating_lvl-0-spells_20_components}}} {{range=@{repeating_lvl-0-spells_20_range}}} {{targets=@{repeating_lvl-0-spells_20_targets}}} {{duration=@{repeating_lvl-0-spells_20_duration}}} {{saving_throw=@{repeating_lvl-0-spells_20_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_20_sr}}} {{description=@{repeating_lvl-0-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_21_Cast" title="%{selected|repeating_lvl-0-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_21_name}}} {{school=@{repeating_lvl-0-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_21_cast-time}}} {{components=@{repeating_lvl-0-spells_21_components}}} {{range=@{repeating_lvl-0-spells_21_range}}} {{targets=@{repeating_lvl-0-spells_21_targets}}} {{duration=@{repeating_lvl-0-spells_21_duration}}} {{saving_throw=@{repeating_lvl-0-spells_21_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_21_sr}}} {{description=@{repeating_lvl-0-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_22_Cast" title="%{selected|repeating_lvl-0-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_22_name}}} {{school=@{repeating_lvl-0-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_22_cast-time}}} {{components=@{repeating_lvl-0-spells_22_components}}} {{range=@{repeating_lvl-0-spells_22_range}}} {{targets=@{repeating_lvl-0-spells_22_targets}}} {{duration=@{repeating_lvl-0-spells_22_duration}}} {{saving_throw=@{repeating_lvl-0-spells_22_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_22_sr}}} {{description=@{repeating_lvl-0-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_23_Cast" title="%{selected|repeating_lvl-0-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_23_name}}} {{school=@{repeating_lvl-0-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_23_cast-time}}} {{components=@{repeating_lvl-0-spells_23_components}}} {{range=@{repeating_lvl-0-spells_23_range}}} {{targets=@{repeating_lvl-0-spells_23_targets}}} {{duration=@{repeating_lvl-0-spells_23_duration}}} {{saving_throw=@{repeating_lvl-0-spells_23_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_23_sr}}} {{description=@{repeating_lvl-0-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_24_Cast" title="%{selected|repeating_lvl-0-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_24_name}}} {{school=@{repeating_lvl-0-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_24_cast-time}}} {{components=@{repeating_lvl-0-spells_24_components}}} {{range=@{repeating_lvl-0-spells_24_range}}} {{targets=@{repeating_lvl-0-spells_24_targets}}} {{duration=@{repeating_lvl-0-spells_24_duration}}} {{saving_throw=@{repeating_lvl-0-spells_24_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_24_sr}}} {{description=@{repeating_lvl-0-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_25_Cast" title="%{selected|repeating_lvl-0-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_25_name}}} {{school=@{repeating_lvl-0-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_25_cast-time}}} {{components=@{repeating_lvl-0-spells_25_components}}} {{range=@{repeating_lvl-0-spells_25_range}}} {{targets=@{repeating_lvl-0-spells_25_targets}}} {{duration=@{repeating_lvl-0-spells_25_duration}}} {{saving_throw=@{repeating_lvl-0-spells_25_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_25_sr}}} {{description=@{repeating_lvl-0-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-0-spells_26_Cast" title="%{selected|repeating_lvl-0-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-0-spells_26_name}}} {{school=@{repeating_lvl-0-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-0-spells_26_cast-time}}} {{components=@{repeating_lvl-0-spells_26_components}}} {{range=@{repeating_lvl-0-spells_26_range}}} {{targets=@{repeating_lvl-0-spells_26_targets}}} {{duration=@{repeating_lvl-0-spells_26_duration}}} {{saving_throw=@{repeating_lvl-0-spells_26_save}}} {{dc=[[ @{spellclass-0-level-0-savedc} + [[ @{repeating_lvl-0-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-0-spells_26_sr}}} {{description=@{repeating_lvl-0-spells_26_description}}}"></button></span>
-                    </div>
-                </div>		    
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -6482,11 +6166,11 @@
                     </div>
                     <fieldset class="repeating_lvl-0-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-0-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-0-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -6494,21 +6178,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-0-spells_X_spell_level}" type="number" value="0" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-0-spells_$X_spell_level}" type="number" value="0" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salvación</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salvación</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-0-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-0-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -6519,15 +6203,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-0-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-0-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-0-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-0-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-0-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-0-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-0-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-0-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-0-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-0-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -6544,16 +6228,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-0-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-0-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-0-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-0-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-0-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-0-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-0-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-0-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-0-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-0-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-0-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-0-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-0-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada Salv.</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-0-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-0-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-0-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada Salv.</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguno</b>
@@ -6562,8 +6246,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-0-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-0-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-0-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-0-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>			
@@ -6571,67 +6255,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-1">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 1</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_0_Cast" title="%{selected|repeating_lvl-1-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_0_name}}} {{school=@{repeating_lvl-1-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_0_cast-time}}} {{components=@{repeating_lvl-1-spells_0_components}}} {{range=@{repeating_lvl-1-spells_0_range}}} {{targets=@{repeating_lvl-1-spells_0_targets}}} {{duration=@{repeating_lvl-1-spells_0_duration}}} {{saving_throw=@{repeating_lvl-1-spells_0_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_0_sr}}} {{description=@{repeating_lvl-1-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_1_Cast" title="%{selected|repeating_lvl-1-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_1_name}}} {{school=@{repeating_lvl-1-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_1_cast-time}}} {{components=@{repeating_lvl-1-spells_1_components}}} {{range=@{repeating_lvl-1-spells_1_range}}} {{targets=@{repeating_lvl-1-spells_1_targets}}} {{duration=@{repeating_lvl-1-spells_1_duration}}} {{saving_throw=@{repeating_lvl-1-spells_1_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_1_sr}}} {{description=@{repeating_lvl-1-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_2_Cast" title="%{selected|repeating_lvl-1-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_2_name}}} {{school=@{repeating_lvl-1-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_2_cast-time}}} {{components=@{repeating_lvl-1-spells_2_components}}} {{range=@{repeating_lvl-1-spells_2_range}}} {{targets=@{repeating_lvl-1-spells_2_targets}}} {{duration=@{repeating_lvl-1-spells_2_duration}}} {{saving_throw=@{repeating_lvl-1-spells_2_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_2_sr}}} {{description=@{repeating_lvl-1-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_3_Cast" title="%{selected|repeating_lvl-1-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_3_name}}} {{school=@{repeating_lvl-1-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_3_cast-time}}} {{components=@{repeating_lvl-1-spells_3_components}}} {{range=@{repeating_lvl-1-spells_3_range}}} {{targets=@{repeating_lvl-1-spells_3_targets}}} {{duration=@{repeating_lvl-1-spells_3_duration}}} {{saving_throw=@{repeating_lvl-1-spells_3_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_3_sr}}} {{description=@{repeating_lvl-1-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_4_Cast" title="%{selected|repeating_lvl-1-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_4_name}}} {{school=@{repeating_lvl-1-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_4_cast-time}}} {{components=@{repeating_lvl-1-spells_4_components}}} {{range=@{repeating_lvl-1-spells_4_range}}} {{targets=@{repeating_lvl-1-spells_4_targets}}} {{duration=@{repeating_lvl-1-spells_4_duration}}} {{saving_throw=@{repeating_lvl-1-spells_4_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_4_sr}}} {{description=@{repeating_lvl-1-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_5_Cast" title="%{selected|repeating_lvl-1-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_5_name}}} {{school=@{repeating_lvl-1-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_5_cast-time}}} {{components=@{repeating_lvl-1-spells_5_components}}} {{range=@{repeating_lvl-1-spells_5_range}}} {{targets=@{repeating_lvl-1-spells_5_targets}}} {{duration=@{repeating_lvl-1-spells_5_duration}}} {{saving_throw=@{repeating_lvl-1-spells_5_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_5_sr}}} {{description=@{repeating_lvl-1-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_6_Cast" title="%{selected|repeating_lvl-1-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_6_name}}} {{school=@{repeating_lvl-1-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_6_cast-time}}} {{components=@{repeating_lvl-1-spells_6_components}}} {{range=@{repeating_lvl-1-spells_6_range}}} {{targets=@{repeating_lvl-1-spells_6_targets}}} {{duration=@{repeating_lvl-1-spells_6_duration}}} {{saving_throw=@{repeating_lvl-1-spells_6_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_6_sr}}} {{description=@{repeating_lvl-1-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_7_Cast" title="%{selected|repeating_lvl-1-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_7_name}}} {{school=@{repeating_lvl-1-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_7_cast-time}}} {{components=@{repeating_lvl-1-spells_7_components}}} {{range=@{repeating_lvl-1-spells_7_range}}} {{targets=@{repeating_lvl-1-spells_7_targets}}} {{duration=@{repeating_lvl-1-spells_7_duration}}} {{saving_throw=@{repeating_lvl-1-spells_7_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_7_sr}}} {{description=@{repeating_lvl-1-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_8_Cast" title="%{selected|repeating_lvl-1-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_8_name}}} {{school=@{repeating_lvl-1-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_8_cast-time}}} {{components=@{repeating_lvl-1-spells_8_components}}} {{range=@{repeating_lvl-1-spells_8_range}}} {{targets=@{repeating_lvl-1-spells_8_targets}}} {{duration=@{repeating_lvl-1-spells_8_duration}}} {{saving_throw=@{repeating_lvl-1-spells_8_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_8_sr}}} {{description=@{repeating_lvl-1-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_9_Cast" title="%{selected|repeating_lvl-1-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_9_name}}} {{school=@{repeating_lvl-1-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_9_cast-time}}} {{components=@{repeating_lvl-1-spells_9_components}}} {{range=@{repeating_lvl-1-spells_9_range}}} {{targets=@{repeating_lvl-1-spells_9_targets}}} {{duration=@{repeating_lvl-1-spells_9_duration}}} {{saving_throw=@{repeating_lvl-1-spells_9_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_9_sr}}} {{description=@{repeating_lvl-1-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_10_Cast" title="%{selected|repeating_lvl-1-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_10_name}}} {{school=@{repeating_lvl-1-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_10_cast-time}}} {{components=@{repeating_lvl-1-spells_10_components}}} {{range=@{repeating_lvl-1-spells_10_range}}} {{targets=@{repeating_lvl-1-spells_10_targets}}} {{duration=@{repeating_lvl-1-spells_10_duration}}} {{saving_throw=@{repeating_lvl-1-spells_10_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_10_sr}}} {{description=@{repeating_lvl-1-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_11_Cast" title="%{selected|repeating_lvl-1-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_11_name}}} {{school=@{repeating_lvl-1-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_11_cast-time}}} {{components=@{repeating_lvl-1-spells_11_components}}} {{range=@{repeating_lvl-1-spells_11_range}}} {{targets=@{repeating_lvl-1-spells_11_targets}}} {{duration=@{repeating_lvl-1-spells_11_duration}}} {{saving_throw=@{repeating_lvl-1-spells_11_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_11_sr}}} {{description=@{repeating_lvl-1-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_12_Cast" title="%{selected|repeating_lvl-1-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_12_name}}} {{school=@{repeating_lvl-1-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_12_cast-time}}} {{components=@{repeating_lvl-1-spells_12_components}}} {{range=@{repeating_lvl-1-spells_12_range}}} {{targets=@{repeating_lvl-1-spells_12_targets}}} {{duration=@{repeating_lvl-1-spells_12_duration}}} {{saving_throw=@{repeating_lvl-1-spells_12_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_12_sr}}} {{description=@{repeating_lvl-1-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_13_Cast" title="%{selected|repeating_lvl-1-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_13_name}}} {{school=@{repeating_lvl-1-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_13_cast-time}}} {{components=@{repeating_lvl-1-spells_13_components}}} {{range=@{repeating_lvl-1-spells_13_range}}} {{targets=@{repeating_lvl-1-spells_13_targets}}} {{duration=@{repeating_lvl-1-spells_13_duration}}} {{saving_throw=@{repeating_lvl-1-spells_13_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_13_sr}}} {{description=@{repeating_lvl-1-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_14_Cast" title="%{selected|repeating_lvl-1-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_14_name}}} {{school=@{repeating_lvl-1-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_14_cast-time}}} {{components=@{repeating_lvl-1-spells_14_components}}} {{range=@{repeating_lvl-1-spells_14_range}}} {{targets=@{repeating_lvl-1-spells_14_targets}}} {{duration=@{repeating_lvl-1-spells_14_duration}}} {{saving_throw=@{repeating_lvl-1-spells_14_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_14_sr}}} {{description=@{repeating_lvl-1-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_15_Cast" title="%{selected|repeating_lvl-1-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_15_name}}} {{school=@{repeating_lvl-1-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_15_cast-time}}} {{components=@{repeating_lvl-1-spells_15_components}}} {{range=@{repeating_lvl-1-spells_15_range}}} {{targets=@{repeating_lvl-1-spells_15_targets}}} {{duration=@{repeating_lvl-1-spells_15_duration}}} {{saving_throw=@{repeating_lvl-1-spells_15_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_15_sr}}} {{description=@{repeating_lvl-1-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_16_Cast" title="%{selected|repeating_lvl-1-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_16_name}}} {{school=@{repeating_lvl-1-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_16_cast-time}}} {{components=@{repeating_lvl-1-spells_16_components}}} {{range=@{repeating_lvl-1-spells_16_range}}} {{targets=@{repeating_lvl-1-spells_16_targets}}} {{duration=@{repeating_lvl-1-spells_16_duration}}} {{saving_throw=@{repeating_lvl-1-spells_16_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_16_sr}}} {{description=@{repeating_lvl-1-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_17_Cast" title="%{selected|repeating_lvl-1-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_17_name}}} {{school=@{repeating_lvl-1-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_17_cast-time}}} {{components=@{repeating_lvl-1-spells_17_components}}} {{range=@{repeating_lvl-1-spells_17_range}}} {{targets=@{repeating_lvl-1-spells_17_targets}}} {{duration=@{repeating_lvl-1-spells_17_duration}}} {{saving_throw=@{repeating_lvl-1-spells_17_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_17_sr}}} {{description=@{repeating_lvl-1-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_18_Cast" title="%{selected|repeating_lvl-1-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_18_name}}} {{school=@{repeating_lvl-1-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_18_cast-time}}} {{components=@{repeating_lvl-1-spells_18_components}}} {{range=@{repeating_lvl-1-spells_18_range}}} {{targets=@{repeating_lvl-1-spells_18_targets}}} {{duration=@{repeating_lvl-1-spells_18_duration}}} {{saving_throw=@{repeating_lvl-1-spells_18_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_18_sr}}} {{description=@{repeating_lvl-1-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_19_Cast" title="%{selected|repeating_lvl-1-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_19_name}}} {{school=@{repeating_lvl-1-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_19_cast-time}}} {{components=@{repeating_lvl-1-spells_19_components}}} {{range=@{repeating_lvl-1-spells_19_range}}} {{targets=@{repeating_lvl-1-spells_19_targets}}} {{duration=@{repeating_lvl-1-spells_19_duration}}} {{saving_throw=@{repeating_lvl-1-spells_19_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_19_sr}}} {{description=@{repeating_lvl-1-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_20_Cast" title="%{selected|repeating_lvl-1-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_20_name}}} {{school=@{repeating_lvl-1-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_20_cast-time}}} {{components=@{repeating_lvl-1-spells_20_components}}} {{range=@{repeating_lvl-1-spells_20_range}}} {{targets=@{repeating_lvl-1-spells_20_targets}}} {{duration=@{repeating_lvl-1-spells_20_duration}}} {{saving_throw=@{repeating_lvl-1-spells_20_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_20_sr}}} {{description=@{repeating_lvl-1-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_21_Cast" title="%{selected|repeating_lvl-1-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_21_name}}} {{school=@{repeating_lvl-1-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_21_cast-time}}} {{components=@{repeating_lvl-1-spells_21_components}}} {{range=@{repeating_lvl-1-spells_21_range}}} {{targets=@{repeating_lvl-1-spells_21_targets}}} {{duration=@{repeating_lvl-1-spells_21_duration}}} {{saving_throw=@{repeating_lvl-1-spells_21_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_21_sr}}} {{description=@{repeating_lvl-1-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_22_Cast" title="%{selected|repeating_lvl-1-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_22_name}}} {{school=@{repeating_lvl-1-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_22_cast-time}}} {{components=@{repeating_lvl-1-spells_22_components}}} {{range=@{repeating_lvl-1-spells_22_range}}} {{targets=@{repeating_lvl-1-spells_22_targets}}} {{duration=@{repeating_lvl-1-spells_22_duration}}} {{saving_throw=@{repeating_lvl-1-spells_22_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_22_sr}}} {{description=@{repeating_lvl-1-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_23_Cast" title="%{selected|repeating_lvl-1-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_23_name}}} {{school=@{repeating_lvl-1-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_23_cast-time}}} {{components=@{repeating_lvl-1-spells_23_components}}} {{range=@{repeating_lvl-1-spells_23_range}}} {{targets=@{repeating_lvl-1-spells_23_targets}}} {{duration=@{repeating_lvl-1-spells_23_duration}}} {{saving_throw=@{repeating_lvl-1-spells_23_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_23_sr}}} {{description=@{repeating_lvl-1-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_24_Cast" title="%{selected|repeating_lvl-1-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_24_name}}} {{school=@{repeating_lvl-1-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_24_cast-time}}} {{components=@{repeating_lvl-1-spells_24_components}}} {{range=@{repeating_lvl-1-spells_24_range}}} {{targets=@{repeating_lvl-1-spells_24_targets}}} {{duration=@{repeating_lvl-1-spells_24_duration}}} {{saving_throw=@{repeating_lvl-1-spells_24_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_24_sr}}} {{description=@{repeating_lvl-1-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_25_Cast" title="%{selected|repeating_lvl-1-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_25_name}}} {{school=@{repeating_lvl-1-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_25_cast-time}}} {{components=@{repeating_lvl-1-spells_25_components}}} {{range=@{repeating_lvl-1-spells_25_range}}} {{targets=@{repeating_lvl-1-spells_25_targets}}} {{duration=@{repeating_lvl-1-spells_25_duration}}} {{saving_throw=@{repeating_lvl-1-spells_25_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_25_sr}}} {{description=@{repeating_lvl-1-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-1-spells_26_Cast" title="%{selected|repeating_lvl-1-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-1-spells_26_name}}} {{school=@{repeating_lvl-1-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-1-spells_26_cast-time}}} {{components=@{repeating_lvl-1-spells_26_components}}} {{range=@{repeating_lvl-1-spells_26_range}}} {{targets=@{repeating_lvl-1-spells_26_targets}}} {{duration=@{repeating_lvl-1-spells_26_duration}}} {{saving_throw=@{repeating_lvl-1-spells_26_save}}} {{dc=[[ @{spellclass-0-level-1-savedc} + [[ @{repeating_lvl-1-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-1-spells_26_sr}}} {{description=@{repeating_lvl-1-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -6639,11 +6262,11 @@
                     </div>
                     <fieldset class="repeating_lvl-1-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-1-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-1-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -6651,21 +6274,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-1-spells_X_spell_level}" type="number" value="1" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-1-spells_$X_spell_level}" type="number" value="1" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Áreaa"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Áreaa"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-1-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-1-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -6676,15 +6299,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-1-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-1-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-1-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-1-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-1-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-1-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-1-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-1-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-1-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-1-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -6701,16 +6324,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-1-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-1-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-1-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-1-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-1-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-1-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-1-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-1-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-1-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-1-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-1-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-1-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-1-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-1-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-1-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-1-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -6719,8 +6342,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-1-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-1-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-1-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-1-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>				
@@ -6728,67 +6351,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-2">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 2</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_0_Cast" title="%{selected|repeating_lvl-2-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_0_name}}} {{school=@{repeating_lvl-2-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_0_cast-time}}} {{components=@{repeating_lvl-2-spells_0_components}}} {{range=@{repeating_lvl-2-spells_0_range}}} {{targets=@{repeating_lvl-2-spells_0_targets}}} {{duration=@{repeating_lvl-2-spells_0_duration}}} {{saving_throw=@{repeating_lvl-2-spells_0_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_0_sr}}} {{description=@{repeating_lvl-2-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_1_Cast" title="%{selected|repeating_lvl-2-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_1_name}}} {{school=@{repeating_lvl-2-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_1_cast-time}}} {{components=@{repeating_lvl-2-spells_1_components}}} {{range=@{repeating_lvl-2-spells_1_range}}} {{targets=@{repeating_lvl-2-spells_1_targets}}} {{duration=@{repeating_lvl-2-spells_1_duration}}} {{saving_throw=@{repeating_lvl-2-spells_1_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_1_sr}}} {{description=@{repeating_lvl-2-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_2_Cast" title="%{selected|repeating_lvl-2-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_2_name}}} {{school=@{repeating_lvl-2-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_2_cast-time}}} {{components=@{repeating_lvl-2-spells_2_components}}} {{range=@{repeating_lvl-2-spells_2_range}}} {{targets=@{repeating_lvl-2-spells_2_targets}}} {{duration=@{repeating_lvl-2-spells_2_duration}}} {{saving_throw=@{repeating_lvl-2-spells_2_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_2_sr}}} {{description=@{repeating_lvl-2-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_3_Cast" title="%{selected|repeating_lvl-2-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_3_name}}} {{school=@{repeating_lvl-2-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_3_cast-time}}} {{components=@{repeating_lvl-2-spells_3_components}}} {{range=@{repeating_lvl-2-spells_3_range}}} {{targets=@{repeating_lvl-2-spells_3_targets}}} {{duration=@{repeating_lvl-2-spells_3_duration}}} {{saving_throw=@{repeating_lvl-2-spells_3_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_3_sr}}} {{description=@{repeating_lvl-2-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_4_Cast" title="%{selected|repeating_lvl-2-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_4_name}}} {{school=@{repeating_lvl-2-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_4_cast-time}}} {{components=@{repeating_lvl-2-spells_4_components}}} {{range=@{repeating_lvl-2-spells_4_range}}} {{targets=@{repeating_lvl-2-spells_4_targets}}} {{duration=@{repeating_lvl-2-spells_4_duration}}} {{saving_throw=@{repeating_lvl-2-spells_4_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_4_sr}}} {{description=@{repeating_lvl-2-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_5_Cast" title="%{selected|repeating_lvl-2-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_5_name}}} {{school=@{repeating_lvl-2-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_5_cast-time}}} {{components=@{repeating_lvl-2-spells_5_components}}} {{range=@{repeating_lvl-2-spells_5_range}}} {{targets=@{repeating_lvl-2-spells_5_targets}}} {{duration=@{repeating_lvl-2-spells_5_duration}}} {{saving_throw=@{repeating_lvl-2-spells_5_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_5_sr}}} {{description=@{repeating_lvl-2-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_6_Cast" title="%{selected|repeating_lvl-2-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_6_name}}} {{school=@{repeating_lvl-2-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_6_cast-time}}} {{components=@{repeating_lvl-2-spells_6_components}}} {{range=@{repeating_lvl-2-spells_6_range}}} {{targets=@{repeating_lvl-2-spells_6_targets}}} {{duration=@{repeating_lvl-2-spells_6_duration}}} {{saving_throw=@{repeating_lvl-2-spells_6_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_6_sr}}} {{description=@{repeating_lvl-2-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_7_Cast" title="%{selected|repeating_lvl-2-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_7_name}}} {{school=@{repeating_lvl-2-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_7_cast-time}}} {{components=@{repeating_lvl-2-spells_7_components}}} {{range=@{repeating_lvl-2-spells_7_range}}} {{targets=@{repeating_lvl-2-spells_7_targets}}} {{duration=@{repeating_lvl-2-spells_7_duration}}} {{saving_throw=@{repeating_lvl-2-spells_7_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_7_sr}}} {{description=@{repeating_lvl-2-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_8_Cast" title="%{selected|repeating_lvl-2-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_8_name}}} {{school=@{repeating_lvl-2-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_8_cast-time}}} {{components=@{repeating_lvl-2-spells_8_components}}} {{range=@{repeating_lvl-2-spells_8_range}}} {{targets=@{repeating_lvl-2-spells_8_targets}}} {{duration=@{repeating_lvl-2-spells_8_duration}}} {{saving_throw=@{repeating_lvl-2-spells_8_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_8_sr}}} {{description=@{repeating_lvl-2-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_9_Cast" title="%{selected|repeating_lvl-2-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_9_name}}} {{school=@{repeating_lvl-2-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_9_cast-time}}} {{components=@{repeating_lvl-2-spells_9_components}}} {{range=@{repeating_lvl-2-spells_9_range}}} {{targets=@{repeating_lvl-2-spells_9_targets}}} {{duration=@{repeating_lvl-2-spells_9_duration}}} {{saving_throw=@{repeating_lvl-2-spells_9_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_9_sr}}} {{description=@{repeating_lvl-2-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_10_Cast" title="%{selected|repeating_lvl-2-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_10_name}}} {{school=@{repeating_lvl-2-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_10_cast-time}}} {{components=@{repeating_lvl-2-spells_10_components}}} {{range=@{repeating_lvl-2-spells_10_range}}} {{targets=@{repeating_lvl-2-spells_10_targets}}} {{duration=@{repeating_lvl-2-spells_10_duration}}} {{saving_throw=@{repeating_lvl-2-spells_10_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_10_sr}}} {{description=@{repeating_lvl-2-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_11_Cast" title="%{selected|repeating_lvl-2-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_11_name}}} {{school=@{repeating_lvl-2-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_11_cast-time}}} {{components=@{repeating_lvl-2-spells_11_components}}} {{range=@{repeating_lvl-2-spells_11_range}}} {{targets=@{repeating_lvl-2-spells_11_targets}}} {{duration=@{repeating_lvl-2-spells_11_duration}}} {{saving_throw=@{repeating_lvl-2-spells_11_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_11_sr}}} {{description=@{repeating_lvl-2-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_12_Cast" title="%{selected|repeating_lvl-2-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_12_name}}} {{school=@{repeating_lvl-2-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_12_cast-time}}} {{components=@{repeating_lvl-2-spells_12_components}}} {{range=@{repeating_lvl-2-spells_12_range}}} {{targets=@{repeating_lvl-2-spells_12_targets}}} {{duration=@{repeating_lvl-2-spells_12_duration}}} {{saving_throw=@{repeating_lvl-2-spells_12_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_12_sr}}} {{description=@{repeating_lvl-2-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_13_Cast" title="%{selected|repeating_lvl-2-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_13_name}}} {{school=@{repeating_lvl-2-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_13_cast-time}}} {{components=@{repeating_lvl-2-spells_13_components}}} {{range=@{repeating_lvl-2-spells_13_range}}} {{targets=@{repeating_lvl-2-spells_13_targets}}} {{duration=@{repeating_lvl-2-spells_13_duration}}} {{saving_throw=@{repeating_lvl-2-spells_13_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_13_sr}}} {{description=@{repeating_lvl-2-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_14_Cast" title="%{selected|repeating_lvl-2-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_14_name}}} {{school=@{repeating_lvl-2-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_14_cast-time}}} {{components=@{repeating_lvl-2-spells_14_components}}} {{range=@{repeating_lvl-2-spells_14_range}}} {{targets=@{repeating_lvl-2-spells_14_targets}}} {{duration=@{repeating_lvl-2-spells_14_duration}}} {{saving_throw=@{repeating_lvl-2-spells_14_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_14_sr}}} {{description=@{repeating_lvl-2-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_15_Cast" title="%{selected|repeating_lvl-2-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_15_name}}} {{school=@{repeating_lvl-2-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_15_cast-time}}} {{components=@{repeating_lvl-2-spells_15_components}}} {{range=@{repeating_lvl-2-spells_15_range}}} {{targets=@{repeating_lvl-2-spells_15_targets}}} {{duration=@{repeating_lvl-2-spells_15_duration}}} {{saving_throw=@{repeating_lvl-2-spells_15_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_15_sr}}} {{description=@{repeating_lvl-2-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_16_Cast" title="%{selected|repeating_lvl-2-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_16_name}}} {{school=@{repeating_lvl-2-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_16_cast-time}}} {{components=@{repeating_lvl-2-spells_16_components}}} {{range=@{repeating_lvl-2-spells_16_range}}} {{targets=@{repeating_lvl-2-spells_16_targets}}} {{duration=@{repeating_lvl-2-spells_16_duration}}} {{saving_throw=@{repeating_lvl-2-spells_16_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_16_sr}}} {{description=@{repeating_lvl-2-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_17_Cast" title="%{selected|repeating_lvl-2-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_17_name}}} {{school=@{repeating_lvl-2-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_17_cast-time}}} {{components=@{repeating_lvl-2-spells_17_components}}} {{range=@{repeating_lvl-2-spells_17_range}}} {{targets=@{repeating_lvl-2-spells_17_targets}}} {{duration=@{repeating_lvl-2-spells_17_duration}}} {{saving_throw=@{repeating_lvl-2-spells_17_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_17_sr}}} {{description=@{repeating_lvl-2-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_18_Cast" title="%{selected|repeating_lvl-2-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_18_name}}} {{school=@{repeating_lvl-2-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_18_cast-time}}} {{components=@{repeating_lvl-2-spells_18_components}}} {{range=@{repeating_lvl-2-spells_18_range}}} {{targets=@{repeating_lvl-2-spells_18_targets}}} {{duration=@{repeating_lvl-2-spells_18_duration}}} {{saving_throw=@{repeating_lvl-2-spells_18_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_18_sr}}} {{description=@{repeating_lvl-2-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_19_Cast" title="%{selected|repeating_lvl-2-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_19_name}}} {{school=@{repeating_lvl-2-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_19_cast-time}}} {{components=@{repeating_lvl-2-spells_19_components}}} {{range=@{repeating_lvl-2-spells_19_range}}} {{targets=@{repeating_lvl-2-spells_19_targets}}} {{duration=@{repeating_lvl-2-spells_19_duration}}} {{saving_throw=@{repeating_lvl-2-spells_19_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_19_sr}}} {{description=@{repeating_lvl-2-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_20_Cast" title="%{selected|repeating_lvl-2-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_20_name}}} {{school=@{repeating_lvl-2-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_20_cast-time}}} {{components=@{repeating_lvl-2-spells_20_components}}} {{range=@{repeating_lvl-2-spells_20_range}}} {{targets=@{repeating_lvl-2-spells_20_targets}}} {{duration=@{repeating_lvl-2-spells_20_duration}}} {{saving_throw=@{repeating_lvl-2-spells_20_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_20_sr}}} {{description=@{repeating_lvl-2-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_21_Cast" title="%{selected|repeating_lvl-2-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_21_name}}} {{school=@{repeating_lvl-2-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_21_cast-time}}} {{components=@{repeating_lvl-2-spells_21_components}}} {{range=@{repeating_lvl-2-spells_21_range}}} {{targets=@{repeating_lvl-2-spells_21_targets}}} {{duration=@{repeating_lvl-2-spells_21_duration}}} {{saving_throw=@{repeating_lvl-2-spells_21_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_21_sr}}} {{description=@{repeating_lvl-2-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_22_Cast" title="%{selected|repeating_lvl-2-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_22_name}}} {{school=@{repeating_lvl-2-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_22_cast-time}}} {{components=@{repeating_lvl-2-spells_22_components}}} {{range=@{repeating_lvl-2-spells_22_range}}} {{targets=@{repeating_lvl-2-spells_22_targets}}} {{duration=@{repeating_lvl-2-spells_22_duration}}} {{saving_throw=@{repeating_lvl-2-spells_22_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_22_sr}}} {{description=@{repeating_lvl-2-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_23_Cast" title="%{selected|repeating_lvl-2-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_23_name}}} {{school=@{repeating_lvl-2-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_23_cast-time}}} {{components=@{repeating_lvl-2-spells_23_components}}} {{range=@{repeating_lvl-2-spells_23_range}}} {{targets=@{repeating_lvl-2-spells_23_targets}}} {{duration=@{repeating_lvl-2-spells_23_duration}}} {{saving_throw=@{repeating_lvl-2-spells_23_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_23_sr}}} {{description=@{repeating_lvl-2-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_24_Cast" title="%{selected|repeating_lvl-2-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_24_name}}} {{school=@{repeating_lvl-2-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_24_cast-time}}} {{components=@{repeating_lvl-2-spells_24_components}}} {{range=@{repeating_lvl-2-spells_24_range}}} {{targets=@{repeating_lvl-2-spells_24_targets}}} {{duration=@{repeating_lvl-2-spells_24_duration}}} {{saving_throw=@{repeating_lvl-2-spells_24_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_24_sr}}} {{description=@{repeating_lvl-2-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_25_Cast" title="%{selected|repeating_lvl-2-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_25_name}}} {{school=@{repeating_lvl-2-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_25_cast-time}}} {{components=@{repeating_lvl-2-spells_25_components}}} {{range=@{repeating_lvl-2-spells_25_range}}} {{targets=@{repeating_lvl-2-spells_25_targets}}} {{duration=@{repeating_lvl-2-spells_25_duration}}} {{saving_throw=@{repeating_lvl-2-spells_25_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_25_sr}}} {{description=@{repeating_lvl-2-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-2-spells_26_Cast" title="%{selected|repeating_lvl-2-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-2-spells_26_name}}} {{school=@{repeating_lvl-2-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-2-spells_26_cast-time}}} {{components=@{repeating_lvl-2-spells_26_components}}} {{range=@{repeating_lvl-2-spells_26_range}}} {{targets=@{repeating_lvl-2-spells_26_targets}}} {{duration=@{repeating_lvl-2-spells_26_duration}}} {{saving_throw=@{repeating_lvl-2-spells_26_save}}} {{dc=[[ @{spellclass-0-level-2-savedc} + [[ @{repeating_lvl-2-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-2-spells_26_sr}}} {{description=@{repeating_lvl-2-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -6796,11 +6358,11 @@
                     </div>
                     <fieldset class="repeating_lvl-2-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-2-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-2-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -6808,21 +6370,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-2-spells_X_spell_level}" type="number" value="2" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-2-spells_$X_spell_level}" type="number" value="2" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efectos Salvación"><br>Efectos Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efectos Salvación"><br>Efectos Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-2-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-2-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -6833,15 +6395,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-2-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-2-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-2-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-2-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-2-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-2-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-2-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-2-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Options&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-2-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-2-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -6858,16 +6420,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-2-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-2-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-2-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-2-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-2-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-2-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-2-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-2-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-2-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-2-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-2-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-2-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-2-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-2-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-2-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-2-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -6876,8 +6438,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-2-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-2-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-2-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-2-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>				
@@ -6885,67 +6447,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-3">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 3</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_0_Cast" title="%{selected|repeating_lvl-3-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_0_name}}} {{school=@{repeating_lvl-3-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_0_cast-time}}} {{components=@{repeating_lvl-3-spells_0_components}}} {{range=@{repeating_lvl-3-spells_0_range}}} {{targets=@{repeating_lvl-3-spells_0_targets}}} {{duration=@{repeating_lvl-3-spells_0_duration}}} {{saving_throw=@{repeating_lvl-3-spells_0_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_0_sr}}} {{description=@{repeating_lvl-3-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_1_Cast" title="%{selected|repeating_lvl-3-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_1_name}}} {{school=@{repeating_lvl-3-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_1_cast-time}}} {{components=@{repeating_lvl-3-spells_1_components}}} {{range=@{repeating_lvl-3-spells_1_range}}} {{targets=@{repeating_lvl-3-spells_1_targets}}} {{duration=@{repeating_lvl-3-spells_1_duration}}} {{saving_throw=@{repeating_lvl-3-spells_1_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_1_sr}}} {{description=@{repeating_lvl-3-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_2_Cast" title="%{selected|repeating_lvl-3-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_2_name}}} {{school=@{repeating_lvl-3-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_2_cast-time}}} {{components=@{repeating_lvl-3-spells_2_components}}} {{range=@{repeating_lvl-3-spells_2_range}}} {{targets=@{repeating_lvl-3-spells_2_targets}}} {{duration=@{repeating_lvl-3-spells_2_duration}}} {{saving_throw=@{repeating_lvl-3-spells_2_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_2_sr}}} {{description=@{repeating_lvl-3-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_3_Cast" title="%{selected|repeating_lvl-3-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_3_name}}} {{school=@{repeating_lvl-3-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_3_cast-time}}} {{components=@{repeating_lvl-3-spells_3_components}}} {{range=@{repeating_lvl-3-spells_3_range}}} {{targets=@{repeating_lvl-3-spells_3_targets}}} {{duration=@{repeating_lvl-3-spells_3_duration}}} {{saving_throw=@{repeating_lvl-3-spells_3_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_3_sr}}} {{description=@{repeating_lvl-3-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_4_Cast" title="%{selected|repeating_lvl-3-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_4_name}}} {{school=@{repeating_lvl-3-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_4_cast-time}}} {{components=@{repeating_lvl-3-spells_4_components}}} {{range=@{repeating_lvl-3-spells_4_range}}} {{targets=@{repeating_lvl-3-spells_4_targets}}} {{duration=@{repeating_lvl-3-spells_4_duration}}} {{saving_throw=@{repeating_lvl-3-spells_4_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_4_sr}}} {{description=@{repeating_lvl-3-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_5_Cast" title="%{selected|repeating_lvl-3-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_5_name}}} {{school=@{repeating_lvl-3-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_5_cast-time}}} {{components=@{repeating_lvl-3-spells_5_components}}} {{range=@{repeating_lvl-3-spells_5_range}}} {{targets=@{repeating_lvl-3-spells_5_targets}}} {{duration=@{repeating_lvl-3-spells_5_duration}}} {{saving_throw=@{repeating_lvl-3-spells_5_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_5_sr}}} {{description=@{repeating_lvl-3-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_6_Cast" title="%{selected|repeating_lvl-3-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_6_name}}} {{school=@{repeating_lvl-3-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_6_cast-time}}} {{components=@{repeating_lvl-3-spells_6_components}}} {{range=@{repeating_lvl-3-spells_6_range}}} {{targets=@{repeating_lvl-3-spells_6_targets}}} {{duration=@{repeating_lvl-3-spells_6_duration}}} {{saving_throw=@{repeating_lvl-3-spells_6_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_6_sr}}} {{description=@{repeating_lvl-3-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_7_Cast" title="%{selected|repeating_lvl-3-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_7_name}}} {{school=@{repeating_lvl-3-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_7_cast-time}}} {{components=@{repeating_lvl-3-spells_7_components}}} {{range=@{repeating_lvl-3-spells_7_range}}} {{targets=@{repeating_lvl-3-spells_7_targets}}} {{duration=@{repeating_lvl-3-spells_7_duration}}} {{saving_throw=@{repeating_lvl-3-spells_7_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_7_sr}}} {{description=@{repeating_lvl-3-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_8_Cast" title="%{selected|repeating_lvl-3-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_8_name}}} {{school=@{repeating_lvl-3-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_8_cast-time}}} {{components=@{repeating_lvl-3-spells_8_components}}} {{range=@{repeating_lvl-3-spells_8_range}}} {{targets=@{repeating_lvl-3-spells_8_targets}}} {{duration=@{repeating_lvl-3-spells_8_duration}}} {{saving_throw=@{repeating_lvl-3-spells_8_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_8_sr}}} {{description=@{repeating_lvl-3-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_9_Cast" title="%{selected|repeating_lvl-3-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_9_name}}} {{school=@{repeating_lvl-3-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_9_cast-time}}} {{components=@{repeating_lvl-3-spells_9_components}}} {{range=@{repeating_lvl-3-spells_9_range}}} {{targets=@{repeating_lvl-3-spells_9_targets}}} {{duration=@{repeating_lvl-3-spells_9_duration}}} {{saving_throw=@{repeating_lvl-3-spells_9_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_9_sr}}} {{description=@{repeating_lvl-3-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_10_Cast" title="%{selected|repeating_lvl-3-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_10_name}}} {{school=@{repeating_lvl-3-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_10_cast-time}}} {{components=@{repeating_lvl-3-spells_10_components}}} {{range=@{repeating_lvl-3-spells_10_range}}} {{targets=@{repeating_lvl-3-spells_10_targets}}} {{duration=@{repeating_lvl-3-spells_10_duration}}} {{saving_throw=@{repeating_lvl-3-spells_10_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_10_sr}}} {{description=@{repeating_lvl-3-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_11_Cast" title="%{selected|repeating_lvl-3-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_11_name}}} {{school=@{repeating_lvl-3-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_11_cast-time}}} {{components=@{repeating_lvl-3-spells_11_components}}} {{range=@{repeating_lvl-3-spells_11_range}}} {{targets=@{repeating_lvl-3-spells_11_targets}}} {{duration=@{repeating_lvl-3-spells_11_duration}}} {{saving_throw=@{repeating_lvl-3-spells_11_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_11_sr}}} {{description=@{repeating_lvl-3-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_12_Cast" title="%{selected|repeating_lvl-3-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_12_name}}} {{school=@{repeating_lvl-3-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_12_cast-time}}} {{components=@{repeating_lvl-3-spells_12_components}}} {{range=@{repeating_lvl-3-spells_12_range}}} {{targets=@{repeating_lvl-3-spells_12_targets}}} {{duration=@{repeating_lvl-3-spells_12_duration}}} {{saving_throw=@{repeating_lvl-3-spells_12_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_12_sr}}} {{description=@{repeating_lvl-3-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_13_Cast" title="%{selected|repeating_lvl-3-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_13_name}}} {{school=@{repeating_lvl-3-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_13_cast-time}}} {{components=@{repeating_lvl-3-spells_13_components}}} {{range=@{repeating_lvl-3-spells_13_range}}} {{targets=@{repeating_lvl-3-spells_13_targets}}} {{duration=@{repeating_lvl-3-spells_13_duration}}} {{saving_throw=@{repeating_lvl-3-spells_13_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_13_sr}}} {{description=@{repeating_lvl-3-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_14_Cast" title="%{selected|repeating_lvl-3-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_14_name}}} {{school=@{repeating_lvl-3-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_14_cast-time}}} {{components=@{repeating_lvl-3-spells_14_components}}} {{range=@{repeating_lvl-3-spells_14_range}}} {{targets=@{repeating_lvl-3-spells_14_targets}}} {{duration=@{repeating_lvl-3-spells_14_duration}}} {{saving_throw=@{repeating_lvl-3-spells_14_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_14_sr}}} {{description=@{repeating_lvl-3-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_15_Cast" title="%{selected|repeating_lvl-3-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_15_name}}} {{school=@{repeating_lvl-3-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_15_cast-time}}} {{components=@{repeating_lvl-3-spells_15_components}}} {{range=@{repeating_lvl-3-spells_15_range}}} {{targets=@{repeating_lvl-3-spells_15_targets}}} {{duration=@{repeating_lvl-3-spells_15_duration}}} {{saving_throw=@{repeating_lvl-3-spells_15_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_15_sr}}} {{description=@{repeating_lvl-3-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_16_Cast" title="%{selected|repeating_lvl-3-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_16_name}}} {{school=@{repeating_lvl-3-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_16_cast-time}}} {{components=@{repeating_lvl-3-spells_16_components}}} {{range=@{repeating_lvl-3-spells_16_range}}} {{targets=@{repeating_lvl-3-spells_16_targets}}} {{duration=@{repeating_lvl-3-spells_16_duration}}} {{saving_throw=@{repeating_lvl-3-spells_16_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_16_sr}}} {{description=@{repeating_lvl-3-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_17_Cast" title="%{selected|repeating_lvl-3-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_17_name}}} {{school=@{repeating_lvl-3-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_17_cast-time}}} {{components=@{repeating_lvl-3-spells_17_components}}} {{range=@{repeating_lvl-3-spells_17_range}}} {{targets=@{repeating_lvl-3-spells_17_targets}}} {{duration=@{repeating_lvl-3-spells_17_duration}}} {{saving_throw=@{repeating_lvl-3-spells_17_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_17_sr}}} {{description=@{repeating_lvl-3-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_18_Cast" title="%{selected|repeating_lvl-3-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_18_name}}} {{school=@{repeating_lvl-3-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_18_cast-time}}} {{components=@{repeating_lvl-3-spells_18_components}}} {{range=@{repeating_lvl-3-spells_18_range}}} {{targets=@{repeating_lvl-3-spells_18_targets}}} {{duration=@{repeating_lvl-3-spells_18_duration}}} {{saving_throw=@{repeating_lvl-3-spells_18_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_18_sr}}} {{description=@{repeating_lvl-3-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_19_Cast" title="%{selected|repeating_lvl-3-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_19_name}}} {{school=@{repeating_lvl-3-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_19_cast-time}}} {{components=@{repeating_lvl-3-spells_19_components}}} {{range=@{repeating_lvl-3-spells_19_range}}} {{targets=@{repeating_lvl-3-spells_19_targets}}} {{duration=@{repeating_lvl-3-spells_19_duration}}} {{saving_throw=@{repeating_lvl-3-spells_19_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_19_sr}}} {{description=@{repeating_lvl-3-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_20_Cast" title="%{selected|repeating_lvl-3-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_20_name}}} {{school=@{repeating_lvl-3-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_20_cast-time}}} {{components=@{repeating_lvl-3-spells_20_components}}} {{range=@{repeating_lvl-3-spells_20_range}}} {{targets=@{repeating_lvl-3-spells_20_targets}}} {{duration=@{repeating_lvl-3-spells_20_duration}}} {{saving_throw=@{repeating_lvl-3-spells_20_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_20_sr}}} {{description=@{repeating_lvl-3-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_21_Cast" title="%{selected|repeating_lvl-3-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_21_name}}} {{school=@{repeating_lvl-3-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_21_cast-time}}} {{components=@{repeating_lvl-3-spells_21_components}}} {{range=@{repeating_lvl-3-spells_21_range}}} {{targets=@{repeating_lvl-3-spells_21_targets}}} {{duration=@{repeating_lvl-3-spells_21_duration}}} {{saving_throw=@{repeating_lvl-3-spells_21_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_21_sr}}} {{description=@{repeating_lvl-3-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_22_Cast" title="%{selected|repeating_lvl-3-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_22_name}}} {{school=@{repeating_lvl-3-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_22_cast-time}}} {{components=@{repeating_lvl-3-spells_22_components}}} {{range=@{repeating_lvl-3-spells_22_range}}} {{targets=@{repeating_lvl-3-spells_22_targets}}} {{duration=@{repeating_lvl-3-spells_22_duration}}} {{saving_throw=@{repeating_lvl-3-spells_22_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_22_sr}}} {{description=@{repeating_lvl-3-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_23_Cast" title="%{selected|repeating_lvl-3-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_23_name}}} {{school=@{repeating_lvl-3-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_23_cast-time}}} {{components=@{repeating_lvl-3-spells_23_components}}} {{range=@{repeating_lvl-3-spells_23_range}}} {{targets=@{repeating_lvl-3-spells_23_targets}}} {{duration=@{repeating_lvl-3-spells_23_duration}}} {{saving_throw=@{repeating_lvl-3-spells_23_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_23_sr}}} {{description=@{repeating_lvl-3-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_24_Cast" title="%{selected|repeating_lvl-3-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_24_name}}} {{school=@{repeating_lvl-3-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_24_cast-time}}} {{components=@{repeating_lvl-3-spells_24_components}}} {{range=@{repeating_lvl-3-spells_24_range}}} {{targets=@{repeating_lvl-3-spells_24_targets}}} {{duration=@{repeating_lvl-3-spells_24_duration}}} {{saving_throw=@{repeating_lvl-3-spells_24_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_24_sr}}} {{description=@{repeating_lvl-3-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_25_Cast" title="%{selected|repeating_lvl-3-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_25_name}}} {{school=@{repeating_lvl-3-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_25_cast-time}}} {{components=@{repeating_lvl-3-spells_25_components}}} {{range=@{repeating_lvl-3-spells_25_range}}} {{targets=@{repeating_lvl-3-spells_25_targets}}} {{duration=@{repeating_lvl-3-spells_25_duration}}} {{saving_throw=@{repeating_lvl-3-spells_25_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_25_sr}}} {{description=@{repeating_lvl-3-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-3-spells_26_Cast" title="%{selected|repeating_lvl-3-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-3-spells_26_name}}} {{school=@{repeating_lvl-3-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-3-spells_26_cast-time}}} {{components=@{repeating_lvl-3-spells_26_components}}} {{range=@{repeating_lvl-3-spells_26_range}}} {{targets=@{repeating_lvl-3-spells_26_targets}}} {{duration=@{repeating_lvl-3-spells_26_duration}}} {{saving_throw=@{repeating_lvl-3-spells_26_save}}} {{dc=[[ @{spellclass-0-level-3-savedc} + [[ @{repeating_lvl-3-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-3-spells_26_sr}}} {{description=@{repeating_lvl-3-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -6953,11 +6454,11 @@
                     </div>
                     <fieldset class="repeating_lvl-3-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-3-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-3-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -6965,21 +6466,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-3-spells_X_spell_level}" type="number" value="3" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-3-spells_$X_spell_level}" type="number" value="3" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-3-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-3-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -6990,15 +6491,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-3-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-3-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-3-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-3-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-3-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-3-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-3-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-3-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-3-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-3-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -7015,16 +6516,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-3-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-3-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-3-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-3-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-3-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-3-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-3-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-3-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-3-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-3-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-3-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-3-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-3-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-3-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-3-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-3-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -7033,8 +6534,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-3-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-3-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-3-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-3-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>			
@@ -7042,67 +6543,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-4">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 4</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_0_Cast" title="%{selected|repeating_lvl-4-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_0_name}}} {{school=@{repeating_lvl-4-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_0_cast-time}}} {{components=@{repeating_lvl-4-spells_0_components}}} {{range=@{repeating_lvl-4-spells_0_range}}} {{targets=@{repeating_lvl-4-spells_0_targets}}} {{duration=@{repeating_lvl-4-spells_0_duration}}} {{saving_throw=@{repeating_lvl-4-spells_0_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_0_sr}}} {{description=@{repeating_lvl-4-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_1_Cast" title="%{selected|repeating_lvl-4-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_1_name}}} {{school=@{repeating_lvl-4-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_1_cast-time}}} {{components=@{repeating_lvl-4-spells_1_components}}} {{range=@{repeating_lvl-4-spells_1_range}}} {{targets=@{repeating_lvl-4-spells_1_targets}}} {{duration=@{repeating_lvl-4-spells_1_duration}}} {{saving_throw=@{repeating_lvl-4-spells_1_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_1_sr}}} {{description=@{repeating_lvl-4-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_2_Cast" title="%{selected|repeating_lvl-4-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_2_name}}} {{school=@{repeating_lvl-4-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_2_cast-time}}} {{components=@{repeating_lvl-4-spells_2_components}}} {{range=@{repeating_lvl-4-spells_2_range}}} {{targets=@{repeating_lvl-4-spells_2_targets}}} {{duration=@{repeating_lvl-4-spells_2_duration}}} {{saving_throw=@{repeating_lvl-4-spells_2_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_2_sr}}} {{description=@{repeating_lvl-4-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_3_Cast" title="%{selected|repeating_lvl-4-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_3_name}}} {{school=@{repeating_lvl-4-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_3_cast-time}}} {{components=@{repeating_lvl-4-spells_3_components}}} {{range=@{repeating_lvl-4-spells_3_range}}} {{targets=@{repeating_lvl-4-spells_3_targets}}} {{duration=@{repeating_lvl-4-spells_3_duration}}} {{saving_throw=@{repeating_lvl-4-spells_3_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_3_sr}}} {{description=@{repeating_lvl-4-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_4_Cast" title="%{selected|repeating_lvl-4-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_4_name}}} {{school=@{repeating_lvl-4-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_4_cast-time}}} {{components=@{repeating_lvl-4-spells_4_components}}} {{range=@{repeating_lvl-4-spells_4_range}}} {{targets=@{repeating_lvl-4-spells_4_targets}}} {{duration=@{repeating_lvl-4-spells_4_duration}}} {{saving_throw=@{repeating_lvl-4-spells_4_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_4_sr}}} {{description=@{repeating_lvl-4-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_5_Cast" title="%{selected|repeating_lvl-4-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_5_name}}} {{school=@{repeating_lvl-4-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_5_cast-time}}} {{components=@{repeating_lvl-4-spells_5_components}}} {{range=@{repeating_lvl-4-spells_5_range}}} {{targets=@{repeating_lvl-4-spells_5_targets}}} {{duration=@{repeating_lvl-4-spells_5_duration}}} {{saving_throw=@{repeating_lvl-4-spells_5_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_5_sr}}} {{description=@{repeating_lvl-4-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_6_Cast" title="%{selected|repeating_lvl-4-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_6_name}}} {{school=@{repeating_lvl-4-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_6_cast-time}}} {{components=@{repeating_lvl-4-spells_6_components}}} {{range=@{repeating_lvl-4-spells_6_range}}} {{targets=@{repeating_lvl-4-spells_6_targets}}} {{duration=@{repeating_lvl-4-spells_6_duration}}} {{saving_throw=@{repeating_lvl-4-spells_6_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_6_sr}}} {{description=@{repeating_lvl-4-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_7_Cast" title="%{selected|repeating_lvl-4-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_7_name}}} {{school=@{repeating_lvl-4-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_7_cast-time}}} {{components=@{repeating_lvl-4-spells_7_components}}} {{range=@{repeating_lvl-4-spells_7_range}}} {{targets=@{repeating_lvl-4-spells_7_targets}}} {{duration=@{repeating_lvl-4-spells_7_duration}}} {{saving_throw=@{repeating_lvl-4-spells_7_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_7_sr}}} {{description=@{repeating_lvl-4-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_8_Cast" title="%{selected|repeating_lvl-4-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_8_name}}} {{school=@{repeating_lvl-4-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_8_cast-time}}} {{components=@{repeating_lvl-4-spells_8_components}}} {{range=@{repeating_lvl-4-spells_8_range}}} {{targets=@{repeating_lvl-4-spells_8_targets}}} {{duration=@{repeating_lvl-4-spells_8_duration}}} {{saving_throw=@{repeating_lvl-4-spells_8_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_8_sr}}} {{description=@{repeating_lvl-4-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_9_Cast" title="%{selected|repeating_lvl-4-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_9_name}}} {{school=@{repeating_lvl-4-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_9_cast-time}}} {{components=@{repeating_lvl-4-spells_9_components}}} {{range=@{repeating_lvl-4-spells_9_range}}} {{targets=@{repeating_lvl-4-spells_9_targets}}} {{duration=@{repeating_lvl-4-spells_9_duration}}} {{saving_throw=@{repeating_lvl-4-spells_9_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_9_sr}}} {{description=@{repeating_lvl-4-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_10_Cast" title="%{selected|repeating_lvl-4-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_10_name}}} {{school=@{repeating_lvl-4-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_10_cast-time}}} {{components=@{repeating_lvl-4-spells_10_components}}} {{range=@{repeating_lvl-4-spells_10_range}}} {{targets=@{repeating_lvl-4-spells_10_targets}}} {{duration=@{repeating_lvl-4-spells_10_duration}}} {{saving_throw=@{repeating_lvl-4-spells_10_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_10_sr}}} {{description=@{repeating_lvl-4-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_11_Cast" title="%{selected|repeating_lvl-4-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_11_name}}} {{school=@{repeating_lvl-4-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_11_cast-time}}} {{components=@{repeating_lvl-4-spells_11_components}}} {{range=@{repeating_lvl-4-spells_11_range}}} {{targets=@{repeating_lvl-4-spells_11_targets}}} {{duration=@{repeating_lvl-4-spells_11_duration}}} {{saving_throw=@{repeating_lvl-4-spells_11_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_11_sr}}} {{description=@{repeating_lvl-4-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_12_Cast" title="%{selected|repeating_lvl-4-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_12_name}}} {{school=@{repeating_lvl-4-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_12_cast-time}}} {{components=@{repeating_lvl-4-spells_12_components}}} {{range=@{repeating_lvl-4-spells_12_range}}} {{targets=@{repeating_lvl-4-spells_12_targets}}} {{duration=@{repeating_lvl-4-spells_12_duration}}} {{saving_throw=@{repeating_lvl-4-spells_12_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_12_sr}}} {{description=@{repeating_lvl-4-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_13_Cast" title="%{selected|repeating_lvl-4-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_13_name}}} {{school=@{repeating_lvl-4-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_13_cast-time}}} {{components=@{repeating_lvl-4-spells_13_components}}} {{range=@{repeating_lvl-4-spells_13_range}}} {{targets=@{repeating_lvl-4-spells_13_targets}}} {{duration=@{repeating_lvl-4-spells_13_duration}}} {{saving_throw=@{repeating_lvl-4-spells_13_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_13_sr}}} {{description=@{repeating_lvl-4-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_14_Cast" title="%{selected|repeating_lvl-4-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_14_name}}} {{school=@{repeating_lvl-4-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_14_cast-time}}} {{components=@{repeating_lvl-4-spells_14_components}}} {{range=@{repeating_lvl-4-spells_14_range}}} {{targets=@{repeating_lvl-4-spells_14_targets}}} {{duration=@{repeating_lvl-4-spells_14_duration}}} {{saving_throw=@{repeating_lvl-4-spells_14_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_14_sr}}} {{description=@{repeating_lvl-4-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_15_Cast" title="%{selected|repeating_lvl-4-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_15_name}}} {{school=@{repeating_lvl-4-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_15_cast-time}}} {{components=@{repeating_lvl-4-spells_15_components}}} {{range=@{repeating_lvl-4-spells_15_range}}} {{targets=@{repeating_lvl-4-spells_15_targets}}} {{duration=@{repeating_lvl-4-spells_15_duration}}} {{saving_throw=@{repeating_lvl-4-spells_15_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_15_sr}}} {{description=@{repeating_lvl-4-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_16_Cast" title="%{selected|repeating_lvl-4-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_16_name}}} {{school=@{repeating_lvl-4-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_16_cast-time}}} {{components=@{repeating_lvl-4-spells_16_components}}} {{range=@{repeating_lvl-4-spells_16_range}}} {{targets=@{repeating_lvl-4-spells_16_targets}}} {{duration=@{repeating_lvl-4-spells_16_duration}}} {{saving_throw=@{repeating_lvl-4-spells_16_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_16_sr}}} {{description=@{repeating_lvl-4-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_17_Cast" title="%{selected|repeating_lvl-4-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_17_name}}} {{school=@{repeating_lvl-4-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_17_cast-time}}} {{components=@{repeating_lvl-4-spells_17_components}}} {{range=@{repeating_lvl-4-spells_17_range}}} {{targets=@{repeating_lvl-4-spells_17_targets}}} {{duration=@{repeating_lvl-4-spells_17_duration}}} {{saving_throw=@{repeating_lvl-4-spells_17_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_17_sr}}} {{description=@{repeating_lvl-4-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_18_Cast" title="%{selected|repeating_lvl-4-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_18_name}}} {{school=@{repeating_lvl-4-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_18_cast-time}}} {{components=@{repeating_lvl-4-spells_18_components}}} {{range=@{repeating_lvl-4-spells_18_range}}} {{targets=@{repeating_lvl-4-spells_18_targets}}} {{duration=@{repeating_lvl-4-spells_18_duration}}} {{saving_throw=@{repeating_lvl-4-spells_18_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_18_sr}}} {{description=@{repeating_lvl-4-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_19_Cast" title="%{selected|repeating_lvl-4-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_19_name}}} {{school=@{repeating_lvl-4-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_19_cast-time}}} {{components=@{repeating_lvl-4-spells_19_components}}} {{range=@{repeating_lvl-4-spells_19_range}}} {{targets=@{repeating_lvl-4-spells_19_targets}}} {{duration=@{repeating_lvl-4-spells_19_duration}}} {{saving_throw=@{repeating_lvl-4-spells_19_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_19_sr}}} {{description=@{repeating_lvl-4-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_20_Cast" title="%{selected|repeating_lvl-4-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_20_name}}} {{school=@{repeating_lvl-4-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_20_cast-time}}} {{components=@{repeating_lvl-4-spells_20_components}}} {{range=@{repeating_lvl-4-spells_20_range}}} {{targets=@{repeating_lvl-4-spells_20_targets}}} {{duration=@{repeating_lvl-4-spells_20_duration}}} {{saving_throw=@{repeating_lvl-4-spells_20_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_20_sr}}} {{description=@{repeating_lvl-4-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_21_Cast" title="%{selected|repeating_lvl-4-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_21_name}}} {{school=@{repeating_lvl-4-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_21_cast-time}}} {{components=@{repeating_lvl-4-spells_21_components}}} {{range=@{repeating_lvl-4-spells_21_range}}} {{targets=@{repeating_lvl-4-spells_21_targets}}} {{duration=@{repeating_lvl-4-spells_21_duration}}} {{saving_throw=@{repeating_lvl-4-spells_21_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_21_sr}}} {{description=@{repeating_lvl-4-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_22_Cast" title="%{selected|repeating_lvl-4-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_22_name}}} {{school=@{repeating_lvl-4-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_22_cast-time}}} {{components=@{repeating_lvl-4-spells_22_components}}} {{range=@{repeating_lvl-4-spells_22_range}}} {{targets=@{repeating_lvl-4-spells_22_targets}}} {{duration=@{repeating_lvl-4-spells_22_duration}}} {{saving_throw=@{repeating_lvl-4-spells_22_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_22_sr}}} {{description=@{repeating_lvl-4-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_23_Cast" title="%{selected|repeating_lvl-4-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_23_name}}} {{school=@{repeating_lvl-4-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_23_cast-time}}} {{components=@{repeating_lvl-4-spells_23_components}}} {{range=@{repeating_lvl-4-spells_23_range}}} {{targets=@{repeating_lvl-4-spells_23_targets}}} {{duration=@{repeating_lvl-4-spells_23_duration}}} {{saving_throw=@{repeating_lvl-4-spells_23_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_23_sr}}} {{description=@{repeating_lvl-4-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_24_Cast" title="%{selected|repeating_lvl-4-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_24_name}}} {{school=@{repeating_lvl-4-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_24_cast-time}}} {{components=@{repeating_lvl-4-spells_24_components}}} {{range=@{repeating_lvl-4-spells_24_range}}} {{targets=@{repeating_lvl-4-spells_24_targets}}} {{duration=@{repeating_lvl-4-spells_24_duration}}} {{saving_throw=@{repeating_lvl-4-spells_24_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_24_sr}}} {{description=@{repeating_lvl-4-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_25_Cast" title="%{selected|repeating_lvl-4-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_25_name}}} {{school=@{repeating_lvl-4-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_25_cast-time}}} {{components=@{repeating_lvl-4-spells_25_components}}} {{range=@{repeating_lvl-4-spells_25_range}}} {{targets=@{repeating_lvl-4-spells_25_targets}}} {{duration=@{repeating_lvl-4-spells_25_duration}}} {{saving_throw=@{repeating_lvl-4-spells_25_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_25_sr}}} {{description=@{repeating_lvl-4-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-4-spells_26_Cast" title="%{selected|repeating_lvl-4-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-4-spells_26_name}}} {{school=@{repeating_lvl-4-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-4-spells_26_cast-time}}} {{components=@{repeating_lvl-4-spells_26_components}}} {{range=@{repeating_lvl-4-spells_26_range}}} {{targets=@{repeating_lvl-4-spells_26_targets}}} {{duration=@{repeating_lvl-4-spells_26_duration}}} {{saving_throw=@{repeating_lvl-4-spells_26_save}}} {{dc=[[ @{spellclass-0-level-4-savedc} + [[ @{repeating_lvl-4-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-4-spells_26_sr}}} {{description=@{repeating_lvl-4-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -7110,11 +6550,11 @@
                     </div>
                     <fieldset class="repeating_lvl-4-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-4-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-4-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -7122,21 +6562,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-4-spells_X_spell_level}" type="number" value="4" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-4-spells_$X_spell_level}" type="number" value="4" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-4-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-4-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -7147,15 +6587,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-4-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-4-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-4-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-4-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-4-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-4-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-4-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-4-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-4-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-4-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -7172,16 +6612,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-4-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-4-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-4-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-4-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-4-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-4-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-4-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-4-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-4-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-4-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-4-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-4-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-4-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-4-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-4-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-4-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguno</b>
@@ -7190,8 +6630,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-4-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-4-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-4-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-4-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>				
@@ -7199,67 +6639,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-5">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 5</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_0_Cast" title="%{selected|repeating_lvl-5-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_0_name}}} {{school=@{repeating_lvl-5-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_0_cast-time}}} {{components=@{repeating_lvl-5-spells_0_components}}} {{range=@{repeating_lvl-5-spells_0_range}}} {{targets=@{repeating_lvl-5-spells_0_targets}}} {{duration=@{repeating_lvl-5-spells_0_duration}}} {{saving_throw=@{repeating_lvl-5-spells_0_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_0_sr}}} {{description=@{repeating_lvl-5-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_1_Cast" title="%{selected|repeating_lvl-5-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_1_name}}} {{school=@{repeating_lvl-5-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_1_cast-time}}} {{components=@{repeating_lvl-5-spells_1_components}}} {{range=@{repeating_lvl-5-spells_1_range}}} {{targets=@{repeating_lvl-5-spells_1_targets}}} {{duration=@{repeating_lvl-5-spells_1_duration}}} {{saving_throw=@{repeating_lvl-5-spells_1_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_1_sr}}} {{description=@{repeating_lvl-5-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_2_Cast" title="%{selected|repeating_lvl-5-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_2_name}}} {{school=@{repeating_lvl-5-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_2_cast-time}}} {{components=@{repeating_lvl-5-spells_2_components}}} {{range=@{repeating_lvl-5-spells_2_range}}} {{targets=@{repeating_lvl-5-spells_2_targets}}} {{duration=@{repeating_lvl-5-spells_2_duration}}} {{saving_throw=@{repeating_lvl-5-spells_2_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_2_sr}}} {{description=@{repeating_lvl-5-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_3_Cast" title="%{selected|repeating_lvl-5-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_3_name}}} {{school=@{repeating_lvl-5-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_3_cast-time}}} {{components=@{repeating_lvl-5-spells_3_components}}} {{range=@{repeating_lvl-5-spells_3_range}}} {{targets=@{repeating_lvl-5-spells_3_targets}}} {{duration=@{repeating_lvl-5-spells_3_duration}}} {{saving_throw=@{repeating_lvl-5-spells_3_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_3_sr}}} {{description=@{repeating_lvl-5-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_4_Cast" title="%{selected|repeating_lvl-5-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_4_name}}} {{school=@{repeating_lvl-5-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_4_cast-time}}} {{components=@{repeating_lvl-5-spells_4_components}}} {{range=@{repeating_lvl-5-spells_4_range}}} {{targets=@{repeating_lvl-5-spells_4_targets}}} {{duration=@{repeating_lvl-5-spells_4_duration}}} {{saving_throw=@{repeating_lvl-5-spells_4_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_4_sr}}} {{description=@{repeating_lvl-5-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_5_Cast" title="%{selected|repeating_lvl-5-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_5_name}}} {{school=@{repeating_lvl-5-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_5_cast-time}}} {{components=@{repeating_lvl-5-spells_5_components}}} {{range=@{repeating_lvl-5-spells_5_range}}} {{targets=@{repeating_lvl-5-spells_5_targets}}} {{duration=@{repeating_lvl-5-spells_5_duration}}} {{saving_throw=@{repeating_lvl-5-spells_5_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_5_sr}}} {{description=@{repeating_lvl-5-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_6_Cast" title="%{selected|repeating_lvl-5-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_6_name}}} {{school=@{repeating_lvl-5-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_6_cast-time}}} {{components=@{repeating_lvl-5-spells_6_components}}} {{range=@{repeating_lvl-5-spells_6_range}}} {{targets=@{repeating_lvl-5-spells_6_targets}}} {{duration=@{repeating_lvl-5-spells_6_duration}}} {{saving_throw=@{repeating_lvl-5-spells_6_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_6_sr}}} {{description=@{repeating_lvl-5-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_7_Cast" title="%{selected|repeating_lvl-5-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_7_name}}} {{school=@{repeating_lvl-5-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_7_cast-time}}} {{components=@{repeating_lvl-5-spells_7_components}}} {{range=@{repeating_lvl-5-spells_7_range}}} {{targets=@{repeating_lvl-5-spells_7_targets}}} {{duration=@{repeating_lvl-5-spells_7_duration}}} {{saving_throw=@{repeating_lvl-5-spells_7_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_7_sr}}} {{description=@{repeating_lvl-5-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_8_Cast" title="%{selected|repeating_lvl-5-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_8_name}}} {{school=@{repeating_lvl-5-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_8_cast-time}}} {{components=@{repeating_lvl-5-spells_8_components}}} {{range=@{repeating_lvl-5-spells_8_range}}} {{targets=@{repeating_lvl-5-spells_8_targets}}} {{duration=@{repeating_lvl-5-spells_8_duration}}} {{saving_throw=@{repeating_lvl-5-spells_8_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_8_sr}}} {{description=@{repeating_lvl-5-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_9_Cast" title="%{selected|repeating_lvl-5-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_9_name}}} {{school=@{repeating_lvl-5-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_9_cast-time}}} {{components=@{repeating_lvl-5-spells_9_components}}} {{range=@{repeating_lvl-5-spells_9_range}}} {{targets=@{repeating_lvl-5-spells_9_targets}}} {{duration=@{repeating_lvl-5-spells_9_duration}}} {{saving_throw=@{repeating_lvl-5-spells_9_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_9_sr}}} {{description=@{repeating_lvl-5-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_10_Cast" title="%{selected|repeating_lvl-5-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_10_name}}} {{school=@{repeating_lvl-5-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_10_cast-time}}} {{components=@{repeating_lvl-5-spells_10_components}}} {{range=@{repeating_lvl-5-spells_10_range}}} {{targets=@{repeating_lvl-5-spells_10_targets}}} {{duration=@{repeating_lvl-5-spells_10_duration}}} {{saving_throw=@{repeating_lvl-5-spells_10_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_10_sr}}} {{description=@{repeating_lvl-5-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_11_Cast" title="%{selected|repeating_lvl-5-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_11_name}}} {{school=@{repeating_lvl-5-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_11_cast-time}}} {{components=@{repeating_lvl-5-spells_11_components}}} {{range=@{repeating_lvl-5-spells_11_range}}} {{targets=@{repeating_lvl-5-spells_11_targets}}} {{duration=@{repeating_lvl-5-spells_11_duration}}} {{saving_throw=@{repeating_lvl-5-spells_11_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_11_sr}}} {{description=@{repeating_lvl-5-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_12_Cast" title="%{selected|repeating_lvl-5-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_12_name}}} {{school=@{repeating_lvl-5-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_12_cast-time}}} {{components=@{repeating_lvl-5-spells_12_components}}} {{range=@{repeating_lvl-5-spells_12_range}}} {{targets=@{repeating_lvl-5-spells_12_targets}}} {{duration=@{repeating_lvl-5-spells_12_duration}}} {{saving_throw=@{repeating_lvl-5-spells_12_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_12_sr}}} {{description=@{repeating_lvl-5-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_13_Cast" title="%{selected|repeating_lvl-5-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_13_name}}} {{school=@{repeating_lvl-5-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_13_cast-time}}} {{components=@{repeating_lvl-5-spells_13_components}}} {{range=@{repeating_lvl-5-spells_13_range}}} {{targets=@{repeating_lvl-5-spells_13_targets}}} {{duration=@{repeating_lvl-5-spells_13_duration}}} {{saving_throw=@{repeating_lvl-5-spells_13_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_13_sr}}} {{description=@{repeating_lvl-5-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_14_Cast" title="%{selected|repeating_lvl-5-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_14_name}}} {{school=@{repeating_lvl-5-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_14_cast-time}}} {{components=@{repeating_lvl-5-spells_14_components}}} {{range=@{repeating_lvl-5-spells_14_range}}} {{targets=@{repeating_lvl-5-spells_14_targets}}} {{duration=@{repeating_lvl-5-spells_14_duration}}} {{saving_throw=@{repeating_lvl-5-spells_14_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_14_sr}}} {{description=@{repeating_lvl-5-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_15_Cast" title="%{selected|repeating_lvl-5-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_15_name}}} {{school=@{repeating_lvl-5-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_15_cast-time}}} {{components=@{repeating_lvl-5-spells_15_components}}} {{range=@{repeating_lvl-5-spells_15_range}}} {{targets=@{repeating_lvl-5-spells_15_targets}}} {{duration=@{repeating_lvl-5-spells_15_duration}}} {{saving_throw=@{repeating_lvl-5-spells_15_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_15_sr}}} {{description=@{repeating_lvl-5-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_16_Cast" title="%{selected|repeating_lvl-5-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_16_name}}} {{school=@{repeating_lvl-5-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_16_cast-time}}} {{components=@{repeating_lvl-5-spells_16_components}}} {{range=@{repeating_lvl-5-spells_16_range}}} {{targets=@{repeating_lvl-5-spells_16_targets}}} {{duration=@{repeating_lvl-5-spells_16_duration}}} {{saving_throw=@{repeating_lvl-5-spells_16_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_16_sr}}} {{description=@{repeating_lvl-5-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_17_Cast" title="%{selected|repeating_lvl-5-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_17_name}}} {{school=@{repeating_lvl-5-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_17_cast-time}}} {{components=@{repeating_lvl-5-spells_17_components}}} {{range=@{repeating_lvl-5-spells_17_range}}} {{targets=@{repeating_lvl-5-spells_17_targets}}} {{duration=@{repeating_lvl-5-spells_17_duration}}} {{saving_throw=@{repeating_lvl-5-spells_17_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_17_sr}}} {{description=@{repeating_lvl-5-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_18_Cast" title="%{selected|repeating_lvl-5-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_18_name}}} {{school=@{repeating_lvl-5-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_18_cast-time}}} {{components=@{repeating_lvl-5-spells_18_components}}} {{range=@{repeating_lvl-5-spells_18_range}}} {{targets=@{repeating_lvl-5-spells_18_targets}}} {{duration=@{repeating_lvl-5-spells_18_duration}}} {{saving_throw=@{repeating_lvl-5-spells_18_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_18_sr}}} {{description=@{repeating_lvl-5-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_19_Cast" title="%{selected|repeating_lvl-5-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_19_name}}} {{school=@{repeating_lvl-5-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_19_cast-time}}} {{components=@{repeating_lvl-5-spells_19_components}}} {{range=@{repeating_lvl-5-spells_19_range}}} {{targets=@{repeating_lvl-5-spells_19_targets}}} {{duration=@{repeating_lvl-5-spells_19_duration}}} {{saving_throw=@{repeating_lvl-5-spells_19_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_19_sr}}} {{description=@{repeating_lvl-5-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_20_Cast" title="%{selected|repeating_lvl-5-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_20_name}}} {{school=@{repeating_lvl-5-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_20_cast-time}}} {{components=@{repeating_lvl-5-spells_20_components}}} {{range=@{repeating_lvl-5-spells_20_range}}} {{targets=@{repeating_lvl-5-spells_20_targets}}} {{duration=@{repeating_lvl-5-spells_20_duration}}} {{saving_throw=@{repeating_lvl-5-spells_20_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_20_sr}}} {{description=@{repeating_lvl-5-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_21_Cast" title="%{selected|repeating_lvl-5-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_21_name}}} {{school=@{repeating_lvl-5-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_21_cast-time}}} {{components=@{repeating_lvl-5-spells_21_components}}} {{range=@{repeating_lvl-5-spells_21_range}}} {{targets=@{repeating_lvl-5-spells_21_targets}}} {{duration=@{repeating_lvl-5-spells_21_duration}}} {{saving_throw=@{repeating_lvl-5-spells_21_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_21_sr}}} {{description=@{repeating_lvl-5-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_22_Cast" title="%{selected|repeating_lvl-5-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_22_name}}} {{school=@{repeating_lvl-5-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_22_cast-time}}} {{components=@{repeating_lvl-5-spells_22_components}}} {{range=@{repeating_lvl-5-spells_22_range}}} {{targets=@{repeating_lvl-5-spells_22_targets}}} {{duration=@{repeating_lvl-5-spells_22_duration}}} {{saving_throw=@{repeating_lvl-5-spells_22_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_22_sr}}} {{description=@{repeating_lvl-5-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_23_Cast" title="%{selected|repeating_lvl-5-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_23_name}}} {{school=@{repeating_lvl-5-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_23_cast-time}}} {{components=@{repeating_lvl-5-spells_23_components}}} {{range=@{repeating_lvl-5-spells_23_range}}} {{targets=@{repeating_lvl-5-spells_23_targets}}} {{duration=@{repeating_lvl-5-spells_23_duration}}} {{saving_throw=@{repeating_lvl-5-spells_23_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_23_sr}}} {{description=@{repeating_lvl-5-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_24_Cast" title="%{selected|repeating_lvl-5-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_24_name}}} {{school=@{repeating_lvl-5-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_24_cast-time}}} {{components=@{repeating_lvl-5-spells_24_components}}} {{range=@{repeating_lvl-5-spells_24_range}}} {{targets=@{repeating_lvl-5-spells_24_targets}}} {{duration=@{repeating_lvl-5-spells_24_duration}}} {{saving_throw=@{repeating_lvl-5-spells_24_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_24_sr}}} {{description=@{repeating_lvl-5-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_25_Cast" title="%{selected|repeating_lvl-5-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_25_name}}} {{school=@{repeating_lvl-5-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_25_cast-time}}} {{components=@{repeating_lvl-5-spells_25_components}}} {{range=@{repeating_lvl-5-spells_25_range}}} {{targets=@{repeating_lvl-5-spells_25_targets}}} {{duration=@{repeating_lvl-5-spells_25_duration}}} {{saving_throw=@{repeating_lvl-5-spells_25_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_25_sr}}} {{description=@{repeating_lvl-5-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-5-spells_26_Cast" title="%{selected|repeating_lvl-5-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-5-spells_26_name}}} {{school=@{repeating_lvl-5-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-5-spells_26_cast-time}}} {{components=@{repeating_lvl-5-spells_26_components}}} {{range=@{repeating_lvl-5-spells_26_range}}} {{targets=@{repeating_lvl-5-spells_26_targets}}} {{duration=@{repeating_lvl-5-spells_26_duration}}} {{saving_throw=@{repeating_lvl-5-spells_26_save}}} {{dc=[[ @{spellclass-0-level-5-savedc} + [[ @{repeating_lvl-5-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-5-spells_26_sr}}} {{description=@{repeating_lvl-5-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -7267,11 +6646,11 @@
                     </div>
                     <fieldset class="repeating_lvl-5-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-5-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-5-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -7279,21 +6658,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-5-spells_X_spell_level}" type="number" value="5" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-5-spells_$X_spell_level}" type="number" value="5" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-5-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-5-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -7304,15 +6683,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-5-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-5-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-5-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-5-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-5-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-5-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-5-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-5-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-5-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-5-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -7329,16 +6708,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-5-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-5-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-5-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-5-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-5-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-5-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-5-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-5-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-5-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-5-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-5-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-5-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-5-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-5-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-5-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-5-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -7347,8 +6726,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-5-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-5-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-5-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-5-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>			
@@ -7356,67 +6735,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-6">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 6</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_0_Cast" title="%{selected|repeating_lvl-6-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_0_name}}} {{school=@{repeating_lvl-6-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_0_cast-time}}} {{components=@{repeating_lvl-6-spells_0_components}}} {{range=@{repeating_lvl-6-spells_0_range}}} {{targets=@{repeating_lvl-6-spells_0_targets}}} {{duration=@{repeating_lvl-6-spells_0_duration}}} {{saving_throw=@{repeating_lvl-6-spells_0_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_0_sr}}} {{description=@{repeating_lvl-6-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_1_Cast" title="%{selected|repeating_lvl-6-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_1_name}}} {{school=@{repeating_lvl-6-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_1_cast-time}}} {{components=@{repeating_lvl-6-spells_1_components}}} {{range=@{repeating_lvl-6-spells_1_range}}} {{targets=@{repeating_lvl-6-spells_1_targets}}} {{duration=@{repeating_lvl-6-spells_1_duration}}} {{saving_throw=@{repeating_lvl-6-spells_1_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_1_sr}}} {{description=@{repeating_lvl-6-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_2_Cast" title="%{selected|repeating_lvl-6-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_2_name}}} {{school=@{repeating_lvl-6-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_2_cast-time}}} {{components=@{repeating_lvl-6-spells_2_components}}} {{range=@{repeating_lvl-6-spells_2_range}}} {{targets=@{repeating_lvl-6-spells_2_targets}}} {{duration=@{repeating_lvl-6-spells_2_duration}}} {{saving_throw=@{repeating_lvl-6-spells_2_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_2_sr}}} {{description=@{repeating_lvl-6-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_3_Cast" title="%{selected|repeating_lvl-6-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_3_name}}} {{school=@{repeating_lvl-6-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_3_cast-time}}} {{components=@{repeating_lvl-6-spells_3_components}}} {{range=@{repeating_lvl-6-spells_3_range}}} {{targets=@{repeating_lvl-6-spells_3_targets}}} {{duration=@{repeating_lvl-6-spells_3_duration}}} {{saving_throw=@{repeating_lvl-6-spells_3_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_3_sr}}} {{description=@{repeating_lvl-6-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_4_Cast" title="%{selected|repeating_lvl-6-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_4_name}}} {{school=@{repeating_lvl-6-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_4_cast-time}}} {{components=@{repeating_lvl-6-spells_4_components}}} {{range=@{repeating_lvl-6-spells_4_range}}} {{targets=@{repeating_lvl-6-spells_4_targets}}} {{duration=@{repeating_lvl-6-spells_4_duration}}} {{saving_throw=@{repeating_lvl-6-spells_4_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_4_sr}}} {{description=@{repeating_lvl-6-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_5_Cast" title="%{selected|repeating_lvl-6-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_5_name}}} {{school=@{repeating_lvl-6-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_5_cast-time}}} {{components=@{repeating_lvl-6-spells_5_components}}} {{range=@{repeating_lvl-6-spells_5_range}}} {{targets=@{repeating_lvl-6-spells_5_targets}}} {{duration=@{repeating_lvl-6-spells_5_duration}}} {{saving_throw=@{repeating_lvl-6-spells_5_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_5_sr}}} {{description=@{repeating_lvl-6-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_6_Cast" title="%{selected|repeating_lvl-6-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_6_name}}} {{school=@{repeating_lvl-6-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_6_cast-time}}} {{components=@{repeating_lvl-6-spells_6_components}}} {{range=@{repeating_lvl-6-spells_6_range}}} {{targets=@{repeating_lvl-6-spells_6_targets}}} {{duration=@{repeating_lvl-6-spells_6_duration}}} {{saving_throw=@{repeating_lvl-6-spells_6_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_6_sr}}} {{description=@{repeating_lvl-6-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_7_Cast" title="%{selected|repeating_lvl-6-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_7_name}}} {{school=@{repeating_lvl-6-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_7_cast-time}}} {{components=@{repeating_lvl-6-spells_7_components}}} {{range=@{repeating_lvl-6-spells_7_range}}} {{targets=@{repeating_lvl-6-spells_7_targets}}} {{duration=@{repeating_lvl-6-spells_7_duration}}} {{saving_throw=@{repeating_lvl-6-spells_7_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_7_sr}}} {{description=@{repeating_lvl-6-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_8_Cast" title="%{selected|repeating_lvl-6-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_8_name}}} {{school=@{repeating_lvl-6-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_8_cast-time}}} {{components=@{repeating_lvl-6-spells_8_components}}} {{range=@{repeating_lvl-6-spells_8_range}}} {{targets=@{repeating_lvl-6-spells_8_targets}}} {{duration=@{repeating_lvl-6-spells_8_duration}}} {{saving_throw=@{repeating_lvl-6-spells_8_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_8_sr}}} {{description=@{repeating_lvl-6-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_9_Cast" title="%{selected|repeating_lvl-6-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_9_name}}} {{school=@{repeating_lvl-6-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_9_cast-time}}} {{components=@{repeating_lvl-6-spells_9_components}}} {{range=@{repeating_lvl-6-spells_9_range}}} {{targets=@{repeating_lvl-6-spells_9_targets}}} {{duration=@{repeating_lvl-6-spells_9_duration}}} {{saving_throw=@{repeating_lvl-6-spells_9_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_9_sr}}} {{description=@{repeating_lvl-6-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_10_Cast" title="%{selected|repeating_lvl-6-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_10_name}}} {{school=@{repeating_lvl-6-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_10_cast-time}}} {{components=@{repeating_lvl-6-spells_10_components}}} {{range=@{repeating_lvl-6-spells_10_range}}} {{targets=@{repeating_lvl-6-spells_10_targets}}} {{duration=@{repeating_lvl-6-spells_10_duration}}} {{saving_throw=@{repeating_lvl-6-spells_10_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_10_sr}}} {{description=@{repeating_lvl-6-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_11_Cast" title="%{selected|repeating_lvl-6-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_11_name}}} {{school=@{repeating_lvl-6-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_11_cast-time}}} {{components=@{repeating_lvl-6-spells_11_components}}} {{range=@{repeating_lvl-6-spells_11_range}}} {{targets=@{repeating_lvl-6-spells_11_targets}}} {{duration=@{repeating_lvl-6-spells_11_duration}}} {{saving_throw=@{repeating_lvl-6-spells_11_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_11_sr}}} {{description=@{repeating_lvl-6-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_12_Cast" title="%{selected|repeating_lvl-6-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_12_name}}} {{school=@{repeating_lvl-6-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_12_cast-time}}} {{components=@{repeating_lvl-6-spells_12_components}}} {{range=@{repeating_lvl-6-spells_12_range}}} {{targets=@{repeating_lvl-6-spells_12_targets}}} {{duration=@{repeating_lvl-6-spells_12_duration}}} {{saving_throw=@{repeating_lvl-6-spells_12_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_12_sr}}} {{description=@{repeating_lvl-6-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_13_Cast" title="%{selected|repeating_lvl-6-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_13_name}}} {{school=@{repeating_lvl-6-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_13_cast-time}}} {{components=@{repeating_lvl-6-spells_13_components}}} {{range=@{repeating_lvl-6-spells_13_range}}} {{targets=@{repeating_lvl-6-spells_13_targets}}} {{duration=@{repeating_lvl-6-spells_13_duration}}} {{saving_throw=@{repeating_lvl-6-spells_13_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_13_sr}}} {{description=@{repeating_lvl-6-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_14_Cast" title="%{selected|repeating_lvl-6-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_14_name}}} {{school=@{repeating_lvl-6-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_14_cast-time}}} {{components=@{repeating_lvl-6-spells_14_components}}} {{range=@{repeating_lvl-6-spells_14_range}}} {{targets=@{repeating_lvl-6-spells_14_targets}}} {{duration=@{repeating_lvl-6-spells_14_duration}}} {{saving_throw=@{repeating_lvl-6-spells_14_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_14_sr}}} {{description=@{repeating_lvl-6-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_15_Cast" title="%{selected|repeating_lvl-6-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_15_name}}} {{school=@{repeating_lvl-6-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_15_cast-time}}} {{components=@{repeating_lvl-6-spells_15_components}}} {{range=@{repeating_lvl-6-spells_15_range}}} {{targets=@{repeating_lvl-6-spells_15_targets}}} {{duration=@{repeating_lvl-6-spells_15_duration}}} {{saving_throw=@{repeating_lvl-6-spells_15_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_15_sr}}} {{description=@{repeating_lvl-6-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_16_Cast" title="%{selected|repeating_lvl-6-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_16_name}}} {{school=@{repeating_lvl-6-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_16_cast-time}}} {{components=@{repeating_lvl-6-spells_16_components}}} {{range=@{repeating_lvl-6-spells_16_range}}} {{targets=@{repeating_lvl-6-spells_16_targets}}} {{duration=@{repeating_lvl-6-spells_16_duration}}} {{saving_throw=@{repeating_lvl-6-spells_16_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_16_sr}}} {{description=@{repeating_lvl-6-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_17_Cast" title="%{selected|repeating_lvl-6-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_17_name}}} {{school=@{repeating_lvl-6-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_17_cast-time}}} {{components=@{repeating_lvl-6-spells_17_components}}} {{range=@{repeating_lvl-6-spells_17_range}}} {{targets=@{repeating_lvl-6-spells_17_targets}}} {{duration=@{repeating_lvl-6-spells_17_duration}}} {{saving_throw=@{repeating_lvl-6-spells_17_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_17_sr}}} {{description=@{repeating_lvl-6-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_18_Cast" title="%{selected|repeating_lvl-6-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_18_name}}} {{school=@{repeating_lvl-6-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_18_cast-time}}} {{components=@{repeating_lvl-6-spells_18_components}}} {{range=@{repeating_lvl-6-spells_18_range}}} {{targets=@{repeating_lvl-6-spells_18_targets}}} {{duration=@{repeating_lvl-6-spells_18_duration}}} {{saving_throw=@{repeating_lvl-6-spells_18_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_18_sr}}} {{description=@{repeating_lvl-6-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_19_Cast" title="%{selected|repeating_lvl-6-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_19_name}}} {{school=@{repeating_lvl-6-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_19_cast-time}}} {{components=@{repeating_lvl-6-spells_19_components}}} {{range=@{repeating_lvl-6-spells_19_range}}} {{targets=@{repeating_lvl-6-spells_19_targets}}} {{duration=@{repeating_lvl-6-spells_19_duration}}} {{saving_throw=@{repeating_lvl-6-spells_19_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_19_sr}}} {{description=@{repeating_lvl-6-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_20_Cast" title="%{selected|repeating_lvl-6-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_20_name}}} {{school=@{repeating_lvl-6-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_20_cast-time}}} {{components=@{repeating_lvl-6-spells_20_components}}} {{range=@{repeating_lvl-6-spells_20_range}}} {{targets=@{repeating_lvl-6-spells_20_targets}}} {{duration=@{repeating_lvl-6-spells_20_duration}}} {{saving_throw=@{repeating_lvl-6-spells_20_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_20_sr}}} {{description=@{repeating_lvl-6-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_21_Cast" title="%{selected|repeating_lvl-6-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_21_name}}} {{school=@{repeating_lvl-6-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_21_cast-time}}} {{components=@{repeating_lvl-6-spells_21_components}}} {{range=@{repeating_lvl-6-spells_21_range}}} {{targets=@{repeating_lvl-6-spells_21_targets}}} {{duration=@{repeating_lvl-6-spells_21_duration}}} {{saving_throw=@{repeating_lvl-6-spells_21_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_21_sr}}} {{description=@{repeating_lvl-6-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_22_Cast" title="%{selected|repeating_lvl-6-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_22_name}}} {{school=@{repeating_lvl-6-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_22_cast-time}}} {{components=@{repeating_lvl-6-spells_22_components}}} {{range=@{repeating_lvl-6-spells_22_range}}} {{targets=@{repeating_lvl-6-spells_22_targets}}} {{duration=@{repeating_lvl-6-spells_22_duration}}} {{saving_throw=@{repeating_lvl-6-spells_22_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_22_sr}}} {{description=@{repeating_lvl-6-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_23_Cast" title="%{selected|repeating_lvl-6-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_23_name}}} {{school=@{repeating_lvl-6-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_23_cast-time}}} {{components=@{repeating_lvl-6-spells_23_components}}} {{range=@{repeating_lvl-6-spells_23_range}}} {{targets=@{repeating_lvl-6-spells_23_targets}}} {{duration=@{repeating_lvl-6-spells_23_duration}}} {{saving_throw=@{repeating_lvl-6-spells_23_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_23_sr}}} {{description=@{repeating_lvl-6-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_24_Cast" title="%{selected|repeating_lvl-6-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_24_name}}} {{school=@{repeating_lvl-6-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_24_cast-time}}} {{components=@{repeating_lvl-6-spells_24_components}}} {{range=@{repeating_lvl-6-spells_24_range}}} {{targets=@{repeating_lvl-6-spells_24_targets}}} {{duration=@{repeating_lvl-6-spells_24_duration}}} {{saving_throw=@{repeating_lvl-6-spells_24_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_24_sr}}} {{description=@{repeating_lvl-6-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_25_Cast" title="%{selected|repeating_lvl-6-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_25_name}}} {{school=@{repeating_lvl-6-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_25_cast-time}}} {{components=@{repeating_lvl-6-spells_25_components}}} {{range=@{repeating_lvl-6-spells_25_range}}} {{targets=@{repeating_lvl-6-spells_25_targets}}} {{duration=@{repeating_lvl-6-spells_25_duration}}} {{saving_throw=@{repeating_lvl-6-spells_25_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_25_sr}}} {{description=@{repeating_lvl-6-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-6-spells_26_Cast" title="%{selected|repeating_lvl-6-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-6-spells_26_name}}} {{school=@{repeating_lvl-6-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-6-spells_26_cast-time}}} {{components=@{repeating_lvl-6-spells_26_components}}} {{range=@{repeating_lvl-6-spells_26_range}}} {{targets=@{repeating_lvl-6-spells_26_targets}}} {{duration=@{repeating_lvl-6-spells_26_duration}}} {{saving_throw=@{repeating_lvl-6-spells_26_save}}} {{dc=[[ @{spellclass-0-level-6-savedc} + [[ @{repeating_lvl-6-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-6-spells_26_sr}}} {{description=@{repeating_lvl-6-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -7424,11 +6742,11 @@
                     </div>
                     <fieldset class="repeating_lvl-6-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-6-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-6-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -7436,21 +6754,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-6-spells_X_spell_level}" type="number" value="6" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-6-spells_$X_spell_level}" type="number" value="6" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-6-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-6-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -7461,15 +6779,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-6-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-6-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-6-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-6-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-6-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-6-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-6-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-6-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-6-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-6-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -7486,16 +6804,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-6-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-6-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-6-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-6-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-6-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-6-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-6-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-6-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-6-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-6-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-6-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-6-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-6-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-6-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-6-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-6-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -7504,8 +6822,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-6-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-6-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-6-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-6-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>				
@@ -7513,67 +6831,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-7">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjutos Nivel 7</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_0_Cast" title="%{selected|repeating_lvl-7-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_0_name}}} {{school=@{repeating_lvl-7-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_0_cast-time}}} {{components=@{repeating_lvl-7-spells_0_components}}} {{range=@{repeating_lvl-7-spells_0_range}}} {{targets=@{repeating_lvl-7-spells_0_targets}}} {{duration=@{repeating_lvl-7-spells_0_duration}}} {{saving_throw=@{repeating_lvl-7-spells_0_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_0_sr}}} {{description=@{repeating_lvl-7-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_1_Cast" title="%{selected|repeating_lvl-7-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_1_name}}} {{school=@{repeating_lvl-7-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_1_cast-time}}} {{components=@{repeating_lvl-7-spells_1_components}}} {{range=@{repeating_lvl-7-spells_1_range}}} {{targets=@{repeating_lvl-7-spells_1_targets}}} {{duration=@{repeating_lvl-7-spells_1_duration}}} {{saving_throw=@{repeating_lvl-7-spells_1_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_1_sr}}} {{description=@{repeating_lvl-7-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_2_Cast" title="%{selected|repeating_lvl-7-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_2_name}}} {{school=@{repeating_lvl-7-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_2_cast-time}}} {{components=@{repeating_lvl-7-spells_2_components}}} {{range=@{repeating_lvl-7-spells_2_range}}} {{targets=@{repeating_lvl-7-spells_2_targets}}} {{duration=@{repeating_lvl-7-spells_2_duration}}} {{saving_throw=@{repeating_lvl-7-spells_2_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_2_sr}}} {{description=@{repeating_lvl-7-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_3_Cast" title="%{selected|repeating_lvl-7-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_3_name}}} {{school=@{repeating_lvl-7-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_3_cast-time}}} {{components=@{repeating_lvl-7-spells_3_components}}} {{range=@{repeating_lvl-7-spells_3_range}}} {{targets=@{repeating_lvl-7-spells_3_targets}}} {{duration=@{repeating_lvl-7-spells_3_duration}}} {{saving_throw=@{repeating_lvl-7-spells_3_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_3_sr}}} {{description=@{repeating_lvl-7-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_4_Cast" title="%{selected|repeating_lvl-7-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_4_name}}} {{school=@{repeating_lvl-7-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_4_cast-time}}} {{components=@{repeating_lvl-7-spells_4_components}}} {{range=@{repeating_lvl-7-spells_4_range}}} {{targets=@{repeating_lvl-7-spells_4_targets}}} {{duration=@{repeating_lvl-7-spells_4_duration}}} {{saving_throw=@{repeating_lvl-7-spells_4_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_4_sr}}} {{description=@{repeating_lvl-7-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_5_Cast" title="%{selected|repeating_lvl-7-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_5_name}}} {{school=@{repeating_lvl-7-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_5_cast-time}}} {{components=@{repeating_lvl-7-spells_5_components}}} {{range=@{repeating_lvl-7-spells_5_range}}} {{targets=@{repeating_lvl-7-spells_5_targets}}} {{duration=@{repeating_lvl-7-spells_5_duration}}} {{saving_throw=@{repeating_lvl-7-spells_5_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_5_sr}}} {{description=@{repeating_lvl-7-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_6_Cast" title="%{selected|repeating_lvl-7-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_6_name}}} {{school=@{repeating_lvl-7-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_6_cast-time}}} {{components=@{repeating_lvl-7-spells_6_components}}} {{range=@{repeating_lvl-7-spells_6_range}}} {{targets=@{repeating_lvl-7-spells_6_targets}}} {{duration=@{repeating_lvl-7-spells_6_duration}}} {{saving_throw=@{repeating_lvl-7-spells_6_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_6_sr}}} {{description=@{repeating_lvl-7-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_7_Cast" title="%{selected|repeating_lvl-7-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_7_name}}} {{school=@{repeating_lvl-7-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_7_cast-time}}} {{components=@{repeating_lvl-7-spells_7_components}}} {{range=@{repeating_lvl-7-spells_7_range}}} {{targets=@{repeating_lvl-7-spells_7_targets}}} {{duration=@{repeating_lvl-7-spells_7_duration}}} {{saving_throw=@{repeating_lvl-7-spells_7_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_7_sr}}} {{description=@{repeating_lvl-7-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_8_Cast" title="%{selected|repeating_lvl-7-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_8_name}}} {{school=@{repeating_lvl-7-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_8_cast-time}}} {{components=@{repeating_lvl-7-spells_8_components}}} {{range=@{repeating_lvl-7-spells_8_range}}} {{targets=@{repeating_lvl-7-spells_8_targets}}} {{duration=@{repeating_lvl-7-spells_8_duration}}} {{saving_throw=@{repeating_lvl-7-spells_8_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_8_sr}}} {{description=@{repeating_lvl-7-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_9_Cast" title="%{selected|repeating_lvl-7-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_9_name}}} {{school=@{repeating_lvl-7-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_9_cast-time}}} {{components=@{repeating_lvl-7-spells_9_components}}} {{range=@{repeating_lvl-7-spells_9_range}}} {{targets=@{repeating_lvl-7-spells_9_targets}}} {{duration=@{repeating_lvl-7-spells_9_duration}}} {{saving_throw=@{repeating_lvl-7-spells_9_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_9_sr}}} {{description=@{repeating_lvl-7-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_10_Cast" title="%{selected|repeating_lvl-7-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_10_name}}} {{school=@{repeating_lvl-7-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_10_cast-time}}} {{components=@{repeating_lvl-7-spells_10_components}}} {{range=@{repeating_lvl-7-spells_10_range}}} {{targets=@{repeating_lvl-7-spells_10_targets}}} {{duration=@{repeating_lvl-7-spells_10_duration}}} {{saving_throw=@{repeating_lvl-7-spells_10_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_10_sr}}} {{description=@{repeating_lvl-7-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_11_Cast" title="%{selected|repeating_lvl-7-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_11_name}}} {{school=@{repeating_lvl-7-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_11_cast-time}}} {{components=@{repeating_lvl-7-spells_11_components}}} {{range=@{repeating_lvl-7-spells_11_range}}} {{targets=@{repeating_lvl-7-spells_11_targets}}} {{duration=@{repeating_lvl-7-spells_11_duration}}} {{saving_throw=@{repeating_lvl-7-spells_11_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_11_sr}}} {{description=@{repeating_lvl-7-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_12_Cast" title="%{selected|repeating_lvl-7-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_12_name}}} {{school=@{repeating_lvl-7-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_12_cast-time}}} {{components=@{repeating_lvl-7-spells_12_components}}} {{range=@{repeating_lvl-7-spells_12_range}}} {{targets=@{repeating_lvl-7-spells_12_targets}}} {{duration=@{repeating_lvl-7-spells_12_duration}}} {{saving_throw=@{repeating_lvl-7-spells_12_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_12_sr}}} {{description=@{repeating_lvl-7-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_13_Cast" title="%{selected|repeating_lvl-7-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_13_name}}} {{school=@{repeating_lvl-7-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_13_cast-time}}} {{components=@{repeating_lvl-7-spells_13_components}}} {{range=@{repeating_lvl-7-spells_13_range}}} {{targets=@{repeating_lvl-7-spells_13_targets}}} {{duration=@{repeating_lvl-7-spells_13_duration}}} {{saving_throw=@{repeating_lvl-7-spells_13_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_13_sr}}} {{description=@{repeating_lvl-7-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_14_Cast" title="%{selected|repeating_lvl-7-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_14_name}}} {{school=@{repeating_lvl-7-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_14_cast-time}}} {{components=@{repeating_lvl-7-spells_14_components}}} {{range=@{repeating_lvl-7-spells_14_range}}} {{targets=@{repeating_lvl-7-spells_14_targets}}} {{duration=@{repeating_lvl-7-spells_14_duration}}} {{saving_throw=@{repeating_lvl-7-spells_14_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_14_sr}}} {{description=@{repeating_lvl-7-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_15_Cast" title="%{selected|repeating_lvl-7-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_15_name}}} {{school=@{repeating_lvl-7-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_15_cast-time}}} {{components=@{repeating_lvl-7-spells_15_components}}} {{range=@{repeating_lvl-7-spells_15_range}}} {{targets=@{repeating_lvl-7-spells_15_targets}}} {{duration=@{repeating_lvl-7-spells_15_duration}}} {{saving_throw=@{repeating_lvl-7-spells_15_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_15_sr}}} {{description=@{repeating_lvl-7-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_16_Cast" title="%{selected|repeating_lvl-7-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_16_name}}} {{school=@{repeating_lvl-7-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_16_cast-time}}} {{components=@{repeating_lvl-7-spells_16_components}}} {{range=@{repeating_lvl-7-spells_16_range}}} {{targets=@{repeating_lvl-7-spells_16_targets}}} {{duration=@{repeating_lvl-7-spells_16_duration}}} {{saving_throw=@{repeating_lvl-7-spells_16_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_16_sr}}} {{description=@{repeating_lvl-7-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_17_Cast" title="%{selected|repeating_lvl-7-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_17_name}}} {{school=@{repeating_lvl-7-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_17_cast-time}}} {{components=@{repeating_lvl-7-spells_17_components}}} {{range=@{repeating_lvl-7-spells_17_range}}} {{targets=@{repeating_lvl-7-spells_17_targets}}} {{duration=@{repeating_lvl-7-spells_17_duration}}} {{saving_throw=@{repeating_lvl-7-spells_17_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_17_sr}}} {{description=@{repeating_lvl-7-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_18_Cast" title="%{selected|repeating_lvl-7-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_18_name}}} {{school=@{repeating_lvl-7-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_18_cast-time}}} {{components=@{repeating_lvl-7-spells_18_components}}} {{range=@{repeating_lvl-7-spells_18_range}}} {{targets=@{repeating_lvl-7-spells_18_targets}}} {{duration=@{repeating_lvl-7-spells_18_duration}}} {{saving_throw=@{repeating_lvl-7-spells_18_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_18_sr}}} {{description=@{repeating_lvl-7-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_19_Cast" title="%{selected|repeating_lvl-7-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_19_name}}} {{school=@{repeating_lvl-7-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_19_cast-time}}} {{components=@{repeating_lvl-7-spells_19_components}}} {{range=@{repeating_lvl-7-spells_19_range}}} {{targets=@{repeating_lvl-7-spells_19_targets}}} {{duration=@{repeating_lvl-7-spells_19_duration}}} {{saving_throw=@{repeating_lvl-7-spells_19_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_19_sr}}} {{description=@{repeating_lvl-7-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_20_Cast" title="%{selected|repeating_lvl-7-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_20_name}}} {{school=@{repeating_lvl-7-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_20_cast-time}}} {{components=@{repeating_lvl-7-spells_20_components}}} {{range=@{repeating_lvl-7-spells_20_range}}} {{targets=@{repeating_lvl-7-spells_20_targets}}} {{duration=@{repeating_lvl-7-spells_20_duration}}} {{saving_throw=@{repeating_lvl-7-spells_20_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_20_sr}}} {{description=@{repeating_lvl-7-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_21_Cast" title="%{selected|repeating_lvl-7-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_21_name}}} {{school=@{repeating_lvl-7-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_21_cast-time}}} {{components=@{repeating_lvl-7-spells_21_components}}} {{range=@{repeating_lvl-7-spells_21_range}}} {{targets=@{repeating_lvl-7-spells_21_targets}}} {{duration=@{repeating_lvl-7-spells_21_duration}}} {{saving_throw=@{repeating_lvl-7-spells_21_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_21_sr}}} {{description=@{repeating_lvl-7-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_22_Cast" title="%{selected|repeating_lvl-7-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_22_name}}} {{school=@{repeating_lvl-7-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_22_cast-time}}} {{components=@{repeating_lvl-7-spells_22_components}}} {{range=@{repeating_lvl-7-spells_22_range}}} {{targets=@{repeating_lvl-7-spells_22_targets}}} {{duration=@{repeating_lvl-7-spells_22_duration}}} {{saving_throw=@{repeating_lvl-7-spells_22_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_22_sr}}} {{description=@{repeating_lvl-7-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_23_Cast" title="%{selected|repeating_lvl-7-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_23_name}}} {{school=@{repeating_lvl-7-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_23_cast-time}}} {{components=@{repeating_lvl-7-spells_23_components}}} {{range=@{repeating_lvl-7-spells_23_range}}} {{targets=@{repeating_lvl-7-spells_23_targets}}} {{duration=@{repeating_lvl-7-spells_23_duration}}} {{saving_throw=@{repeating_lvl-7-spells_23_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_23_sr}}} {{description=@{repeating_lvl-7-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_24_Cast" title="%{selected|repeating_lvl-7-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_24_name}}} {{school=@{repeating_lvl-7-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_24_cast-time}}} {{components=@{repeating_lvl-7-spells_24_components}}} {{range=@{repeating_lvl-7-spells_24_range}}} {{targets=@{repeating_lvl-7-spells_24_targets}}} {{duration=@{repeating_lvl-7-spells_24_duration}}} {{saving_throw=@{repeating_lvl-7-spells_24_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_24_sr}}} {{description=@{repeating_lvl-7-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_25_Cast" title="%{selected|repeating_lvl-7-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_25_name}}} {{school=@{repeating_lvl-7-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_25_cast-time}}} {{components=@{repeating_lvl-7-spells_25_components}}} {{range=@{repeating_lvl-7-spells_25_range}}} {{targets=@{repeating_lvl-7-spells_25_targets}}} {{duration=@{repeating_lvl-7-spells_25_duration}}} {{saving_throw=@{repeating_lvl-7-spells_25_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_25_sr}}} {{description=@{repeating_lvl-7-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-7-spells_26_Cast" title="%{selected|repeating_lvl-7-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-7-spells_26_name}}} {{school=@{repeating_lvl-7-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-7-spells_26_cast-time}}} {{components=@{repeating_lvl-7-spells_26_components}}} {{range=@{repeating_lvl-7-spells_26_range}}} {{targets=@{repeating_lvl-7-spells_26_targets}}} {{duration=@{repeating_lvl-7-spells_26_duration}}} {{saving_throw=@{repeating_lvl-7-spells_26_save}}} {{dc=[[ @{spellclass-0-level-7-savedc} + [[ @{repeating_lvl-7-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-7-spells_26_sr}}} {{description=@{repeating_lvl-7-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -7581,11 +6838,11 @@
                     </div>
                     <fieldset class="repeating_lvl-7-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-7-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-7-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -7593,21 +6850,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-7-spells_X_spell_level}" type="number" value="7" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-7-spells_$X_spell_level}" type="number" value="7" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-7-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-7-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -7618,15 +6875,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-7-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-7-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-7-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-7-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-7-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-7-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-7-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-7-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-7-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-7-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -7643,16 +6900,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-7-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-7-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-7-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-7-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-7-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-7-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-7-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-7-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-7-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-7-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-7-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-7-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-7-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-7-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-7-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-7-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -7661,8 +6918,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-7-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-7-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-7-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-7-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>				
@@ -7670,67 +6927,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-8">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 8</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_0_Cast" title="%{selected|repeating_lvl-8-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_0_name}}} {{school=@{repeating_lvl-8-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_0_cast-time}}} {{components=@{repeating_lvl-8-spells_0_components}}} {{range=@{repeating_lvl-8-spells_0_range}}} {{targets=@{repeating_lvl-8-spells_0_targets}}} {{duration=@{repeating_lvl-8-spells_0_duration}}} {{saving_throw=@{repeating_lvl-8-spells_0_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_0_sr}}} {{description=@{repeating_lvl-8-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_1_Cast" title="%{selected|repeating_lvl-8-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_1_name}}} {{school=@{repeating_lvl-8-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_1_cast-time}}} {{components=@{repeating_lvl-8-spells_1_components}}} {{range=@{repeating_lvl-8-spells_1_range}}} {{targets=@{repeating_lvl-8-spells_1_targets}}} {{duration=@{repeating_lvl-8-spells_1_duration}}} {{saving_throw=@{repeating_lvl-8-spells_1_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_1_sr}}} {{description=@{repeating_lvl-8-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_2_Cast" title="%{selected|repeating_lvl-8-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_2_name}}} {{school=@{repeating_lvl-8-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_2_cast-time}}} {{components=@{repeating_lvl-8-spells_2_components}}} {{range=@{repeating_lvl-8-spells_2_range}}} {{targets=@{repeating_lvl-8-spells_2_targets}}} {{duration=@{repeating_lvl-8-spells_2_duration}}} {{saving_throw=@{repeating_lvl-8-spells_2_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_2_sr}}} {{description=@{repeating_lvl-8-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_3_Cast" title="%{selected|repeating_lvl-8-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_3_name}}} {{school=@{repeating_lvl-8-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_3_cast-time}}} {{components=@{repeating_lvl-8-spells_3_components}}} {{range=@{repeating_lvl-8-spells_3_range}}} {{targets=@{repeating_lvl-8-spells_3_targets}}} {{duration=@{repeating_lvl-8-spells_3_duration}}} {{saving_throw=@{repeating_lvl-8-spells_3_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_3_sr}}} {{description=@{repeating_lvl-8-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_4_Cast" title="%{selected|repeating_lvl-8-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_4_name}}} {{school=@{repeating_lvl-8-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_4_cast-time}}} {{components=@{repeating_lvl-8-spells_4_components}}} {{range=@{repeating_lvl-8-spells_4_range}}} {{targets=@{repeating_lvl-8-spells_4_targets}}} {{duration=@{repeating_lvl-8-spells_4_duration}}} {{saving_throw=@{repeating_lvl-8-spells_4_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_4_sr}}} {{description=@{repeating_lvl-8-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_5_Cast" title="%{selected|repeating_lvl-8-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_5_name}}} {{school=@{repeating_lvl-8-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_5_cast-time}}} {{components=@{repeating_lvl-8-spells_5_components}}} {{range=@{repeating_lvl-8-spells_5_range}}} {{targets=@{repeating_lvl-8-spells_5_targets}}} {{duration=@{repeating_lvl-8-spells_5_duration}}} {{saving_throw=@{repeating_lvl-8-spells_5_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_5_sr}}} {{description=@{repeating_lvl-8-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_6_Cast" title="%{selected|repeating_lvl-8-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_6_name}}} {{school=@{repeating_lvl-8-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_6_cast-time}}} {{components=@{repeating_lvl-8-spells_6_components}}} {{range=@{repeating_lvl-8-spells_6_range}}} {{targets=@{repeating_lvl-8-spells_6_targets}}} {{duration=@{repeating_lvl-8-spells_6_duration}}} {{saving_throw=@{repeating_lvl-8-spells_6_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_6_sr}}} {{description=@{repeating_lvl-8-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_7_Cast" title="%{selected|repeating_lvl-8-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_7_name}}} {{school=@{repeating_lvl-8-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_7_cast-time}}} {{components=@{repeating_lvl-8-spells_7_components}}} {{range=@{repeating_lvl-8-spells_7_range}}} {{targets=@{repeating_lvl-8-spells_7_targets}}} {{duration=@{repeating_lvl-8-spells_7_duration}}} {{saving_throw=@{repeating_lvl-8-spells_7_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_7_sr}}} {{description=@{repeating_lvl-8-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_8_Cast" title="%{selected|repeating_lvl-8-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_8_name}}} {{school=@{repeating_lvl-8-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_8_cast-time}}} {{components=@{repeating_lvl-8-spells_8_components}}} {{range=@{repeating_lvl-8-spells_8_range}}} {{targets=@{repeating_lvl-8-spells_8_targets}}} {{duration=@{repeating_lvl-8-spells_8_duration}}} {{saving_throw=@{repeating_lvl-8-spells_8_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_8_sr}}} {{description=@{repeating_lvl-8-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_9_Cast" title="%{selected|repeating_lvl-8-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_9_name}}} {{school=@{repeating_lvl-8-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_9_cast-time}}} {{components=@{repeating_lvl-8-spells_9_components}}} {{range=@{repeating_lvl-8-spells_9_range}}} {{targets=@{repeating_lvl-8-spells_9_targets}}} {{duration=@{repeating_lvl-8-spells_9_duration}}} {{saving_throw=@{repeating_lvl-8-spells_9_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_9_sr}}} {{description=@{repeating_lvl-8-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_10_Cast" title="%{selected|repeating_lvl-8-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_10_name}}} {{school=@{repeating_lvl-8-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_10_cast-time}}} {{components=@{repeating_lvl-8-spells_10_components}}} {{range=@{repeating_lvl-8-spells_10_range}}} {{targets=@{repeating_lvl-8-spells_10_targets}}} {{duration=@{repeating_lvl-8-spells_10_duration}}} {{saving_throw=@{repeating_lvl-8-spells_10_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_10_sr}}} {{description=@{repeating_lvl-8-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_11_Cast" title="%{selected|repeating_lvl-8-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_11_name}}} {{school=@{repeating_lvl-8-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_11_cast-time}}} {{components=@{repeating_lvl-8-spells_11_components}}} {{range=@{repeating_lvl-8-spells_11_range}}} {{targets=@{repeating_lvl-8-spells_11_targets}}} {{duration=@{repeating_lvl-8-spells_11_duration}}} {{saving_throw=@{repeating_lvl-8-spells_11_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_11_sr}}} {{description=@{repeating_lvl-8-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_12_Cast" title="%{selected|repeating_lvl-8-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_12_name}}} {{school=@{repeating_lvl-8-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_12_cast-time}}} {{components=@{repeating_lvl-8-spells_12_components}}} {{range=@{repeating_lvl-8-spells_12_range}}} {{targets=@{repeating_lvl-8-spells_12_targets}}} {{duration=@{repeating_lvl-8-spells_12_duration}}} {{saving_throw=@{repeating_lvl-8-spells_12_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_12_sr}}} {{description=@{repeating_lvl-8-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_13_Cast" title="%{selected|repeating_lvl-8-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_13_name}}} {{school=@{repeating_lvl-8-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_13_cast-time}}} {{components=@{repeating_lvl-8-spells_13_components}}} {{range=@{repeating_lvl-8-spells_13_range}}} {{targets=@{repeating_lvl-8-spells_13_targets}}} {{duration=@{repeating_lvl-8-spells_13_duration}}} {{saving_throw=@{repeating_lvl-8-spells_13_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_13_sr}}} {{description=@{repeating_lvl-8-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_14_Cast" title="%{selected|repeating_lvl-8-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_14_name}}} {{school=@{repeating_lvl-8-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_14_cast-time}}} {{components=@{repeating_lvl-8-spells_14_components}}} {{range=@{repeating_lvl-8-spells_14_range}}} {{targets=@{repeating_lvl-8-spells_14_targets}}} {{duration=@{repeating_lvl-8-spells_14_duration}}} {{saving_throw=@{repeating_lvl-8-spells_14_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_14_sr}}} {{description=@{repeating_lvl-8-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_15_Cast" title="%{selected|repeating_lvl-8-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_15_name}}} {{school=@{repeating_lvl-8-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_15_cast-time}}} {{components=@{repeating_lvl-8-spells_15_components}}} {{range=@{repeating_lvl-8-spells_15_range}}} {{targets=@{repeating_lvl-8-spells_15_targets}}} {{duration=@{repeating_lvl-8-spells_15_duration}}} {{saving_throw=@{repeating_lvl-8-spells_15_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_15_sr}}} {{description=@{repeating_lvl-8-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_16_Cast" title="%{selected|repeating_lvl-8-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_16_name}}} {{school=@{repeating_lvl-8-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_16_cast-time}}} {{components=@{repeating_lvl-8-spells_16_components}}} {{range=@{repeating_lvl-8-spells_16_range}}} {{targets=@{repeating_lvl-8-spells_16_targets}}} {{duration=@{repeating_lvl-8-spells_16_duration}}} {{saving_throw=@{repeating_lvl-8-spells_16_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_16_sr}}} {{description=@{repeating_lvl-8-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_17_Cast" title="%{selected|repeating_lvl-8-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_17_name}}} {{school=@{repeating_lvl-8-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_17_cast-time}}} {{components=@{repeating_lvl-8-spells_17_components}}} {{range=@{repeating_lvl-8-spells_17_range}}} {{targets=@{repeating_lvl-8-spells_17_targets}}} {{duration=@{repeating_lvl-8-spells_17_duration}}} {{saving_throw=@{repeating_lvl-8-spells_17_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_17_sr}}} {{description=@{repeating_lvl-8-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_18_Cast" title="%{selected|repeating_lvl-8-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_18_name}}} {{school=@{repeating_lvl-8-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_18_cast-time}}} {{components=@{repeating_lvl-8-spells_18_components}}} {{range=@{repeating_lvl-8-spells_18_range}}} {{targets=@{repeating_lvl-8-spells_18_targets}}} {{duration=@{repeating_lvl-8-spells_18_duration}}} {{saving_throw=@{repeating_lvl-8-spells_18_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_18_sr}}} {{description=@{repeating_lvl-8-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_19_Cast" title="%{selected|repeating_lvl-8-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_19_name}}} {{school=@{repeating_lvl-8-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_19_cast-time}}} {{components=@{repeating_lvl-8-spells_19_components}}} {{range=@{repeating_lvl-8-spells_19_range}}} {{targets=@{repeating_lvl-8-spells_19_targets}}} {{duration=@{repeating_lvl-8-spells_19_duration}}} {{saving_throw=@{repeating_lvl-8-spells_19_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_19_sr}}} {{description=@{repeating_lvl-8-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_20_Cast" title="%{selected|repeating_lvl-8-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_20_name}}} {{school=@{repeating_lvl-8-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_20_cast-time}}} {{components=@{repeating_lvl-8-spells_20_components}}} {{range=@{repeating_lvl-8-spells_20_range}}} {{targets=@{repeating_lvl-8-spells_20_targets}}} {{duration=@{repeating_lvl-8-spells_20_duration}}} {{saving_throw=@{repeating_lvl-8-spells_20_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_20_sr}}} {{description=@{repeating_lvl-8-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_21_Cast" title="%{selected|repeating_lvl-8-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_21_name}}} {{school=@{repeating_lvl-8-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_21_cast-time}}} {{components=@{repeating_lvl-8-spells_21_components}}} {{range=@{repeating_lvl-8-spells_21_range}}} {{targets=@{repeating_lvl-8-spells_21_targets}}} {{duration=@{repeating_lvl-8-spells_21_duration}}} {{saving_throw=@{repeating_lvl-8-spells_21_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_21_sr}}} {{description=@{repeating_lvl-8-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_22_Cast" title="%{selected|repeating_lvl-8-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_22_name}}} {{school=@{repeating_lvl-8-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_22_cast-time}}} {{components=@{repeating_lvl-8-spells_22_components}}} {{range=@{repeating_lvl-8-spells_22_range}}} {{targets=@{repeating_lvl-8-spells_22_targets}}} {{duration=@{repeating_lvl-8-spells_22_duration}}} {{saving_throw=@{repeating_lvl-8-spells_22_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_22_sr}}} {{description=@{repeating_lvl-8-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_23_Cast" title="%{selected|repeating_lvl-8-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_23_name}}} {{school=@{repeating_lvl-8-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_23_cast-time}}} {{components=@{repeating_lvl-8-spells_23_components}}} {{range=@{repeating_lvl-8-spells_23_range}}} {{targets=@{repeating_lvl-8-spells_23_targets}}} {{duration=@{repeating_lvl-8-spells_23_duration}}} {{saving_throw=@{repeating_lvl-8-spells_23_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_23_sr}}} {{description=@{repeating_lvl-8-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_24_Cast" title="%{selected|repeating_lvl-8-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_24_name}}} {{school=@{repeating_lvl-8-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_24_cast-time}}} {{components=@{repeating_lvl-8-spells_24_components}}} {{range=@{repeating_lvl-8-spells_24_range}}} {{targets=@{repeating_lvl-8-spells_24_targets}}} {{duration=@{repeating_lvl-8-spells_24_duration}}} {{saving_throw=@{repeating_lvl-8-spells_24_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_24_sr}}} {{description=@{repeating_lvl-8-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_25_Cast" title="%{selected|repeating_lvl-8-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_25_name}}} {{school=@{repeating_lvl-8-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_25_cast-time}}} {{components=@{repeating_lvl-8-spells_25_components}}} {{range=@{repeating_lvl-8-spells_25_range}}} {{targets=@{repeating_lvl-8-spells_25_targets}}} {{duration=@{repeating_lvl-8-spells_25_duration}}} {{saving_throw=@{repeating_lvl-8-spells_25_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_25_sr}}} {{description=@{repeating_lvl-8-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-8-spells_26_Cast" title="%{selected|repeating_lvl-8-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-8-spells_26_name}}} {{school=@{repeating_lvl-8-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-8-spells_26_cast-time}}} {{components=@{repeating_lvl-8-spells_26_components}}} {{range=@{repeating_lvl-8-spells_26_range}}} {{targets=@{repeating_lvl-8-spells_26_targets}}} {{duration=@{repeating_lvl-8-spells_26_duration}}} {{saving_throw=@{repeating_lvl-8-spells_26_save}}} {{dc=[[ @{spellclass-0-level-8-savedc} + [[ @{repeating_lvl-8-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-8-spells_26_sr}}} {{description=@{repeating_lvl-8-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -7738,11 +6934,11 @@
                     </div>
                     <fieldset class="repeating_lvl-8-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-8-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-8-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -7750,21 +6946,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-8-spells_X_spell_level}" type="number" value="8" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-8-spells_$X_spell_level}" type="number" value="8" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duraciónn</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duraciónn</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-8-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-8-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -7775,15 +6971,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-8-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-8-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-8-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-8-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-8-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-8-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-8-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-8-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-8-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-8-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -7800,16 +6996,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-8-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-8-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-8-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-8-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-8-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-8-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-8-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-8-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-8-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-8-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-8-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-8-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-8-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-8-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-8-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-8-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -7818,8 +7014,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-8-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-8-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-8-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-8-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>				
@@ -7827,67 +7023,6 @@
                 </div>
             </div>
             <div class="sheet-section sheet-section-level-9">
-                <div class="sheet-table sheet-sect">
-                    <span class="sheet-table-name">Botones Conjuros Nivel 9</span>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-header">0</span>
-                        <span class="sheet-table-header">1</span>
-                        <span class="sheet-table-header">2</span>
-                        <span class="sheet-table-header">3</span>
-                        <span class="sheet-table-header">4</span>
-                        <span class="sheet-table-header">5</span>
-                        <span class="sheet-table-header">6</span>
-                        <span class="sheet-table-header">7</span>
-                        <span class="sheet-table-header">8</span>
-                        <span class="sheet-table-header">9</span>
-                        <span class="sheet-table-header">10</span>
-                        <span class="sheet-table-header">11</span>
-                        <span class="sheet-table-header">12</span>
-                        <span class="sheet-table-header">13</span>
-                        <span class="sheet-table-header">14</span>
-                        <span class="sheet-table-header">15</span>
-                        <span class="sheet-table-header">16</span>
-                        <span class="sheet-table-header">17</span>
-                        <span class="sheet-table-header">18</span>
-                        <span class="sheet-table-header">19</span>
-                        <span class="sheet-table-header">20</span>
-                        <span class="sheet-table-header">21</span>
-                        <span class="sheet-table-header">22</span>
-                        <span class="sheet-table-header">23</span>
-                        <span class="sheet-table-header">24</span>
-                        <span class="sheet-table-header">25</span>
-                        <span class="sheet-table-header">26</span>
-                    </div>
-                    <div class="sheet-table-row">
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_0_Cast" title="%{selected|repeating_lvl-9-spells_0_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_0_name}}} {{school=@{repeating_lvl-9-spells_0_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_0_cast-time}}} {{components=@{repeating_lvl-9-spells_0_components}}} {{range=@{repeating_lvl-9-spells_0_range}}} {{targets=@{repeating_lvl-9-spells_0_targets}}} {{duration=@{repeating_lvl-9-spells_0_duration}}} {{saving_throw=@{repeating_lvl-9-spells_0_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_0_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_0_sr}}} {{description=@{repeating_lvl-9-spells_0_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_1_Cast" title="%{selected|repeating_lvl-9-spells_1_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_1_name}}} {{school=@{repeating_lvl-9-spells_1_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_1_cast-time}}} {{components=@{repeating_lvl-9-spells_1_components}}} {{range=@{repeating_lvl-9-spells_1_range}}} {{targets=@{repeating_lvl-9-spells_1_targets}}} {{duration=@{repeating_lvl-9-spells_1_duration}}} {{saving_throw=@{repeating_lvl-9-spells_1_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_1_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_1_sr}}} {{description=@{repeating_lvl-9-spells_1_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_2_Cast" title="%{selected|repeating_lvl-9-spells_2_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_2_name}}} {{school=@{repeating_lvl-9-spells_2_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_2_cast-time}}} {{components=@{repeating_lvl-9-spells_2_components}}} {{range=@{repeating_lvl-9-spells_2_range}}} {{targets=@{repeating_lvl-9-spells_2_targets}}} {{duration=@{repeating_lvl-9-spells_2_duration}}} {{saving_throw=@{repeating_lvl-9-spells_2_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_2_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_2_sr}}} {{description=@{repeating_lvl-9-spells_2_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_3_Cast" title="%{selected|repeating_lvl-9-spells_3_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_3_name}}} {{school=@{repeating_lvl-9-spells_3_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_3_cast-time}}} {{components=@{repeating_lvl-9-spells_3_components}}} {{range=@{repeating_lvl-9-spells_3_range}}} {{targets=@{repeating_lvl-9-spells_3_targets}}} {{duration=@{repeating_lvl-9-spells_3_duration}}} {{saving_throw=@{repeating_lvl-9-spells_3_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_3_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_3_sr}}} {{description=@{repeating_lvl-9-spells_3_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_4_Cast" title="%{selected|repeating_lvl-9-spells_4_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_4_name}}} {{school=@{repeating_lvl-9-spells_4_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_4_cast-time}}} {{components=@{repeating_lvl-9-spells_4_components}}} {{range=@{repeating_lvl-9-spells_4_range}}} {{targets=@{repeating_lvl-9-spells_4_targets}}} {{duration=@{repeating_lvl-9-spells_4_duration}}} {{saving_throw=@{repeating_lvl-9-spells_4_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_4_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_4_sr}}} {{description=@{repeating_lvl-9-spells_4_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_5_Cast" title="%{selected|repeating_lvl-9-spells_5_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_5_name}}} {{school=@{repeating_lvl-9-spells_5_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_5_cast-time}}} {{components=@{repeating_lvl-9-spells_5_components}}} {{range=@{repeating_lvl-9-spells_5_range}}} {{targets=@{repeating_lvl-9-spells_5_targets}}} {{duration=@{repeating_lvl-9-spells_5_duration}}} {{saving_throw=@{repeating_lvl-9-spells_5_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_5_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_5_sr}}} {{description=@{repeating_lvl-9-spells_5_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_6_Cast" title="%{selected|repeating_lvl-9-spells_6_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_6_name}}} {{school=@{repeating_lvl-9-spells_6_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_6_cast-time}}} {{components=@{repeating_lvl-9-spells_6_components}}} {{range=@{repeating_lvl-9-spells_6_range}}} {{targets=@{repeating_lvl-9-spells_6_targets}}} {{duration=@{repeating_lvl-9-spells_6_duration}}} {{saving_throw=@{repeating_lvl-9-spells_6_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_6_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_6_sr}}} {{description=@{repeating_lvl-9-spells_6_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_7_Cast" title="%{selected|repeating_lvl-9-spells_7_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_7_name}}} {{school=@{repeating_lvl-9-spells_7_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_7_cast-time}}} {{components=@{repeating_lvl-9-spells_7_components}}} {{range=@{repeating_lvl-9-spells_7_range}}} {{targets=@{repeating_lvl-9-spells_7_targets}}} {{duration=@{repeating_lvl-9-spells_7_duration}}} {{saving_throw=@{repeating_lvl-9-spells_7_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_7_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_7_sr}}} {{description=@{repeating_lvl-9-spells_7_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_8_Cast" title="%{selected|repeating_lvl-9-spells_8_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_8_name}}} {{school=@{repeating_lvl-9-spells_8_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_8_cast-time}}} {{components=@{repeating_lvl-9-spells_8_components}}} {{range=@{repeating_lvl-9-spells_8_range}}} {{targets=@{repeating_lvl-9-spells_8_targets}}} {{duration=@{repeating_lvl-9-spells_8_duration}}} {{saving_throw=@{repeating_lvl-9-spells_8_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_8_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_8_sr}}} {{description=@{repeating_lvl-9-spells_8_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_9_Cast" title="%{selected|repeating_lvl-9-spells_9_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_9_name}}} {{school=@{repeating_lvl-9-spells_9_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_9_cast-time}}} {{components=@{repeating_lvl-9-spells_9_components}}} {{range=@{repeating_lvl-9-spells_9_range}}} {{targets=@{repeating_lvl-9-spells_9_targets}}} {{duration=@{repeating_lvl-9-spells_9_duration}}} {{saving_throw=@{repeating_lvl-9-spells_9_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_9_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_9_sr}}} {{description=@{repeating_lvl-9-spells_9_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_10_Cast" title="%{selected|repeating_lvl-9-spells_10_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_10_name}}} {{school=@{repeating_lvl-9-spells_10_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_10_cast-time}}} {{components=@{repeating_lvl-9-spells_10_components}}} {{range=@{repeating_lvl-9-spells_10_range}}} {{targets=@{repeating_lvl-9-spells_10_targets}}} {{duration=@{repeating_lvl-9-spells_10_duration}}} {{saving_throw=@{repeating_lvl-9-spells_10_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_10_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_10_sr}}} {{description=@{repeating_lvl-9-spells_10_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_11_Cast" title="%{selected|repeating_lvl-9-spells_11_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_11_name}}} {{school=@{repeating_lvl-9-spells_11_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_11_cast-time}}} {{components=@{repeating_lvl-9-spells_11_components}}} {{range=@{repeating_lvl-9-spells_11_range}}} {{targets=@{repeating_lvl-9-spells_11_targets}}} {{duration=@{repeating_lvl-9-spells_11_duration}}} {{saving_throw=@{repeating_lvl-9-spells_11_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_11_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_11_sr}}} {{description=@{repeating_lvl-9-spells_11_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_12_Cast" title="%{selected|repeating_lvl-9-spells_12_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_12_name}}} {{school=@{repeating_lvl-9-spells_12_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_12_cast-time}}} {{components=@{repeating_lvl-9-spells_12_components}}} {{range=@{repeating_lvl-9-spells_12_range}}} {{targets=@{repeating_lvl-9-spells_12_targets}}} {{duration=@{repeating_lvl-9-spells_12_duration}}} {{saving_throw=@{repeating_lvl-9-spells_12_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_12_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_12_sr}}} {{description=@{repeating_lvl-9-spells_12_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_13_Cast" title="%{selected|repeating_lvl-9-spells_13_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_13_name}}} {{school=@{repeating_lvl-9-spells_13_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_13_cast-time}}} {{components=@{repeating_lvl-9-spells_13_components}}} {{range=@{repeating_lvl-9-spells_13_range}}} {{targets=@{repeating_lvl-9-spells_13_targets}}} {{duration=@{repeating_lvl-9-spells_13_duration}}} {{saving_throw=@{repeating_lvl-9-spells_13_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_13_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_13_sr}}} {{description=@{repeating_lvl-9-spells_13_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_14_Cast" title="%{selected|repeating_lvl-9-spells_14_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_14_name}}} {{school=@{repeating_lvl-9-spells_14_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_14_cast-time}}} {{components=@{repeating_lvl-9-spells_14_components}}} {{range=@{repeating_lvl-9-spells_14_range}}} {{targets=@{repeating_lvl-9-spells_14_targets}}} {{duration=@{repeating_lvl-9-spells_14_duration}}} {{saving_throw=@{repeating_lvl-9-spells_14_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_14_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_14_sr}}} {{description=@{repeating_lvl-9-spells_14_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_15_Cast" title="%{selected|repeating_lvl-9-spells_15_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_15_name}}} {{school=@{repeating_lvl-9-spells_15_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_15_cast-time}}} {{components=@{repeating_lvl-9-spells_15_components}}} {{range=@{repeating_lvl-9-spells_15_range}}} {{targets=@{repeating_lvl-9-spells_15_targets}}} {{duration=@{repeating_lvl-9-spells_15_duration}}} {{saving_throw=@{repeating_lvl-9-spells_15_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_15_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_15_sr}}} {{description=@{repeating_lvl-9-spells_15_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_16_Cast" title="%{selected|repeating_lvl-9-spells_16_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_16_name}}} {{school=@{repeating_lvl-9-spells_16_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_16_cast-time}}} {{components=@{repeating_lvl-9-spells_16_components}}} {{range=@{repeating_lvl-9-spells_16_range}}} {{targets=@{repeating_lvl-9-spells_16_targets}}} {{duration=@{repeating_lvl-9-spells_16_duration}}} {{saving_throw=@{repeating_lvl-9-spells_16_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_16_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_16_sr}}} {{description=@{repeating_lvl-9-spells_16_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_17_Cast" title="%{selected|repeating_lvl-9-spells_17_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_17_name}}} {{school=@{repeating_lvl-9-spells_17_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_17_cast-time}}} {{components=@{repeating_lvl-9-spells_17_components}}} {{range=@{repeating_lvl-9-spells_17_range}}} {{targets=@{repeating_lvl-9-spells_17_targets}}} {{duration=@{repeating_lvl-9-spells_17_duration}}} {{saving_throw=@{repeating_lvl-9-spells_17_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_17_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_17_sr}}} {{description=@{repeating_lvl-9-spells_17_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_18_Cast" title="%{selected|repeating_lvl-9-spells_18_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_18_name}}} {{school=@{repeating_lvl-9-spells_18_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_18_cast-time}}} {{components=@{repeating_lvl-9-spells_18_components}}} {{range=@{repeating_lvl-9-spells_18_range}}} {{targets=@{repeating_lvl-9-spells_18_targets}}} {{duration=@{repeating_lvl-9-spells_18_duration}}} {{saving_throw=@{repeating_lvl-9-spells_18_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_18_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_18_sr}}} {{description=@{repeating_lvl-9-spells_18_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_19_Cast" title="%{selected|repeating_lvl-9-spells_19_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_19_name}}} {{school=@{repeating_lvl-9-spells_19_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_19_cast-time}}} {{components=@{repeating_lvl-9-spells_19_components}}} {{range=@{repeating_lvl-9-spells_19_range}}} {{targets=@{repeating_lvl-9-spells_19_targets}}} {{duration=@{repeating_lvl-9-spells_19_duration}}} {{saving_throw=@{repeating_lvl-9-spells_19_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_19_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_19_sr}}} {{description=@{repeating_lvl-9-spells_19_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_20_Cast" title="%{selected|repeating_lvl-9-spells_20_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_20_name}}} {{school=@{repeating_lvl-9-spells_20_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_20_cast-time}}} {{components=@{repeating_lvl-9-spells_20_components}}} {{range=@{repeating_lvl-9-spells_20_range}}} {{targets=@{repeating_lvl-9-spells_20_targets}}} {{duration=@{repeating_lvl-9-spells_20_duration}}} {{saving_throw=@{repeating_lvl-9-spells_20_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_20_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_20_sr}}} {{description=@{repeating_lvl-9-spells_20_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_21_Cast" title="%{selected|repeating_lvl-9-spells_21_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_21_name}}} {{school=@{repeating_lvl-9-spells_21_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_21_cast-time}}} {{components=@{repeating_lvl-9-spells_21_components}}} {{range=@{repeating_lvl-9-spells_21_range}}} {{targets=@{repeating_lvl-9-spells_21_targets}}} {{duration=@{repeating_lvl-9-spells_21_duration}}} {{saving_throw=@{repeating_lvl-9-spells_21_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_21_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_21_sr}}} {{description=@{repeating_lvl-9-spells_21_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_22_Cast" title="%{selected|repeating_lvl-9-spells_22_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_22_name}}} {{school=@{repeating_lvl-9-spells_22_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_22_cast-time}}} {{components=@{repeating_lvl-9-spells_22_components}}} {{range=@{repeating_lvl-9-spells_22_range}}} {{targets=@{repeating_lvl-9-spells_22_targets}}} {{duration=@{repeating_lvl-9-spells_22_duration}}} {{saving_throw=@{repeating_lvl-9-spells_22_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_22_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_22_sr}}} {{description=@{repeating_lvl-9-spells_22_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_23_Cast" title="%{selected|repeating_lvl-9-spells_23_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_23_name}}} {{school=@{repeating_lvl-9-spells_23_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_23_cast-time}}} {{components=@{repeating_lvl-9-spells_23_components}}} {{range=@{repeating_lvl-9-spells_23_range}}} {{targets=@{repeating_lvl-9-spells_23_targets}}} {{duration=@{repeating_lvl-9-spells_23_duration}}} {{saving_throw=@{repeating_lvl-9-spells_23_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_23_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_23_sr}}} {{description=@{repeating_lvl-9-spells_23_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_24_Cast" title="%{selected|repeating_lvl-9-spells_24_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_24_name}}} {{school=@{repeating_lvl-9-spells_24_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_24_cast-time}}} {{components=@{repeating_lvl-9-spells_24_components}}} {{range=@{repeating_lvl-9-spells_24_range}}} {{targets=@{repeating_lvl-9-spells_24_targets}}} {{duration=@{repeating_lvl-9-spells_24_duration}}} {{saving_throw=@{repeating_lvl-9-spells_24_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_24_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_24_sr}}} {{description=@{repeating_lvl-9-spells_24_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_25_Cast" title="%{selected|repeating_lvl-9-spells_25_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_25_name}}} {{school=@{repeating_lvl-9-spells_25_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_25_cast-time}}} {{components=@{repeating_lvl-9-spells_25_components}}} {{range=@{repeating_lvl-9-spells_25_range}}} {{targets=@{repeating_lvl-9-spells_25_targets}}} {{duration=@{repeating_lvl-9-spells_25_duration}}} {{saving_throw=@{repeating_lvl-9-spells_25_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_25_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_25_sr}}} {{description=@{repeating_lvl-9-spells_25_description}}}"></button></span>
-                        <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_lvl-9-spells_26_Cast" title="%{selected|repeating_lvl-9-spells_26_Cast}" value="&{template:pf_spell} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_lvl-9-spells_26_name}}} {{school=@{repeating_lvl-9-spells_26_school}}} {{level=@{spellclass-0-name} [[ @{spellclass-0-level-total} ]]}} {{casting_time=@{repeating_lvl-9-spells_26_cast-time}}} {{components=@{repeating_lvl-9-spells_26_components}}} {{range=@{repeating_lvl-9-spells_26_range}}} {{targets=@{repeating_lvl-9-spells_26_targets}}} {{duration=@{repeating_lvl-9-spells_26_duration}}} {{saving_throw=@{repeating_lvl-9-spells_26_save}}} {{dc=[[ @{spellclass-0-level-9-savedc} + [[ @{repeating_lvl-9-spells_26_DC-mod} ]] ]]}} {{sr=@{repeating_lvl-9-spells_26_sr}}} {{description=@{repeating_lvl-9-spells_26_description}}}"></button></span>
-                    </div>
-                </div>
                 <br>
                 <div class="sheet-sect">
                     <div class="sheet-table">
@@ -7895,11 +7030,11 @@
                     </div>
                     <fieldset class="repeating_lvl-9-spells">
                         <div class="sheet-table">
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_used}" type="number" name="attr_used" value="0" placeholder="Preparado"><br>Prepdo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_name}" type="text" value="N/A" name="attr_name" placeholder="Nombre"><br>Nombre</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">
-					  <select title="@{repeating_lvl-9-spells_X_spellclass}" name="attr_spellclass">
+					  <select title="@{repeating_lvl-9-spells_$X_spellclass}" name="attr_spellclass">
 						<option value="" selected>N/A</option>
                                     <option value="@{spellclass-0-name}">Clase 0</option>
                                     <option value="@{spellclass-1-name}">Clase 1</option>
@@ -7907,21 +7042,21 @@
                                 </select>
 					  <br>Clase
 				    </span>
-				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-9-spells_X_spell_level}" type="number" value="9" name="attr_spell_level" disabled><br>Nivel</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
+				    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-9-spells_$X_spell_level}" type="number" value="9" name="attr_spell_level" disabled><br>Nivel</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_school}" type="text" value="N/A" name="attr_school" placeholder="Escuela [descriptor]"><br>Escuela</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_cast-time}" type="text" value="N/A" name="attr_cast-time" placeholder="Tiempo"><br>Tiempo</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_DC-mod}" type="number" value="0" name="attr_DC-mod" placeholder="Mod. CD"> <br>Mod. CD</span>
                         </div>
                         <div class="sheet-table">
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 				    <span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_components}" type="text" value="N/A" name="attr_components" placeholder="Componentes"><br>Componentes</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_range}" type="text" value="N/A" name="attr_range" placeholder="Rango"><br>Rango</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_targets}" type="text" value="N/A" name="attr_targets" placeholder="Área"><br>Área</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_duration}" type="text" value="N/A" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_save}" type="text" value="N/A" name="attr_save" placeholder="Efecto Salvación"><br>Efecto Salv.</span>
                             <span class="sheet-table-data sheet-center sheet-small-label">
-                                <select title="@{repeating_lvl-9-spells_X_sr}" name="attr_sr">
+                                <select title="@{repeating_lvl-9-spells_$X_sr}" name="attr_sr">
                                     <option value="" selected>N/A</option>
                                     <option value="Yes">Sí</option>
                                     <option value="No">No</option>
@@ -7932,15 +7067,15 @@
                             </span>
                         </div>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-9-spells_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_lvl-9-spells_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_lvl-9-spells_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_lvl-9-spells_$X_description}" name="attr_description"></textarea>
 				<br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-9-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-				<textarea class="sheet-macro-text" title="@{repeating_lvl-9-spells_X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_lvl-9-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<textarea class="sheet-macro-text" title="@{repeating_lvl-9-spells_$X_macro-text}" name="attr_macro-text">&{template:pf_spell} {{name=@{name}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} @{spell_options}</textarea>
 				<br>
                         <b>Opciones&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-9-spells_X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
+                        <input type="checkbox" class="sheet-options-show" title="@{repeating_lvl-9-spells_$X_options-show}" name="attr_options-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>				
 				<input type="hidden" name="attr_var_level_notes" value="{{level=@{spellclass} @{spell_level}}}"/>
 				<input type="hidden" name="attr_var_school_notes" value="{{school=@{school}}}"/>
 				<input type="hidden" name="attr_var_casting_time_notes" value="{{casting_time=@{cast-time}}}"/>
@@ -7957,16 +7092,16 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label"><b title="Include these attributes with this spell roll?">Incluir info?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-9-spells_X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-9-spells_X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-9-spells_X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-9-spells_X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-9-spells_X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_school_notes" value="@{var_school_notes}" title="@{repeating_lvl-9-spells_$X_school_notes}" checked/><b title="Include School">Escuela</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_level_notes" value="@{var_level_notes}" title="@{repeating_lvl-9-spells_$X_level_notes}" checked/><b title="Include Class/Level">Nivel</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_casting_time_notes" value="@{var_casting_time_notes}" title="@{repeating_lvl-9-spells_$X_casting_time_notes}" checked/><b title="Include Casting Time">Tiempo</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_components_notes" value="@{var_components_notes}" title="@{repeating_lvl-9-spells_$X_components_notes}" checked/><b title="Include Components">Componentes</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_range_notes" value="@{var_range_notes}" title="@{repeating_lvl-9-spells_$X_range_notes}" checked/><b title="Include Range">Rango</b></label></span>
 					</div>
 					<div class="sheet-table-row sheet-table-header">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-9-spells_X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-9-spells_X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-9-spells_X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="padding-left:10px;"><label><input type="checkbox" name="attr_toggle_targets_notes" value="@{var_targets_notes}" title="@{repeating_lvl-9-spells_$X_targets_notes}" checked/><b title="Include Targets/Area">Área</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_duration_notes" value="@{var_duration_notes}" title="@{repeating_lvl-9-spells_$X_duration_notes}" checked/><b title="Include Duration">Duración</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_saving_throw_notes" value="@{var_saving_throw_notes}" title="@{repeating_lvl-9-spells_$X_saving_throw_notes}" checked/><b title="Include Saving Throw">Tirada de Salvación</b></label></span>
 						<span class="sheet-table-data sheet-center sheet-small-label"><label><b style="float: left; padding-top:4px; padding-right:4px;" title="Include DC">CD</b>
 						<select name="attr_toggle_dc_notes" style="width:50%; float:left; height:1.85em; margin-bottom: 2px;">
 							<option name="attr_toggle_dc_notes" value="" title="Do not Include Difficulty Check" /><b>Ninguna</b>
@@ -7975,8 +7110,8 @@
 							<option name="attr_toggle_dc_notes" value="@{var_dc2_notes}" title="Include Difficulty Check Spell Class 2" /><b>CD2</b>
 						</select>
 						</label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-9-spells_X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-9-spells_X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_sr_notes" value="@{var_sr_notes}" title="@{repeating_lvl-9-spells_$X_sr_notes}" checked/><b title="Include Spell Resistance">RC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><label><input type="checkbox" name="attr_toggle_description_notes" value="@{var_description_notes}" title="@{repeating_lvl-9-spells_$X_description_notes}" checked/><b title="Include Description">Descripción</b></label></span>
 					</div>
 				</div>
 				<input type="hidden" name="attr_spell_options" value="@{toggle_level_notes} @{toggle_school_notes} @{toggle_casting_time_notes} @{toggle_dc_notes} @{toggle_components_notes} @{toggle_range_notes} @{toggle_targets_notes} @{toggle_duration_notes} @{toggle_saving_throw_notes} @{toggle_sr_notes} @{toggle_description_notes}"/>				
@@ -8038,67 +7173,6 @@
     <div>
         <b>Rasgos Raciales&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
         <input type="checkbox" class="sheet-sect-show" title="@{racial-traits-show}" name="attr_racial-traits-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-        <div class="sheet-table sheet-sect">
-            <span class="sheet-table-name">Botones Rasgos Raciales</span>
-            <div class="sheet-table-row">
-                <span class="sheet-table-header">0</span>
-                <span class="sheet-table-header">1</span>
-                <span class="sheet-table-header">2</span>
-                <span class="sheet-table-header">3</span>
-                <span class="sheet-table-header">4</span>
-                <span class="sheet-table-header">5</span>
-                <span class="sheet-table-header">6</span>
-                <span class="sheet-table-header">7</span>
-                <span class="sheet-table-header">8</span>
-                <span class="sheet-table-header">9</span>
-                <span class="sheet-table-header">10</span>
-                <span class="sheet-table-header">11</span>
-                <span class="sheet-table-header">12</span>
-                <span class="sheet-table-header">13</span>
-                <span class="sheet-table-header">14</span>
-                <span class="sheet-table-header">15</span>
-                <span class="sheet-table-header">16</span>
-                <span class="sheet-table-header">17</span>
-                <span class="sheet-table-header">18</span>
-                <span class="sheet-table-header">19</span>
-                <span class="sheet-table-header">20</span>
-                <span class="sheet-table-header">21</span>
-                <span class="sheet-table-header">22</span>
-                <span class="sheet-table-header">23</span>
-                <span class="sheet-table-header">24</span>
-                <span class="sheet-table-header">25</span>
-                <span class="sheet-table-header">26</span>
-            </div>
-            <div class="sheet-table-row">
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_0_Display" title="%{selected|repeating_racial-trait_0_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_0_name}}} {{description = @{repeating_racial-trait_0_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_1_Display" title="%{selected|repeating_racial-trait_1_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_1_name}}} {{description = @{repeating_racial-trait_1_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_2_Display" title="%{selected|repeating_racial-trait_2_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_2_name}}} {{description = @{repeating_racial-trait_2_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_3_Display" title="%{selected|repeating_racial-trait_3_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_3_name}}} {{description = @{repeating_racial-trait_3_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_4_Display" title="%{selected|repeating_racial-trait_4_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_4_name}}} {{description = @{repeating_racial-trait_4_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_5_Display" title="%{selected|repeating_racial-trait_5_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_5_name}}} {{description = @{repeating_racial-trait_5_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_6_Display" title="%{selected|repeating_racial-trait_6_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_6_name}}} {{description = @{repeating_racial-trait_6_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_7_Display" title="%{selected|repeating_racial-trait_7_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_7_name}}} {{description = @{repeating_racial-trait_7_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_8_Display" title="%{selected|repeating_racial-trait_8_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_8_name}}} {{description = @{repeating_racial-trait_8_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_9_Display" title="%{selected|repeating_racial-trait_9_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_9_name}}} {{description = @{repeating_racial-trait_9_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_10_Display" title="%{selected|repeating_racial-trait_10_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_10_name}}} {{description = @{repeating_racial-trait_10_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_11_Display" title="%{selected|repeating_racial-trait_11_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_11_name}}} {{description = @{repeating_racial-trait_11_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_12_Display" title="%{selected|repeating_racial-trait_12_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_12_name}}} {{description = @{repeating_racial-trait_12_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_13_Display" title="%{selected|repeating_racial-trait_13_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_13_name}}} {{description = @{repeating_racial-trait_13_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_14_Display" title="%{selected|repeating_racial-trait_14_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_14_name}}} {{description = @{repeating_racial-trait_14_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_15_Display" title="%{selected|repeating_racial-trait_15_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_15_name}}} {{description = @{repeating_racial-trait_15_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_16_Display" title="%{selected|repeating_racial-trait_16_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_16_name}}} {{description = @{repeating_racial-trait_16_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_17_Display" title="%{selected|repeating_racial-trait_17_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_17_name}}} {{description = @{repeating_racial-trait_17_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_18_Display" title="%{selected|repeating_racial-trait_18_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_18_name}}} {{description = @{repeating_racial-trait_18_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_19_Display" title="%{selected|repeating_racial-trait_19_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_19_name}}} {{description = @{repeating_racial-trait_19_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_20_Display" title="%{selected|repeating_racial-trait_20_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_20_name}}} {{description = @{repeating_racial-trait_20_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_21_Display" title="%{selected|repeating_racial-trait_21_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_21_name}}} {{description = @{repeating_racial-trait_21_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_22_Display" title="%{selected|repeating_racial-trait_22_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_22_name}}} {{description = @{repeating_racial-trait_22_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_23_Display" title="%{selected|repeating_racial-trait_23_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_23_name}}} {{description = @{repeating_racial-trait_23_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_24_Display" title="%{selected|repeating_racial-trait_24_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_24_name}}} {{description = @{repeating_racial-trait_24_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_25_Display" title="%{selected|repeating_racial-trait_25_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_25_name}}} {{description = @{repeating_racial-trait_25_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_racial-trait_26_Display" title="%{selected|repeating_racial-trait_26_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_racial-trait_26_name}}} {{description = @{repeating_racial-trait_26_short-description}}}"></button></span>
-            </div>
-        </div>
         <br>
         <div class="sheet-table sheet-sect">
             <span class="sheet-table-name">Rasgos Raciales</span>
@@ -8115,88 +7189,27 @@
         <div class="sheet-table sheet-sect">
             <fieldset class="repeating_racial-trait">
                 <div class="sheet-table-row">
-                    <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_racial-trait_X_name}" type="text" name="attr_name" placeholder="Rasgo Racial"></span>
-                    <span class="sheet-table-data sheet-center" style="width:28%;"><input title="@{repeating_racial-trait_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
-                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_racial-trait_X_used}" type="number" name="attr_used" value="0"></span>
+                    <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_racial-trait_$X_name}" type="text" name="attr_name" placeholder="Rasgo Racial"></span>
+                    <span class="sheet-table-data sheet-center" style="width:28%;"><input title="@{repeating_racial-trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
+                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_racial-trait_$X_used}" type="number" name="attr_used" value="0"></span>
                     <span class="sheet-table-data sheet-center" style="width:2%;vertical-align:middle;font-size:150%;">/</span>
-                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_racial-trait_X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
-                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_racial-trait_X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
+                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_racial-trait_$X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
+                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_racial-trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
                 </div>
                 <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-desc-show" title="@{repeating_racial-trait_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                <textarea class="sheet-desc" title="@{repeating_racial-trait_X_description}" name="attr_description"></textarea>
+                <input type="checkbox" class="sheet-desc-show" title="@{repeating_racial-trait_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                <textarea class="sheet-desc" title="@{repeating_racial-trait_$X_description}" name="attr_description"></textarea>
                 <br>
                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_racial-trait_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                <textarea class="sheet-macro-text" title="@{repeating_racial-trait_X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
+                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_racial-trait_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                <textarea class="sheet-macro-text" title="@{repeating_racial-trait_$X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
             </fieldset>
         </div>
     </div>
     <div>
         <b>Rasgos&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
         <input type="checkbox" class="sheet-sect-show" title="@{traits-show}" name="attr_traits-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-        <div class="sheet-table sheet-sect">
-            <span class="sheet-table-name">Botones Rasgos</span>
-            <div class="sheet-table-row">
-                <span class="sheet-table-header">0</span>
-                <span class="sheet-table-header">1</span>
-                <span class="sheet-table-header">2</span>
-                <span class="sheet-table-header">3</span>
-                <span class="sheet-table-header">4</span>
-                <span class="sheet-table-header">5</span>
-                <span class="sheet-table-header">6</span>
-                <span class="sheet-table-header">7</span>
-                <span class="sheet-table-header">8</span>
-                <span class="sheet-table-header">9</span>
-                <span class="sheet-table-header">10</span>
-                <span class="sheet-table-header">11</span>
-                <span class="sheet-table-header">12</span>
-                <span class="sheet-table-header">13</span>
-                <span class="sheet-table-header">14</span>
-                <span class="sheet-table-header">15</span>
-                <span class="sheet-table-header">16</span>
-                <span class="sheet-table-header">17</span>
-                <span class="sheet-table-header">18</span>
-                <span class="sheet-table-header">19</span>
-                <span class="sheet-table-header">20</span>
-                <span class="sheet-table-header">21</span>
-                <span class="sheet-table-header">22</span>
-                <span class="sheet-table-header">23</span>
-                <span class="sheet-table-header">24</span>
-                <span class="sheet-table-header">25</span>
-                <span class="sheet-table-header">26</span>
-            </div>
-            <div class="sheet-table-row">
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_0_Display" title="%{selected|repeating_trait_0_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_0_name}}} {{description = @{repeating_trait_0_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_1_Display" title="%{selected|repeating_trait_1_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_1_name}}} {{description = @{repeating_trait_1_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_2_Display" title="%{selected|repeating_trait_2_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_2_name}}} {{description = @{repeating_trait_2_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_3_Display" title="%{selected|repeating_trait_3_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_3_name}}} {{description = @{repeating_trait_3_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_4_Display" title="%{selected|repeating_trait_4_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_4_name}}} {{description = @{repeating_trait_4_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_5_Display" title="%{selected|repeating_trait_5_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_5_name}}} {{description = @{repeating_trait_5_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_6_Display" title="%{selected|repeating_trait_6_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_6_name}}} {{description = @{repeating_trait_6_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_7_Display" title="%{selected|repeating_trait_7_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_7_name}}} {{description = @{repeating_trait_7_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_8_Display" title="%{selected|repeating_trait_8_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_8_name}}} {{description = @{repeating_trait_8_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_9_Display" title="%{selected|repeating_trait_9_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_9_name}}} {{description = @{repeating_trait_9_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_10_Display" title="%{selected|repeating_trait_10_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_10_name}}} {{description = @{repeating_trait_10_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_11_Display" title="%{selected|repeating_trait_11_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_11_name}}} {{description = @{repeating_trait_11_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_12_Display" title="%{selected|repeating_trait_12_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_12_name}}} {{description = @{repeating_trait_12_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_13_Display" title="%{selected|repeating_trait_13_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_13_name}}} {{description = @{repeating_trait_13_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_14_Display" title="%{selected|repeating_trait_14_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_14_name}}} {{description = @{repeating_trait_14_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_15_Display" title="%{selected|repeating_trait_15_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_15_name}}} {{description = @{repeating_trait_15_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_16_Display" title="%{selected|repeating_trait_16_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_16_name}}} {{description = @{repeating_trait_16_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_17_Display" title="%{selected|repeating_trait_17_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_17_name}}} {{description = @{repeating_trait_17_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_18_Display" title="%{selected|repeating_trait_18_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_18_name}}} {{description = @{repeating_trait_18_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_19_Display" title="%{selected|repeating_trait_19_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_19_name}}} {{description = @{repeating_trait_19_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_20_Display" title="%{selected|repeating_trait_20_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_20_name}}} {{description = @{repeating_trait_20_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_21_Display" title="%{selected|repeating_trait_21_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_21_name}}} {{description = @{repeating_trait_21_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_22_Display" title="%{selected|repeating_trait_22_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_22_name}}} {{description = @{repeating_trait_22_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_23_Display" title="%{selected|repeating_trait_23_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_23_name}}} {{description = @{repeating_trait_23_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_24_Display" title="%{selected|repeating_trait_24_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_24_name}}} {{description = @{repeating_trait_24_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_25_Display" title="%{selected|repeating_trait_25_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_25_name}}} {{description = @{repeating_trait_25_short-description}}}"></button></span>
-                <span class="sheet-table-data sheet-center"><button type="roll" name="roll_repeating_trait_26_Display" title="%{selected|repeating_trait_26_Display}" value="&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{repeating_trait_26_name}}} {{description = @{repeating_trait_26_short-description}}}"></button></span>
-            </div>
-        </div>
         <br>
         <div class="sheet-table sheet-sect">
             <span class="sheet-table-name">Rasgos</span>
@@ -8213,21 +7226,21 @@
         <div class="sheet-table sheet-sect">
             <fieldset class="repeating_trait">
                 <div class="sheet-table-row">
-                    <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_trait_X_name}" type="text" name="attr_name" placeholder="Rasgo"></span>
-                    <span class="sheet-table-data sheet-center" style="width:28%;"><input title="@{repeating_trait_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
-                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_trait_X_used}" type="number" name="attr_used" value="0"></span>
+                    <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button></span>
+                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_trait_$X_name}" type="text" name="attr_name" placeholder="Rasgo"></span>
+                    <span class="sheet-table-data sheet-center" style="width:28%;"><input title="@{repeating_trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"></span>
+                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_trait_$X_used}" type="number" name="attr_used" value="0"></span>
                     <span class="sheet-table-data sheet-center" style="width:2%;vertical-align:middle;font-size:150%;">/</span>
-                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_trait_X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
-                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_trait_X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
+                    <span class="sheet-table-data sheet-center" style="width:5%;"><input title="@{repeating_trait_$X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled></span>
+                    <span class="sheet-table-data sheet-center" style="width:15%;"><input title="@{repeating_trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="0"></span>
                 </div>
                 <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-desc-show" title="@{repeating_trait_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                <textarea class="sheet-desc" title="@{repeating_trait_X_description}" name="attr_description"></textarea>
+                <input type="checkbox" class="sheet-desc-show" title="@{repeating_trait_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                <textarea class="sheet-desc" title="@{repeating_trait_$X_description}" name="attr_description"></textarea>
                 <br>
                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_trait_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                <textarea class="sheet-macro-text" title="@{repeating_trait_X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
+                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_trait_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                <textarea class="sheet-macro-text" title="@{repeating_trait_$X_macro-text}" name="attr_macro-text">&{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
             </fieldset>
         </div>
     </div>
@@ -8422,26 +7435,26 @@
                     <fieldset class="repeating_weapon">
                         <div class="sheet-table">
                             <div class="sheet-table-row">
-                                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button></span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" min="0" name="attr_enhance" title="@{repeating_weapon_X_enhance}"><br>Mejora</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_X_masterwork}" value="1"><br>Mtr</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_name" title="@{repeating_weapon_X_name}" placeholder="Nombre"><br>Nombre</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_attack" title="@{repeating_weapon_X_attack}" placeholder="Modificadores Ataque"><br>Mod. Ataque</span>
+                                <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_attack-roll" value="@{macro-text}"></button></span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" min="0" name="attr_enhance" title="@{repeating_weapon_$X_enhance}"><br>Mejora</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_$X_masterwork}" value="1"><br>Mtr</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_name" title="@{repeating_weapon_$X_name}" placeholder="Nombre"><br>Nombre</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_attack" title="@{repeating_weapon_$X_attack}" placeholder="Modificadores Ataque"><br>Mod. Ataque</span>
 					  <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-						<select title="@{repeating_weapon_X_attack-type}" name="attr_attack-type">
+						<select title="@{repeating_weapon_$X_attack-type}" name="attr_attack-type">
                                         <option value="0" selected>Ninguno</option>
                                         <option value="@{attk-melee}">C/C</option>
                                         <option value="@{attk-ranged}">A Distancia</option>
                                     </select>
 							<br>Tipo Ataque
 						</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-attack" title="@{repeating_weapon_X_total-attack}" value="(@{proficiency} + (((@{enhance} + @{masterwork}) + abs(@{enhance} - @{masterwork})) / 2) + @{attack} + @{attack-type} + @{armor-proficiency} + @{condition-Drained} - @{condition-Wounds})" disabled><br>ATC</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_X_damage-dice-num}" min="0"><br>Dado</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-attack" title="@{repeating_weapon_$X_total-attack}" value="(@{proficiency} + (((@{enhance} + @{masterwork}) + abs(@{enhance} - @{masterwork})) / 2) + @{attack} + @{attack-type} + @{armor-proficiency} + @{condition-Drained} - @{condition-Wounds})" disabled><br>ATC</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_$X_damage-dice-num}" min="0"><br>Dado</span>
                                 <span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;">d</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-die" title="@{repeating_weapon_X_damage-die}" min="0"><br>Dado</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_damage" title="@{repeating_weapon_X_damage}" placeholder="Modificadores Daño"><br>Mod. Daño</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_damage-die" title="@{repeating_weapon_$X_damage-die}" min="0"><br>Dado</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_damage" title="@{repeating_weapon_$X_damage}" placeholder="Modificadores Daño"><br>Mod. Daño</span>
 						<span class="sheet-table-data sheet-center" style="width:15%;">
-						<select title="@{repeating_weapon_X_damage-ability}" name="attr_damage-ability">
+						<select title="@{repeating_weapon_$X_damage-ability}" name="attr_damage-ability">
                                         <option value="0" selected>Ninguno</option>
                                         <option value="floor(0.5 * @{STR-mod})">1/2 FUE</option>
                                         <option value="floor(0.5 * @{DEX-mod})">1/2 DES</option>
@@ -8470,30 +7483,30 @@
                                     </select>
 							<br>Caract. Daño
 						</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-damage" title="@{repeating_weapon_X_total-damage}" value="(@{enhance} + [[ @{damage} ]] + [[ @{damage-ability} ]])" disabled><br>DAÑ</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_total-damage" title="@{repeating_weapon_$X_total-damage}" value="(@{enhance} + [[ @{damage} ]] + [[ @{damage-ability} ]])" disabled><br>DAÑ</span>
                             </div>
                         </div>
                         <div class="sheet-table">
                             <div class="sheet-table-row">
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-target" title="@{repeating_weapon_X_crit-target}" min="0" max="20"><br>Crit</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-target" title="@{repeating_weapon_$X_crit-target}" min="0" max="20"><br>Crit</span>
                                 <span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;"><b>/x</b></span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_X_crit-multiplier}" min="0"><br>Multiplic.</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_range" title="@{repeating_weapon_X_range}" value="0" min="0"><br>Rango</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_type" title="@{repeating_weapon_X_type}" placeholder="Tipo Daño"><br>Tipo Daño</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_weight" title="@{repeating_weapon_X_weight}" value="0" step="any" min="0"><br>Peso</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_ammo" title="@{repeating_weapon_X_ammo}" value="0"><br>Munic.</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_$X_crit-multiplier}" min="0"><br>Multiplic.</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_range" title="@{repeating_weapon_$X_range}" value="0" min="0"><br>Rango</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_type" title="@{repeating_weapon_$X_type}" placeholder="Tipo Daño"><br>Tipo Daño</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_weight" title="@{repeating_weapon_$X_weight}" value="0" step="any" min="0"><br>Peso</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_ammo" title="@{repeating_weapon_$X_ammo}" value="0"><br>Munic.</span>
 					  <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-						<select title="@{repeating_weapon_X_proficiency}" name="attr_proficiency">
+						<select title="@{repeating_weapon_$X_proficiency}" name="attr_proficiency">
                                         <option value="0">Sí</option>
                                         <option value="-4" selected>No</option>
                                     </select>
 							<br>Competencia
 					  </span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_notes" title="@{repeating_weapon_X_notes}" placeholder="Attack Notes"><br>Notas</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_notes" title="@{repeating_weapon_$X_notes}" placeholder="Attack Notes"><br>Notas</span>
                             </div>
                         </div>
 				<b>Ataques Repetitivos&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-				<input type="checkbox" class="sheet-sect-show" title="@{repeating_weapon_X_iterative-attacks-show}" name="attr_iterative-attacks-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+				<input type="checkbox" class="sheet-sect-show" title="@{repeating_weapon_$X_iterative-attacks-show}" name="attr_iterative-attacks-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
 				<div class="sheet-table sheet-sect sheet-iterative_attack_section">
 					<span class="sheet-table-name">Ataques Repetitivos</span>
 					<div class="sheet-table-row">
@@ -8504,105 +7517,105 @@
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack2" title="@{repeating_weapon_X_toggle_iterative_attack2}" value="@{var_iterative_attack2_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack2" title="@{repeating_weapon_$X_toggle_iterative_attack2}" value="@{var_iterative_attack2_macro}"/>
 	                            <b title="Include a second attack to your weapon?">Incluir 2º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack2_value" title="@{repeating_weapon_X_iterative_attack2_value}" value="-5" max="0"/>
+							<input type="number" name="attr_iterative_attack2_value" title="@{repeating_weapon_$X_iterative_attack2_value}" value="-5" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack2_macro" title="@{repeating_weapon_X_var_iterative_attack2_macro}" value="{{attack2=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack2_value} ]] ]] }} {{damage2=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm2=[[ 1d20 + [[ @{total-attack} + @{iterative_attack2_value} ]] ]] }} {{crit_damage2=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
+                            <input type="text" name="attr_var_iterative_attack2_macro" title="@{repeating_weapon_$X_var_iterative_attack2_macro}" value="{{attack2=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack2_value} ]] ]] }} {{damage2=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm2=[[ 1d20 + [[ @{total-attack} + @{iterative_attack2_value} ]] ]] }} {{crit_damage2=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
 		                </span>
 						<input type="hidden" name="attr_var_iterative_attack2" value="{{attack2=@{iterative_attack2_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack3" title="@{repeating_weapon_X_toggle_iterative_attack3}" value="@{var_iterative_attack3_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack3" title="@{repeating_weapon_$X_toggle_iterative_attack3}" value="@{var_iterative_attack3_macro}"/>
 	                            <b title="Include a third attack to your weapon?">Incluir 3º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center sheet-small-label">
-							<input type="number" name="attr_iterative_attack3_value" title="@{repeating_weapon_X_iterative_attack3_value}" value="-10" max="0"/>
+							<input type="number" name="attr_iterative_attack3_value" title="@{repeating_weapon_$X_iterative_attack3_value}" value="-10" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center sheet-small-label">
-                            <input type="text" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_X_var_iterative_attack3_macro}" value="{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack3_value} ]] ]] }} {{damage3=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm3=[[ 1d20 + [[ @{total-attack} + @{iterative_attack3_value} ]] ]] }} {{crit_damage3=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
+                            <input type="text" name="attr_var_iterative_attack3_macro" title="@{repeating_weapon_$X_var_iterative_attack3_macro}" value="{{attack3=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack3_value} ]] ]] }} {{damage3=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm3=[[ 1d20 + [[ @{total-attack} + @{iterative_attack3_value} ]] ]] }} {{crit_damage3=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
 		                </span>
 						<input type="hidden" name="attr_var_iterative_attack3" value="{{attack3=@{iterative_attack3_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack4" title="@{repeating_weapon_X_toggle_iterative_attack4}" value="@{var_iterative_attack4_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack4" title="@{repeating_weapon_$X_toggle_iterative_attack4}" value="@{var_iterative_attack4_macro}"/>
 	                            <b title="Include a fourth attack to your weapon?">Incluir 4º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack4_value" title="@{repeating_weapon_X_iterative_attack4_value}" value="-15" max="0"/>
+							<input type="number" name="attr_iterative_attack4_value" title="@{repeating_weapon_$X_iterative_attack4_value}" value="-15" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_X_var_iterative_attack4_macro}" value="{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack4_value} ]] ]] }} {{damage4=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm4=[[ 1d20 + [[ @{total-attack} + @{iterative_attack4_value} ]] ]] }} {{crit_damage4=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
+                            <input type="text" name="attr_var_iterative_attack4_macro" title="@{repeating_weapon_$X_var_iterative_attack4_macro}" value="{{attack4=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack4_value} ]] ]] }} {{damage4=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm4=[[ 1d20 + [[ @{total-attack} + @{iterative_attack4_value} ]] ]] }} {{crit_damage4=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack4" value="{{attack4=@{iterative_attack4_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack5" title="@{repeating_weapon_X_toggle_iterative_attack5}" value="@{var_iterative_attack5_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack5" title="@{repeating_weapon_$X_toggle_iterative_attack5}" value="@{var_iterative_attack5_macro}"/>
 	                            <b title="Include a fifth attack to your weapon?">Incluir 5º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack5_value" title="@{repeating_weapon_X_iterative_attack5_value}" value="-20" max="0"/>
+							<input type="number" name="attr_iterative_attack5_value" title="@{repeating_weapon_$X_iterative_attack5_value}" value="-20" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_X_var_iterative_attack5_macro}" value="{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack5_value} ]] ]] }} {{damage5=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm5=[[ 1d20 + [[ @{total-attack} + @{iterative_attack5_value} ]] ]] }} {{crit_damage5=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
+                            <input type="text" name="attr_var_iterative_attack5_macro" title="@{repeating_weapon_$X_var_iterative_attack5_macro}" value="{{attack5=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack5_value} ]] ]] }} {{damage5=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm5=[[ 1d20 + [[ @{total-attack} + @{iterative_attack5_value} ]] ]] }} {{crit_damage5=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack5" value="{{attack5=@{iterative_attack5_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack6" title="@{repeating_weapon_X_toggle_iterative_attack6}" value="@{var_iterative_attack6_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack6" title="@{repeating_weapon_$X_toggle_iterative_attack6}" value="@{var_iterative_attack6_macro}"/>
 	                            <b title="Include a sixth attack to your weapon?">Incluir 6º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack6_value" title="@{repeating_weapon_X_iterative_attack6_value}" value="-25" max="0"/>
+							<input type="number" name="attr_iterative_attack6_value" title="@{repeating_weapon_$X_iterative_attack6_value}" value="-25" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_X_var_iterative_attack6_macro}" value="{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack6_value} ]] ]] }} {{damage6=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm6=[[ 1d20 + [[ @{total-attack} + @{iterative_attack6_value} ]] ]] }} {{crit_damage6=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
+                            <input type="text" name="attr_var_iterative_attack6_macro" title="@{repeating_weapon_$X_var_iterative_attack6_macro}" value="{{attack6=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack6_value} ]] ]] }} {{damage6=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm6=[[ 1d20 + [[ @{total-attack} + @{iterative_attack6_value} ]] ]] }} {{crit_damage6=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack6" value="{{attack6=@{iterative_attack6_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack7" title="@{repeating_weapon_X_toggle_iterative_attack7}" value="@{var_iterative_attack7_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack7" title="@{repeating_weapon_$X_toggle_iterative_attack7}" value="@{var_iterative_attack7_macro}"/>
 	                            <b title="Include a seventh attack to your weapon?">Incluir 7º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack7_value" title="@{repeating_weapon_X_iterative_attack7_value}" value="-30" max="0"/>
+							<input type="number" name="attr_iterative_attack7_value" title="@{repeating_weapon_$X_iterative_attack7_value}" value="-30" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_X_var_iterative_attack7_macro}" value="{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack7_value} ]] ]] }} {{damage7=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm7=[[ 1d20 + [[ @{total-attack} + @{iterative_attack7_value} ]] ]] }} {{crit_damage7=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
+                            <input type="text" name="attr_var_iterative_attack7_macro" title="@{repeating_weapon_$X_var_iterative_attack7_macro}" value="{{attack7=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack7_value} ]] ]] }} {{damage7=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]] }} {{crit_confirm7=[[ 1d20 + [[ @{total-attack} + @{iterative_attack7_value} ]] ]] }} {{crit_damage7=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]] }}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack7" value="{{attack7=@{iterative_attack7_macro}}}"/>
 					</div>
 					<div class="sheet-table-row">
                         <span class="sheet-table-data sheet-center">
                             <label>
-	                            <input type="checkbox" name="attr_toggle_iterative_attack8" title="@{repeating_weapon_X_toggle_iterative_attack8}" value="@{var_iterative_attack8_macro}"/>
+	                            <input type="checkbox" name="attr_toggle_iterative_attack8" title="@{repeating_weapon_$X_toggle_iterative_attack8}" value="@{var_iterative_attack8_macro}"/>
 	                            <b title="Include an eighth attack to your weapon?">Incluir 8º Ataque?</b>
                             </label>
                         </span>
 						<span class="sheet-table-data sheet-center">
-							<input type="number" name="attr_iterative_attack8_value" title="@{repeating_weapon_X_iterative_attack8_value}" value="-35" max="0"/>
+							<input type="number" name="attr_iterative_attack8_value" title="@{repeating_weapon_$X_iterative_attack8_value}" value="-35" max="0"/>
 						</span>
 		                <span class="sheet-table-data sheet-center">
-                            <input type="text" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_X_var_iterative_attack8_macro}" value="{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm8=[[ 1d20 + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{crit_damage8=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
+                            <input type="text" name="attr_var_iterative_attack8_macro" title="@{repeating_weapon_$X_var_iterative_attack8_macro}" value="{{attack8=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{damage8=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm8=[[ 1d20 + [[ @{total-attack} + @{iterative_attack8_value} ]] ]]}} {{crit_damage8=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}}" />
 						</span>
 						<input type="hidden" name="attr_var_iterative_attack8" value="{{attack8=@{iterative_attack8_macro}}}"/>
 					</div>
@@ -8619,17 +7632,17 @@
 				<div class="sheet-table sheet-options">
 					<div class="sheet-table-row sheet-table-header">
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><b title="Include these additional notes with this attack roll.">Incluir notes?</b></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_melee_notes" value="@{var_melee_notes}" title="@{repeating_weapon_X_toggle_melee_notes}"/><b title="Include Melee attack notes"> Notas C/C</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_ranged_notes" value="@{var_ranged_notes}" title="@{repeating_weapon_X_toggle_ranged_notes}"/><b title="Include Ranged attack notes"> Notas A Distancia</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_CMB_notes" value="@{var_CMB_notes}" title="@{repeating_weapon_X_toggle_CMB_notes}"/><b title="Include CMB notes"> Notas BMC</b></label></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_attack_notes" value="@{var_attack_notes}" title="@{repeating_weapon_X_toggle_attack_notes}"/><b title="Include Attack notes"> Notas Ataque</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_melee_notes" value="@{var_melee_notes}" title="@{repeating_weapon_$X_toggle_melee_notes}"/><b title="Include Melee attack notes"> Notas C/C</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_ranged_notes" value="@{var_ranged_notes}" title="@{repeating_weapon_$X_toggle_ranged_notes}"/><b title="Include Ranged attack notes"> Notas A Distancia</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_CMB_notes" value="@{var_CMB_notes}" title="@{repeating_weapon_$X_toggle_CMB_notes}"/><b title="Include CMB notes"> Notas BMC</b></label></span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><label><input type="checkbox" name="attr_toggle_attack_notes" value="@{var_attack_notes}" title="@{repeating_weapon_$X_toggle_attack_notes}"/><b title="Include Attack notes"> Notas Ataque</b></label></span>
 					</div>
 				</div>
 			</div>
 				<input type="hidden" name="attr_macro_options" value="@{toggle_melee_notes} @{toggle_ranged_notes} @{toggle_CMB_notes} @{toggle_attack_notes}"/>				
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_weapon_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                        <textarea class="sheet-macro-text" title="@{repeating_weapon_X_macro-text}" name="attr_macro-text">/w gm &{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{attack=[[ 1d20cs>@{crit-target} + [[ @{total-attack} ]] ]]}} {{damage=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm=[[ 1d20 + [[ @{total-attack} ]] ]]}} {{crit_damage=[[ (@{damage-dice-num} * (@{crit-multiplier} - 1))d@{damage-die} + (@{total-damage} * (@{crit-multiplier} - 1)) ]]}} {{type=@{type}}} {{description=@{notes}}} @{iterative_attacks} @{macro_options}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_weapon_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                        <textarea class="sheet-macro-text" title="@{repeating_weapon_$X_macro-text}" name="attr_macro-text">/w gm &{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{attack=[[ 1d20cs>@{crit-target} + [[ @{total-attack} ]] ]]}} {{damage=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm=[[ 1d20 + [[ @{total-attack} ]] ]]}} {{crit_damage=[[ (@{damage-dice-num} * (@{crit-multiplier} - 1))d@{damage-die} + (@{total-damage} * (@{crit-multiplier} - 1)) ]]}} {{type=@{type}}} {{description=@{notes}}} @{iterative_attacks} @{macro_options}</textarea>
                     </fieldset>
                 </div>
             </div>
@@ -8697,14 +7710,14 @@
                         <input type="checkbox" class="sheet-sect-show" title="@{npc-spell-like-abilities-sect-show}" name="attr_npc-spell-like-abilities-sect-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
                         <div class="sheet-sect">
                             <fieldset class="repeating_npc-spell-like-abilities">
-                                <span class="sheet-table-data sheet-center sheet-small label" style="width:5%;"><button type="roll" value="@{macro-text}"></button><br>&nbsp;</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_npc-spell-like-abilities_X_used}" type="number" name="attr_used" value="0"><br>Usos/Día</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spell-like-abilities_X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:42%;"><input title="@{repeating_npc-spell-like-abilities_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spell-like-abilities_X_duration}" type="text" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spell-like-abilities_X_save}" type="text" name="attr_save" placeholder="Salvación"><br>Salv.</span>
+                                <span class="sheet-table-data sheet-center sheet-small label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button><br>&nbsp;</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_npc-spell-like-abilities_$X_used}" type="number" name="attr_used" value="0"><br>Usos/Día</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spell-like-abilities_$X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:42%;"><input title="@{repeating_npc-spell-like-abilities_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spell-like-abilities_$X_duration}" type="text" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spell-like-abilities_$X_save}" type="text" name="attr_save" placeholder="Salvación"><br>Salv.</span>
                                 <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;">
-                                    <select title="@{repeating_npc-spell-like-abilities_X_sr}" name="attr_sr">
+                                    <select title="@{repeating_npc-spell-like-abilities_$X_sr}" name="attr_sr">
                                         <option value="" selected>RC</option>
                                         <option value="Yes">Sí</option>
                                         <option value="No">No</option>
@@ -8716,7 +7729,7 @@
                                 <br>
                                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
                                 <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_npc-spells_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                                <textarea class="sheet-macro-text" title="@{repeating_npc-spell-like-abilities_X_macro-text}" name="attr_macro-text">/w gm &{template:pf_generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{Save=@{save}}} {{description=@{short-description}}}</textarea>
+                                <textarea class="sheet-macro-text" title="@{repeating_npc-spell-like-abilities_$X_macro-text}" name="attr_macro-text">/w gm &{template:pf_generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{Save=@{save}}} {{description=@{short-description}}}</textarea>
                                 <hr/>
                             </fieldset>
                         </div>
@@ -8777,14 +7790,14 @@
                         <input type="checkbox" class="sheet-sect-show" title="@{npc-spell1-sect-show}" name="attr_npc-spell1-sect-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
                         <div class="sheet-sect">
                             <fieldset class="repeating_npc-spells1">
-                                <span class="sheet-table-data sheet-center sheet-small label" style="width:5%;"><button type="roll" value="@{macro-text}"></button><br>&nbsp;</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_npc-spells1_X_used}" type="number" name="attr_used" value="0"><br>Usos/Día</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells1_X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:42%;"><input title="@{repeating_npc-spells1_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells1_X_duration}" type="text" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells1_X_save}" type="text" name="attr_save" placeholder="Salvación"><br>Salv.</span>
+                                <span class="sheet-table-data sheet-center sheet-small label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button><br>&nbsp;</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_npc-spells1_$X_used}" type="number" name="attr_used" value="0"><br>Usos/Día</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells1_$X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:42%;"><input title="@{repeating_npc-spells1_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells1_$X_duration}" type="text" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells1_$X_save}" type="text" name="attr_save" placeholder="Salvación"><br>Salv.</span>
                                 <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;">
-                                    <select title="@{repeating_npc-spells1_X_sr}" name="attr_sr">
+                                    <select title="@{repeating_npc-spells1_$X_sr}" name="attr_sr">
                                         <option value="" selected>RC</option>
                                         <option value="Yes">Sí</option>
                                         <option value="No">No</option>
@@ -8795,8 +7808,8 @@
                                 </span>
                                 <br>
                                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_npc-spells1_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                                <textarea class="sheet-macro-text" title="@{repeating_npc-spells1_X_macro-text}" name="attr_macro-text">/w gm &{template:pf_generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{Save=@{save}}} {{description=@{short-description}}}</textarea>
+                                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_npc-spells1_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                                <textarea class="sheet-macro-text" title="@{repeating_npc-spells1_$X_macro-text}" name="attr_macro-text">/w gm &{template:pf_generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{Save=@{save}}} {{description=@{short-description}}}</textarea>
                                 <hr/>
                             </fieldset>
                         </div>
@@ -8857,14 +7870,14 @@
                         <input type="checkbox" class="sheet-sect-show" title="@{npc-spell1-sect-show}" name="attr_npc-spell1-sect-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
                         <div class="sheet-sect">
                             <fieldset class="repeating_npc-spells2">
-                                <span class="sheet-table-data sheet-center sheet-small label" style="width:5%;"><button type="roll" value="@{macro-text}"></button><br>&nbsp;</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_npc-spells2_X_used}" type="number" name="attr_used" value="0"><br>Usos/Día</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells2_X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:42%;"><input title="@{repeating_npc-spells2_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells2_X_duration}" type="text" name="attr_duration" placeholder="Duración"><br>Duración</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells2_X_save}" type="text" name="attr_save" placeholder="Salvación"><br>Salv.</span>
+                                <span class="sheet-table-data sheet-center sheet-small label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button><br>&nbsp;</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_npc-spells2_$X_used}" type="number" name="attr_used" value="0"><br>Usos/Día</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells2_$X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:42%;"><input title="@{repeating_npc-spells2_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells2_$X_duration}" type="text" name="attr_duration" placeholder="Duración"><br>Duración</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input title="@{repeating_npc-spells2_$X_save}" type="text" name="attr_save" placeholder="Salvación"><br>Salv.</span>
                                 <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;">
-                                    <select title="@{repeating_npc-spells2_X_sr}" name="attr_sr">
+                                    <select title="@{repeating_npc-spells2_$X_sr}" name="attr_sr">
                                         <option value="" selected>RC</option>
                                         <option value="Yes">Sí</option>
                                         <option value="No">No</option>
@@ -8875,8 +7888,8 @@
                                 </span>
                                 <br>
                                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_npc-spells2_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                                <textarea class="sheet-macro-text" title="@{repeating_npc-spells2_X_macro-text}" name="attr_macro-text">/w gm &{template:pf_generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{Save=@{save}}} {{description=@{short-description}}}</textarea>
+                                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_npc-spells2_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                                <textarea class="sheet-macro-text" title="@{repeating_npc-spells2_$X_macro-text}" name="attr_macro-text">/w gm &{template:pf_generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{Save=@{save}}} {{description=@{short-description}}}</textarea>
                                 <hr/>
                             </fieldset>
                         </div>
@@ -8945,20 +7958,20 @@
                 <input type="checkbox" class="sheet-sect-show" title="@{npc-feats-show}" name="attr_npc-feats-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
                 <div class="sheet-table sheet-sect">
                     <fieldset class="repeating_feat">
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" value="@{macro-text}"></button><br>&nbsp;</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:23%;"><input title="@{repeating_feat_X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:45%;"><input title="@{repeating_feat_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripciónn</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_feat_X_used}" type="number" name="attr_used" value="0"><br>Usado</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button><br>&nbsp;</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:23%;"><input title="@{repeating_feat_$X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:45%;"><input title="@{repeating_feat_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripciónn</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_feat_$X_used}" type="number" name="attr_used" value="0"><br>Usado</span>
                         <span class="sheet-table-data sheet-center" style="width:2%;vertical-align:middle;font-size:150%;">/<br>&nbsp;</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_feat_X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled><br>Máx.</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_feat_X_max-calculation}" type="text" name="attr_max-calculation" value="0"><br>Máx. Calc.</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_feat_$X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled><br>Máx.</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="0"><br>Máx. Calc.</span>
                         <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_feat_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                        <textarea class="sheet-desc" title="@{repeating_feat_X_description}" name="attr_description"></textarea>
+                        <input type="checkbox" class="sheet-desc-show" title="@{repeating_feat_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                        <textarea class="sheet-desc" title="@{repeating_feat_$X_description}" name="attr_description"></textarea>
                         <br>
                         <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_feat_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                        <textarea class="sheet-macro-text" title="@{repeating_feat_X_macro-text}" name="attr_macro-text">/w gm &{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
+                        <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_feat_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                        <textarea class="sheet-macro-text" title="@{repeating_feat_$X_macro-text}" name="attr_macro-text">/w gm &{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
                     </fieldset>
                 </div>
             </div>
@@ -9284,21 +8297,21 @@
         <div class="sheet-table sheet-sect">
             <fieldset class="repeating_racial-trait">
                 <div class="sheet-table-row">
-                    <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" value="@{macro-text}"></button><br>&nbsp;</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_racial-trait_X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:28%;"><input title="@{repeating_racial-trait_X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_racial-trait_X_used}" type="number" name="attr_used" value="0"><br>Usos</span>
+                    <span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll"  value="@{macro-text}"></button><br>&nbsp;</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_racial-trait_$X_name}" type="text" name="attr_name" placeholder="Nombre"><br>Nombre</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:28%;"><input title="@{repeating_racial-trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Descripción"><br>Descripción</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_racial-trait_$X_used}" type="number" name="attr_used" value="0"><br>Usos</span>
                     <span class="sheet-table-data sheet-center" style="width:2%;vertical-align:middle;font-size:150%;">/<br>/</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_racial-trait_X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled><br>Máx.</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_racial-trait_X_max-calculation}" type="text" name="attr_max-calculation" value="0"><br>Máx. Calc.</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_racial-trait_$X_used|max" type="number" name="attr_used_max" value="@{max-calculation}" disabled><br>Máx.</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_racial-trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="0"><br>Máx. Calc.</span>
                 </div>
                 <b>Descripción&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-desc-show" title="@{repeating_racial-trait_X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
-                <textarea class="sheet-desc" title="@{repeating_racial-trait_X_description}" name="attr_description"></textarea>
+                <input type="checkbox" class="sheet-desc-show" title="@{repeating_racial-trait_$X_description-show}" name="attr_description-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;" checked/><span></span>
+                <textarea class="sheet-desc" title="@{repeating_racial-trait_$X_description}" name="attr_description"></textarea>
                 <br>
                 <b>Macro&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_racial-trait_X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
-                <textarea class="sheet-macro-text" title="@{repeating_racial-trait_X_macro-text}" name="attr_macro-text">/w gm &{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
+                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_racial-trait_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0;width: 35px;height: 16px;position: relative;top: 5px;left: 6px;margin: -32px;cursor: pointer;z-index: 1;"/><span></span>
+                <textarea class="sheet-macro-text" title="@{repeating_racial-trait_$X_macro-text}" name="attr_macro-text">/w gm &{template:pf_block} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
             </fieldset>
         </div>
     </div>
@@ -9321,10 +8334,11 @@
 <div class="sheet-footer">
 	<div class="sheet-table">
 		<div class="sheet-table-row">
-			<span class="sheet-table-data sheet-center">Sheet created by Samuel Marino, currently maintained by Vince, Samuel Terrazas and Nibrodooh | Last updated: <i>09.03.2015</i><br>Traducida por Masivi <i>10.12.2015</i></span>
+			<span class="sheet-table-data sheet-center">Sheet created by Samuel Marino, currently maintained by Vince, Samuel Terrazas and Nibrodooh | Last updated: <i>09.03.2015</i><br>Traducida por Masivi <i>10.12.2015</i> 
+			<b>Actualizado para Roll20 repitiendo cambios de atributos.</b> Vince <i>01.18.2016</i></span>
 		</div>
 		<div class="sheet-table-row">
-			<span class="sheet-table-data sheet-center">Have questions or feedback?  This thread can help:<input type="text" style="width:50%; border:0px;" value="https://app.roll20.net/forum/post/1915585/pathfinder-sheet-thread-4-life-after-sam"/></span>
+			<span class="sheet-table-data sheet-center">Have questions or feedback?  This thread can help:<input type="text" style="width:50%; border:none;" value="https://app.roll20.net/forum/post/2788628/pf-pathfinder-sheet-thread-5" /></span>
 		</div>
 	</div>
 </div>