diff --git a/Forsaken Worlds/ForsakenWorlds.html b/Forsaken Worlds/ForsakenWorlds.html
index 292608b26e..118123bdc3 100644
--- a/Forsaken Worlds/ForsakenWorlds.html	
+++ b/Forsaken Worlds/ForsakenWorlds.html	
@@ -671,7 +671,7 @@
                     <td><input type="text" name="attr_ppd" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_ppa" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_ppl" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_ppt" value="@{ppb}@{ppr}@{ppd}@{ppa}@{ppl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_pp" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{ppt}]] [Pick Pockets]"></button><button type="roll" name="roll_ppnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{ppb}@{ppr}@{ppd}@{ppl}]] [Pick Pockets (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_ppt" value="@{ppb}@{ppr}@{ppd}@{ppa}@{ppl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_pp" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{ppt}]] [Pick Pockets]"></button><button type="roll" name="roll_ppnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{ppb}@{ppr}@{ppd}@{ppl}]] [Pick Pockets (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bold;'>Open Locks</td>
@@ -680,7 +680,7 @@
                     <td><input type="text" name="attr_old" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_ola" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_oll" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_olt" value="@{olb}@{olr}@{old}@{ola}@{oll}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_ol" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{olt}]] [Open Locks]"></button><button type="roll" name="roll_olnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{olb}@{olr}@{old}@{oll}]] [Open Locks (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_olt" value="@{olb}@{olr}@{old}@{ola}@{oll}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_ol" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{olt}]] [Open Locks]"></button><button type="roll" name="roll_olnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{olb}@{olr}@{old}@{oll}]] [Open Locks (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: brtd;'>Find/Remove Traps</td>
@@ -689,7 +689,7 @@
                     <td><input type="text" name="attr_rtd" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_rta" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_rtl" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_rtt" value="@{rtb}@{rtr}@{rtd}@{rta}@{rtl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_rt" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{rtt}]] [Find/Remove Traps]"></button><button type="roll" name="roll_rtnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{rtb}@{rtr}@{rtd}@{rtl}]] [Find/Remove Traps (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_rtt" value="@{rtb}@{rtr}@{rtd}@{rta}@{rtl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_rt" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{rtt}]] [Find/Remove Traps]"></button><button type="roll" name="roll_rtnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{rtb}@{rtr}@{rtd}@{rtl}]] [Find/Remove Traps (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bmsd;'>Move Silently</td>
@@ -698,7 +698,7 @@
                     <td><input type="text" name="attr_msd" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_msa" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_msl" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_mst" value="@{msb}@{msr}@{msd}@{msa}@{msl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_ms" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{mst}]] [Move Silently]"></button><button type="roll" name="roll_msnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{msb}@{msr}@{msd}@{msl}]] [Move Silently (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_mst" value="@{msb}@{msr}@{msd}@{msa}@{msl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_ms" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{mst}]] [Move Silently]"></button><button type="roll" name="roll_msnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{msb}@{msr}@{msd}@{msl}]] [Move Silently (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bold;'>Hide in Shadows</td>
@@ -707,7 +707,7 @@
                     <td><input type="text" name="attr_hsd" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_hsa" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_hsl" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_hst" value="@{hsb}@{hsr}@{hsd}@{hsa}@{hsl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_hs" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{hst}]] [Hide in Shadows]"></button><button type="roll" name="roll_hsnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{hsb}@{hsr}@{hsd}@{hsl}]] [Hide in Shadows (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_hst" value="@{hsb}@{hsr}@{hsd}@{hsa}@{hsl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_hs" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{hst}]] [Hide in Shadows]"></button><button type="roll" name="roll_hsnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{hsb}@{hsr}@{hsd}@{hsl}]] [Hide in Shadows (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bold;'>Detect Noise</td>
@@ -716,7 +716,7 @@
                     <td><input type="text" name="attr_dnd" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_dna" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_dnl" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_dnt" value="@{dnb}@{dnr}@{dnd}@{dna}@{dnl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_dn" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{dnt}]] [Detect Noise]"></button><button type="roll" name="roll_dnnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{dnb}@{dnr}@{dnd}@{dnl}]] [Detect Noise (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_dnt" value="@{dnb}@{dnr}@{dnd}@{dna}@{dnl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_dn" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{dnt}]] [Detect Noise]"></button><button type="roll" name="roll_dnnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{dnb}@{dnr}@{dnd}@{dnl}]] [Detect Noise (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bold;'>Climb Walls</td>
@@ -725,7 +725,7 @@
                     <td><input type="text" name="attr_cwd" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_cwa" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_cwl" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_cwt" value="@{cwb}@{cwr}@{cwd}@{cwa}@{cwl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_cw" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{cwt}]] [Climb Walls]"></button><button type="roll" name="roll_cwnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{cwb}@{cwr}@{cwd}@{cwl}]] [Climb Walls (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_cwt" value="@{cwb}@{cwr}@{cwd}@{cwa}@{cwl}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_cw" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{cwt}]] [Climb Walls]"></button><button type="roll" name="roll_cwnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{cwb}@{cwr}@{cwd}@{cwl}]] [Climb Walls (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bold;'>Read Languages</td>
@@ -734,7 +734,7 @@
                     <td><input type="text" name="attr_rld" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_rla" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_rll" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_rlt" value="@{rlb}@{rlr}@{rld}@{rla}@{rll}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_rl" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{rlt}]] [Read Languages]"></button><button type="roll" name="roll_rlnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{rlb}@{rlr}@{rld}@{rll}]] [Read Languages (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_rlt" value="@{rlb}@{rlr}@{rld}@{rla}@{rll}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_rl" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{rlt}]] [Read Languages]"></button><button type="roll" name="roll_rlnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{rlb}@{rlr}@{rld}@{rll}]] [Read Languages (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bold;'>Detect Magic*</td>
@@ -743,7 +743,7 @@
                     <td><input type="text" name="attr_dmd" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_dma" value="+0" class="sheet-short"/> </td>
                     <td><input type="text" name="attr_dml" value="+0" class="sheet-short"/> </td>
-                    <td><input type="text" name="attr_dmt" value="@{dmb}@{dmr}@{dmd}@{dma}@{dml}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_dm" value="/gmroll {1d100+[[?{Misc. modifier|+0}]]}<[[@{dmt}]] [Detect Magic]"></button><button type="roll" name="roll_dmnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{dmb}@{dmr}@{dmd}@{dml}]] [Detect Magic (no armor)]">No armor</button></td>
+                    <td><input type="text" name="attr_dmt" value="@{dmb}@{dmr}@{dmd}@{dma}@{dml}" disabled="true" class="sheet-short"/>%<button type="roll" name="roll_dm" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{dmt}]] [Detect Magic]"></button><button type="roll" name="roll_dmnoarmor" value="/gmroll {1d20+[[?{Misc. modifier|+0}]]}<[[@{dmb}@{dmr}@{dmd}@{dml}]] [Detect Magic (no armor)]">No armor</button></td>
                 </tr>
                 <tr>
                     <td style='background-color: #4e1702; color: #FFF; font-weight: bold;'>Detect Illusion*</td>