diff --git a/RolemasterUnified/sheet_RMU_v1.0.html b/RolemasterUnified/sheet_RMU_v1.0.html
index f477fff7ff..f3d1b5dab7 100644
--- a/RolemasterUnified/sheet_RMU_v1.0.html
+++ b/RolemasterUnified/sheet_RMU_v1.0.html
@@ -1242,7 +1242,7 @@
             checked="checked" /><span style="text-align: left; font-size: 0.6em;" data-i18n="animal">Animal</span>:<span
             style="text-align: left; font-size: 0.6em;" data-i18n="stats-animal">[Ag]+ [Em]</span>
         <div class="pc-skillanimal">
-        		<div class="table-row">
+			<div class="table-row">
 				<span class="table-data-skills-name"><span data-i18n="animal-handling">Animal Handling</span>-<input type="text" name="attr_animalhandling1name" title="animalhandling1name" style="width: 100px;"/></span>
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_animalhandling1" title="animalhandling1" value="0" readonly /></span>
 				<span class="table-data"><input type="text" class="table-data-skills-wide" name="attr_animalhandling1ranks" title="animalhandling1ranks (Number of Ranks)" value="0"/></span>
@@ -1255,7 +1255,7 @@
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_animalhandling1specialmod" title="animalhandling1specialmod (Any Special bonuses)" value="0"/></span>
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_animalhandling1itemmod" title="animalhandling1itemmod (Item Bonus)" value="0"/></span>
 				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-notes" name="attr_animalhandling1notes" title="animalhandling1notes"></textarea></span>
