diff --git a/assets/combat/_event_next_page_1.png b/assets/combat/_event_next_page_1.png
deleted file mode 100644
index f96add9e..00000000
Binary files a/assets/combat/_event_next_page_1.png and /dev/null differ
diff --git a/assets/combat/_event_world_E-1.png b/assets/combat/_event_world_E-1.png
index f0a91995..c2d00431 100644
Binary files a/assets/combat/_event_world_E-1.png and b/assets/combat/_event_world_E-1.png differ
diff --git a/assets/combat/_event_world_E-2.png b/assets/combat/_event_world_E-2.png
deleted file mode 100644
index 044ad686..00000000
Binary files a/assets/combat/_event_world_E-2.png and /dev/null differ
diff --git a/assets/combat/_event_world_E-3.png b/assets/combat/_event_world_E-3.png
deleted file mode 100644
index bd238d6c..00000000
Binary files a/assets/combat/_event_world_E-3.png and /dev/null differ
diff --git a/assets/combat/c_world_E.png b/assets/combat/c_world_E.png
index c289fed6..4f8b12d8 100644
Binary files a/assets/combat/c_world_E.png and b/assets/combat/c_world_E.png differ
diff --git a/assets/expedition/e_world_2.png b/assets/expedition/e_world_2.png
deleted file mode 100644
index 84493654..00000000
Binary files a/assets/expedition/e_world_2.png and /dev/null differ
diff --git a/assets/expedition/e_world_3.png b/assets/expedition/e_world_3.png
deleted file mode 100644
index 39413f12..00000000
Binary files a/assets/expedition/e_world_3.png and /dev/null differ
diff --git a/assets/expedition/e_world_4.png b/assets/expedition/e_world_4.png
deleted file mode 100644
index ad70f53e..00000000
Binary files a/assets/expedition/e_world_4.png and /dev/null differ
diff --git a/assets/expedition/e_world_5.png b/assets/expedition/e_world_5.png
deleted file mode 100644
index 9c9696d4..00000000
Binary files a/assets/expedition/e_world_5.png and /dev/null differ
diff --git a/assets/expedition/e_world_7.png b/assets/expedition/e_world_7.png
deleted file mode 100644
index 7a375f6a..00000000
Binary files a/assets/expedition/e_world_7.png and /dev/null differ
diff --git a/assets/expedition/e_world_E.png b/assets/expedition/e_world_E.png
index 407d3ddb..ebafce4e 100644
Binary files a/assets/expedition/e_world_E.png and b/assets/expedition/e_world_E.png differ
diff --git a/data/combat/E-1.json b/data/combat/E-1.json
index 45511767..802fb5e8 100644
--- a/data/combat/E-1.json
+++ b/data/combat/E-1.json
@@ -4,116 +4,86 @@
     "enemy_context": ["subs"],
     "nodes": {
         "A": {
-            "coords": [992, 420]
+            "coords": [220, 358],
+			"types": ["select"]
         },
         "B": {
-            "coords": [952, 346]
+            "coords": [250, 425],
+			"types": ["air"]
         },
         "C": {
-            "coords": [923, 292]
-        },
-        "C1": {
-            "coords": [1002, 274]
-        },
-        "C2": {
-            "coords": [965, 212]
+            "coords": [287, 503]
         },
         "D": {
-            "coords": [866, 202],
-			"types": ["air"]
+            "coords": [306, 367],
+			"types": ["sub"]
         },
         "E": {
-            "coords": [817, 251]
+            "coords": [435, 419]
         },
         "F": {
-            "coords": [769, 196]
+            "coords": [553, 485],
+			"types": ["sub"]
         },
         "G": {
-            "coords": [758, 307],
-			"types": ["boss"]
+            "coords": [587, 333],
+			"types": ["select"]
         },
         "H": {
-            "coords": [684, 398]
+            "coords": [646, 404],
+			"types": ["air"]
         },
         "I": {
-            "coords": [624, 334]
+            "coords": [663, 509]
         },
         "J": {
-            "coords": [534, 318],
-			"types": ["sub"]
-        },
-        "K": {
-            "coords": [523, 481],
-			"types": ["air"]
+            "coords": [738, 209]
         },
         "L": {
-            "coords": [487, 211]
+            "coords": [805, 370],
+			"types": ["air"]
         },
         "M": {
-            "coords": [460, 361]
+            "coords": [842, 166]
         },
         "N": {
-            "coords": [444, 424],
-			"types": ["select"]
+            "coords": [887, 441],
+			"types": ["boss"]
         },
         "O": {
-            "coords": [411, 297],
-			"types": ["boss"]
+            "coords": [782, 272],
+			"types": ["sub"]
         },
         "P": {
-            "coords": [385, 192]
-        },
-        "Q": {
-            "coords": [376, 379]
+            "coords": [892, 321]
         },
         "R": {
-            "coords": [341, 472]
-        },
-        "S": {
-            "coords": [307, 363]
-        },
-        "T": {
-            "coords": [249, 370]
-        },
-        "U": {
-            "coords": [168, 361]
-        },
-        "V": {
-            "coords": [218, 273],
+            "coords": [945, 200],
 			"types": ["boss"]
         }
     },
     "edges": {
-        "1": ["Start 1", "A"],
-        "2": ["A", "B"],
-        "3": ["B", "C"],
-        "4": ["C", "C1"],
-        "5": ["C", "C2"],
-        "6": ["C", "D"],
-        "7": ["C", "E"],
-        "8": ["E", "F"],
-        "9": ["C1", "C2"],
-        "10": ["D", "E"],
-        "11": ["E", "G"],
-        "12": ["Start 2", "H"],
-        "13": ["H", "I"],
-        "14": ["I", "J"],
-        "15": ["I", "K"],
-        "16": ["J", "L"],
-        "17": ["Q", "M"],
-        "18": ["I", "N"],
-        "19": ["Q", "O"],
-        "20": ["J", "P"],
-        "21": ["N", "Q"],
-        "22": ["N", "R"],
-        "23": ["Start 2", "I"],
-        "24": ["J", "K"],
-        "25": ["K", "N"],
-        "26": ["L", "P"],
-        "28": ["R", "S"],
-        "29": ["S", "T"],
-        "30": ["T", "U"],
-        "31": ["T", "V"],
-        "32": ["R", "T"]
+		"1" : ["Start", "A"],
+		"2" : ["A", "B"],
+		"3" : ["B", "C"],
+		"4" : ["A", "D"],
+		"5" : ["C", "E"],
+		"6" : ["C", "F"],
+		"7" : ["E", "G"],
+		"8" : ["F", "H"],
+		"9" : ["F", "I"],
+		"10": ["G", "J"],
+		"11": ["I", "K"],
+		"12": ["G", "L"],
+		"13": ["J", "M"],
+		"14": ["I", "N"],
+		"15": ["D", "E"],
+		"16": ["E", "F"],
+		"17": ["H", "I"],
+		"18": ["L", "O"],
+		"19": ["O", "P"],
+		"20": ["P", "Q"],
+		"21": ["P", "R"],
+		"22": ["L", "P"]
     }
 }
