diff --git a/data/mods/MindOverMatter/PowerDescriptionSpoilers.md b/data/mods/MindOverMatter/PowerDescriptionSpoilers.md
index fbe3930e9894a..ab5f3d3f307e8 100644
--- a/data/mods/MindOverMatter/PowerDescriptionSpoilers.md
+++ b/data/mods/MindOverMatter/PowerDescriptionSpoilers.md
@@ -88,7 +88,7 @@ This is natural painkiller and so has natural effects (reduces speed slightly)<b
 *Duration*: 5 minutes to 15 minutes, plus 45 seconds to 120 seconds per level<br />
 *Stamina Cost*: 4500, minus 150 per level to a minimum of 2500<br />
 *Channeling Time*: 275 moves, minus 15 moves per level to a minimum of 50.<br />
-*Effects*: Reduces encumbrance on every body part, improving every 4 levels.  Other than -2 at level 0 through 3, encumbrance reduction is equal to power threshold level: -4 from levels 4 to 7, -8 from levels 8 to 11, and so on.<br />
+*Effects*: Reduces encumbrance on every body part, starting at -2 and improving by -2 every 2 levels, to a maximum of -32 at level 30.<br />
 *Prerequisites*: Overcome Pain 4,  Heightened Reflexes 6 *or* Flexibility 9, Burst of Speed 10 *or* Combat Dance 4 *or* Physical Enhancement 10.<br />
 
 ## Hammerhand (C) 
diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
index efa63d684b297..70dd3e8ae4938 100644
--- a/data/mods/MindOverMatter/effects/effects_psionic.json
+++ b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -314,7 +314,334 @@
     "apply_message": "",
     "remove_message": "Your gear suddenly seems to weigh you down.",
     "rating": "good",
-    "max_duration": "7 days"
+    "max_duration": "7 days",
+    "enchantments": [
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "0"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "2"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_01" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "2"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "4"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_02" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "4"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "6"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_03" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "6"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "8"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_04" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "8"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "10"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_05" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "10"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "12"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_06" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "12"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "14"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_07" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "14"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "16"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_08" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "16"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "18"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_09" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "18"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "20"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_10" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "20"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "22"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_11" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "22"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "24"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_12" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "24"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "26"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_13" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "26"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "28"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_14" ]
+      },
+      {
+        "condition": {
+          "and": [
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                ">=",
+                "28"
+              ]
+            },
+            {
+              "math": [
+                "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+                "<",
+                "30"
+              ]
+            }
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_15" ]
+      },
+      {
+        "condition": {
+          "math": [
+            "u_spell_level('biokin_enhance_mobility') * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling",
+            ">=",
+            "30"
+          ]
+        },
+        "mutations": [ "BIOKIN_ENHANCE_MOBILITY_16" ]
+      }
+    ]
   },
   {
     "type": "effect_type",
diff --git a/data/mods/MindOverMatter/mutations/temporary.json b/data/mods/MindOverMatter/mutations/temporary.json
index a322867151c3e..443f540569e33 100644
--- a/data/mods/MindOverMatter/mutations/temporary.json
+++ b/data/mods/MindOverMatter/mutations/temporary.json
@@ -51,6 +51,27 @@
     "ugliness": 0,
     "player_display": false,
     "valid": false,
+    "encumbrance_always": [
+      [ "head", -6 ],
+      [ "torso", -6 ],
+      [ "hand_r", -6 ],
+      [ "hand_l", -6 ],
+      [ "arm_r", -6 ],
+      [ "arm_l", -6 ],
+      [ "leg_r", -6 ],
+      [ "leg_l", -6 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_04",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
     "encumbrance_always": [
       [ "head", -8 ],
       [ "torso", -8 ],
@@ -63,7 +84,28 @@
     ]
   },
   {
-    "id": "BIOKIN_ENHANCE_MOBILITY_04",
+    "id": "BIOKIN_ENHANCE_MOBILITY_05",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -10 ],
+      [ "torso", -10 ],
+      [ "hand_r", -10 ],
+      [ "hand_l", -10 ],
+      [ "arm_r", -10 ],
+      [ "arm_l", -10 ],
+      [ "leg_r", -10 ],
+      [ "leg_l", -10 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_06",
     "type": "mutation",
     "name": { "str": "Enhanced Mobility" },
     "description": "Your gear isn't bothering you as much.",
@@ -84,7 +126,28 @@
     ]
   },
   {
-    "id": "BIOKIN_ENHANCE_MOBILITY_05",
+    "id": "BIOKIN_ENHANCE_MOBILITY_07",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -14 ],
+      [ "torso", -14 ],
+      [ "hand_r", -14 ],
+      [ "hand_l", -14 ],
+      [ "arm_r", -14 ],
+      [ "arm_l", -14 ],
+      [ "leg_r", -14 ],
+      [ "leg_l", -14 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_08",
     "type": "mutation",
     "name": { "str": "Enhanced Mobility" },
     "description": "Your gear isn't bothering you as much.",
@@ -105,7 +168,28 @@
     ]
   },
   {
-    "id": "BIOKIN_ENHANCE_MOBILITY_06",
+    "id": "BIOKIN_ENHANCE_MOBILITY_09",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -18 ],
+      [ "torso", -18 ],
+      [ "hand_r", -18 ],
+      [ "hand_l", -18 ],
+      [ "arm_r", -18 ],
+      [ "arm_l", -18 ],
+      [ "leg_r", -18 ],
+      [ "leg_l", -18 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_10",
     "type": "mutation",
     "name": { "str": "Enhanced Mobility" },
     "description": "Your gear isn't bothering you as much.",
@@ -125,6 +209,132 @@
       [ "leg_l", -20 ]
     ]
   },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_11",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -22 ],