-				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_animalhandling1macro" title="animalhandling1macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Animal Handling-@{animalhandling1name}}} {{subtags=Category: Animal}} {{check= Animal Handling - @{animalhandling1name} (@{animalhandling1ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{animalhandling1}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{animalhandling1} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{animalhandling1notes} }} </textarea></span>
+				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_animalhandling1macro" title="animalhandling1macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Animal Handling @{animalhandling1name}}} {{subtags=Category: Animal}} {{check=Animal Handling @{animalhandling1name} (@{animalhandling1ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{animalhandling1}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{animalhandling1} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{animalhandling1notes} }} </textarea></span>
 				<span class="table-data-skills-sm"><button type="roll" class="button-roll" name="roll_animalhandling1check" title="animalhandling1check" value="@{animalhandling1macro}"></button></span>
 			</div>
 			<div class="table-row">
@@ -1271,7 +1271,7 @@
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_animalhandling2specialmod" title="animalhandling2specialmod (Any Special bonuses)" value="0"/></span>
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_animalhandling2itemmod" title="animalhandling2itemmod (Item Bonus)" value="0"/></span>
 				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-notes" name="attr_animalhandling2notes" title="animalhandling2notes"></textarea></span>
-				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_animalhandling2macro" title="animalhandling2macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Animal Handling-@{animalhandling2name}}} {{subtags=Category: Animal}} {{check= Animal Handling - @{animalhandling2name} (@{animalhandling2ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{animalhandling2}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{animalhandling2} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{animalhandling2notes} }} </textarea></span>
+				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_animalhandling2macro" title="animalhandling2macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Animal Handling @{animalhandling2name}}} {{subtags=Category: Animal}} {{check=Animal Handling @{animalhandling2name} (@{animalhandling2ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{animalhandling2}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{animalhandling2} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{animalhandling2notes} }} </textarea></span>
 				<span class="table-data-skills-sm"><button type="roll" class="button-roll" name="roll_animalhandling2check" title="animalhandling2check" value="@{animalhandling2macro}"></button></span>
 			</div>
 			<div class="table-row">
@@ -1287,7 +1287,7 @@
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_animalhandling3specialmod" title="animalhandling3specialmod (Any Special bonuses)" value="0"/></span>
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_animalhandling3itemmod" title="animalhandling3itemmod (Item Bonus)" value="0"/></span>
 				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-notes" name="attr_animalhandling3notes" title="animalhandling3notes"></textarea></span>
-				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_animalhandling3macro" title="animalhandling3macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Animal Handling-@{animalhandling3name}}} {{subtags=Category: Animal}} {{check= Animal Handling - @{animalhandling3name} (@{animalhandling3ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{animalhandling3}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{animalhandling3} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{animalhandling3notes} }} </textarea></span>
+				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_animalhandling3macro" title="animalhandling3macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Animal Handling @{animalhandling3name}}} {{subtags=Category: Animal}} {{check=Animal Handling @{animalhandling3name} (@{animalhandling3ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{animalhandling3}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{animalhandling3} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{animalhandling3notes} }} </textarea></span>
 				<span class="table-data-skills-sm"><button type="roll" class="button-roll" name="roll_animalhandling3check" title="animalhandling3check" value="@{animalhandling3macro}"></button></span>
 			</div>
 			<div class="table-row">
@@ -1303,7 +1303,7 @@
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_riding1specialmod" title="riding1specialmod (Any Special bonuses)" value="0"/></span>
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_riding1itemmod" title="riding1itemmod (Item Bonus)" value="0"/></span>
 				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-notes" name="attr_riding1notes" title="riding1notes"></textarea></span>
-				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_riding1macro" title="riding1macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Riding-@{riding1name}}} {{subtags=Category: Animal}} {{check= Riding - @{riding1name} (@{riding1ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{riding1}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{riding1} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{riding1notes} }} </textarea></span>
+				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_riding1macro" title="riding1macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Riding @{riding1name}}} {{subtags=Category: Animal}} {{check=Riding @{riding1name} (@{riding1ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{riding1}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{riding1} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{riding1notes} }} </textarea></span>
 				<span class="table-data-skills-sm"><button type="roll" class="button-roll" name="roll_riding1check" title="riding1check" value="@{riding1macro}"></button></span>
 			</div>
 			<div class="table-row">
@@ -1319,7 +1319,7 @@
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_riding2specialmod" title="riding2specialmod (Any Special bonuses)" value="0"/></span>
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_riding2itemmod" title="riding2itemmod (Item Bonus)" value="0"/></span>
 				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-notes" name="attr_riding2notes" title="riding2notes"></textarea></span>
-				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_riding2macro" title="riding2macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Riding-@{riding2name}}} {{subtags=Category: Animal}} {{check= Riding - @{riding2name} (@{riding2ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{riding2}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{riding2} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{riding2notes} }} </textarea></span>
+				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_riding2macro" title="riding2macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Riding @{riding2name}}} {{subtags=Category: Animal}} {{check=Riding @{riding2name} (@{riding2ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{riding2}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{riding2} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{riding2notes} }} </textarea></span>
 				<span class="table-data-skills-sm"><button type="roll" class="button-roll" name="roll_riding2check" title="riding2check" value="@{riding2macro}"></button></span>
 			</div>
 			<div class="table-row">
@@ -1335,9 +1335,10 @@
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_riding3specialmod" title="riding3specialmod (Any Special bonuses)" value="0"/></span>
 				<span class="table-data"><input type="text" class="table-data-skills" name="attr_riding3itemmod" title="riding3itemmod (Item Bonus)" value="0"/></span>
 				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-notes" name="attr_riding3notes" title="riding3notes"></textarea></span>
-				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_riding3macro" title="riding3macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Riding-@{riding3name}}} {{subtags=Category: Animal}} {{check= Riding - @{riding3name} (@{riding3ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{riding3}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{riding3} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{riding3notes} }} </textarea></span>
+				<span class="table-data"><textarea rows="1" cols="50" class="table-data-skills-macrobox" name="attr_riding3macro" title="riding3macro">/w gm &{template:RmuStdRoll} {{skillflag=true}} {{name=@{character_name}'s Riding @{riding3name}}} {{subtags=Category: Animal}} {{check=Riding @{riding3name} (@{riding3ranks} ranks): }}  {{checkroll=[[1d100!>@{oeuproll}cf<@{oedownroll}cs=100 +[[@{riding3}]] +?{Other bonus/penalty?|0} ]]}} {{oedownroll= -[[1d100!>@{oeuproll}[open ended down roll; subtract from previous roll] ]]}} {{critroll= **Check for Nat 100!!!!**}} {{highlight66= [[66 +?{Other bonus/penalty?|0} +@{riding3} ]]}} {{highlight66roll=**Natural 66.** }} {{notes=@{riding3notes} }} </textarea></span>
 				<span class="table-data-skills-sm"><button type="roll" class="button-roll" name="roll_riding3check" title="riding3check" value="@{riding3macro}"></button></span>
-			</div>		
+			</div>
+		
         </div>
         <br>
         <input type="checkbox" class="pc-skillawareness-show arrow" title="skillawareness-show" name="attr_skillawareness-show"