diff --git a/data/combat/E-2.json b/data/combat/E-2.json
deleted file mode 100644
index 7aab9ece..00000000
--- a/data/combat/E-2.json
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-    "world": "E",
-    "subworld": 2,
-    "enemy_context": ["subs"],
-    "nodes": {
-        "A": {
-            "coords": [970, 536]
-        },
-        "B": {
-            "coords": [962, 437]
-        },
-        "C": {
-            "coords": [895, 494],
-			"types": ["sub"]
-        },
-        "D": {
-            "coords": [824, 452],
-			"types": ["air"]
-        },
-        "D1": {
-            "coords": [778, 528]
-        },
-        "D2": {
-            "coords": [769, 418]
-        },
-        "E": {
-            "coords": [712, 531],
-			"types": ["select"]
-        },
-        "F": {
-            "coords": [698, 449]
-        },
-        "G": {
-            "coords": [664, 496]
-        },
-        "H": {
-            "coords": [634, 536]
-        },
-        "I": {
-            "coords": [766, 354],
-			"types": ["boss"]
-        },
-        "J": {
-            "coords": [253, 385],
-			"types": ["select"]
-        },
-        "K": {
-            "coords": [309, 265],
-			"types": ["sub"]
-        },
-        "L": {
-            "coords": [331, 355],
-			"types": ["sub"]
-        },
-        "M": {
-            "coords": [387, 252],
-			"types": ["air"]
-        },
-        "N": {
-            "coords": [410, 322]
-        },
-        "O": {
-            "coords": [421, 403]
-        },
-        "P": {
-            "coords": [518, 354],
-			"types": ["select"]
-        },
-        "Q": {
-            "coords": [564, 237]
-        },
-        "R": {
-            "coords": [595, 312],
-			"types": ["air"]
-        },
-        "S": {
-            "coords": [658, 278]
-        },
-        "T": {
-            "coords": [672, 343]
-        },
-        "X": {
-            "coords": [575, 389]
-        },
-        "2": {
-            "coords": [160, 423]
-        },
-        "U": {
-            "coords": [387, 187]
-        },
-        "V": {
-            "coords": [456, 239]
-        },
-        "W": {
-            "coords": [514, 138],
-			"types": ["boss"]
-        },
-        "Y": {
-            "coords": [567, 491]
-        },
-        "Z": {
-            "coords": [623, 441],
-			"types": ["boss"]
-        }
-    },
-    "edges": {
-        "1": ["Start 1", "A"],
-        "2": ["Start 1", "B"],
-        "3": ["A", "C"],
-        "4": ["C", "D"],
-        "5": ["C", "D1"],
-        "6": ["F", "D2"],
-        "7": ["D1", "E"],
-        "8": ["D", "F"],
-        "9": ["E", "G"],
-        "10": ["E", "H"],
-        "11": ["F", "I"],
-        "12": ["B", "C"],
-        "13": ["D", "D1"],
-        "14": ["D1", "F"],
-        "15": ["G", "F"],
-        "16": ["Start 2", "J"],
-        "17": ["J", "K"],
-        "18": ["J", "L"],
-        "19": ["K", "M"],
-        "20": ["L", "N"],
-        "21": ["L", "O"],
-        "22": ["N", "P"],
-        "23": ["R", "Q"],
-        "24": ["P", "R"],
-        "25": ["R", "S"],
-        "26": ["R", "T"],
-        "27": ["P", "X"],
-        "28": ["N", "O"],
-        "29": ["O", "P"],
-        "30": ["T", "S"],
-        "32": ["M", "U"],
-        "33": ["U", "V"],
-        "34": ["V", "W"],
-        "35": ["V", "Q"],
-        "36": ["M", "V"],
-        "37": ["Q", "W"],
-        "38": ["X", "Y"],
-        "39": ["Y", "Z"],
-        "40": ["Y", "H"],
-        "41": ["X", "Z"]
-    }
-}
diff --git a/data/combat/E-3.json b/data/combat/E-3.json
deleted file mode 100644
index b7f848d5..00000000
--- a/data/combat/E-3.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
-    "world": "E",
-    "subworld": 3,
-    "panel": 1,
-    "page": 2,
-    "enemy_context": ["subs"],
-    "nodes": {
-        "A": {
-            "coords": [456, 392]
-        },
-        "B": {
-            "coords": [520, 367],
-			"types": ["sub"]
-        },
-        "B1": {
-            "coords": [554, 303],
-			"types": ["air"]
-        },
-        "B2": {
-            "coords": [591, 355],
-			"types": ["air"]
-        },
-        "C": {
-            "coords": [587, 245],
-			"types": ["sub"]
-        },
-        "C1": {
-            "coords": [619, 301]
-        },
-        "C2": {
-            "coords": [655, 357],
-			"types": ["select"]
-        },
-        "D": {
-            "coords": [646, 215]
-        },
-        "E": {
-            "coords": [701, 281]
-        },
-        "F": {
-            "coords": [724, 393]
-        },
-        "G": {
-            "coords": [788, 260]
-        },
-        "H": {
-            "coords": [817, 172]
-        },
-        "I": {
-            "coords": [738, 166],
-			"types": ["boss"]
-        },
-        "Z": {
-            "coords": [1064, 480]
-        },
-        "J1": {
-            "coords": [207, 440],
-			"types": ["sub"]
-        },
-        "J2": {
-            "coords": [196, 361],
-			"types": ["sub"]
-        },
-        "J": {
-            "coords": [140, 395],
-			"types": ["air"]
-        },
-        "K": {
-            "coords": [116, 328]
-        },
-        "L": {
-            "coords": [175, 284],
-			"types": ["air"]
-        },
-        "M": {
-            "coords": [135, 245]
-        },
-        "N": {
-            "coords": [186, 203]
-        },
-        "O": {
-            "coords": [173, 126],
-			"types": ["boss"]
-        },
-        "P": {
-            "coords": [814, 380],
-			"types": ["air"]
-        },
-        "Q": {
-            "coords": [828, 326]
-        },
-        "R": {
-            "coords": [875, 368],
-			"types": ["sub"]
-        },
-        "S": {
-            "coords": [906, 321],
-			"types": ["air"]
-        },
-        "T": {
-            "coords": [964, 344],
-			"types": ["air"]
-        },
-        "T1": {
-            "coords": [916, 176]
-        },
-        "T2": {
-            "coords": [940, 244]
-        },
-        "T3": {
-            "coords": [1001, 272]
-        },
-        "T4": {
-            "coords": [1035, 343]
-        },
-        "U": {
-            "coords": [936, 394]
-        },
-        "V": {
-            "coords": [932, 443],
-			"types": ["select"]
-        },
-        "W": {
-            "coords": [873, 444]
-        },
-        "X": {
-            "coords": [938, 499]
-        },
-        "Y": {
-            "coords": [998, 521],
-			"types": ["air"]
-        },
-        "Z1": {
-            "coords": [1076, 545]
-        },
-        "Z2": {
-            "coords": [1076, 412],
-			"types": ["boss"]
-        },
-        "X1": {
-            "coords": [898, 529]
-        },
-        "X2": {
-            "coords": [951, 547]
-        },
-        "Z3": {
-            "coords": [990, 437],
-			"types": ["boss"]
-        }
-    },
-    "edges": {
-        "1": ["Start 1", "A"],
-        "2": ["A", "B"],
-        "3": ["B", "B1"],
-        "4": ["B", "B2"],
-        "5": ["B1", "C"],
-        "6": ["B1", "C1"],
-        "7": ["B2", "C2"],
-        "8": ["C", "D"],
-        "9": ["C1", "E"],
-        "10": ["C2", "F"],
-        "11": ["D", "G"],
-        "12": ["G", "H"],
-        "13": ["E", "I"],
-        "14": ["B2", "C1"],
-        "15": ["C", "C1"],
-        "16": ["C1", "C2"],
-        "17": ["C2", "E"],
-        "18": ["E", "G"],
-        "19": ["G", "I"],
-        "21": ["Start 2", "J1"],
-        "22": ["J1", "J2"],
-        "23": ["J1", "J"],
-        "24": ["L", "K"],
-        "25": ["J2", "L"],
-        "26": ["L", "M"],
-        "27": ["M", "N"],
-        "28": ["M", "O"],
-        "29": ["J", "J2"],
-        "30": ["Start 2", "J2"],
-        "31": ["N", "O"],
-        "33": ["Start 3", "P"],
-        "34": ["Start 3", "Q"],
-        "35": ["P", "R"],
-        "36": ["Q", "S"],
-        "37": ["R", "T"],
-        "38": ["T2", "T1"],
-        "39": ["S", "T2"],
-        "40": ["S", "T3"],
-        "41": ["T3", "T4"],
-        "42": ["R", "U"],
-        "43": ["U", "V"],
-        "44": ["V", "W"],
-        "45": ["V", "X"],
-        "46": ["T2", "T3"],
-        "47": ["S", "U"],
-        "48": ["T", "U"],
-        "50": ["X", "Y"],
-        "51": ["Y", "Z"],
-        "52": ["Z", "Z1"],
-        "53": ["Z", "Z2"],
-        "54": ["X", "X1"],
-        "55": ["X1", "X2"],
-        "56": ["X2", "Z3"],
-        "57": ["R", "S"],
-        "58": ["S", "T"],
-        "59": ["X2", "Y"],
-        "60": ["X", "Z3"],
-        "61": ["Y", "Z3"]
-    }
-}