diff --git a/Fallout (classic_pnp 2)/Fallout 2.0.html b/Fallout (classic_pnp 2)/Fallout 2.0.html
index 5ea6667c4d..0c64f410f4 100644
--- a/Fallout (classic_pnp 2)/Fallout 2.0.html	
+++ b/Fallout (classic_pnp 2)/Fallout 2.0.html	
@@ -224,7 +224,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-barter" value='/em @{character_name} rolls Barter skill [[1d100]], compared to [[@{barter}]]' /></td>
             <td>Barter</td>
             <td><input name="attr_tagskill1" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_barter" value="@{mod-barter} + @{base-barter}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_barter" value="@{mod-barter} + @{base-barter} + 20*@{tagskill1}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-barter" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-barter" value="@{charisma}*4" disabled="true" /></td>
@@ -235,7 +235,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-big_guns" value='/em @{character_name} rolls Big Guns skill [[1d100]], compared to [[@{big_guns}]]' /></td>
             <td>Big Guns</td>
             <td><input name="attr_tagskill2" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_big_guns" value="@{mod-big_guns} + @{base-big_guns}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_big_guns" value="@{mod-big_guns} + @{base-big_guns} + 20*@{tagskill2}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-big_guns" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-big_guns" value=" @{agility}*2 " disabled="true" /></td>
@@ -247,7 +247,7 @@
             <td style="height: 30px">Doctor</td>
             <td style="height: 30px">
 			<input name="attr_tagskill3" value="1" type="checkbox"></td>
-            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_doctor" value="@{mod-doctor} + @{base-doctor}" disabled="true"/></td>
+            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_doctor" value="@{mod-doctor} + @{base-doctor} + 20*@{tagskill3}" disabled="true"/></td>
             <td style="height: 30px"><input type="number" class="sheet-number"name="attr_mod-doctor" value="0" /></td>
             <td style="height: 30px">
 			<input type="number" class="sheet-number" name="attr_base-doctor" disabled="true" value="5 + @{perception} + @{intelligence}" /></td>
@@ -259,7 +259,7 @@
             <td style="height: 30px">Energy Weapons</td>
             <td style="height: 30px">
 			<input name="attr_tagskill4" value="1" type="checkbox"></td>
-            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_energy_weapons" value="@{mod-energy_weapons} + @{base-energy_weapons}" disabled="true"/></td>
+            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_energy_weapons" value="@{mod-energy_weapons} + @{base-energy_weapons} + 20*@{tagskill4}" disabled="true"/></td>
             <td style="height: 30px"><input type="number" class="sheet-number"name="attr_mod-energy_weapons" value="0" /></td>
             <td style="height: 30px">
 			<input type="number" class="sheet-number" name="attr_base-energy_weapons" value=" @{agility}*2" disabled="true" /></td>
@@ -271,7 +271,7 @@
             <td>First Aid</td>
             <td><input name="attr_tagskill5" value="1" type="checkbox"></td>
             <td>
-			<input type="number" class="sheet-number" name="attr_firstaid" value="@{mod-firstaid} + @{base-firstaid}" disabled="true"/></td>
+			<input type="number" class="sheet-number" name="attr_firstaid" value="@{mod-firstaid} + @{base-firstaid} + 20*@{tagskill5}" disabled="true"/></td>
             <td>
 			<input type="number" class="sheet-number"name="attr_mod-firstaid" value="0" /></td>
             <td>
@@ -283,7 +283,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-gambling" value='/em @{character_name} rolls Gambling skill [[1d100]], compared to [[@{gambling}]]' /></td>
             <td>Gambling</td>
             <td><input name="attr_tagskill6" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_gambling" value="@{mod-gambling} + @{base-gambling}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_gambling" value="@{mod-gambling} + @{base-gambling} + 20*@{tagskill6}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-gambling" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-gambling" value="@{luck}*5" disabled="true" /></td>
@@ -294,7 +294,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-lockpick" value='/em @{character_name} rolls Lockpick skill [[1d100]], compared to [[@{lockpick}]]' /></td>
             <td>Lockpick</td>
             <td><input name="attr_tagskill7" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_lockpick" value="@{mod-lockpick} + @{base-lockpick}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_lockpick" value="@{mod-lockpick} + @{base-lockpick} + 20*@{tagskill7}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-lockpick" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-lockpick" value="10 + @{perception} + @{agility}" disabled="true" style="height: 22px" /></td>
@@ -306,7 +306,7 @@
             <td style="height: 30px">Melee Weapons</td>
             <td style="height: 30px">
 			<input name="attr_tagskill8" value="1" type="checkbox"></td>
-            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_melee_weapons" value="@{mod-melee_weapons} + @{base-melee_weapons}" disabled="true"/></td>
+            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_melee_weapons" value="@{mod-melee_weapons} + @{base-melee_weapons} + 20*@{tagskill8}" disabled="true"/></td>
             <td style="height: 30px"><input type="number" class="sheet-number"name="attr_mod-melee_weapons" value="0" /></td>
             <td style="height: 30px">
 			<input type="number" class="sheet-number" name="attr_base-melee_weapons" value="20 + @{strength}*2 + @{agility}*2" disabled="true" /></td>
@@ -317,7 +317,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-outdoorsman" value='/em @{character_name} rolls Outdoorsman skill [[1d100]], compared to [[@{outdoorsman}]]' /></td>
             <td>Outdoorsman</td>
             <td><input name="attr_tagskill9" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_outdoorsman" value="@{mod-outdoorsman} + @{base-outdoorsman}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_outdoorsman" value="@{mod-outdoorsman} + @{base-outdoorsman} + 20*@{tagskill9}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-outdoorsman" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-outdoorsman" value="(@{endurance} + @{intelligence})*2" disabled="true" /></td>
