diff --git a/region/brinstar/kraid/Kraid Room.json b/region/brinstar/kraid/Kraid Room.json
index caf901545d..0f401f09e2 100644
--- a/region/brinstar/kraid/Kraid Room.json	
+++ b/region/brinstar/kraid/Kraid Room.json	
@@ -231,18 +231,57 @@
     {
       "id": 2,
       "link": [1, 1],
-      "name": "Leave Shinecharged",
+      "name": "Leave Shinecharged (Kraid Defeated)",
       "requires": [
         {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
         "canShinechargeMovement",
         "f_DefeatedKraid",
-        {"shineChargeFrames": 45}
+        {"shineChargeFrames": 40}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true
+    },
+    {
+      "link": [1, 1],
+      "name": "Leave Shinecharged (X-Mode or Kraid Defeated)",
+      "requires": [
+        "canXMode",
+        "h_XModeThornHit",
+        "h_shinechargeMaxRunway",
+        {"or": [
+          {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
+          {"and": [
+            {"not": "f_DefeatedKraid"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]},
+        "canShinechargeMovement",
+        {"shineChargeFrames": 45},
+        {"or": [
+          "canBeVeryPatient",
+          {"and": [
+            "h_XModeThornHit",
+            {"shineChargeFrames": 20}
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
       },
       "flashSuitChecked": true,
-      "devNote": "An X-Mode strat is likely possible but not included. It would require the doors unlocked and canRiskPermanentLossOfAccess."
+      "note": [
+        "If Kraid is alive, use X-mode on the thorns to gain blue speed.",
+        "Hold an angle button to turn around while retaining blue.",
+        "If needed, arm pump to get close to the ledge without touching it.",
+        "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
+        "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
+        "a second thorn hit can be avoided."
+      ],
+      "devNote": [
+        "If Kraid is alive, leaving with a horizontal damage boost is also possible, but not easy to model."
+      ]
     },
     {
       "id": 3,
@@ -523,18 +562,58 @@
     {
       "id": 17,
       "link": [2, 2],
-      "name": "Leave Shinecharged",
+      "name": "Leave Shinecharged (Kraid Defeated)",
       "requires": [
         {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
         "canShinechargeMovement",
         "f_DefeatedKraid",
-        {"shineChargeFrames": 45}
+        {"shineChargeFrames": 40}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true
+    },
+    {
+      "link": [2, 2],
+      "name": "Leave Shinecharged (X-Mode or Kraid Defeated)",
+      "requires": [
+        "h_KraidCameraFix",
+        "canXMode",
+        "h_XModeThornHit",
+        "h_shinechargeMaxRunway",
+        {"or": [
+          {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
+          {"and": [
+            {"not": "f_DefeatedKraid"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]},
+        "canShinechargeMovement",
+        {"shineChargeFrames": 45},
+        {"or": [
+          "canBeVeryPatient",
+          {"and": [
+            "h_XModeThornHit",
+            {"shineChargeFrames": 20}
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
       },
       "flashSuitChecked": true,
-      "devNote": "An X-Mode strat is likely possible but not included. It would require the doors unlocked and canRiskPermanentLossOfAccess."
+      "note": [
+        "If Kraid is alive, use X-mode on the thorns to gain blue speed.",
+        "Hold an angle button to turn around while retaining blue.",
+        "If needed, arm pump to get close to the ledge without touching it.",
+        "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
+        "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
+        "a second thorn hit can be avoided."
+      ],
+      "devNote": [
+        "If Kraid is alive, leaving with a horizontal damage boost is also possible, but not easy to model."
+      ]
     },
     {
       "id": 18,