diff --git a/src/main/java/dev/tricht/lunaris/listeners/MapInfoListener.java b/src/main/java/dev/tricht/lunaris/listeners/MapInfoListener.java
index 9d567ed..fe76fb8 100644
--- a/src/main/java/dev/tricht/lunaris/listeners/MapInfoListener.java
+++ b/src/main/java/dev/tricht/lunaris/listeners/MapInfoListener.java
@@ -29,6 +29,8 @@ public class MapInfoListener implements GameListener {
     private Pattern elementalAffix = Pattern.compile("(?i:Monsters reflect .*% of Elemental Damage)");
     private Pattern physicalAffix = Pattern.compile("(?i:Monsters reflect .*% of Physical Damage)");
     private Pattern recoveryAffix = Pattern.compile("(?i:Players have .*% less Recovery Rate of Life and Energy Shield)");
+    private Pattern ailmentAffix = Pattern.compile("(?i:Monsters have .*% chance to Avoid Elemental Ailments)");
+    private Pattern poisonAffix = Pattern.compile("(?i:Monsters have .*% chance to avoid Poison, Blind, and Bleeding)");
 
     public MapInfoListener() {
         this.mapInfoResolver = new MapInfoResolver();
@@ -108,6 +110,12 @@ private List<String> getMapModWarnings(Item item) {
             if (recoveryAffix.matcher(affix).matches() && isModWarningEnabled("low_recovery")) {
                 warnings.add("Less recovery of Life and ES");
             }
+            if (ailmentAffix.matcher(affix).matches() && isModWarningEnabled("avoidElementalAilments")) {
+                warnings.add("Avoid elemental ailments");
+            }
+            if (poisonAffix.matcher(affix).matches() && isModWarningEnabled("avoidPoisonBlindAndBleeding")) {
+                warnings.add("Avoid poison, blind and bleeding");
+            }
         }
         if (damageMods >= 2 && isModWarningEnabled("multi_dmg")) {
             warnings.add(String.format("Multi (%d) extra damage", damageMods));
diff --git a/src/main/java/dev/tricht/lunaris/settings/game/MapModsGUI.java b/src/main/java/dev/tricht/lunaris/settings/game/MapModsGUI.java
index 1f4243e..22fafe4 100644
--- a/src/main/java/dev/tricht/lunaris/settings/game/MapModsGUI.java
+++ b/src/main/java/dev/tricht/lunaris/settings/game/MapModsGUI.java
@@ -26,6 +26,10 @@ public class MapModsGUI implements Initializable {
     private CheckBox multiDmgModWarning;
     @FXML
     private CheckBox tempChainsModWarning;
+    @FXML
+    private CheckBox avoidElementalAilments;
+    @FXML
+    private CheckBox avoidPoisonBlindAndBleeding;
 
     private HashMap<CheckBox, String> propertyMap;
 
@@ -58,6 +62,12 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         if (!PropertiesManager.containsKey("map_mod_warnings.low_recovery")) {
             PropertiesManager.writeProperty("map_mod_warnings.low_recovery", "1");
         }
+        if (!PropertiesManager.containsKey("map_mod_warnings.avoid_elemental_ailments")) {
+            PropertiesManager.writeProperty("map_mod_warnings.avoid_elemental_ailments", "0");
+        }
+        if (!PropertiesManager.containsKey("map_mod_warnings.avoid_poison_blind_and_bleed")) {
+            PropertiesManager.writeProperty("map_mod_warnings.avoid_poison_blind_and_bleed", "0");
+        }
 
         propertyMap.put(eleReflModWarning, "map_mod_warnings.ele_refl");
         propertyMap.put(physReflModWarning, "map_mod_warnings.phys_refl");
@@ -66,6 +76,8 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         propertyMap.put(multiDmgModWarning, "map_mod_warnings.multi_dmg");
         propertyMap.put(tempChainsModWarning, "map_mod_warnings.tmp_chains");
         propertyMap.put(lowRecoveryModWarning, "map_mod_warnings.low_recovery");
+        propertyMap.put(avoidElementalAilments, "map_mod_warnings.avoid_elemental_ailments");
+        propertyMap.put(avoidPoisonBlindAndBleeding, "map_mod_warnings.avoid_poison_blind_and_bleed");
 
 
         for (Map.Entry<CheckBox, String> entry :propertyMap.entrySet()) {
@@ -76,7 +88,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
 
     public void toggleCheckbox(ActionEvent actionEvent) {
         CheckBox source = (CheckBox) actionEvent.getSource();
-        if(!propertyMap.containsKey(source)) {
+        if (!propertyMap.containsKey(source)) {
             return;
         }
         PropertiesManager.writeProperty(propertyMap.get(source), source.isSelected() ? "1" : "0");
diff --git a/src/main/resources/settings/game/map_mods.fxml b/src/main/resources/settings/game/map_mods.fxml
index f6ddb62..777fbd4 100644
--- a/src/main/resources/settings/game/map_mods.fxml
+++ b/src/main/resources/settings/game/map_mods.fxml
@@ -21,12 +21,15 @@
                   <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
                </columnConstraints>
                <rowConstraints>
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
                </rowConstraints>
                <children>
                   <CheckBox fx:id="eleReflModWarning" mnemonicParsing="false" onAction="#toggleCheckbox" text="Elemental reflect" GridPane.rowIndex="0" />
@@ -36,6 +39,8 @@
                   <CheckBox fx:id="multiDmgModWarning" mnemonicParsing="false" onAction="#toggleCheckbox" text="Multi damage" GridPane.rowIndex="4" />
                   <CheckBox fx:id="tempChainsModWarning" mnemonicParsing="false" onAction="#toggleCheckbox" text="Temporal Chains" GridPane.rowIndex="5" />
                   <CheckBox fx:id="lowRecoveryModWarning" mnemonicParsing="false" onAction="#toggleCheckbox" text="Low recovery" GridPane.rowIndex="6" />
+                  <CheckBox fx:id="avoidElementalAilments" mnemonicParsing="false" onAction="#toggleCheckbox" text="Avoid elemental ailments" GridPane.rowIndex="7" />
+                  <CheckBox fx:id="avoidPoisonBlindAndBleeding" mnemonicParsing="false" onAction="#toggleCheckbox" text="Avoid Poison, blind and bleeding" GridPane.rowIndex="8" />
                </children>
             </GridPane>
          </children>