@@ -328,7 +328,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-pilot" value='/em @{character_name} rolls Pilot skill [[1d100]], compared to [[@{pilot}]]' /></td>
             <td>Pilot</td>
             <td><input name="attr_tagskill10" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_pilot" value="@{mod-pilot} + @{base-pilot}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_pilot" value="@{mod-pilot} + @{base-pilot} + 20*@{tagskill10}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-pilot" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-pilot" value="(@{agility} + @{perception})*2" disabled="true" /></td>
@@ -340,7 +340,7 @@
             <td style="height: 30px">Repair</td>
             <td style="height: 30px">
 			<input name="attr_tagskill11" value="1" type="checkbox"></td>
-            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_repair" value="@{mod-repair} + @{base-repair}" disabled="true"/></td>
+            <td style="height: 30px"><input type="number" class="sheet-number" name="attr_repair" value="@{mod-repair} + @{base-repair} + 20*@{tagskill11}" disabled="true"/></td>
             <td style="height: 30px"><input type="number" class="sheet-number"name="attr_mod-repair" value="0" /></td>
             <td style="height: 30px">
 			<input type="number" class="sheet-number" name="attr_base-repair" value="@{intelligence}*3" disabled="true" /></td>
@@ -351,7 +351,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-science" value='/em @{character_name} rolls Science skill [[1d100]], compared to [[@{science}]]' /></td>
             <td>Science</td>
             <td><input name="attr_tagskill12" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_science" value="@{mod-science} + @{base-science}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_science" value="@{mod-science} + @{base-science} + 20*@{tagskill12}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-science" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-science" value="@{intelligence}*4" disabled="true" /></td>
@@ -362,7 +362,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-small_guns" value='/em @{character_name} rolls Small Guns skill [[1d100]], compared to [[@{small_guns}]]' /></td>
             <td>Small Guns</td>
             <td><input name="attr_tagskill13" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_small_guns" value="@{mod-small_guns} + @{base-small_guns}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_small_guns" value="@{mod-small_guns} + @{base-small_guns} + 20*@{tagskill13}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-small_guns" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-small_guns" value="5 + @{agility}*4" disabled="true" /></td>
@@ -373,7 +373,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-sneak" value='/em @{character_name} rolls Sneak skill [[1d100]], compared to [[@{sneak}]]' /></td>
             <td>Sneak</td>
             <td><input name="attr_tagskill14" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_sneak" value="@{mod-sneak} + @{base-sneak}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_sneak" value="@{mod-sneak} + @{base-sneak} + 20*@{tagskill14}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-sneak" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-sneak" value="5 + (@{agility}*3)" disabled="true" /></td>
@@ -384,7 +384,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-speech" value='/em @{character_name} rolls Speech skill [[1d100]], compared to [[@{speech}]]' /></td>
             <td>Speech</td>
             <td><input name="attr_tagskill15" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_speech" value="@{mod-speech} + @{base-speech}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_speech" value="@{mod-speech} + @{base-speech} + 20*@{tagskill15}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-speech" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-speech" value="@{charisma}*5" disabled="true" /></td>
@@ -395,7 +395,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-steal" value='/em @{character_name} rolls Steal skill [[1d100]], compared to [[@{steal}]]' /></td>
             <td>Steal</td>
             <td><input name="attr_tagskill16" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_steal" value="@{mod-steal} + @{base-steal}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_steal" value="@{mod-steal} + @{base-steal} + 20*@{tagskill16}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-steal" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-steal" value="@{agility}*3" disabled="true" /></td>
@@ -406,7 +406,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-throwing" value='/em @{character_name} rolls Throwing skill [[1d100]], compared to [[@{throwing}]]' /></td>
             <td>Throwing</td>
             <td><input name="attr_tagskill17" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_throwing" value="@{mod-throwing} + @{base-throwing}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_throwing" value="@{mod-throwing} + @{base-throwing} + 20*@{tagskill17}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-throwing" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-throwing" value="@{agility}*4" disabled="true" /></td>
@@ -417,7 +417,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-traps" value='/em @{character_name} rolls Traps skill [[1d100]], compared to [[@{traps}]]' /></td>
             <td>Traps</td>
             <td><input name="attr_tagskill18" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_traps" value="@{mod-traps} + @{base-traps}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_traps" value="@{mod-traps} + @{base-traps} + 20*@{tagskill18}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-traps" value="0" /></td>
             <td><input type="number" class="sheet-number" name="attr_base-traps" value="10 + @{perception} + @{agility}" disabled="true" /></td>
             <td><input type="text" class="sheet-number" name="attr_basetext-traps" value="10 + (PE + AG)" readonly /></td>
@@ -426,7 +426,7 @@
             <td><button class="sheet-skill_button" type='roll' name="attr_roll-unarmed" value='/em @{character_name} rolls Unarmed skill [[1d100]], compared to [[@{traps}]]' /></td>
             <td>Unarmed</td>
             <td><input name="attr_tagskill19" value="1" type="checkbox"></td>
-            <td><input type="number" class="sheet-number" name="attr_unarmed" value="@{mod-unarmed} + @{base-unarmed}" disabled="true"/></td>
+            <td><input type="number" class="sheet-number" name="attr_unarmed" value="@{mod-unarmed} + @{base-unarmed} + 20*@{tagskill19}" disabled="true"/></td>
             <td><input type="number" class="sheet-number"name="attr_mod-unarmed" value="0" /></td>
             <td>
 			<input type="number" class="sheet-number" name="attr_base-unarmed" value="30 + (@{strength} + @{agility})*2" disabled="true" /></td>