diff --git a/M-Space/M-Space.html b/M-Space/M-Space.html
index 2f7b47624d..c017a008b4 100644
--- a/M-Space/M-Space.html
+++ b/M-Space/M-Space.html
@@ -3,7 +3,7 @@
 <div class="wrapper">
     <!-- Header -->
     <div class="logo float-right">
-        <span class="float-right"><span class="bold" data-i18n="sheet-version-u">Sheet Version</span>: <input type="text" class="disabled number-width text-align-center" name="attr_version" value="1.8.0"></span>
+        <span class="float-right"><span class="bold" data-i18n="sheet-version-u">Sheet Version</span>: <input type="text" class="disabled number-width text-align-center" name="attr_version" value="1.8.1"></span>
         <img class="mythras-variant" src="http://i.imgur.com/Sm3ilMW.png">
         <img class="mspace-variant" src="https://i.imgur.com/5uPy3QU.jpg">
     </div>
@@ -92,7 +92,7 @@
             <span class="bold" i18n-data="setting-u">Setting</span>:
             <select name="attr_setting_option">
                 <option value="default" selected><span data-i18n="default-u">Default</span></option>
-                <option value="after_the_vampire_wars" selected><span data-i18n="after-the-vampire-wars-u">After the Vampire Wars</span></option>
+                <option value="after_the_vampire_wars"><span data-i18n="after-the-vampire-wars-u">After the Vampire Wars</span></option>
                 <option value="classic_fantasy"><span data-i18n="classic-fantasy-u">Classic Fantasy</span></option>
                 <option value="luther_arkwright"><span data-i18n="luther-arkwright-u">Luther Arkwright</span></option>
                 <option value="m-space"><span data-i18n="m-space-u">M-Space</span></option>
@@ -3557,7 +3557,7 @@
 						    <div class="arcane-magic-field"><input type="number" class="full-width" name="attr_arcane_magic_rank" value="0"></div>
 						    <div class="arcane-magic-field"><input type="number" class="full-width" name="attr_arcane_armor_penalty" value="ceil(@{armor_penalty}/3)" disabled></div>
 						    <div class="arcane-magic-field">
-						        <select class="full-width" name="attr_apply_arcane_armor_penalty" disabled>
+						        <select class="full-width" name="attr_apply_arcane_armor_penalty">
 						            <option value="@{arcane_armor_penalty}" selected><span data-i18n="yes-u">Yes</span></option>
 						            <option value="0"><span data-i18n="no-u">No</span></option>
 						        </select>  
@@ -3627,11 +3627,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{arcane_rank_1_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{arcane_rank_1_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{arcane_rank_1_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{arcane_rank_1_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{arcane_rank_1_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{arcane_rank_1_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{arcane_rank_1_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{arcane_rank_1_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{arcane_rank_1_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{arcane_rank_1_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -3671,11 +3671,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{arcane_rank_2_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{arcane_rank_2_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{arcane_rank_2_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{arcane_rank_2_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{arcane_rank_2_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{arcane_rank_2_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{arcane_rank_2_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{arcane_rank_2_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{arcane_rank_2_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{arcane_rank_2_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -3715,11 +3715,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{arcane_rank_3_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{arcane_rank_3_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{arcane_rank_3_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{arcane_rank_3_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{arcane_rank_3_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{arcane_rank_3_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{arcane_rank_3_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{arcane_rank_3_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{arcane_rank_3_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{arcane_rank_3_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -3759,11 +3759,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{arcane_rank_4_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{arcane_rank_4_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{arcane_rank_4_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{arcane_rank_4_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{arcane_rank_4_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{arcane_rank_4_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{arcane_rank_4_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{arcane_rank_4_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{arcane_rank_4_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{arcane_rank_4_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -3803,11 +3803,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{arcane_rank_5_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{arcane_rank_5_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{arcane_rank_5_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{arcane_rank_5_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{arcane_rank_5_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{arcane_rank_5_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{arcane_rank_5_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{arcane_rank_5_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{arcane_rank_5_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{arcane_rank_5_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -3943,11 +3943,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{divine_rank_1_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{divine_rank_1_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{divine_rank_1_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{divine_rank_1_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{divine_rank_1_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{divine_rank_1_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{divine_rank_1_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{divine_rank_1_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{divine_rank_1_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{divine_rank_1_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -3987,11 +3987,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{divine_rank_2_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{divine_rank_2_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{divine_rank_2_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{divine_rank_2_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{divine_rank_2_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{divine_rank_2_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{divine_rank_2_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{divine_rank_2_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{divine_rank_2_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{divine_rank_2_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -4031,11 +4031,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{divine_rank_3_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{divine_rank_3_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{divine_rank_3_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{divine_rank_3_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{divine_rank_3_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{divine_rank_3_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{divine_rank_3_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{divine_rank_3_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{divine_rank_3_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{divine_rank_3_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -4075,11 +4075,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{divine_rank_4_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{divine_rank_4_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{divine_rank_4_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{divine_rank_4_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{divine_rank_4_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{divine_rank_4_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{divine_rank_4_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{divine_rank_4_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{divine_rank_4_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{divine_rank_4_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -4119,11 +4119,11 @@
 				                    </div>
 				                    <div>
 				                        <span data-i18n="cost-u" class="bold">Cost</span>: <select type="number" class="number-width" name="attr_mp_cost">
-				                            <option value="[[1-@{divine_rank_5_cost_reduction}]]">1</option>
-				                            <option value="[[(1*?{Intensity|1})-@{divine_rank_5_cost_reduction}]]">1/+1</option>
-				                            <option value="[[3-@{divine_rank_5_cost_reduction}]]">3</option>
-				                            <option value="[[(3+(?{Intensity|1}-1))-@{divine_rank_5_cost_reduction}]]">3/+1</option>
-				                            <option value="[[(3*?{Intensity|1})-@{divine_rank_5_cost_reduction}]]">3/+3</option>
+				                            <option value="[[1+@{divine_rank_5_cost_reduction}]]">1</option>
+				                            <option value="[[(1*?{Intensity|1})+@{divine_rank_5_cost_reduction}]]">1/+1</option>
+				                            <option value="[[3+@{divine_rank_5_cost_reduction}]]">3</option>
+				                            <option value="[[(3+(?{Intensity|1}-1))+@{divine_rank_5_cost_reduction}]]">3/+1</option>
+				                            <option value="[[(3*?{Intensity|1})+@{divine_rank_5_cost_reduction}]]">3/+3</option>
 				                        </select> <span data-i18n="mp-u">MP</span> + <input type="number" class="number-width" name="attr_xp_cost" value="0"> <span data-i18n="xp-u">XP</span>
 				                        <span data-i18n="area-u" class="bold">Area</span>: <input type="text" name="attr_area">
 				                        <span data-i18n="time-u" class="bold">Time</span>: <input type="number" class="number-width" name="attr_time" value="1"> <input type="text" name="attr_time_unit">
@@ -5546,6 +5546,11 @@
                 setAttrs({version: "1.8.0"});
                 versioning();
             }
+            else if(v["version"] === "1.8.0") {
+                console.log("upgrading to v1.8.1");
+                setAttrs({version: "1.8.1"});
+                versioning();
+            }
             else {
                 console.log("Sheet fully updated");
             }