diff --git a/data/mods/Magiclysm/effects/effects_fantasy_species.json b/data/mods/Magiclysm/effects/effects_fantasy_species.json
new file mode 100644
index 0000000000000..52c2e55ada3f6
--- /dev/null
+++ b/data/mods/Magiclysm/effects/effects_fantasy_species.json
@@ -0,0 +1,50 @@
+[
+  {
+    "type": "effect_type",
+    "id": "mutagen_species_dwarf",
+    "name": [ "Dwarven Purification", "Dwarven Reversion", "Dwarven Regression" ],
+    "desc": [
+      "You consumed purifier.",
+      "You consumed a large amount of purifier.  Why does it feel so strange?",
+      "You consumed a huge amount of purifier, and you can tell that something isn't right."
+    ],
+    "max_intensity": 3,
+    "resist_traits": [  ],
+    "base_mods": { "str_mod": [ 0, -2 ], "per_mod": [ 0, -2 ], "dex_mod": [ 0, -2 ], "int_mod": [ 0, -2 ] },
+    "scaling_mods": { "str_mod": [ 0, -2.5 ], "per_mod": [ 0, -2.5 ], "dex_mod": [ 0, -2.5 ], "int_mod": [ 0, -2.5 ] },
+    "rating": "bad",
+    "blood_analysis_description": "Dwarven Primer Contamination"
+  },
+  {
+    "type": "effect_type",
+    "id": "mutagen_species_elf",
+    "name": [ "Elven Purification", "Elven Reversion", "Elven Regression" ],
+    "desc": [
+      "You consumed purifier.",
+      "You consumed a large amount of purifier.  Why does it feel so strange?",
+      "You consumed a huge amount of purifier, and you can tell that something isn't right."
+    ],
+    "max_intensity": 3,
+    "resist_traits": [  ],
+    "base_mods": { "str_mod": [ 0, -2 ], "per_mod": [ 0, -2 ], "dex_mod": [ 0, -2 ], "int_mod": [ 0, -2 ] },
+    "scaling_mods": { "str_mod": [ 0, -2.5 ], "per_mod": [ 0, -2.5 ], "dex_mod": [ 0, -2.5 ], "int_mod": [ 0, -2.5 ] },
+    "rating": "bad",
+    "blood_analysis_description": "Elven Primer Contamination"
+  },
+  {
+    "type": "effect_type",
+    "id": "mutagen_species_lizardfolk",
+    "name": [ "Lizardfolk Purification", "Lizardfolk Reversion", "Lizardfolk Regression" ],
+    "desc": [
+      "You consumed purifier.",
+      "You consumed a large amount of purifier.  Why does it feel so strange?",
+      "You consumed a huge amount of purifier, and you can tell that something isn't right."
+    ],
+    "max_intensity": 3,
+    "resist_traits": [  ],
+    "base_mods": { "str_mod": [ 0, -2 ], "per_mod": [ 0, -2 ], "dex_mod": [ 0, -2 ], "int_mod": [ 0, -2 ] },
+    "scaling_mods": { "str_mod": [ 0, -2.5 ], "per_mod": [ 0, -2.5 ], "dex_mod": [ 0, -2.5 ], "int_mod": [ 0, -2.5 ] },
+    "rating": "bad",
+    "blood_analysis_description": "Lizardfolk Primer Contamination"
+  }
+]
diff --git a/data/mods/Magiclysm/mutations/fantasy_species.json b/data/mods/Magiclysm/mutations/fantasy_species.json
new file mode 100644
index 0000000000000..36e29f4c13767
--- /dev/null
+++ b/data/mods/Magiclysm/mutations/fantasy_species.json
@@ -0,0 +1,525 @@
+[
+  {
+    "type": "mutation_category",
+    "id": "SPECIES_DWARF",
+    "name": "Dwarf",
+    "threshold_mut": "THRESH_SPECIES_DWARF",
+    "mutagen_message": "Your heart beats in time with the rhythm of the Earth.",
+    "vitamin": "mutagen_species_dwarf",
+    "memorial_message": "Entered the halls of the King Under the Mountain.",
+    "base_removal_chance": 0
+  },
+  {
+    "type": "mutation",
+    "id": "THRESH_SPECIES_DWARF",
+    "name": { "str": "Child of the Stone" },
+    "points": 1,
+    "description": "Trust the humans to make a mess of the world.  Trust a dwarf to rebuild it better than they found it.",
+    "valid": false,
+    "purifiable": false,
+    "threshold": true
+  },
+  {
+    "id": "mutagen_species_dwarf",
+    "type": "vitamin",
+    "vit_type": "counter",
+    "name": { "str": "Dwarven Purifier" },
+    "excess": "mutagen_species_dwarf",
+    "min": 0,
+    "max": 2500,
+    "rate": "1 h",
+    "disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 2500 ] ]
+  },
+  {
+    "type": "mutation_category",
+    "id": "SPECIES_ELF",
+    "name": "Elf",
+    "threshold_mut": "THRESH_SPECIES_ELF",
+    "mutagen_message": "You hear the songs of nature.",
+    "vitamin": "mutagen_species_elf",
+    "memorial_message": "Passed into the West.",
+    "base_removal_chance": 0
+  },
+  {
+    "type": "mutation",
+    "id": "THRESH_SPECIES_ELF",
+    "name": { "str": "Firstborn" },
+    "points": 1,
+    "description": "The first elves sprang forth from magic and moonlight before the ancestors of humanity stopped scurrying through the underbrush to avoid the dinosaurs.  You won't let that legacy die with you.",
+    "valid": false,
+    "purifiable": false,
+    "threshold": true
+  },
+  {
+    "id": "mutagen_species_elf",
+    "type": "vitamin",
+    "vit_type": "counter",
+    "name": { "str": "Elven Purifier" },
+    "excess": "mutagen_species_elf",
+    "min": 0,
+    "max": 2500,
+    "rate": "1 h",
+    "disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 2500 ] ]
+  },
+  {
+    "type": "mutation_category",
+    "id": "SPECIES_LIZARDFOLK",
+    "name": "Lizardfolk",
+    "threshold_mut": "THRESH_SPECIES_LIZARDFOLK",
+    "mutagen_message": "You remember the warmth of your home swamps.",
+    "vitamin": "mutagen_species_lizardfolk",
+    "memorial_message": "Returned to the World Egg.",
+    "base_removal_chance": 0
+  },
+  {
+    "type": "mutation",
+    "id": "THRESH_SPECIES_LIZARDFOLK",
+    "name": { "str": "Scaled One" },
+    "points": 1,
+    "description": "The old world was nothing like your home swamps, but this new world is something you understand.",
+    "valid": false,
+    "purifiable": false,
+    "threshold": true
+  },
+  {
+    "id": "mutagen_species_lizardfolk",
+    "type": "vitamin",
+    "vit_type": "counter",
+    "name": { "str": "Lizardfolk Purifier" },
+    "excess": "mutagen_species_lizardfolk",
+    "min": 0,
+    "max": 2500,
+    "rate": "1 h",
+    "disease_excess": [ [ 100, 500 ], [ 501, 2199 ], [ 2200, 2500 ] ]
+  },
+  {
+    "type": "mutation",
+    "id": "BORN_ARTISAN",
+    "name": { "str": "Earthborn Artisan" },
+    "description": "Born from the living earth, your people are naturally adept at the manipulation of the physical world.",
+    "points": 3,
+    "starting_trait": false,
+    "purifiable": false,
+    "category": [ "SPECIES_DWARF" ],
+    "threshreq": [ "THRESH_SPECIES_DWARF" ],
+    "crafting_speed_multiplier": 1.1
+  },
+  {
+    "type": "mutation",
+    "id": "DARKSIGHT",
+    "name": { "str": "Darksight" },
+    "description": "Long ages underground have made your people capable of seeing into the infrared spectrum.",
+    "points": 5,
+    "starting_trait": false,
+    "purifiable": false,
+    "types": [ "VISION" ],
+    "flags": [ "INFRARED" ],
+    "category": [ "SPECIES_DWARF" ],
+    "threshreq": [ "THRESH_SPECIES_DWARF" ]
+  },
+  {
+    "type": "mutation",
+    "id": "DWARVEN_BUILD",
+    "name": { "str": "Dwarven Build" },
+    "//": "Slightly better version of STOCKY_TROGLO since dwarves are born this way",
+    "types": [ "SIZE" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 3,
+    "ugliness": 0,
+    "description": "Dwarves are smaller than humans, the better to deal with confined spaces underground, but as solid as the mountains (+2 STR, -1 DEX).",
+    "category": [ "SPECIES_DWARF" ],
+    "threshreq": [ "THRESH_SPECIES_DWARF" ],
+    "passive_mods": { "str_mod": 2, "dex_mod": -1 },
+    "movecost_modifier": 1.05
+  },
+  {
+    "type": "mutation",
+    "id": "TOLERANCE",
+    "copy-from": "TOLERANCE",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "ALCMET",
+    "copy-from": "ALCMET",
+    "extend": { "category": [ "SPECIES_DWARF" ], "prereqs2": [ "DWARVEN_BUILD" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "TROGLO",
+    "copy-from": "TROGLO",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "TROGLO2",
+    "copy-from": "TROGLO2",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "THICKSKIN",
+    "copy-from": "THICKSKIN",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "TUNNEL_FIGHTER",
+    "copy-from": "TUNNEL_FIGHTER",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "GOURMAND",
+    "copy-from": "GOURMAND",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "NIGHTVISION",
+    "copy-from": "NIGHTVISION",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "NIGHTVISION2",
+    "copy-from": "NIGHTVISION2",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "SMELLY",
+    "copy-from": "SMELLY",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "HIRSUTE",
+    "copy-from": "HIRSUTE",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "GOODCARDIO",
+    "copy-from": "GOODCARDIO",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "HEAVYSLEEPER",
+    "copy-from": "HEAVYSLEEPER",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "HEAVYSLEEPER2",
+    "copy-from": "HEAVYSLEEPER2",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "INFRESIST",
+    "copy-from": "INFRESIST",
+    "extend": { "category": [ "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "ELVEN_BUILD",
+    "name": { "str": "Elven Build" },
+    "//": "Opposite of Dwarven Build!",
+    "types": [ "SIZE" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 3,
+    "ugliness": 0,
+    "description": "Elves are more lithe and frail than humans, but possess an almost otherworldly grace (-1 STR, +2 DEX).",
+    "category": [ "SPECIES_ELF" ],
+    "threshreq": [ "THRESH_SPECIES_ELF" ],
+    "passive_mods": { "str_mod": -1, "dex_mod": 2 }
+  },
+  {
+    "type": "mutation",
+    "id": "ELVEN_BEAUTY",
+    "name": { "str": "Passing Fair" },
+    "purifiable": false,
+    "points": 4,
+    "visibility": 8,
+    "ugliness": -8,
+    "description": "The elves are often called the \"Fair Folk\" due to their preternatural beauty, and you are no exception to this custom.",
+    "types": [ "ATTRACTIVENESS" ],
+    "category": [ "SPECIES_ELF" ],
+    "threshreq": [ "THRESH_SPECIES_ELF" ]
+  },
+  {
+    "type": "mutation",
+    "id": "ELVEN_HEARING",
+    "name": { "str": "Elven Hearing" },
+    "purifiable": false,
+    "points": 2,
+    "description": "Your delicate pointed ears allow you to hear all the sounds of the world.",
+    "types": [ "HEARING" ],
+    "category": [ "SPECIES_ELF" ],
+    "threshreq": [ "THRESH_SPECIES_ELF" ],
+    "flags": [ "SUPER_HEARING" ],
+    "hearing_modifier": 1.75
+  },
+  {
+    "type": "mutation",
+    "id": "ELVEN_SLEEP",
+    "name": { "str": "Reverie" },
+    "points": 4,
+    "description": "Rather than sleep insensate like humans do, you blend living night and dreams into a harmonious whole.  You are not bothered by light levels, and need much less sleep per night.",
+    "purifiable": false,
+    "types": [ "SLEEP" ],
+    "category": [ "SPECIES_ELF" ],
+    "threshreq": [ "THRESH_SPECIES_ELF" ],
+    "flags": [ "SEESLEEP" ],
+    "fatigue_modifier": -0.333,
+    "fatigue_regen_modifier": 0.333
+  },
+  {
+    "type": "mutation",
+    "id": "WILDWALKER",
+    "name": { "str": "Natural Stride" },
+    "purifiable": false,
+    "points": 3,
+    "description": "The elves were born of nature and the elements, and long ages under the trees allow them to quickly pass through their forest homes.",
+    "//": "terrains below copied from the druid caster level boost.",
+    "category": [ "SPECIES_ELF" ],
+    "enchantments": [
+      {
+        "condition": {
+          "or": [
+            { "u_is_on_terrain": "t_tree_young" },
+            { "u_is_on_terrain": "t_mega_fern" },
+            { "u_is_on_terrain": "t_fungus_colony" },
+            { "u_is_on_terrain_with_flag": "SHRUB" },
+            { "u_is_on_terrain": "t_bamboo_long" },
+            { "u_is_on_terrain": "t_bamboo_tall" },
+            { "u_is_on_terrain": "t_grass_tall" },
+            { "u_is_on_terrain": "t_grass_long" },
+            { "u_is_on_terrain": "t_bamboo" },
+            { "u_is_on_terrain": "t_bamboo_harvested" },
+            { "u_is_on_terrain": "t_underbrush_harvested_winter" },
+            { "u_is_on_terrain": "t_grass" },
+            { "u_is_on_terrain": "t_grass_white" },
+            { "u_is_on_terrain": "t_moss" },
+            { "u_is_on_terrain": "t_forestfloor" }
+          ]
+        },
+        "values": [ { "value": "MOVE_COST", "multiply": -0.1 } ]
+      }
+    ]
+  },
+  {
+    "type": "mutation",
+    "id": "ELFAEYES",
+    "copy-from": "ELFAEYES",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "LIGHTEATER",
+    "copy-from": "LIGHTEATER",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "QUICK",
+    "copy-from": "QUICK",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "DEFT",
+    "copy-from": "DEFT",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "ELFA_NV",
+    "copy-from": "ELFA_NV",
+    "extend": { "category": [ "SPECIES_ELF" ], "threshreq": [ "THRESH_SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "ANIMALEMPATH",
+    "copy-from": "ANIMALEMPATH",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "ANIMALEMPATH2",
+    "copy-from": "ANIMALEMPATH2",
+    "extend": { "category": [ "SPECIES_ELF" ], "threshreq": [ "THRESH_SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "ANTIJUNK",
+    "copy-from": "ANTIJUNK",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "DEX_UP",
+    "copy-from": "DEX_UP",
+    "extend": { "category": [ "SPECIES_ELF", "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "DEX_UP_2",
+    "copy-from": "DEX_UP_2",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "PER_UP",
+    "copy-from": "PER_UP",
+    "extend": { "category": [ "SPECIES_ELF", "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "FLIMSY",
+    "copy-from": "FLIMSY",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "DISRESISTANT",
+    "copy-from": "DISRESISTANT",
+    "extend": { "category": [ "SPECIES_ELF", "SPECIES_DWARF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "DISIMMUNE",
+    "copy-from": "DISIMMUNE",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "PICKYEATER",
+    "copy-from": "PICKYEATER",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "LIGHTSTEP",
+    "copy-from": "LIGHTSTEP",
+    "extend": { "category": [ "SPECIES_ELF" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "WEBBED_LIZ_FEET",
+    "name": { "str": "Webbed Feet" },
+    "//": "Alternate so webbed hands are not a prerequisite",
+    "points": 1,
+    "types": [ "FEET" ],
+    "description": "Your feet are heavily webbed, allowing you to swim faster if you aren't wearing footwear.",
+    "category": [ "SPECIES_LIZARDFOLK" ],
+    "flags": [ "WEBBED_FEET", "TOUGH_FEET" ],
+    "wet_protection": [ { "part": "foot_l", "good": 6 }, { "part": "foot_r", "good": 6 } ]
+  },
+  {
+    "type": "mutation",
+    "id": "GILLS",
+    "copy-from": "GILLS",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ], "threshreq": [ "THRESH_SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "COLDBLOOD4_LIZ",
+    "flags": [ "ECTOTHERM" ],
+    "name": { "str": "Ectothermia" },
+    "points": -3,
+    "description": "Your body has become permanently cold-blooded.  Your speed lowers or raises 1% for every 2 (1.1) degrees below or above 65 F (18.3 C).  All this and you need even more food to maintain your energy.",
+    "threshreq": [ "THRESH_SPECIES_LIZARDFOLK" ],
+    "purifiable": false,
+    "types": [ "METABOLISM" ],
+    "category": [ "SPECIES_LIZARDFOLK" ],
+    "temperature_speed_modifier": 0.5,
+    "metabolism_modifier": 0.5
+  },
+  {
+    "type": "mutation",
+    "id": "LIZARDFOLK_BUILD",
+    "name": { "str": "Lizardfolk Build" },
+    "types": [ "SIZE" ],
+    "purifiable": false,
+    "mixed_effect": true,
+    "points": 1,
+    "visibility": 3,
+    "ugliness": 0,
+    "description": "Lizardfolk are taller and stronger than humans but not much thicker and are surprisingly fast for their size (+1 STR, +1 DEX).",
+    "category": [ "SPECIES_LIZARDFOLK" ],
+    "threshreq": [ "THRESH_SPECIES_LIZARDFOLK" ],
+    "flags": [ "LARGE" ],
+    "passive_mods": { "str_mod": 1, "dex_mod": 1 },
+    "stomach_size_multiplier": 1.25,
+    "weight_capacity_modifier": 1.05,
+    "movecost_swim_modifier": 0.9
+  },
+  {
+    "type": "mutation",
+    "id": "PRED_LIZ",
+    "name": { "str": "Scalefolk Mindset" },
+    "description": "While not completely predatory, the lizardfolk are generally not particularly invested in the welfare of warmbloods.  Their death does not affect you greatly, and your ability to maintain combat skills is enhanced.",
+    "points": 2,
+    "purifiable": false,
+    "category": [ "SPECIES_LIZARDFOLK" ],
+    "threshreq": [ "THRESH_SPECIES_LIZARDFOLK" ],
+    "types": [ "PREDATION" ],
+    "flags": [ "PRED2" ],
+    "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "COMBAT_CATCHUP", "multiply": 1.5 } ] } ]
+  },
+  {
+    "type": "mutation",
+    "id": "CARNIVORE_FAKE",
+    "copy-from": "CARNIVORE_FAKE",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "TAIL_STUB",
+    "copy-from": "TAIL_STUB",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "TAIL_THICK",
+    "copy-from": "TAIL_THICK",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "RESISTWARM",
+    "copy-from": "RESISTWARM",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "SNOUT",
+    "copy-from": "SNOUT",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "MUZZLE_LONG",
+    "copy-from": "MUZZLE_LONG",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "NAILS",
+    "copy-from": "NAILS",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  },
+  {
+    "type": "mutation",
+    "id": "TALONS",
+    "copy-from": "TALONS",
+    "extend": { "category": [ "SPECIES_LIZARDFOLK" ] }
+  }
+]
diff --git a/data/mods/Magiclysm/mutations/mutations.json b/data/mods/Magiclysm/mutations/mutations.json
index b7c0d096a58c2..3a127b2bc4330 100644
--- a/data/mods/Magiclysm/mutations/mutations.json
+++ b/data/mods/Magiclysm/mutations/mutations.json
@@ -13,13 +13,13 @@
     "type": "mutation",
     "id": "PAINRESIST",
     "copy-from": "PAINRESIST",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
     "id": "POISRESIST",
     "copy-from": "POISRESIST",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
@@ -31,7 +31,7 @@
     "type": "mutation",
     "id": "BADTEMPER",
     "copy-from": "BADTEMPER",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
@@ -56,19 +56,19 @@
     "id": "HOARDER",
     "copy-from": "HOARDER",
     "valid": true,
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
     "id": "MOODSWINGS",
     "copy-from": "MOODSWINGS",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_ELF" ] }
   },
   {
     "type": "mutation",
     "id": "LIZ_EYE",
     "copy-from": "LIZ_EYE",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
@@ -80,37 +80,40 @@
     "type": "mutation",
     "id": "FASTHEALER",
     "copy-from": "FASTHEALER",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
     "id": "REGEN_LIZ",
     "copy-from": "REGEN_LIZ",
-    "extend": { "category": [ "DRAGON_BLACK" ], "threshreq": [ "THRESH_DRAGON_BLACK" ] }
+    "extend": {
+      "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ],
+      "threshreq": [ "THRESH_DRAGON_BLACK", "THRESH_SPECIES_LIZARDFOLK" ]
+    }
   },
   {
     "type": "mutation",
     "id": "MEMBRANE",
     "copy-from": "MEMBRANE",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
     "id": "SKIN_PEELING",
     "copy-from": "SKIN_PEELING",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
     "id": "SPARSE_SCALES",
     "copy-from": "SPARSE_SCALES",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
     "id": "SCALES",
     "copy-from": "SCALES",
-    "extend": { "category": [ "DRAGON_BLACK" ], "changes_to": [ "DRAGON_SCALES_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ], "changes_to": [ "DRAGON_SCALES_BLACK" ] }
   },
   {
     "type": "mutation",
@@ -201,13 +204,13 @@
     "type": "mutation",
     "id": "PAINREC1",
     "copy-from": "PAINREC1",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
     "id": "PAINREC2",
     "copy-from": "PAINREC2",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
@@ -370,7 +373,7 @@
     "type": "mutation",
     "id": "INT_UP",
     "copy-from": "INT_UP",
-    "extend": { "category": [ "DRAGON_BLACK", "MANATOUCHED" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "MANATOUCHED", "SPECIES_ELF", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
@@ -394,7 +397,7 @@
     "type": "mutation",
     "id": "SLIT_NOSTRILS",
     "copy-from": "SLIT_NOSTRILS",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
@@ -434,7 +437,7 @@
     "type": "mutation",
     "id": "FORKED_TONGUE",
     "copy-from": "FORKED_TONGUE",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
@@ -469,7 +472,7 @@
     "type": "mutation",
     "id": "WEAKSTOMACH",
     "copy-from": "WEAKSTOMACH",
-    "extend": { "category": [ "DRAGON_BLACK", "MANATOUCHED" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "MANATOUCHED", "SPECIES_ELF" ] }
   },
   {
     "type": "mutation",
@@ -512,7 +515,7 @@
     "type": "mutation",
     "id": "THIRST",
     "copy-from": "THIRST",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
@@ -570,7 +573,7 @@
     "type": "mutation",
     "id": "HISS",
     "copy-from": "HISS",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
@@ -753,19 +756,25 @@
     "type": "mutation",
     "id": "DENSE_BONES",
     "copy-from": "DENSE_BONES",
-    "extend": { "category": [ "DRAGON_BLACK" ] }
+    "extend": { "category": [ "DRAGON_BLACK", "SPECIES_DWARF" ] }
   },
   {
     "type": "mutation",
     "id": "PRED1",
     "copy-from": "PRED1",
-    "extend": { "category": [ "DRAGON_BLACK" ], "threshreq": [ "THRESH_DRAGON_BLACK" ] }
+    "extend": {
+      "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ],
+      "threshreq": [ "THRESH_DRAGON_BLACK", "THRESH_SPECIES_LIZARDFOLK" ]
+    }
   },
   {
     "type": "mutation",
     "id": "PRED2",
     "copy-from": "PRED2",
-    "extend": { "category": [ "DRAGON_BLACK" ], "threshreq": [ "THRESH_DRAGON_BLACK" ] }
+    "extend": {
+      "category": [ "DRAGON_BLACK", "SPECIES_LIZARDFOLK" ],
+      "threshreq": [ "THRESH_DRAGON_BLACK", "THRESH_SPECIES_LIZARDFOLK" ]
+    }
   },
   {
     "type": "mutation",
diff --git a/data/mods/Magiclysm/traits/fantasy_species.json b/data/mods/Magiclysm/traits/fantasy_species.json
new file mode 100644
index 0000000000000..c1db1be415504
--- /dev/null
+++ b/data/mods/Magiclysm/traits/fantasy_species.json
@@ -0,0 +1,88 @@
+[
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "hobby_species_elf",
+    "name": "Elf (Species)",
+    "description": "You are one of the Firstborn, called \"alfar\" or \"sidhe\" or, more recently, \"elves\" by the humans.  Your people had integrated into human society before the Cataclysm, doing jobs involving animals and nature since modern industry was never to your liking.  Had technological development continued, you might have been forced to make some unpleasant compromises, but not as unpleasant as you have during the end of the world.",
+    "points": 4,
+    "skills": [ { "level": 2, "name": "archery" }, { "level": 2, "name": "gun" } ],
+    "traits": [
+      "THRESH_SPECIES_ELF",
+      "ANIMALEMPATH2",
+      "ELVEN_BUILD",
+      "ELFA_NV",
+      "ELVEN_BEAUTY",
+      "ELVEN_SLEEP",
+      "ELFA_EARS",
+      "ELVEN_HEARING",
+      "LIGHTSTEP",
+      "WILDWALKER",
+      "ANTIJUNK",
+      "FLIMSY",
+      "WEAKSTOMACH",
+      "PALE",
+      "DISIMMUNE",
+      "PICKYEATER"
+    ]
+  },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "hobby_species_dwarf",
+    "name": "Dwarf (Species)",
+    "description": "You are a Child of the Stone, called \"dwarf\" by the humans.  The legends tell that long ago, your people were born of stone and mined your way up to the surface world and its light, where you found the other sapient species of Earth.  While the scale of the human world was always a bit of a problem, you fit in well due to your people's long tradition of craftsdwarfship and hard work.  Now that society has collapsed, maybe you can turn that same drive to rebuilding it.",
+    "points": 4,
+    "skills": [ { "level": 2, "name": "fabrication" }, { "level": 2, "name": "mechanics" } ],
+    "traits": [
+      "THRESH_SPECIES_DWARF",
+      "DARKSIGHT",
+      "NIGHTVISION",
+      "DWARVEN_BUILD",
+      "PAINRESIST",
+      "INFRESIST",
+      "DISRESISTANT",
+      "BORN_ARTISAN",
+      "ALCMET",
+      "TOLERANCE",
+      "GOODCARDIO",
+      "DENSE_BONES",
+      "TUNNEL_FIGHTER",
+      "TROGLO",
+      "HIRSUTE",
+      "GOURMAND",
+      "SMELLY",
+      "HEAVYSLEEPER2"
+    ]
+  },
+  {
+    "type": "profession",
+    "subtype": "hobby",
+    "id": "hobby_species_lizardfolk",
+    "name": "Lizardfolk (Species)",
+    "description": "You are one of the Scaled Ones, called \"lizardfolk\" by the warmbloods.  For generations, your tribe served a dragon as its eyes and ears in the outside world, until civilization encroached far enough that even all the dragon's might could not hold it back.  You were sent out to integrate into the modern world, but you were only there a few years before human science ended their world.  Now, you have to survive in the mess they've created.",
+    "points": 4,
+    "skills": [ { "level": 2, "name": "swimming" }, { "level": 2, "name": "unarmed" } ],
+    "traits": [
+      "THRESH_SPECIES_LIZARDFOLK",
+      "LIZARDFOLK_BUILD",
+      "SCALES",
+      "MEMBRANE",
+      "COLDBLOOD4_LIZ",
+      "FORKED_TONGUE",
+      "HISS",
+      "GILLS",
+      "ANTIWHEAT",
+      "ANTIJUNK",
+      "TAIL_THICK",
+      "RESISTWARM",
+      "LIZ_EYE",
+      "REGEN_LIZ",
+      "MUZZLE_LONG",
+      "WEBBED_LIZ_FEET",
+      "TALONS",
+      "SLIT_NOSTRILS",
+      "PRED_LIZ"
+    ]
+  }
+]
diff --git a/data/mods/Magiclysm/traits/manatouched.json b/data/mods/Magiclysm/traits/manatouched.json
index 006b46f9affef..01ba9c49ac975 100644
--- a/data/mods/Magiclysm/traits/manatouched.json
+++ b/data/mods/Magiclysm/traits/manatouched.json
@@ -74,20 +74,20 @@
     "points": -1,
     "description": "Your body is unnaturally weak.  -2 Strength.",
     "types": [ "STR" ],
-    "category": [ "MANATOUCHED", "RAT", "BIRD", "SLIME" ],
+    "category": [ "MANATOUCHED", "RAT", "BIRD", "SLIME", "SPECIES_ELF" ],
     "cancels": [ "STR_UP", "STR_UP_2", "STR_UP_3", "STR_UP_4", "STR_ALPHA" ]
   },
   {
     "id": "STR_UP",
     "type": "mutation",
     "copy-from": "STR_UP",
-    "extend": { "cancels": [ "WEAK" ] }
+    "extend": { "cancels": [ "WEAK" ], "category": [ "SPECIES_LIZARDFOLK", "SPECIES_DWARF" ] }
   },
   {
     "id": "STR_UP_2",
     "type": "mutation",
     "copy-from": "STR_UP_2",
-    "extend": { "cancels": [ "WEAK" ] }
+    "extend": { "cancels": [ "WEAK" ], "category": [ "SPECIES_DWARF" ] }
   },
   {
     "id": "STR_UP_3",
@@ -121,7 +121,7 @@
     "type": "mutation",
     "id": "PALE",
     "copy-from": "PALE",
-    "extend": { "category": [ "MANATOUCHED" ] }
+    "extend": { "category": [ "MANATOUCHED", "SPECIES_ELF" ] }
   },
   {
     "type": "mutation",
@@ -183,8 +183,8 @@
     "name": { "str": "Mana Siphon" },
     "points": 1,
     "description": "Violence excites your ley lines.  Whenever you hit an enemy in melee, you have a chance of regaining some mana.",
-    "category": [ "MANATOUCHED", "DRAGON_BLACK" ],
-    "threshreq": [ "THRESH_MANA", "THRESH_DRAGON_BLACK" ],
+    "category": [ "MANATOUCHED", "DRAGON_BLACK", "SPECIES_ELF" ],
+    "threshreq": [ "THRESH_MANA", "THRESH_DRAGON_BLACK", "THRESH_SPECIES_ELF" ],
     "types": [ "MANA_SIPHON" ],
     "changes_to": [ "MANA_SIPHON_2" ],
     "enchantments": [ "ench_mana_siphon_1" ]
@@ -289,7 +289,7 @@
     "id": "GOODMEMORY",
     "copy-from": "GOODMEMORY",
     "valid": true,
-    "extend": { "category": [ "MANATOUCHED" ] }
+    "extend": { "category": [ "MANATOUCHED", "SPECIES_LIZARDFOLK" ] }
   },
   {
     "type": "mutation",
@@ -317,6 +317,6 @@
     "id": "MORE_PAIN",
     "copy-from": "MORE_PAIN",
     "valid": true,
-    "extend": { "category": [ "MANATOUCHED" ] }
+    "extend": { "category": [ "MANATOUCHED", "SPECIES_ELF" ] }
   }
 ]
diff --git a/data/mods/Magiclysm/traits/mutation.json b/data/mods/Magiclysm/traits/mutation.json
index b3143de00159d..b9388ec54b4c7 100644
--- a/data/mods/Magiclysm/traits/mutation.json
+++ b/data/mods/Magiclysm/traits/mutation.json
@@ -54,7 +54,7 @@
     "cancels": [ "MANA_SUB1", "MANA_SUB2", "MANA_SUB3" ],
     "changes_to": [ "MANA_ADD2" ],
     "types": [ "MANA_ADD" ],
-    "category": [ "DRAGON_BLACK", "MANATOUCHED" ],
+    "category": [ "DRAGON_BLACK", "MANATOUCHED", "SPECIES_ELF" ],
     "starting_trait": true,
     "flags": [ "NON_THRESH" ],
     "mana_modifier": 500
@@ -68,7 +68,7 @@
     "cancels": [ "MANA_SUB1", "MANA_SUB2", "MANA_SUB3" ],
     "changes_to": [ "MANA_ADD3" ],
     "types": [ "MANA_ADD" ],
-    "category": [ "DRAGON_BLACK", "MANATOUCHED" ],
+    "category": [ "DRAGON_BLACK", "MANATOUCHED", "SPECIES_ELF" ],
     "starting_trait": true,
     "prereqs": [ "MANA_ADD1" ],
     "flags": [ "NON_THRESH" ],
@@ -96,6 +96,7 @@
     "description": "You are able to store a little less mana in your body than usual.",
     "cancels": [ "MANA_ADD1", "MANA_ADD2", "MANA_ADD3" ],
     "changes_to": [ "MANA_SUB2" ],
+    "category": [ "SPECIES_DWARF" ],
     "types": [ "MANA_ADD" ],
     "flags": [ "NON_THRESH" ],
     "mana_modifier": -500
@@ -134,7 +135,7 @@
     "cancels": [ "BAD_MANA_REGEN1", "BAD_MANA_REGEN2", "BAD_MANA_REGEN3" ],
     "changes_to": [ "MANA_REGEN2" ],
     "types": [ "MANA_REGEN" ],
-    "category": [ "FISH", "ELFA", "ALPHA", "PLANT", "CEPHALOPOD", "MANATOUCHED", "DRAGON_BLACK" ],
+    "category": [ "FISH", "ELFA", "ALPHA", "PLANT", "CEPHALOPOD", "MANATOUCHED", "DRAGON_BLACK", "SPECIES_ELF", "SPECIES_LIZARDFOLK" ],
     "starting_trait": true,
     "flags": [ "NON_THRESH" ],
     "mana_regen_multiplier": 1.1
@@ -149,7 +150,7 @@
     "cancels": [ "BAD_MANA_REGEN1", "BAD_MANA_REGEN2", "BAD_MANA_REGEN3" ],
     "changes_to": [ "MANA_REGEN3", "MANA_REGEN_MANATOUCHED" ],
     "types": [ "MANA_REGEN" ],
-    "category": [ "FISH", "ELFA", "PLANT", "MANATOUCHED", "DRAGON_BLACK" ],
+    "category": [ "FISH", "ELFA", "PLANT", "MANATOUCHED", "DRAGON_BLACK", "SPECIES_ELF" ],
     "starting_trait": true,
     "flags": [ "NON_THRESH" ],
     "mana_regen_multiplier": 1.25
@@ -163,8 +164,8 @@
     "prereqs": [ "MANA_REGEN2" ],
     "cancels": [ "BAD_MANA_REGEN1", "BAD_MANA_REGEN2", "BAD_MANA_REGEN3" ],
     "types": [ "MANA_REGEN" ],
-    "threshreq": [ "THRESH_PLANT", "THRESH_MANA", "THRESH_DRAGON_BLACK" ],
-    "category": [ "PLANT", "DRAGON_BLACK" ],
+    "threshreq": [ "THRESH_PLANT", "THRESH_MANA", "THRESH_DRAGON_BLACK", "THRESH_SPECIES_ELF" ],
+    "category": [ "PLANT", "DRAGON_BLACK", "SPECIES_ELF" ],
     "flags": [ "NON_THRESH" ],
     "mana_regen_multiplier": 1.5
   },
@@ -230,7 +231,8 @@
       "ALPHA",
       "ELFA",
       "MANATOUCHED",
-      "DRAGON_BLACK"
+      "DRAGON_BLACK",
+      "SPECIES_ELF"
     ],
     "starting_trait": true,
     "flags": [ "NON_THRESH" ],
@@ -245,7 +247,7 @@
     "cancels": [ "BAD_MANA_MULT1", "BAD_MANA_MULT2", "BAD_MANA_MULT3" ],
     "changes_to": [ "MANA_MULT3" ],
     "types": [ "MANA_MULT" ],
-    "category": [ "BIRD", "SLIME", "CATTLE", "PLANT", "CEPHALOPOD", "ELFA", "MANATOUCHED", "DRAGON_BLACK" ],
+    "category": [ "BIRD", "SLIME", "CATTLE", "PLANT", "CEPHALOPOD", "ELFA", "MANATOUCHED", "DRAGON_BLACK", "SPECIES_ELF" ],
     "prereqs": [ "MANA_MULT1" ],
     "starting_trait": true,
     "flags": [ "NON_THRESH" ],
@@ -274,7 +276,20 @@
     "cancels": [ "MANA_MULT1", "MANA_MULT2", "MANA_MULT3" ],
     "changes_to": [ "BAD_MANA_MULT2" ],
     "types": [ "MANA_MULT" ],
-    "category": [ "BEAST", "FISH", "LUPINE", "INSECT", "TROGLOBITE", "SPIDER", "RAT", "MOUSE", "MEDICAL", "CHIMERA", "RAPTOR" ],
+    "category": [
+      "BEAST",
+      "FISH",
+      "LUPINE",
+      "INSECT",
+      "TROGLOBITE",
+      "SPIDER",
+      "RAT",
+      "MOUSE",
+      "MEDICAL",
+      "CHIMERA",
+      "RAPTOR",
+      "SPECIES_DWARF"
+    ],
     "starting_trait": true,
     "flags": [ "NON_THRESH" ],
     "mana_multiplier": 0.85
@@ -288,7 +303,7 @@
     "cancels": [ "MANA_MULT1", "MANA_MULT2", "MANA_MULT3" ],
     "changes_to": [ "BAD_MANA_MULT3" ],
     "types": [ "MANA_MULT" ],
-    "category": [ "BEAST", "INSECT", "TROGLOBITE", "MOUSE", "MEDICAL", "CHIMERA", "RAPTOR" ],
+    "category": [ "BEAST", "INSECT", "TROGLOBITE", "MOUSE", "MEDICAL", "CHIMERA", "RAPTOR", "SPECIES_DWARF" ],
     "prereqs": [ "BAD_MANA_MULT1" ],
     "flags": [ "NON_THRESH" ],
     "mana_multiplier": 0.65