diff --git a/data/mods/MindOverMatter/items/psions_summon_items.json b/data/mods/MindOverMatter/items/psions_summon_items.json
index 40836863eae31..754b39b977ed4 100644
--- a/data/mods/MindOverMatter/items/psions_summon_items.json
+++ b/data/mods/MindOverMatter/items/psions_summon_items.json
@@ -62,180 +62,6 @@
     "armor": [ { "encumbrance": 0, "coverage": 0, "covers": [ "hand_l", "hand_r" ] } ],
     "melee_damage": { "bash": 6 }
   },
-  {
-    "id": "biokin_enhance_mobility_item_1",
-    "type": "ARMOR",
-    "name": { "str_sp": "[Ψ]enhanced mobility" },
-    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
-    "weight": "0g",
-    "volume": "0ml",
-    "symbol": "o",
-    "color": "pink",
-    "flags": [
-      "AURA",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "INTEGRATED",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ZERO_WEIGHT",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "armor": [
-      {
-        "encumbrance": -2,
-        "coverage": 100,
-        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
-      }
-    ]
-  },
-  {
-    "id": "biokin_enhance_mobility_item_2",
-    "type": "ARMOR",
-    "name": { "str_sp": "[Ψ]enhanced mobility" },
-    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
-    "weight": "0g",
-    "volume": "0ml",
-    "symbol": "o",
-    "color": "pink",
-    "flags": [
-      "AURA",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "INTEGRATED",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ZERO_WEIGHT",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "armor": [
-      {
-        "encumbrance": -4,
-        "coverage": 100,
-        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
-      }
-    ]
-  },
-  {
-    "id": "biokin_enhance_mobility_item_3",
-    "type": "ARMOR",
-    "name": { "str_sp": "[Ψ]enhanced mobility" },
-    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
-    "weight": "0g",
-    "volume": "0ml",
-    "symbol": "o",
-    "color": "pink",
-    "flags": [
-      "AURA",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "INTEGRATED",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ZERO_WEIGHT",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "armor": [
-      {
-        "encumbrance": -8,
-        "coverage": 100,
-        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
-      }
-    ]
-  },
-  {
-    "id": "biokin_enhance_mobility_item_4",
-    "type": "ARMOR",
-    "name": { "str_sp": "[Ψ]enhanced mobility" },
-    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
-    "weight": "0g",
-    "volume": "0ml",
-    "symbol": "o",
-    "color": "pink",
-    "flags": [
-      "AURA",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "INTEGRATED",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ZERO_WEIGHT",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "armor": [
-      {
-        "encumbrance": -12,
-        "coverage": 100,
-        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
-      }
-    ]
-  },
-  {
-    "id": "biokin_enhance_mobility_item_5",
-    "type": "ARMOR",
-    "name": { "str_sp": "[Ψ]enhanced mobility" },
-    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
-    "weight": "0g",
-    "volume": "0ml",
-    "symbol": "o",
-    "color": "pink",
-    "flags": [
-      "AURA",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "INTEGRATED",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ZERO_WEIGHT",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "armor": [
-      {
-        "encumbrance": -16,
-        "coverage": 100,
-        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
-      }
-    ]
-  },
-  {
-    "id": "biokin_enhance_mobility_item_6",
-    "type": "ARMOR",
-    "name": { "str_sp": "[Ψ]enhanced mobility" },
-    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
-    "weight": "0g",
-    "volume": "0ml",
-    "symbol": "o",
-    "color": "pink",
-    "flags": [
-      "AURA",
-      "OVERSIZE",
-      "ONLY_ONE",
-      "TRADER_AVOID",
-      "INTEGRATED",
-      "NO_TAKEOFF",
-      "NONCONDUCTIVE",
-      "UNBREAKABLE",
-      "ZERO_WEIGHT",
-      "ALLOWS_NATURAL_ATTACKS"
-    ],
-    "armor": [
-      {
-        "encumbrance": -20,
-        "coverage": 100,
-        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
-      }
-    ]
-  },
   {
     "id": "clair_sense_rad_item",
     "type": "ARMOR",
diff --git a/data/mods/MindOverMatter/mutations/temporary.json b/data/mods/MindOverMatter/mutations/temporary.json
index cc3c9e4612c92..9c80bf4697145 100644
--- a/data/mods/MindOverMatter/mutations/temporary.json
+++ b/data/mods/MindOverMatter/mutations/temporary.json
@@ -1,4 +1,130 @@
 [
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_01",
+    "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", -2 ],
+      [ "torso", -2 ],
+      [ "hand_r", -2 ],
+      [ "hand_l", -2 ],
+      [ "arm_r", -2 ],
+      [ "arm_l", -2 ],
+      [ "leg_r", -2 ],
+      [ "leg_l", -2 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_02",
+    "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", -4 ],
+      [ "torso", -4 ],
+      [ "hand_r", -4 ],
+      [ "hand_l", -4 ],
+      [ "arm_r", -4 ],
+      [ "arm_l", -4 ],
+      [ "leg_r", -4 ],
+      [ "leg_l", -4 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_03",
+    "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 ],
+      [ "hand_r", -8 ],
+      [ "hand_l", -8 ],
+      [ "arm_r", -8 ],
+      [ "arm_l", -8 ],
+      [ "leg_r", -8 ],
+      [ "leg_l", -8 ]
+    ]
+  },
+  {
+    "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", -12 ],
+      [ "torso", -12 ],
+      [ "hand_r", -12 ],
+      [ "hand_l", -12 ],
+      [ "arm_r", -12 ],
+      [ "arm_l", -12 ],
+      [ "leg_r", -12 ],
+      [ "leg_l", -12 ]
+    ]
+  },
+  {
+    "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", -16 ],
+      [ "torso", -16 ],
+      [ "hand_r", -16 ],
+      [ "hand_l", -16 ],
+      [ "arm_r", -16 ],
+      [ "arm_l", -16 ],
+      [ "leg_r", -16 ],
+      [ "leg_l", -16 ]
+    ]
+  },
+  {
+    "id": "BIOKIN_ENHANCE_MOBILITY_06",
+    "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", -20 ],
+      [ "torso", -20 ],
+      [ "hand_r", -20 ],
+      [ "hand_l", -20 ],
+      [ "arm_r", -20 ],
+      [ "arm_l", -20 ],
+      [ "leg_r", -20 ],
+      [ "leg_l", -20 ]
+    ]
+  },
   {
     "type": "mutation",
     "id": "CLAIR_CRAFT_BONUS_01",
diff --git a/data/mods/MindOverMatter/obsolete/items.json b/data/mods/MindOverMatter/obsolete/items.json
new file mode 100644
index 0000000000000..4298d4f60242c
--- /dev/null
+++ b/data/mods/MindOverMatter/obsolete/items.json
@@ -0,0 +1,176 @@
+[
+  {
+    "id": "biokin_enhance_mobility_item_1",
+    "type": "ARMOR",
+    "name": { "str_sp": "[Ψ]enhanced mobility" },
+    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
+    "weight": "0g",
+    "volume": "0ml",
+    "symbol": "o",
+    "color": "pink",
+    "flags": [
+      "AURA",
+      "OVERSIZE",
+      "ONLY_ONE",
+      "TRADER_AVOID",
+      "INTEGRATED",
+      "NO_TAKEOFF",
+      "NONCONDUCTIVE",
+      "UNBREAKABLE",
+      "ZERO_WEIGHT",
+      "ALLOWS_NATURAL_ATTACKS"
+    ],
+    "armor": [
+      {
+        "encumbrance": -2,
+        "coverage": 100,
+        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
+      }
+    ]
+  },
+  {
+    "id": "biokin_enhance_mobility_item_2",
+    "type": "ARMOR",
+    "name": { "str_sp": "[Ψ]enhanced mobility" },
+    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
+    "weight": "0g",
+    "volume": "0ml",
+    "symbol": "o",
+    "color": "pink",
+    "flags": [
+      "AURA",
+      "OVERSIZE",
+      "ONLY_ONE",
+      "TRADER_AVOID",
+      "INTEGRATED",
+      "NO_TAKEOFF",
+      "NONCONDUCTIVE",
+      "UNBREAKABLE",
+      "ZERO_WEIGHT",
+      "ALLOWS_NATURAL_ATTACKS"
+    ],
+    "armor": [
+      {
+        "encumbrance": -4,
+        "coverage": 100,
+        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
+      }
+    ]
+  },
+  {
+    "id": "biokin_enhance_mobility_item_3",
+    "type": "ARMOR",
+    "name": { "str_sp": "[Ψ]enhanced mobility" },
+    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
+    "weight": "0g",
+    "volume": "0ml",
+    "symbol": "o",
+    "color": "pink",
+    "flags": [
+      "AURA",
+      "OVERSIZE",
+      "ONLY_ONE",
+      "TRADER_AVOID",
+      "INTEGRATED",
+      "NO_TAKEOFF",
+      "NONCONDUCTIVE",
+      "UNBREAKABLE",
+      "ZERO_WEIGHT",
+      "ALLOWS_NATURAL_ATTACKS"
+    ],
+    "armor": [
+      {
+        "encumbrance": -8,
+        "coverage": 100,
+        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
+      }
+    ]
+  },
+  {
+    "id": "biokin_enhance_mobility_item_4",
+    "type": "ARMOR",
+    "name": { "str_sp": "[Ψ]enhanced mobility" },
+    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
+    "weight": "0g",
+    "volume": "0ml",
+    "symbol": "o",
+    "color": "pink",
+    "flags": [
+      "AURA",
+      "OVERSIZE",
+      "ONLY_ONE",
+      "TRADER_AVOID",
+      "INTEGRATED",
+      "NO_TAKEOFF",
+      "NONCONDUCTIVE",
+      "UNBREAKABLE",
+      "ZERO_WEIGHT",
+      "ALLOWS_NATURAL_ATTACKS"
+    ],
+    "armor": [
+      {
+        "encumbrance": -12,
+        "coverage": 100,
+        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
+      }
+    ]
+  },
+  {
+    "id": "biokin_enhance_mobility_item_5",
+    "type": "ARMOR",
+    "name": { "str_sp": "[Ψ]enhanced mobility" },
+    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
+    "weight": "0g",
+    "volume": "0ml",
+    "symbol": "o",
+    "color": "pink",
+    "flags": [
+      "AURA",
+      "OVERSIZE",
+      "ONLY_ONE",
+      "TRADER_AVOID",
+      "INTEGRATED",
+      "NO_TAKEOFF",
+      "NONCONDUCTIVE",
+      "UNBREAKABLE",
+      "ZERO_WEIGHT",
+      "ALLOWS_NATURAL_ATTACKS"
+    ],
+    "armor": [
+      {
+        "encumbrance": -16,
+        "coverage": 100,
+        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
+      }
+    ]
+  },
+  {
+    "id": "biokin_enhance_mobility_item_6",
+    "type": "ARMOR",
+    "name": { "str_sp": "[Ψ]enhanced mobility" },
+    "description": "Your powers give you greater range of motion even in heavy clothing or armor.",
+    "weight": "0g",
+    "volume": "0ml",
+    "symbol": "o",
+    "color": "pink",
+    "flags": [
+      "AURA",
+      "OVERSIZE",
+      "ONLY_ONE",
+      "TRADER_AVOID",
+      "INTEGRATED",
+      "NO_TAKEOFF",
+      "NONCONDUCTIVE",
+      "UNBREAKABLE",
+      "ZERO_WEIGHT",
+      "ALLOWS_NATURAL_ATTACKS"
+    ],
+    "armor": [
+      {
+        "encumbrance": -20,
+        "coverage": 100,
+        "covers": [ "leg_l", "leg_r", "torso", "arm_l", "arm_r", "hand_l", "hand_r", "head", "foot_l", "foot_r", "mouth", "eyes" ]
+      }
+    ]
+  }
+]
diff --git a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json
index f61b3a0f9b890..88c75fbd50c3d 100644
--- a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json
+++ b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json
@@ -302,30 +302,12 @@
     "effect": {
       "switch": { "math": [ "u_spell_level('biokin_enhance_mobility')" ] },
       "cases": [
-        {
-          "case": 0,
-          "effect": [ { "u_spawn_item": "biokin_enhance_mobility_item_1", "suppress_message": true, "force_equip": true } ]
-        },
-        {
-          "case": 4,
-          "effect": [ { "u_spawn_item": "biokin_enhance_mobility_item_2", "suppress_message": true, "force_equip": true } ]
-        },
-        {
-          "case": 8,
-          "effect": [ { "u_spawn_item": "biokin_enhance_mobility_item_3", "suppress_message": true, "force_equip": true } ]
-        },
-        {
-          "case": 12,
-          "effect": [ { "u_spawn_item": "biokin_enhance_mobility_item_4", "suppress_message": true, "force_equip": true } ]
-        },
-        {
-          "case": 16,
-          "effect": [ { "u_spawn_item": "biokin_enhance_mobility_item_5", "suppress_message": true, "force_equip": true } ]
-        },
-        {
-          "case": 20,
-          "effect": [ { "u_spawn_item": "biokin_enhance_mobility_item_6", "suppress_message": true, "force_equip": true } ]
-        }
+        { "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" } ] }
       ]
     }
   },
@@ -334,6 +316,12 @@
     "id": "EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY",
     "condition": { "u_has_effect": "effect_biokin_enhance_mobility" },
     "effect": [
+      { "u_lose_trait": "BIOKIN_ENHANCE_MOBILITY_01" },
+      { "u_lose_trait": "BIOKIN_ENHANCE_MOBILITY_02" },
+      { "u_lose_trait": "BIOKIN_ENHANCE_MOBILITY_03" },
+      { "u_lose_trait": "BIOKIN_ENHANCE_MOBILITY_04" },
+      { "u_lose_trait": "BIOKIN_ENHANCE_MOBILITY_05" },
+      { "u_lose_trait": "BIOKIN_ENHANCE_MOBILITY_06" },
       { "u_remove_item_with": "biokin_enhance_mobility_item_1" },
       { "u_remove_item_with": "biokin_enhance_mobility_item_2" },
       { "u_remove_item_with": "biokin_enhance_mobility_item_3" },