diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json
index 4b42e1776252e..481d62570a56b 100644
--- a/data/mods/Magiclysm/effects/effects.json
+++ b/data/mods/Magiclysm/effects/effects.json
@@ -1274,8 +1274,10 @@
     "desc": [ "You are immune to heat and fire." ],
     "rating": "good",
     "show_in_info": true,
-    "removes_effects": [ "onfire", "blisters" ],
-    "enchantments": [ "ench_heat_and_fire_immunity" ]
+    "blocks_effects": [ "blisters" ],
+    "removes_effects": [ "onfire" ],
+    "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1 } ] } ],
+    "flags": [ "HEAT_IMMUME" ]
   },
   {
     "type": "effect_type",
diff --git a/data/mods/Magiclysm/enchantments/Cleansing_Flame.json b/data/mods/Magiclysm/enchantments/Cleansing_Flame.json
index adaada3fe0795..5161a3c05af74 100644
--- a/data/mods/Magiclysm/enchantments/Cleansing_Flame.json
+++ b/data/mods/Magiclysm/enchantments/Cleansing_Flame.json
@@ -6,13 +6,5 @@
     "description": "Your Cleansing Flame abilities grant you good resistance to temperature conditions.  You are also immune to infection, as your body cleanses every tainted part of you, constantly.",
     "condition": "ALWAYS",
     "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 30 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 10 } ]
-  },
-  {
-    "type": "enchantment",
-    "id": "ench_heat_and_fire_immunity",
-    "name": { "str": "Total Fire Immunity" },
-    "description": "You are utterly immune to fire and heat.",
-    "condition": "ALWAYS",
-    "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 }, { "value": "ARMOR_HEAT", "add": -1000 } ]
   }
 ]
diff --git a/data/mods/Magiclysm/enchantments/Vulcanist.json b/data/mods/Magiclysm/enchantments/Vulcanist.json
index 038b35a339d64..5a4a3f13b9ced 100644
--- a/data/mods/Magiclysm/enchantments/Vulcanist.json
+++ b/data/mods/Magiclysm/enchantments/Vulcanist.json
@@ -5,7 +5,7 @@
     "condition": "ALWAYS",
     "name": { "str": "Lava" },
     "description": "Your Vulcanist abilities grant you good resistance to temperature conditions, total heat immunity, and immunity to smoke.",
-    "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 30 }, { "value": "CLIMATE_CONTROL_CHILL", "add": 10 } ],
+    "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 30 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ],
     "ench_effects": [ { "effect": "effect_vulcanist_no_smoke_or_blisters", "intensity": 1 } ]
   },
   {
@@ -13,6 +13,6 @@
     "id": "effect_vulcanist_no_smoke_or_blisters",
     "name": [ "" ],
     "desc": [ "" ],
-    "removes_effects": [ "smoke_eyes", "smoke_lungs", "blisters" ]
+    "blocks_effects": [ "smoke_eyes", "smoke_lungs", "blisters" ]
   }
 ]
diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
index 455e64345898a..ff428ca7dedab 100644
--- a/data/mods/MindOverMatter/effects/effects_psionic.json
+++ b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -1365,8 +1365,8 @@
     "max_duration": "7 days",
     "max_intensity": 95,
     "blocks_effects": [ "blisters" ],
-    "enchantments": [ { "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 100000 }, { "value": "ARMOR_HEAT", "multiply": -1.0 } ] } ],
-    "flags": [ "HEAT_IMMUNE", "HEATSINK" ]
+    "enchantments": [ { "values": [ { "value": "ARMOR_HEAT", "multiply": -1.0 } ] } ],
+    "flags": [ "HEAT_IMMUNE" ]
   },
   {
     "type": "effect_type",
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json
index 6002927113571..6a45e547a5dc8 100644
--- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json
+++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json
@@ -585,11 +585,7 @@
     "enchantments": [
       {
         "condition": "ALWAYS",
-        "values": [
-          { "value": "CLIMATE_CONTROL_CHILL", "add": 1000 },
-          { "value": "ARMOR_HEAT", "add": -1000 },
-          { "value": "ARMOR_COLD", "multiply": 0.5 }
-        ],
+        "values": [ { "value": "ARMOR_HEAT", "multiply": -1 }, { "value": "ARMOR_COLD", "multiply": 0.5 } ],
         "ench_effects": [ { "effect": "effect_hidden_flame_immunity", "intensity": 1 } ]
       }
     ],