+      [ "torso", -22 ],
+      [ "hand_r", -22 ],
+      [ "hand_l", -22 ],
+      [ "arm_r", -22 ],
+      [ "arm_l", -22 ],
+      [ "leg_r", -22 ],
+      [ "leg_l", -22 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_12",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -24 ],
+      [ "torso", -24 ],
+      [ "hand_r", -24 ],
+      [ "hand_l", -24 ],
+      [ "arm_r", -24 ],
+      [ "arm_l", -24 ],
+      [ "leg_r", -24 ],
+      [ "leg_l", -24 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_13",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -26 ],
+      [ "torso", -26 ],
+      [ "hand_r", -26 ],
+      [ "hand_l", -26 ],
+      [ "arm_r", -26 ],
+      [ "arm_l", -26 ],
+      [ "leg_r", -26 ],
+      [ "leg_l", -26 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_14",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -28 ],
+      [ "torso", -28 ],
+      [ "hand_r", -28 ],
+      [ "hand_l", -28 ],
+      [ "arm_r", -28 ],
+      [ "arm_l", -28 ],
+      [ "leg_r", -28 ],
+      [ "leg_l", -28 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_15",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -30 ],
+      [ "torso", -30 ],
+      [ "hand_r", -30 ],
+      [ "hand_l", -30 ],
+      [ "arm_r", -30 ],
+      [ "arm_l", -30 ],
+      [ "leg_r", -30 ],
+      [ "leg_l", -30 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_16",
+    "type": "mutation",
+    "name": { "str": "Enhanced Mobility" },
+    "description": "Your gear isn't bothering you as much.",
+    "points": 0,
+    "visibility": 0,
+    "ugliness": 0,
+    "player_display": false,
+    "valid": false,
+    "encumbrance_always": [
+      [ "head", -32 ],
+      [ "torso", -32 ],
+      [ "hand_r", -32 ],
+      [ "hand_l", -32 ],
+      [ "arm_r", -32 ],
+      [ "arm_l", -32 ],
+      [ "leg_r", -32 ],
+      [ "leg_l", -32 ]
+    ]
+  },
   {
     "type": "mutation",
     "id": "CLAIR_CRAFT_BONUS_01",
diff --git a/data/mods/MindOverMatter/obsolete/eocs.json b/data/mods/MindOverMatter/obsolete/eocs.json
index 9af84469d4408..4594ded88ea98 100644
--- a/data/mods/MindOverMatter/obsolete/eocs.json
+++ b/data/mods/MindOverMatter/obsolete/eocs.json
@@ -74,5 +74,10 @@
         { "case": 20, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_06" } }
       ]
     }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_BIOKIN_ENHANCE_MOBILITY_SWITCHER",
+    "effect": [  ]
   }
 ]
diff --git a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json
index 481614d5210b7..2170e38406078 100644
--- a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json
+++ b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json
@@ -331,7 +331,7 @@
     "condition": { "not": { "u_has_effect": "effect_biokin_enhance_mobility" } },
     "effect": [
       { "u_message": "Your gear doesn't seem to encumber you as much.", "type": "good" },
-      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_BIOKIN_ENHANCE_MOBILITY_SWITCHER" ] },
+      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE" ] },
       { "u_add_effect": "effect_biokin_enhance_mobility", "duration": "PERMANENT" },
       {
         "run_eocs": "EOC_BIOKIN_ENHANCE_MOBILITY_DRAIN",
@@ -351,21 +351,6 @@
     ],
     "false_effect": [ { "run_eocs": "EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY" } ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_BIOKIN_ENHANCE_MOBILITY_SWITCHER",
-    "effect": {
-      "switch": { "math": [ "u_spell_level('biokin_enhance_mobility')" ] },
-      "cases": [
-        { "case": 0, "effect": [ { "u_add_trait": "BIOKIN_ENHANCE_MOBILITY_01" } ] },
-        { "case": 4, "effect": [ { "u_add_trait": "BIOKIN_ENHANCE_MOBILITY_02" } ] },
-        { "case": 8, "effect": [ { "u_add_trait": "BIOKIN_ENHANCE_MOBILITY_03" } ] },
-        { "case": 12, "effect": [ { "u_add_trait": "BIOKIN_ENHANCE_MOBILITY_04" } ] },
-        { "case": 16, "effect": [ { "u_add_trait": "BIOKIN_ENHANCE_MOBILITY_05" } ] },
-        { "case": 20, "effect": [ { "u_add_trait": "BIOKIN_ENHANCE_MOBILITY_06" } ] }
-      ]
-    }
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY",