From 62b04c26ca3c2f80d13e49e34edbf3dc9beb4f46 Mon Sep 17 00:00:00 2001
From: XP <smurfs@smurfs.verymad.net>
Date: Sun, 3 Dec 2023 15:33:38 -0800
Subject: [PATCH] MVP for new timeline syncs

---
 .../timelines/CactbotEventTypes.java          | 201 ++++++++++++++++++
 .../timelines/CustomTimelineEntry.java        |   6 +
 .../timelines/CustomTimelineLabel.java        |   5 +
 .../timelines/EventSyncController.java        |  13 ++
 .../timelines/FileEventSyncController.java    |  35 +++
 .../timelines/TextFileLabelEntry.java         |   6 +
 .../timelines/TextFileTimelineEntry.java      |   8 +-
 .../xivsupport/timelines/TimelineEntry.java   |  28 ++-
 .../xivsupport/timelines/TimelineManager.java |   5 +-
 .../xivsupport/timelines/TimelineParser.java  |  55 ++++-
 .../timelines/TimelineProcessor.java          | 146 ++++++++++---
 .../timelines/TranslatedTextFileEntry.java    |   5 +
 .../src/main/resources/timeline/a10n.txt      |   3 +-
 timelines/src/main/resources/timeline/a1s.txt |   6 +-
 timelines/src/main/resources/timeline/a3n.txt | 115 +++++-----
 timelines/src/main/resources/timeline/a3s.txt |   4 +-
 timelines/src/main/resources/timeline/a5s.txt |   3 +-
 timelines/src/main/resources/timeline/a6n.txt |  12 +-
 timelines/src/main/resources/timeline/a6s.txt |  12 +-
 timelines/src/main/resources/timeline/a7s.txt |   8 +-
 timelines/src/main/resources/timeline/a9s.txt |   6 +-
 .../main/resources/timeline/aetherfont.txt    |  12 +-
 .../aetherochemical_research_facility.txt     |   6 +-
 .../src/main/resources/timeline/aglaia.txt    |  29 ++-
 .../resources/timeline/akadaemia_anyder.txt   |   9 +-
 .../src/main/resources/timeline/ala_mhigo.txt |   9 +-
 .../main/resources/timeline/aloalo_island.txt |  24 ++-
 .../resources/timeline/alzadaals_legacy.txt   |  12 +-
 .../src/main/resources/timeline/amaurot.txt   |   9 +-
 .../resources/timeline/anamnesis_anyder.txt   |   9 +-
 .../timeline/another_mount_rokkon-savage.txt  |  14 +-
 .../timeline/another_mount_rokkon.txt         |  12 +-
 .../another_sildihn_subterrane-savage.txt     |  14 +-
 .../timeline/another_sildihn_subterrane.txt   |  12 +-
 .../main/resources/timeline/baelsars_wall.txt |  10 +-
 .../resources/timeline/bardams_mettle.txt     |   9 +-
 .../timeline/bozjan_southern_front.txt        |  21 +-
 .../resources/timeline/castrum_abania.txt     |   9 +-
 .../resources/timeline/delubrum_reginae.txt   |  18 +-
 .../timeline/delubrum_reginae_savage.txt      |  57 +++--
 .../src/main/resources/timeline/dohn_mheg.txt |   9 +-
 .../main/resources/timeline/doma_castle.txt   |   9 +-
 .../timeline/drowned_city_of_skalla.txt       |   9 +-
 .../main/resources/timeline/dun_scaith.txt    |  12 +-
 .../resources/timeline/emerald_weapon-ex.txt  |   5 +-
 .../src/main/resources/timeline/endsinger.txt |   2 +-
 .../main/resources/timeline/euphrosyne.txt    |  15 +-
 .../resources/timeline/eureka_hydatos.txt     |  16 +-
 .../resources/timeline/fractal_continuum.txt  |   9 +-
 .../timeline/fractal_continuum_hard.txt       |   9 +-
 .../main/resources/timeline/ghimlyt_dark.txt  |   9 +-
 .../resources/timeline/ghimlyt_dark64.txt     |   9 +-
 .../resources/timeline/gubal_library_hard.txt |   9 +-
 .../src/main/resources/timeline/hades.txt     |   2 +-
 .../src/main/resources/timeline/hells_lid.txt |   9 +-
 .../resources/timeline/heroes_gauntlet.txt    |   9 +-
 .../resources/timeline/holminster_switch.txt  |   9 +-
 .../resources/timeline/ktisis_hyperboreia.txt |  12 +-
 .../main/resources/timeline/kugane_castle.txt |   9 +-
 .../main/resources/timeline/lakshmi-ex.txt    | 138 ++++++------
 .../main/resources/timeline/lapis_manalis.txt |  12 +-
 .../main/resources/timeline/malikahs_well.txt |   9 +-
 .../resources/timeline/matoyas_relict.txt     |   9 +-
 .../main/resources/timeline/mount_rokkon.txt  |  21 +-
 .../src/main/resources/timeline/mt_gulg.txt   |   9 +-
 .../src/main/resources/timeline/o10s.txt      |   2 +-
 .../src/main/resources/timeline/o12n.txt      |   3 +-
 timelines/src/main/resources/timeline/o6s.txt |   8 +-
 timelines/src/main/resources/timeline/o7s.txt |   6 +-
 .../resources/timeline/orbonne_monastery.txt  |  15 +-
 .../src/main/resources/timeline/p10n.txt      |   2 +-
 .../src/main/resources/timeline/paglthan.txt  |   6 +-
 .../main/resources/timeline/qitana_ravel.txt  |   9 +-
 .../timeline/ridorana_lighthouse.txt          |  12 +-
 .../timeline/royal_city_of_rabanastre.txt     |  12 +-
 .../main/resources/timeline/sephirot-un.txt   |   3 +-
 .../src/main/resources/timeline/shinryu.txt   |   2 +-
 .../timeline/shisui_of_the_violet_tides.txt   |   9 +-
 .../main/resources/timeline/sirensong_sea.txt |   9 +-
 .../src/main/resources/timeline/smileton.txt  |  12 +-
 .../src/main/resources/timeline/sohm_al.txt   |   9 +-
 .../main/resources/timeline/sohm_al_hard.txt  |   6 +-
 .../src/main/resources/timeline/sophia-un.txt |   2 +
 .../resources/timeline/st_mocianne_hard.txt   |   9 +-
 .../resources/timeline/stigma_dreamscape.txt  |  12 +-
 .../resources/timeline/swallows_compass.txt   |   9 +-
 timelines/src/main/resources/timeline/t10.txt |   3 +-
 timelines/src/main/resources/timeline/t11.txt |   3 +-
 timelines/src/main/resources/timeline/t6.txt  |   3 +-
 timelines/src/main/resources/timeline/t7.txt  |   4 +-
 timelines/src/main/resources/timeline/t8.txt  |   3 +-
 .../resources/timeline/temple_of_the_fist.txt |   9 +-
 .../src/main/resources/timeline/test.txt      |  18 +-
 .../src/main/resources/timeline/thaleia.txt   |  11 +-
 .../resources/timeline/the_aitiascope.txt     |  12 +-
 .../src/main/resources/timeline/the_burn.txt  |   9 +-
 .../main/resources/timeline/the_burn64.txt    |   9 +-
 .../resources/timeline/the_copied_factory.txt |  18 +-
 .../main/resources/timeline/the_dead_ends.txt |  12 +-
 .../timeline/the_epic_of_alexander.txt        |   2 +-
 .../timeline/the_fell_court_of_troia.txt      |  12 +-
 .../resources/timeline/the_grand_cosmos.txt   |   9 +-
 .../the_lost_city_of_amdapor_hard.txt         |  12 +-
 .../timeline/the_lunar_subterrane.txt         |  12 +-
 .../resources/timeline/the_puppets_bunker.txt |  18 +-
 .../timeline/the_sildihn_subterrane.txt       |  33 ++-
 .../the_tower_at_paradigms_breach.txt         |  27 ++-
 .../resources/timeline/the_tower_of_babil.txt |  12 +-
 .../resources/timeline/the_tower_of_zot.txt   |  12 +-
 .../src/main/resources/timeline/the_vault.txt |   9 +-
 .../main/resources/timeline/thordan-un.txt    |   2 +
 .../translations/aloalo_island.txt.json       |   2 +-
 .../translations/lapis_manalis.txt.json       |   2 +-
 .../timeline/translations/thaleia.txt.json    |   2 +-
 .../the_lunar_subterrane.txt.json             |   2 +-
 .../src/main/resources/timeline/twinning.txt  |   9 +-
 .../src/main/resources/timeline/vanaspati.txt |  12 +-
 .../main/resources/timeline/weeping_city.txt  |  12 +-
 .../src/main/resources/timeline/xelphatol.txt |   9 +-
 .../src/main/resources/timeline/zadnor.txt    |  18 +-
 .../src/main/resources/timeline/zurvan-un.txt |   2 +
 timelines/src/main/resources/timelines.csv    |  10 -
 .../timelines/TimelineParserTest.java         |  64 ++++++
 123 files changed, 1372 insertions(+), 550 deletions(-)
 create mode 100644 timelines/src/main/java/gg/xp/xivsupport/timelines/CactbotEventTypes.java
 create mode 100644 timelines/src/main/java/gg/xp/xivsupport/timelines/EventSyncController.java
 create mode 100644 timelines/src/main/java/gg/xp/xivsupport/timelines/FileEventSyncController.java

diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/CactbotEventTypes.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/CactbotEventTypes.java
new file mode 100644
index 000000000000..29e7175b918e
--- /dev/null
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/CactbotEventTypes.java
@@ -0,0 +1,201 @@
+package gg.xp.xivsupport.timelines;
+
+import gg.xp.reevent.events.Event;
+import gg.xp.xivsupport.events.actlines.events.AbilityUsedEvent;
+import gg.xp.xivsupport.events.actlines.events.ChatLineEvent;
+import gg.xp.xivsupport.events.actlines.events.NameIdPair;
+import gg.xp.xivsupport.events.actlines.events.SystemLogMessageEvent;
+import gg.xp.xivsupport.events.state.InCombatChangeEvent;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+
+public enum CactbotEventTypes {
+
+	GameLog(ChatLineEvent.class, Map.of(
+			"code", intConv(ChatLineEvent::getCode, 16),
+			"line", strConv(ChatLineEvent::getLine),
+			// TODO
+			"message", strConv(ChatLineEvent::getLine),
+			"echo", strConv(ChatLineEvent::getLine),
+			"dialog", strConv(ChatLineEvent::getLine)
+	)),
+	StartsUsing(AbilityUsedEvent.class, Map.of(
+			"sourceId", id(AbilityUsedEvent::getSource),
+			"source", name(AbilityUsedEvent::getSource),
+			"targetId", id(AbilityUsedEvent::getTarget),
+			"target", name(AbilityUsedEvent::getTarget),
+			"id", id(AbilityUsedEvent::getAbility),
+			"ability", name(AbilityUsedEvent::getAbility)
+	)),
+	Ability(AbilityUsedEvent.class, Map.of(
+			"sourceId", id(AbilityUsedEvent::getSource),
+			"source", name(AbilityUsedEvent::getSource),
+			"targetId", id(AbilityUsedEvent::getTarget),
+			"target", name(AbilityUsedEvent::getTarget),
+			"id", id(AbilityUsedEvent::getAbility),
+			"ability", name(AbilityUsedEvent::getAbility)
+	)),
+	InCombat(InCombatChangeEvent.class, Map.of(
+			// TODO: kind of fake
+			"inACTCombat", boolToInt(InCombatChangeEvent::isInCombat),
+			"inGameCombat", boolToInt(InCombatChangeEvent::isInCombat)
+	)),
+	SystemLogMessage(SystemLogMessageEvent.class, Map.of(
+			"instance", intConv(SystemLogMessageEvent::getUnknown, 16),
+			"id", intConv(SystemLogMessageEvent::getId, 16),
+			"param0", intConv(SystemLogMessageEvent::getParam0, 16),
+			"param1", intConv(SystemLogMessageEvent::getParam1, 16),
+			"param2", intConv(SystemLogMessageEvent::getParam2, 16)
+	))
+
+
+	// TODO: the rest of the events
+	;
+
+
+	private final Holder<?> data;
+
+	<X extends Event> CactbotEventTypes(Class<X> eventType, Map<String, ConvToCondition<? super X>> condMap) {
+		this.data = new Holder<>(eventType, condMap);
+	}
+
+	public Class<? extends Event> eventType() {
+		return data.eventType;
+	}
+
+	/**
+	 * Represents a conversion from some field (possibly nested) on an event, to a predicate that matches events.
+	 * All cactbot netregices use string values regardless of the underlying data type, so this always takes a string.
+	 *
+	 * @param <X> The event type.
+	 */
+	@FunctionalInterface
+	private interface ConvToCondition<X> {
+		/**
+		 * Example: on a 21-line, we want to check if the ability ID is "12AB".
+		 * We would call this with "12AB" as the argument, and it should return a predicate that checks that
+		 * a given AbilityUsedEvent has an ability ID of 0x12AB.
+		 *
+		 * @param input The input string.
+		 * @return The resulting predicate.
+		 */
+		Predicate<X> convert(String input);
+	}
+
+	/**
+	 * Make a combined predicate based on the map of values.
+	 *
+	 * @param values The values
+	 * @return The combined predicate
+	 */
+	public Predicate<Event> make(Map<String, String> values) {
+		return this.data.make(values);
+	}
+
+	/**
+	 * Convenience function for quickly making a ConvToCondition on an integer/long field.
+	 * If the input string in the resulting ConvToCondition is a plain number (and not something that would require
+	 * us to actually do regex), then the numbers will be compared directly.
+	 *
+	 * @param getter A function for getting the required value out of our event.
+	 * @param base   The numerical base, typically 10 or 16
+	 * @param <X>    The event type
+	 * @return The condition matching the above requirements.
+	 */
+	private static <X> ConvToCondition<X> intConv(Function<X, Long> getter, int base) {
+		return intConv(getter, base, 0);
+	}
+
+	/**
+	 * Convenience function for quickly making a ConvToCondition on an integer/long field.
+	 * If the input string in the resulting ConvToCondition is a plain number (and not something that would require
+	 * us to actually do regex), then the numbers will be compared directly.
+	 * <p>
+	 * This version of the method allows you to specify that the number should be left-padded to a minimum number of
+	 * characters, with zeroes. e.g. if the input is "00", and the value is "0", then in order for that to match, you
+	 * would need to specify minDigits == 2.
+	 *
+	 * @param getter    A function for getting the required value out of our event.
+	 * @param base      The numerical base, typically 10 or 16
+	 * @param minDigits If ACT would left-pad the number with zeroes, then you should specify the minimum length
+	 *                  of the number here so that the value can be similarly padded out.
+	 * @param <X>       The event type
+	 * @return The condition matching the above requirements.
+	 */
+	private static <X> ConvToCondition<X> intConv(Function<X, Long> getter, int base, int minDigits) {
+		return str -> {
+			try {
+				// Fast path - input is a number literal, so do a direct number comparison
+				long parsed = Long.parseLong(str, base);
+				return item -> getter.apply(item) == parsed;
+			}
+			catch (NumberFormatException ignored) {
+				// Slow path - input is a regex, so compile to regex first
+				Pattern pattern = Pattern.compile(str, Pattern.CASE_INSENSITIVE);
+				return item -> {
+					String asString = Long.toString(getter.apply(item), base);
+					if (minDigits > 1) {
+						asString = StringUtils.leftPad(asString, minDigits, '0');
+					}
+					return pattern.matcher(asString).matches();
+				};
+			}
+		};
+	}
+
+	private static <X> ConvToCondition<X> strConv(Function<X, String> getter) {
+		return str -> {
+			Pattern pattern = Pattern.compile(str);
+			return item -> pattern.matcher(getter.apply(item)).matches();
+		};
+	}
+
+	private static <X> ConvToCondition<X> id(Function<X, NameIdPair> getter) {
+		return intConv(e -> getter.apply(e).getId(), 16);
+	}
+
+	private static <X> ConvToCondition<X> name(Function<X, NameIdPair> getter) {
+		return strConv(e -> getter.apply(e).getName());
+	}
+
+	private static <X> ConvToCondition<X> boolToInt(Function<X, Boolean> getter) {
+		return str -> switch (str) {
+			case "0" -> (item -> !getter.apply(item));
+			case "1" -> (getter::apply);
+			default -> throw new IllegalArgumentException("Expected 0 or 1, got '%s'".formatted(str));
+		};
+	}
+
+
+	private static class Holder<X extends Event> {
+		private static final Logger log = LoggerFactory.getLogger(CactbotEventTypes.class);
+		private final Class<X> eventType;
+		private final Map<String, ConvToCondition<? super X>> condMap;
+
+		Holder(Class<X> eventType, Map<String, ConvToCondition<? super X>> condMap) {
+			this.eventType = eventType;
+			this.condMap = condMap;
+		}
+
+
+		public Predicate<Event> make(Map<String, String> values) {
+			Predicate<X> combined = eventType::isInstance;
+			for (var entry : values.entrySet()) {
+				ConvToCondition<? super X> convToCondition = this.condMap.get(entry.getKey());
+				if (convToCondition == null) {
+					throw new IllegalArgumentException("Unknown condition: " + entry);
+				}
+				Predicate<? super X> converted = convToCondition.convert(entry.getValue());
+				combined = combined.and(converted);
+			}
+			//noinspection unchecked - the first check is the type check
+			return (Predicate<Event>) combined;
+		}
+	}
+}
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineEntry.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineEntry.java
index 73ce3cdee834..c27e94833571 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineEntry.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineEntry.java
@@ -195,6 +195,12 @@ public int hashCode() {
 		return Objects.hash(time, name, sync, duration, windowStart, windowEnd, jump, jumpLabel, forceJump, icon, replaces, enabled, callout, calloutPreTime, getEnabledJobs());
 	}
 
+	@Override
+	public @Nullable EventSyncController eventSyncController() {
+		// TODO
+		return null;
+	}
+
 	@Override
 	public String toString() {
 		return "CustomTimelineEntry{" +
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineLabel.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineLabel.java
index a08790f043c5..cee48c45b980 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineLabel.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/CustomTimelineLabel.java
@@ -38,6 +38,11 @@ public boolean isLabel() {
 		return true;
 	}
 
+	@Override
+	public @Nullable EventSyncController eventSyncController() {
+		return null;
+	}
+
 	@Override
 	public double time() {
 		return time;
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/EventSyncController.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/EventSyncController.java
new file mode 100644
index 000000000000..3a9f6b8794cc
--- /dev/null
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/EventSyncController.java
@@ -0,0 +1,13 @@
+package gg.xp.xivsupport.timelines;
+
+import gg.xp.reevent.events.Event;
+
+public interface EventSyncController {
+	boolean shouldSync(Event event);
+
+	Class<? extends Event> eventType();
+
+	default boolean isEditable() {
+		return false;
+	};
+}
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/FileEventSyncController.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/FileEventSyncController.java
new file mode 100644
index 000000000000..ccf76908f261
--- /dev/null
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/FileEventSyncController.java
@@ -0,0 +1,35 @@
+package gg.xp.xivsupport.timelines;
+
+import gg.xp.reevent.events.Event;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Predicate;
+
+public class FileEventSyncController implements EventSyncController {
+
+	private final Class<? extends Event> eventType;
+	private final Predicate<Event> predicate;
+	private final Map<String, String> original;
+
+	public FileEventSyncController(Class<? extends Event> eventType, Predicate<Event> predicate, Map<String, String> original) {
+		this.eventType = eventType;
+		this.predicate = predicate;
+		this.original = new HashMap<>(original);
+	}
+
+	@Override
+	public boolean shouldSync(Event event) {
+		return predicate.test(event);
+	}
+
+	@Override
+	public Class<? extends Event> eventType() {
+		return eventType;
+	}
+
+	@Override
+	public String toString() {
+		return eventType.getSimpleName() + original;
+	}
+}
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileLabelEntry.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileLabelEntry.java
index 49c395110514..be7c2e8ba8be 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileLabelEntry.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileLabelEntry.java
@@ -10,6 +10,7 @@ public record TextFileLabelEntry(
 		double time,
 		String name
 ) implements TimelineEntry, Serializable {
+
 	@Override
 	public String toString() {
 		return "TextFileLabelEntry{" +
@@ -62,4 +63,9 @@ public double calloutPreTime() {
 	public boolean isLabel() {
 		return true;
 	}
+
+	@Override
+	public @Nullable EventSyncController eventSyncController() {
+		return null;
+	}
 }
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileTimelineEntry.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileTimelineEntry.java
index 1d61685152b1..de0d7f7de9d1 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileTimelineEntry.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/TextFileTimelineEntry.java
@@ -1,9 +1,11 @@
 package gg.xp.xivsupport.timelines;
 
+import gg.xp.reevent.events.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.Serializable;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 public record TextFileTimelineEntry(
@@ -14,8 +16,9 @@ public record TextFileTimelineEntry(
 		@NotNull TimelineWindow timelineWindow,
 		@Nullable Double jump,
 		@Nullable String jumpLabel,
-		boolean forceJump
-) implements TimelineEntry, Serializable {
+		boolean forceJump,
+		EventSyncController eventSyncController) implements TimelineEntry, Serializable {
+
 	@Override
 	public String toString() {
 		return "TextFileTimelineEntry{" +
@@ -27,6 +30,7 @@ public String toString() {
 		       ", jump=" + jump +
 		       ", jumpLabel='" + jumpLabel + '\'' +
 		       ", forceJump=" + forceJump +
+		       ", syncCtrl=" + eventSyncController +
 		       '}';
 	}
 
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineEntry.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineEntry.java
index 4318f2ea88e1..1c0c8d63a341 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineEntry.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineEntry.java
@@ -1,6 +1,7 @@
 package gg.xp.xivsupport.timelines;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import gg.xp.reevent.events.Event;
 import gg.xp.xivdata.data.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -52,11 +53,34 @@ default boolean shouldSync(double currentTime, String line) {
 		return sync.matcher(line).find();
 	}
 
+	@Nullable EventSyncController eventSyncController();
+
+	default boolean hasEventSync() {
+		return eventSyncController() != null;
+	};
+
+	default @Nullable Class<? extends Event> eventSyncType() {
+		EventSyncController esc = eventSyncController();
+		return esc == null ? null : esc.eventType();
+	}
+
+	default boolean shouldSync(double currentTime, Event event) {
+		EventSyncController syncControl = eventSyncController();
+		if (syncControl == null) {
+			return false;
+		}
+		boolean timesMatch = (currentTime >= getMinTime() && currentTime <= getMaxTime());
+		if (!timesMatch) {
+			return false;
+		}
+		return syncControl.shouldSync(event);
+	}
+
 	/**
 	 * @return true if this timeline entry would ever cause a sync
 	 */
 	default boolean canSync() {
-		return sync() != null;
+		return sync() != null || hasEventSync();
 	}
 
 	/**
@@ -320,7 +344,7 @@ default Stream<String> makeTriggerTimelineEntries() {
 		}
 		String uniqueName = makeUniqueName();
 		String hideAllLine = "hideall \"%s\"".formatted(uniqueName);
-		String actualTimelineLine = new TextFileTimelineEntry(time(), uniqueName, null, null, TimelineWindow.DEFAULT, null, null, false).toTextFormat();
+		String actualTimelineLine = new TextFileTimelineEntry(time(), uniqueName, null, null, TimelineWindow.DEFAULT, null, null, false, null).toTextFormat();
 		return Stream.of(hideAllLine, actualTimelineLine);
 	}
 
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineManager.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineManager.java
index 43a8911281f4..dd67e28f3fed 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineManager.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineManager.java
@@ -1,6 +1,7 @@
 package gg.xp.xivsupport.timelines;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import gg.xp.reevent.events.BaseEvent;
 import gg.xp.reevent.events.CurrentTimeSource;
 import gg.xp.reevent.events.EventContext;
 import gg.xp.reevent.events.EventMaster;
@@ -238,10 +239,10 @@ public void changeZone(EventContext context, ZoneChangeEvent zoneChangeEvent) {
 	}
 
 	@HandleEvents(order = 40_000)
-	public void actLine(EventContext context, ACTLogLineEvent event) {
+	public void actLine(EventContext context, BaseEvent event) {
 		TimelineProcessor currentTimeline = this.currentTimeline;
 		if (currentTimeline != null) {
-			currentTimeline.processActLine(event);
+			currentTimeline.processEvent(event);
 		}
 	}
 
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineParser.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineParser.java
index 85469607a1d9..5fbbbc55833a 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineParser.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineParser.java
@@ -1,5 +1,11 @@
 package gg.xp.xivsupport.timelines;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.json.JsonReadFeature;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import gg.xp.reevent.events.Event;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -7,17 +13,43 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-public class TimelineParser {
+public final class TimelineParser {
 
 	private static final Logger log = LoggerFactory.getLogger(TimelineParser.class);
 	// TODO: there are also windows that do not have a start + end, only a single number
-	private static final Pattern timelinePatternLong = Pattern.compile("^(?<time>\\d+\\.?\\d*) (?:\"(?<title>[^\"]*)\"| sync /(?<sync>.*)/| window (?:(?<windowStart>\\d*\\.?\\d*),)?(?<windowEnd>\\d*\\.?\\d*)| (?<forcejump>force)?jump (?:\"(?<jumplabel>[^\"]*)\"|(?<jump>\\d*\\.?\\d*))| duration (?<duration>\\d*\\.?\\d*))*(?:$|\\s*#.*$)");
+	private static final Pattern timelinePatternLong = Pattern.compile("^(?<time>\\d+\\.?\\d*)" +
+	                                                                   // These can be in any order
+	                                                                   // This non-capturing group matches one element each pass
+	                                                                   " (?:\"(?<title>[^\"]*)\"|" +
+	                                                                   " sync /(?<sync>.*)/|" +
+	                                                                   " window (?:(?<windowStart>\\d*\\.?\\d*),)?(?<windowEnd>\\d*\\.?\\d*)|" +
+	                                                                   " (?<forcejump>force)?jump (?:\"(?<jumplabel>[^\"]*)\"|(?<jump>\\d*\\.?\\d*))|" +
+	                                                                   " (?<eventType>[A-Z].*) (?<eventCond>\\{[^}]*})|" +
+	                                                                   " duration (?<duration>\\d*\\.?\\d*)" +
+	                                                                   ")*(?:$|\\s*#.*$)"
+	);
+
 	private static final Pattern timelineLabelPattern = Pattern.compile("^(?<time>\\d+\\.?\\d*) label \"(?<label>[^\"]*)\"");
+	private static final ObjectMapper mapper = JsonMapper.builder()
+			// get as close as possible to json5
+			.configure(JsonReadFeature.ALLOW_UNQUOTED_FIELD_NAMES, true)
+			.configure(JsonReadFeature.ALLOW_TRAILING_COMMA, true)
+			.configure(JsonReadFeature.ALLOW_SINGLE_QUOTES, true)
+			.configure(JsonReadFeature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER, true)
+			.configure(JsonReadFeature.ALLOW_NON_NUMERIC_NUMBERS, true)
+			.configure(JsonReadFeature.ALLOW_JAVA_COMMENTS, true)
+			.configure(JsonReadFeature.ALLOW_LEADING_DECIMAL_POINT_FOR_NUMBERS, true)
+			.build();
+
+	private TimelineParser() {
+	}
 
 	public static List<TimelineEntry> parseMultiple(Collection<String> line) {
 		return line.stream().map(TimelineParser::parseRaw).filter(Objects::nonNull).collect(Collectors.toList());
@@ -54,12 +86,29 @@ public static List<TimelineEntry> parseMultiple(Collection<String> line) {
 			String jumpLabel = matcher.group("jumplabel");
 			String forceJumpRaw = matcher.group("forcejump");
 			String durationRaw = matcher.group("duration");
+			String eventTypeRaw = matcher.group("eventType");
+			EventSyncController esc = null;
 
 			if ("--sync--".equals(title)) {
 				title = null;
 			}
 			if (syncRaw == null) {
 				sync = null;
+				if (eventTypeRaw != null) {
+					CactbotEventTypes eventDef = CactbotEventTypes.valueOf(eventTypeRaw);
+					String eventCondRaw = matcher.group("eventCond");
+					// TODO: support translation for this
+					Map<String, String> conditions;
+					try {
+						conditions = mapper.readValue(eventCondRaw, new TypeReference<>() {
+						});
+					}
+					catch (JsonProcessingException e) {
+						throw new RuntimeException("Error reading JSON: " + eventCondRaw, e);
+					}
+					Predicate<Event> condition = eventDef.make(conditions);
+					esc = new FileEventSyncController(eventDef.eventType(), condition, conditions);
+				}
 			}
 			else {
 				sync = Pattern.compile(syncRaw, Pattern.CASE_INSENSITIVE);
@@ -86,7 +135,7 @@ public static List<TimelineEntry> parseMultiple(Collection<String> line) {
 				throw new IllegalArgumentException("Not a valid time: %s (entire line: %s)".formatted(timeRaw, line));
 			}
 			boolean forceJump = forceJumpRaw != null;
-			return new TextFileTimelineEntry(time, title, sync, doubleOrNull(durationRaw), window, doubleOrNull(jumpRaw), jumpLabel, forceJump);
+			return new TextFileTimelineEntry(time, title, sync, doubleOrNull(durationRaw), window, doubleOrNull(jumpRaw), jumpLabel, forceJump, esc);
 		}
 		log.trace("Line did not match: {}", line);
 		return null;
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineProcessor.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineProcessor.java
index a0a3ba41bb7b..2a613033fb08 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineProcessor.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/TimelineProcessor.java
@@ -1,6 +1,8 @@
 package gg.xp.xivsupport.timelines;
 
+import gg.xp.reevent.events.BaseEvent;
 import gg.xp.reevent.events.CurrentTimeSource;
+import gg.xp.reevent.events.Event;
 import gg.xp.xivdata.data.*;
 import gg.xp.xivdata.util.ArrayBackedMap;
 import gg.xp.xivsupport.events.ACTLogLineEvent;
@@ -40,26 +42,82 @@ public final class TimelineProcessor {
 	// TODO: we can use in/out of combat now
 
 	private static final Logger log = LoggerFactory.getLogger(TimelineProcessor.class);
-	// For better performance, the timeline processor pre-computes a list of possible syncs within a window
-	// of CHUNK_SIZE millis. e.g. for CHUNK_SIZE = 50,
-	// chunk 5 would be any lines which have a sync window that overaps with [250, 300]
-	// So then if our current time is 269 and we need to sync, we know we can just look at that specific window.
-	// Timeline syncs are actually fairly slow, so this performance optimization has a big impact (timelines used to
-	// be the single slowest event handler other than WS-related things). They're still not fast, but this removes
-	// about ~40% of the overhead.
+	/**
+	 * For better performance, the timeline processor pre-computes a list of possible syncs within a window
+	 * of CHUNK_SIZE millis. e.g. for CHUNK_SIZE = 50,
+	 * chunk 5 would be any lines which have a sync window that overaps with [250, 300]
+	 * So then if our current time is 269 and we need to sync, we know we can just look at that specific window.
+	 * Timeline syncs are actually fairly slow, so this performance optimization has a big impact (timelines used to
+	 * be the single slowest event handler other than WS-related things). They're still not fast, but this removes
+	 * about ~40% of the overhead.
+	 */
 	private static final int CHUNK_SIZE = 50;
+	/**
+	 * Timeline entries which are enabled and not filtered out due to job restrictions and such
+	 */
 	private final List<TimelineEntry> entries;
+	/**
+	 * The timeline manager
+	 */
 	private final TimelineManager manager;
+	/**
+	 * All timeline entries
+	 */
 	private final List<TimelineEntry> rawEntries;
+	/**
+	 * Mapping of timeline labels to their times
+	 */
 	private final Map<String, Double> labels = new HashMap<>();
+	/**
+	 * Setting for how far in the future to display entries
+	 */
 	private final IntSetting secondsFuture;
+	/**
+	 * Setting for how far in the past to display entries
+	 */
 	private final IntSetting secondsPast;
+	/**
+	 * Debug mode - always shows current sync, shows hidden entries
+	 */
 	private final BooleanSetting debugMode;
+	/**
+	 * Show overlay pre-pull
+	 */
 	private final BooleanSetting showPrePull;
+	/**
+	 * Refresh loop for processing timeline
+	 */
 	private final RefreshLoop<TimelineProcessor> refresher;
+	/**
+	 * Function for resolving labels to a time (or null, if nothing matches)
+	 */
 	private final LabelResolver resolver;
+	/**
+	 * Time source
+	 */
 	private final CurrentTimeSource timeSource;
+	/**
+	 * See CHUNK_SIZE
+	 */
 	private final Map<Integer, List<TimelineEntry>> subSyncChunks;
+	/**
+	 * Event types that event-based syncs have chosen. This is only the directly chosen base classes, not subclasses
+	 * of such.
+	 */
+	private final Set<Class<? extends Event>> directlyChosenEvents;
+	/**
+	 * When we encounter an event, we query directlyChosenEvents to see if it is one of those, or a subclass of such.
+	 * This acts as our cache.
+	 */
+	private final Map<Class<? extends Event>, Boolean> effectiveChosenEvents;
+	/**
+	 * True if any entries in this timeline require a classic regex sync. Otherwise, we can save time by skipping that.
+	 */
+	private final boolean useClassicSync;
+
+	/**
+	 * The most recent sync (if any)
+	 */
 	private @Nullable TimelineSync lastSync;
 
 
@@ -84,7 +142,7 @@ private TimelineProcessor(TimelineManager manager, List<TimelineEntry> entries,
 		refresher = new RefreshLoop<>("TimelineRefresher", this, TimelineProcessor::handleTriggers, i -> 200L);
 		refresher.start();
 
-		List<TimelineEntry> syncEntries = this.entries.stream().filter(entry -> entry.sync() != null).toList();
+		List<TimelineEntry> syncEntries = this.entries.stream().filter(TimelineEntry::canSync).toList();
 		OptionalDouble maxTime = syncEntries.stream().mapToDouble(TimelineEntry::getMaxTime).max();
 		if (maxTime.isPresent()) {
 
@@ -96,10 +154,18 @@ private TimelineProcessor(TimelineManager manager, List<TimelineEntry> entries,
 						.forEach(val -> syncChunks.computeIfAbsent(val, k -> new HashSet<>()).add(entry));
 			});
 			this.subSyncChunks = new ArrayBackedMap<>(syncChunks.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> new ArrayList<>(e.getValue()))));
+			this.directlyChosenEvents = syncEntries.stream().map(TimelineEntry::eventSyncType)
+					.filter(Objects::nonNull)
+					.collect(Collectors.toUnmodifiableSet());
+			this.useClassicSync = syncEntries.stream().anyMatch(entry -> entry.sync() != null);
 		}
 		else {
 			this.subSyncChunks = Collections.emptyMap();
+			this.directlyChosenEvents = Collections.emptySet();
+			this.useClassicSync = false;
 		}
+		this.effectiveChosenEvents = new HashMap<>();
+		this.directlyChosenEvents.forEach(evtype -> effectiveChosenEvents.put(evtype, true));
 
 	}
 
@@ -150,7 +216,7 @@ default double secondSince() {
 	}
 
 	record LogLineSync(
-			ACTLogLineEvent line,
+			BaseEvent line,
 			double syncTo,
 			TimelineEntry timelineEntry
 	) implements TimelineSync {
@@ -189,14 +255,21 @@ void setLastSync(@Nullable TimelineSync lastSync) {
 		this.lastSync = lastSync;
 	}
 
-	public void processActLine(ACTLogLineEvent event) {
+
+	public void processEvent(BaseEvent event) {
 		// Skip spammy syncs
 		if (lastSync != null && lastSync.msSince() < 10) {
 			return;
 		}
-		// To save on processing time, ignore some events that will never be found in a timeline
-		int num = event.getLineNumber();
-		// Things that can be ignored:
+		Optional<TimelineEntry> newSync;
+		if (event instanceof ACTLogLineEvent actLine) {
+			if (!useClassicSync) {
+				return;
+			}
+
+			// To save on processing time, ignore some events that will never be found in a timeline
+			int num = actLine.getLineNumber();
+			// Things that can be ignored:
 		/*
 			1. Change Zone
 			2. Change Primary Player
@@ -212,31 +285,50 @@ public void processActLine(ACTLogLineEvent event) {
 			200 and up. Only used by the ACT plugin itself for debug messages and such, and some custom OP lines that
 				aren't relevant here, EXCEPT InCombat (260).
 		 */
-		if (num == 1 || num == 2 || num == 11 || num == 12 || num == 24 || num == 28 || num == 29 || num == 31 || num == 37 || num == 38 || num == 39 || (num > 200 && num != 260)) {
-			return;
-		}
-		// Ignore abilities that originate from players
-		if (num == 14 || num == 15 || num == 16) {
-			if (event.getRawFields()[2].startsWith("1")) {
+			if (num == 1 || num == 2 || num == 11 || num == 12 || num == 24 || num == 28 || num == 29 || num == 31 || num == 37 || num == 38 || num == 39 || (num > 200 && num != 260)) {
+				return;
+			}
+			// Ignore abilities that originate from players
+			if (num == 14 || num == 15 || num == 16) {
+				if (actLine.getRawFields()[2].startsWith("1")) {
+					return;
+				}
+			}
+			double timeNow = getEffectiveTime();
+			int chunk = (int) (timeNow / CHUNK_SIZE);
+			List<TimelineEntry> entries = subSyncChunks.get(chunk);
+			if (entries == null) {
 				return;
 			}
+			String emulatedActLogLine = actLine.getEmulatedActLogLine();
+			newSync = entries.stream().filter(entry -> entry.shouldSync(timeNow, emulatedActLogLine)).findFirst();
 		}
-		double timeNow = getEffectiveTime();
-		int chunk = (int) (timeNow / CHUNK_SIZE);
-		List<TimelineEntry> entries = subSyncChunks.get(chunk);
-		if (entries == null) {
-			return;
+		else {
+			if (!caresAboutEvent(event)) {
+				return;
+			}
+			double timeNow = getEffectiveTime();
+			int chunk = (int) (timeNow / CHUNK_SIZE);
+			List<TimelineEntry> entries = subSyncChunks.get(chunk);
+			if (entries == null) {
+				return;
+			}
+			newSync = entries.stream().filter(entry -> entry.shouldSync(timeNow, event)).findFirst();
+
 		}
-		String emulatedActLogLine = event.getEmulatedActLogLine();
-		Optional<TimelineEntry> newSync = entries.stream().filter(entry -> entry.shouldSync(timeNow, emulatedActLogLine)).findFirst();
 		newSync.ifPresent(rawTimelineEntry -> {
 			double timeToSyncTo = rawTimelineEntry.getSyncToTime(resolver);
 			TimelineSync newTsync = new LogLineSync(event, timeToSyncTo, rawTimelineEntry);
-			log.trace("New Sync: {} -> {} ({})", rawTimelineEntry, timeToSyncTo, emulatedActLogLine);
+			log.trace("New Sync: {} -> {} ({})", rawTimelineEntry, timeToSyncTo, event);
 			setNewSync(newTsync);
 		});
 	}
 
+	private boolean caresAboutEvent(Event event) {
+		return effectiveChosenEvents.computeIfAbsent(event.getClass(),
+				t -> (directlyChosenEvents.stream().anyMatch(dce -> dce.isAssignableFrom(t))));
+	}
+
 	private void setNewSync(TimelineSync sync) {
 		double effectiveTimeBefore = getEffectiveTime();
 		boolean firstSync = lastSync == null;
diff --git a/timelines/src/main/java/gg/xp/xivsupport/timelines/TranslatedTextFileEntry.java b/timelines/src/main/java/gg/xp/xivsupport/timelines/TranslatedTextFileEntry.java
index 7dd186b8df1b..901bc1454b95 100644
--- a/timelines/src/main/java/gg/xp/xivsupport/timelines/TranslatedTextFileEntry.java
+++ b/timelines/src/main/java/gg/xp/xivsupport/timelines/TranslatedTextFileEntry.java
@@ -32,6 +32,11 @@ public double getMaxTime() {
 		return untranslated.getMaxTime();
 	}
 
+	@Override
+	public @Nullable EventSyncController eventSyncController() {
+		return untranslated().eventSyncController();
+	}
+
 	@Override
 	@JsonIgnore
 	public Double getSyncToTime(LabelResolver resolver) {
diff --git a/timelines/src/main/resources/timeline/a10n.txt b/timelines/src/main/resources/timeline/a10n.txt
index 48c604a9f7ef..8092201dae6e 100644
--- a/timelines/src/main/resources/timeline/a10n.txt
+++ b/timelines/src/main/resources/timeline/a10n.txt
@@ -6,7 +6,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--sync--" sync / 00:0839::The Excruciationator will be sealed off/ window 0,1
+# The Excruciationator will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:736:/ window 0,1
 7.0 "Goblin Rush" sync / 1[56]:[^:]*:Lamebrix Strikebocks:1A17:/ window 7,3
 10.1 "Gobsway Rumblerocks" sync / 1[56]:[^:]*:Lamebrix Strikebocks:1AD0:/
 15.2 "Gobsway Rumblerocks" sync / 1[56]:[^:]*:Lamebrix Strikebocks:1AD0:/
diff --git a/timelines/src/main/resources/timeline/a1s.txt b/timelines/src/main/resources/timeline/a1s.txt
index 54d04154eb4d..340ac1252a7e 100644
--- a/timelines/src/main/resources/timeline/a1s.txt
+++ b/timelines/src/main/resources/timeline/a1s.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 ### Faust
 # -p E3C:1006 -ii E3E
-1000.0 "--sync--" sync / 00:0839::Machinery Bay 44 will be sealed off/ window 1000,0
+# Machinery Bay 44 will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:65F:/ window 1000,0
 1006.0 "Kaltstrahl" sync / 1[56]:[^:]*:Faust:E3C:/ window 1006,5
 1009.7 "Sturm Doll Add"
 1016.0 "Kaltstrahl" sync / 1[56]:[^:]*:Faust:E3C:/
@@ -51,7 +52,8 @@ hideall "--sync--"
 # -ii E44 E53 E50 E4C E54 E47
 # -ic "Oppressor 0.5"
 
-2000.0 "--sync--" sync / 00:0839::Hangar 8 will be sealed off in 15 seconds/ window 2000,0
+# Hangar 8 will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:660:/ window 2000,0
 2007.0 "Royal Fount" sync / 1[56]:[^:]*:Oppressor:E40:/ window 2010,5
 2011.1 "Gunnery Pod" sync / 1[56]:[^:]*:Oppressor:E41:/
 2016.2 "Hydrothermal Missile" sync / 1[56]:[^:]*:Oppressor:E43:/ duration 8
diff --git a/timelines/src/main/resources/timeline/a3n.txt b/timelines/src/main/resources/timeline/a3n.txt
index 1bba0d3d55fb..35868eb42e5f 100644
--- a/timelines/src/main/resources/timeline/a3n.txt
+++ b/timelines/src/main/resources/timeline/a3n.txt
@@ -7,39 +7,40 @@ hideall "--sync--"
 
 # -ii 1305 12FA
 
-0.0 "--sync--" sync / 00:0839::Condensate Demineralizer .9 will be sealed off/ window 10000,10000
-7.5 "Fluid Swing" sync /:Living Liquid:12EE:/
-11.6 "Splash x3" duration 3 #sync /:Living Liquid:12EF:/
-19.9 "Protean Wave" sync /:Living Liquid:12F0:/
-23.5 "Fluid Swing" sync /:Living Liquid:12EE:/
-27.6 "Splash x3" duration 3 #sync /:Living Liquid:12EF:/
-32.9 "Fluid Swing" sync /:Living Liquid:12EE:/
-39.0 "Sluice" sync /:Living Liquid:12F2:/
-42.0 "--sync--" sync /:Living Liquid:12F3:/
-44.0 "--sync--" sync /:Living Liquid:12F4:/
-47.2 "Fluid Swing" sync /:Living Liquid:12EE:/
-53.3 "Splash x3" duration 3 #sync /:Living Liquid:12EF:/
+# Condensate Demineralizer #9 will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:66C:/ window 10000,10000
+7.5 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
+11.6 "Splash x3" duration 3 #sync / 1[56]:[^:]*:Living Liquid:12EF:/
+19.9 "Protean Wave" sync / 1[56]:[^:]*:Living Liquid:12F0:/
+23.5 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
+27.6 "Splash x3" duration 3 #sync / 1[56]:[^:]*:Living Liquid:12EF:/
+32.9 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
+39.0 "Sluice" sync / 1[56]:[^:]*:Living Liquid:12F2:/
+42.0 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F3:/
+44.0 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F4:/
+47.2 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/
+53.3 "Splash x3" duration 3 #sync / 1[56]:[^:]*:Living Liquid:12EF:/
 
 # Hand phase
 57.5 "--untargetable--"
-59.5 "--sync--" sync /:Hydrate Core:F28:/
-60.6 "--sync--" sync /:Living Liquid:F22:/ window 60.6,10
-61.0 "Hydromorph" sync /:Hydrate Core:F29:/
-63.0 "--sync--" sync /:Hydrate Core:1040:/
+59.5 "--sync--" sync / 1[56]:[^:]*:Hydrate Core:F28:/
+60.6 "--sync--" sync / 1[56]:[^:]*:Living Liquid:F22:/ window 60.6,10
+61.0 "Hydromorph" sync / 1[56]:[^:]*:Hydrate Core:F29:/
+63.0 "--sync--" sync / 1[56]:[^:]*:Hydrate Core:1040:/
 64.5 "--targetable--"
-70.6 "Fluid Strike" sync /:Living Liquid:12FD:/
-77.7 "Wash Away" sync /:Living Liquid:12FF:/
-87.9 "Fluid Strike" #sync /:Living Liquid:12FD:/
-91.0 "Fluid Strike" #sync /:Living Liquid:12FD:/
-94.1 "Fluid Strike" #sync /:Living Liquid:12FD:/
+70.6 "Fluid Strike" sync / 1[56]:[^:]*:Living Liquid:12FD:/
+77.7 "Wash Away" sync / 1[56]:[^:]*:Living Liquid:12FF:/
+87.9 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FD:/
+91.0 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FD:/
+94.1 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FD:/
 98.1 "--Liquid Limb spawns--"
-104.2 "Fluid Strike" #sync /:Living Liquid:12FE:/
-109.3 "Fluid Strike" #sync /:Living Liquid:12FE:/
-111.4 "Fluid Strike" #sync /:Living Liquid:12FE:/
-116.5 "Fluid Strike" #sync /:Living Liquid:12FE:/
-118.6 "Fluid Strike" #sync /:Living Liquid:12FE:/
-123.7 "Fluid Strike" #sync /:Living Liquid:12FE:/
-125.8 "Fluid Strike" #sync /:Living Liquid:12FE:/
+104.2 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FE:/
+109.3 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FE:/
+111.4 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FE:/
+116.5 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FE:/
+118.6 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FE:/
+123.7 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FE:/
+125.8 "Fluid Strike" #sync / 1[56]:[^:]*:Living Liquid:12FE:/
 
 # Tornado phase
 # There are several add waves here, but the timing is dependent on kill times,
@@ -47,20 +48,20 @@ hideall "--sync--"
 # Drainage is the only consistent thing through the phase.
 
 128.8 "--untargetable--"
-132.1 "--sync--" sync /:Hydrate Core:F28:/ window 68,5
-133.2 "--sync--" sync /:Living Liquid:F24:/
-133.6 "Hydromorph" sync /:Hydrate Core:F29:/
-135.7 "--sync--" sync /:Hydrate Core:1040:/
-157.9 "Drainage" sync /:Living Liquid:1304:/
-178.6 "Drainage" sync /:Living Liquid:1304:/
+132.1 "--sync--" sync / 1[56]:[^:]*:Hydrate Core:F28:/ window 68,5
+133.2 "--sync--" sync / 1[56]:[^:]*:Living Liquid:F24:/
+133.6 "Hydromorph" sync / 1[56]:[^:]*:Hydrate Core:F29:/
+135.7 "--sync--" sync / 1[56]:[^:]*:Hydrate Core:1040:/
+157.9 "Drainage" sync / 1[56]:[^:]*:Living Liquid:1304:/
+178.6 "Drainage" sync / 1[56]:[^:]*:Living Liquid:1304:/
 
 # And back we go to the first phase, which repeats *identically from the beginning*(!!)
 
-200.2 "--sync--" sync /:Hydrate Core:F28:/ window 71.4,5
-201.3 "--sync--" sync /:Living Liquid:F26:/
-201.7 "Hydromorph" sync /:Hydrate Core:F29:/
+200.2 "--sync--" sync / 1[56]:[^:]*:Hydrate Core:F28:/ window 71.4,5
+201.3 "--sync--" sync / 1[56]:[^:]*:Living Liquid:F26:/
+201.7 "Hydromorph" sync / 1[56]:[^:]*:Hydrate Core:F29:/
 205.2 "--targetable--"
-211.3 "Fluid Swing" sync /:Living Liquid:12EE:/ jump 7.5
+211.3 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12EE:/ jump 7.5
 215.4 "Splash x3"
 223.7 "Protean Wave"
 227.3 "Fluid Swing"
@@ -75,26 +76,26 @@ hideall "--sync--"
 # Under certain circumstances, Ferrofluid/Magnetism can be skipped.
 # Fluid Swing after is synced to account for that.
 
-300.0 "Valve" sync /:Living Liquid:12F6:/ window 300,5
-310.1 "Cascade" sync /:Living Liquid:12F7:/
-316.3 "Fluid Swing" sync /:Living Liquid:12F5:/
-319.5 "Fluid Swing" sync /:Living Liquid:12F5:/
-326.6 "Sluice" sync /:Living Liquid:12F2:/
-329.6 "--sync--" sync /:Living Liquid:12F3:/
-331.6 "--sync--" sync /:Living Liquid:12F4:/
-335.9 "Magnetism/Repel" sync /:Living Liquid:(1307|1309):/
-344.0 "Fluid Swing" sync /:Living Liquid:12F5:/ window 17.4,2.5
-346.1 "Splash x4" # sync /:Living Liquid:12EF:/
-350.5 "Fluid Swing" sync /:Living Liquid:12F5:/
-359.8 "Magnetism/Repel" sync /:Living Liquid:(1307|1309):/
-365.9 "Fluid Swing" sync /:Living Liquid:12F5:/ window 10,2.5
-372.0 "Sluice" sync /:Living Liquid:12F2:/
-375.0 "--sync--" sync /:Living Liquid:12F3:/
-377.0 "--sync--" sync /:Living Liquid:12F4:/
-378.7 "Protean Wave" sync /:Living Liquid:12F0:/
-381.4 "Fluid Swing" sync /:Living Liquid:12F5:/
+300.0 "Valve" sync / 1[56]:[^:]*:Living Liquid:12F6:/ window 300,5
+310.1 "Cascade" sync / 1[56]:[^:]*:Living Liquid:12F7:/
+316.3 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12F5:/
+319.5 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12F5:/
+326.6 "Sluice" sync / 1[56]:[^:]*:Living Liquid:12F2:/
+329.6 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F3:/
+331.6 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F4:/
+335.9 "Magnetism/Repel" sync / 1[56]:[^:]*:Living Liquid:(1307|1309):/
+344.0 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12F5:/ window 17.4,2.5
+346.1 "Splash x4" # sync / 1[56]:[^:]*:Living Liquid:12EF:/
+350.5 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12F5:/
+359.8 "Magnetism/Repel" sync / 1[56]:[^:]*:Living Liquid:(1307|1309):/
+365.9 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12F5:/ window 10,2.5
+372.0 "Sluice" sync / 1[56]:[^:]*:Living Liquid:12F2:/
+375.0 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F3:/
+377.0 "--sync--" sync / 1[56]:[^:]*:Living Liquid:12F4:/
+378.7 "Protean Wave" sync / 1[56]:[^:]*:Living Liquid:12F0:/
+381.4 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:12F5:/
 
-387.5 "Cascade" sync /:Living Liquid:12F7:/ window 60,30 jump 310.1
+387.5 "Cascade" sync / 1[56]:[^:]*:Living Liquid:12F7:/ window 60,30 jump 310.1
 393.7 "Fluid Swing"
 396.9 "Fluid Swing"
 404.0 "Sluice"
diff --git a/timelines/src/main/resources/timeline/a3s.txt b/timelines/src/main/resources/timeline/a3s.txt
index 226fa712af56..0dc89b65f26e 100644
--- a/timelines/src/main/resources/timeline/a3s.txt
+++ b/timelines/src/main/resources/timeline/a3s.txt
@@ -104,7 +104,7 @@ hideall "--sync--"
 402.8 "Splash x3" #sync / 1[56]:[^:]*:Living Liquid:EF4:/ duration 2.2
 418.1 "Digititis" sync / 1[56]:[^:]*:Living Liquid:F00:/
 422.3 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:EFC:/
-426.4 "Splash x6" #sync /:Living Liquid::EF4:/ duration 5.5
+426.4 "Splash x6" #sync / 1[56]:[^:]*:Living Liquid:EF4:/ duration 5.5
 435.0 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:EFC:/
 
 441.1 "Cascade 3" sync / 1[56]:[^:]*:Living Liquid:EFE:/ window 40,40
@@ -153,7 +153,7 @@ hideall "--sync--"
 624.6 "Splash x3" #sync / 1[56]:[^:]*:Living Liquid:EF4:/ duration 2.2
 639.9 "Digititis" sync / 1[56]:[^:]*:Living Liquid:F00:/
 644.0 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:EFC:/
-648.1 "Splash x6" #sync /:Living Liquid::EF4:/ duration 5.5
+648.1 "Splash x6" #sync / 1[56]:[^:]*:Living Liquid:EF4:/ duration 5.5
 656.7 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:EFC:/
 
 662.8 "Cascade 6" sync / 1[56]:[^:]*:Living Liquid:EFE:/ window 40,40
diff --git a/timelines/src/main/resources/timeline/a5s.txt b/timelines/src/main/resources/timeline/a5s.txt
index 348f5c120d74..afcaf7cc570b 100644
--- a/timelines/src/main/resources/timeline/a5s.txt
+++ b/timelines/src/main/resources/timeline/a5s.txt
@@ -8,7 +8,8 @@ hideall "Guzzle"
 hideall "Relaxant"
 
 ### Hummel and Friends
-1000.0 "--sync--" sync / 00:0839::The Clevering will be sealed off/ window 1000,0
+# The Clevering will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6AF:/ window 1000,0
 1009.8 "Kaltstrahl x1" sync / 1[56]:[^:]*:Faust:16CC:/ window 10,5
 1018.9 "Kaltstrahl x2" duration 2.1 sync / 1[56]:[^:]*:Faust:16CC:/ window 5,0.5
 #1021.0 "Kaltstrahl" sync / 1[56]:[^:]*:Faust:16CC:/
diff --git a/timelines/src/main/resources/timeline/a6n.txt b/timelines/src/main/resources/timeline/a6n.txt
index c8450df55604..bb764a64a476 100644
--- a/timelines/src/main/resources/timeline/a6n.txt
+++ b/timelines/src/main/resources/timeline/a6n.txt
@@ -4,7 +4,8 @@
 ### Blaster
 
 # -ii 170E
-0.0 "--sync--" sync / 00:0839::Machinery Bay 67 will be sealed off/ window 1,0
+# Machinery Bay 67 will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6B7:/ window 1,0
 6.8 "Brute Force" sync / 1[56]:[^:]*:Blaster:170A:/ window 6.8,5
 10.9 "Mind Blast" sync / 1[56]:[^:]*:Blaster:170B:/
 15.0 "Ballistic Missile" sync / 1[56]:[^:]*:Blaster:15F4:/
@@ -25,7 +26,8 @@
 
 
 ### Brawler
-1000.0 "--sync--" sync / 00:0839::Machinery Bay 68 will be sealed off/ window 1000,0
+# Machinery Bay 68 will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6B8:/ window 1000,0
 1008.7 "Magicked Mark" sync / 1[56]:[^:]*:Brawler:1715:/ window 8.7,5
 1010.8 "Attachment" sync / 1[56]:[^:]*:Brawler:1601:/
 1017.0 "Single Buster/Double Buster/Rocket Drill" sync / 1[56]:[^:]*:Brawler:(1717|1718|1719):/
@@ -44,7 +46,8 @@
 
 ### Swindler
 # -ii 171D
-2000.0 "--sync--" sync / 00:0839::Machinery Bay 69 will be sealed off/ window 2000,0
+# Machinery Bay 69 will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6B9:/ window 2000,0
 2006.5 "Magicked Mark" sync / 1[56]:[^:]*:Swindler:171B:/
 2015.6 "Height" sync / 1[56]:[^:]*:Swindler:171C:/ window 15.6,20
 2018.8 "Magicked Mark" sync / 1[56]:[^:]*:Swindler:171B:/
@@ -63,7 +66,8 @@
 
 
 ### Vortexer
-3000.0 "--sync--" sync / 00:0839::Machinery Bay 70 will be sealed off/ window 3000,0
+# Machinery Bay 70 will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6BA:/ window 3000,0
 3007.3 "Brute Force" sync / 1[56]:[^:]*:Vortexer:1721:/ window 7.3,5
 3017.4 "Elemental Jammer" sync / 1[56]:[^:]*:Vortexer:161B:/
 3019.5 "Ballistic Missile" sync / 1[56]:[^:]*:Vortexer:1622:/
diff --git a/timelines/src/main/resources/timeline/a6s.txt b/timelines/src/main/resources/timeline/a6s.txt
index e7a137bd8b23..4d7f61af5514 100644
--- a/timelines/src/main/resources/timeline/a6s.txt
+++ b/timelines/src/main/resources/timeline/a6s.txt
@@ -7,7 +7,8 @@
 hideall "Ballistic Missile"
 
 ### Blaster
-0.0 "--sync--" sync / 00:0839::Machinery Bay 67 will be sealed off/ window 1,0
+# Machinery Bay 67 will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6B7:/ window 1,0
 7.0 "Brute Force" sync / 1[56]:[^:]*:Blaster:15F2:/ window 10,10
 14.1 "Mind Blast" sync / 1[56]:[^:]*:Blaster:15F3:/
 18.2 "Ballistic Missile" sync / 1[56]:[^:]*:Blaster:15F4:/
@@ -61,7 +62,8 @@ hideall "Ballistic Missile"
 ### Brawler
 # Note: "Brawler Mechanic" drifts relative to attachment depending on type.
 # Brawler Mechanics seem entirely/mostly random?
-1000.0 "--sync--" sync / 00:0839::Machinery Bay 68 will be sealed off/ window 1000,0
+# Machinery Bay 68 will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6B8:/ window 1000,0
 1008.8 "Magicked Mark" sync / 1[56]:[^:]*:Brawler:1600:/ window 100,100
 1011.0 "Attachment" sync / 1[56]:[^:]*:Brawler:1601:/
 1017.2 "Brawler Mechanic" #sync / 1[56]:[^:]*:Brawler:160[2345]:/
@@ -106,7 +108,8 @@ hideall "Ballistic Missile"
 
 
 ### Swindler
-2000.0 "--sync--" sync / 00:0839::Machinery Bay 69 will be sealed off/ window 2000,0
+# Machinery Bay 69 will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6B9:/ window 2000,0
 2021.2 "Height" sync / 1[56]:[^:]*:Swindler:160D:/ window 22,7
 2021.2 "Enumeration" sync / 1[56]:[^:]*:Swindler:160F:/
 2029.3 "Bio-Arithmeticks" sync / 1[56]:[^:]*:Swindler:1610:/
@@ -151,7 +154,8 @@ hideall "Ballistic Missile"
 
 
 ### Vortexer
-3000.0 "--sync--" sync / 00:0839::Machinery Bay 70 will be sealed off/ window 3000,0
+# Machinery Bay 70 will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6BA:/ window 3000,0
 3006.7 "Brute Force" sync / 1[56]:[^:]*:Vortexer:1619:/ window 10,10
 3016.8 "Elemental Jammer" sync / 1[56]:[^:]*:Vortexer:161B:/
 3022.0 "Ballistic Missile" sync / 1[56]:[^:]*:Vortexer:1622:/
diff --git a/timelines/src/main/resources/timeline/a7s.txt b/timelines/src/main/resources/timeline/a7s.txt
index 508cd2fd0752..2038009a2a24 100644
--- a/timelines/src/main/resources/timeline/a7s.txt
+++ b/timelines/src/main/resources/timeline/a7s.txt
@@ -66,7 +66,7 @@ hideall "--sync--"
 66 "Jails" #White Prey & Green Tether
 68 "Zoomdoom" sync / 1[56]:[^:]*:Quickthinx Allthoughts:15BE:/ window 60
 69 "Doll"
-84 "Resync" sync / 1A:[^:]*:Pyretic:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:/ window 20 jump 384
+84 "Resync" sync / 1A:[^:]*:Pyretic:/ window 20 jump 384
 103 "Sizzlespark"
 116 "Uplander Doom"
 130 "Bomb x1"
@@ -130,7 +130,7 @@ hideall "--sync--"
 567 "Jails" #Green Prey & Red Tether
 570 "Zoomdoom" sync / 1[56]:[^:]*:Quickthinx Allthoughts:15BE:/ window 60
 570 "Doll"
-582 "Resync" sync / 1A:[^:]*:Frostbite:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:/ window 20 jump 983
+582 "Resync" sync / 1A:[^:]*:Frostbite:/ window 20 jump 983
 596 "Uplander Doom"
 613 "Sizzlespark"
 621 "Sizzlespark"
@@ -238,8 +238,8 @@ hideall "--sync--"
 1335 "Small Doll"
 1336 "Zoomdoom" sync / 1[56]:[^:]*:Quickthinx Allthoughts:15BE:/ window 55
 1344 "Big Doll"
-1348 "Resync" sync /suffers the effect of Pyretic/ window 20 jump 1548
-1348 "Resync" sync /suffer the effect of Pyretic/ window 20 jump 1548
+1348 "Resync" sync / 1A:[^:]*:Pyretic:/ window 20 jump 1548
+1348 "Resync" sync / 1A:[^:]*:Pyretic:/ window 20 jump 1548
 1362 "Uplander Doom"
 1381 "Sizzlespark"
 1392 "Sizzlebeam"
diff --git a/timelines/src/main/resources/timeline/a9s.txt b/timelines/src/main/resources/timeline/a9s.txt
index a0ef44617138..0c95f82b068a 100644
--- a/timelines/src/main/resources/timeline/a9s.txt
+++ b/timelines/src/main/resources/timeline/a9s.txt
@@ -8,7 +8,8 @@ hideall "--sync--"
 
 ### Faust Z
 # -p 1A2B:1006.5
-1000.0	"--sync--"	sync / 00:0839::The Cranial Plate will be sealed off/ window 10000
+# The Cranial Plate will be sealed off
+1000.0	"--sync--"	sync / 29:[^:]*:7DC:[^:]*:72F:/ window 10000
 1006.5 "Kaltstrahl" sync / 1[56]:[^:]*:Faust Z:1A2B:/ window 1007,2.5
 1013.6 "Kaltstrahl" sync / 1[56]:[^:]*:Faust Z:1A2B:/
 1020.7 "Kaltstrahl" sync / 1[56]:[^:]*:Faust Z:1A2B:/
@@ -47,7 +48,8 @@ hideall "--sync--"
 # Lava doesn't show up in the log either.
 
 # Phase 1
-2000.0	"--sync--"	sync / 00:0839::Life Support will be sealed off/ window 10000
+# Life Support will be sealed off
+2000.0	"--sync--"	sync / 29:[^:]*:7DC:[^:]*:730:/ window 10000
 2010.0 "Stockpile" sync / 1[56]:[^:]*:Refurbisher 0:1A38:/ window 2010,5
 2012.1 "Right Arm Reassembly" sync / 1[56]:[^:]*:Refurbisher 0:1A2E:/
 2014.3 "Power Generator x2 (NE)"
diff --git a/timelines/src/main/resources/timeline/aetherfont.txt b/timelines/src/main/resources/timeline/aetherfont.txt
index d3962d6ed396..84f114ec0b1b 100644
--- a/timelines/src/main/resources/timeline/aetherfont.txt
+++ b/timelines/src/main/resources/timeline/aetherfont.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 # TODO: verify loops with longer logs?
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~~~~#
 # Lyngbakr :U #
@@ -14,7 +15,8 @@ hideall "--sync--"
 # -ii 86D5
 # -p 823A:111.3
 
-100.0 "--sync--" sync / 00:0839::The Landfast Floe will be sealed off/ window 100000,0
+# Landfast Floe will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10CD:/ window 100000,0
 106.3 "--sync--" sync / 14:[^:]*:Lyngbakr:823A:/ window 10,10
 111.3 "Upsweep" sync / 1[56]:[^:]*:Lyngbakr:823A:/
 121.7 "Tidal Breath" sync / 1[56]:[^:]*:Lyngbakr:8240:/
@@ -54,7 +56,8 @@ hideall "--sync--"
 # -ii 8256
 # -p 872D:510
 
-500.0 "--sync--" sync / 00:0839::Cyancap Cavern will be sealed off/ window 100000,0
+# Cyancap Cavern will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10CE:/ window 100000,0
 505.0 "--sync--" sync / 14:[^:]*:Arkas:872D:/ window 10,10
 510.0 "Battle Cry" sync / 1[56]:[^:]*:Arkas:872D:/
 521.3 "Lightning Leap" sync / 1[56]:[^:]*:Arkas:824E:/
@@ -112,7 +115,8 @@ hideall "--sync--"
 # -ii 8242 8249
 # -p 824C:1009.6
 
-1000.0 "--sync--" sync / 00:0839::The Deep Below will be sealed off/ window 100000,0
+# The Deep Below will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10CF:/ window 100000,0
 1004.6 "--sync--" sync / 14:[^:]*:Octomammoth:824C:/ window 10,10
 1009.6 "Tidal Roar" sync / 1[56]:[^:]*:Octomammoth:824C:/
 1032.7 "Octostroke" sync / 1[56]:[^:]*:Octomammoth:8243:/
diff --git a/timelines/src/main/resources/timeline/aetherochemical_research_facility.txt b/timelines/src/main/resources/timeline/aetherochemical_research_facility.txt
index 2835e41c577f..5b437a7fc3c3 100644
--- a/timelines/src/main/resources/timeline/aetherochemical_research_facility.txt
+++ b/timelines/src/main/resources/timeline/aetherochemical_research_facility.txt
@@ -6,7 +6,8 @@ hideall "--sync--"
 #~~~~~~~~~~~~~~~~~~~#
 
 # -ii 10E1
-0.0 "--sync--" sync / 00:0839::Analysis and Proving will be sealed off/
+# Analysis and Proving will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:63E:/
 6.3 "Bastardbluss" sync / 1[56]:[^:]*:Regula van Hydrus:10DA:/ window 6.3,5
 
 13.4 "Judgment" sync / 1[56]:[^:]*:Regula van Hydrus:10DD:/ window 13.4,2.5
@@ -113,7 +114,8 @@ hideall "--sync--"
 # It's not included at phase starts because each start is accompanied
 # by a unique version of the skill as well.
 
-1000.0 "--sync--" sync / 00:0839::Evaluation and Authentication will be sealed off/ window 1000,5
+# Evaluation and Authentication will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:63F:/ window 1000,5
 
 # Cobra is immediate
 1008.6 "Weighing of the Heart" sync / 1[56]:[^:]*:Harmachis:10E8:/ window 9,9
diff --git a/timelines/src/main/resources/timeline/aglaia.txt b/timelines/src/main/resources/timeline/aglaia.txt
index 6322151f0934..5e32b1427317 100644
--- a/timelines/src/main/resources/timeline/aglaia.txt
+++ b/timelines/src/main/resources/timeline/aglaia.txt
@@ -4,7 +4,8 @@ hideall "--Reset--"
 hideall "--sync--"
 hideall "Fan Flames"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~#
 # BYREGOT #
@@ -18,7 +19,8 @@ hideall "Fan Flames"
 # Note: 7171 Peal of the Hammer is when the Levinforge hammer drops, and is marked as "--sync--"" instead.
 # Note: "--hammer--" lines are done visually, as there seem to be no log line for them.
 
-1000.0 "--sync--" sync / 00:0839::Ingenuity's Foothold will be sealed off/ window 10000,0
+# Ingenuity's Foothold will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:104D:/ window 10000,0
 1005.5 "--sync--" sync / 14:[^:]*:Byregot:7176:/ window 10,10
 1010.5 "Ordeal of Thunder" sync / 1[56]:[^:]*:Byregot:7176:/
 1022.4 "Byregot's Strike" sync / 1[56]:[^:]*:Byregot:725A:/
@@ -108,7 +110,8 @@ hideall "Fan Flames"
 # -p 70E0:2012.8
 # -ii 70D8 70E2 70E4 70DC
 
-2000.0 "--sync--" sync / 00:0839::The Path will be sealed off/ window 10000,0
+# The Path will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:104E:/ window 10000,0
 2004.8 "--sync--" sync / 14:[^:]*:Rhalgr's Emissary:70E0:/ window 10,10
 2012.8 "Destructive Static" sync / 1[56]:[^:]*:Rhalgr's Emissary:70E0:/
 2019.8 "Destructive Charge" sync / 1[56]:[^:]*:Rhalgr's Emissary:70DA:/ duration 17
@@ -138,7 +141,8 @@ hideall "Fan Flames"
 
 # TODO: is the ordering of fake vs real Broken World correct? Every log has been this.
 
-3000.0 "--sync--" sync / 00:0839::The Monument To Destruction will be sealed off/ window 10000,0
+# Monument to Destruction will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:104F:/ window 10000,0
 3007.5 "--sync--" sync / 14:[^:]*:Rhalgr:70A5:/ window 10,10
 3012.5 "Lightning Reign" sync / 1[56]:[^:]*:Rhalgr:70A5:/
 3023.6 "Advent of the Eighth" sync / 1[56]:[^:]*:Rhalgr:70A7:/
@@ -208,7 +212,8 @@ hideall "Fan Flames"
 
 # TODO: These do "Rejuvenating Spark" (71D9) to rebalance health.  Does that adjust timings?
 
-4000.0 "--sync--" sync / 00:0839::The Endless City will be sealed off/ window 10000,0
+# Endless City will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1050:/ window 10000,0
 4007.0 "--sync--" sync / 14:[^:]*:Lioness of Aglaia:71D7:/ window 10,10
 4012.0 "Double Immolation" sync / 1[56]:[^:]*:Lioness of Aglaia:71D7:/
 4019.8 "--sync--" sync / 1[56]:[^:]*:Lioness of Aglaia:71CD:/ window 10,10
@@ -261,7 +266,8 @@ hideall "Fan Flames"
 # -p 70A0:5012.2
 # -ii 70A1 7082 7083 709F 708E 72BE 7093 7094 71EE 7089 731C 708C 7092 7087
 
-5000.0 "--sync--" sync / 00:0839::The Circle Of Inquiry will be sealed off/ window 10000,0
+# Circle of Inquiry will be sealed off
+5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1051:/ window 10000,0
 5006.2 "--sync--" sync / 14:[^:]*:Azeyma:70A0:/ window 10,10
 5012.2 "Warden's Prominence" sync / 1[56]:[^:]*:Azeyma:70A0:/
 
@@ -387,7 +393,8 @@ hideall "Fan Flames"
 
 # TODO: Is Fired Up I/II always knockback -> out and I/II/III is out -> knockback -> knockback or out?
 
-6000.0 "--sync--" sync / 00:0839::The Twin Halls will be sealed off/ window 10000,0
+# The Twin Halls will be sealed off
+6000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1052:/ window 10000,0
 6008.2 "--sync--" sync / 14:[^:]*:Nald'thal:70E9:/ window 10,10
 6013.2 "As Above, So Below" sync / 1[56]:[^:]*:Nald'thal:(70E8|70E9):/
 6027.4 "Heat Above, Flames Below" sync / 1[56]:[^:]*:Nald'thal:73A5:/
@@ -459,7 +466,7 @@ hideall "Fan Flames"
 7097.5 "Smelting?" sync / 1[56]:[^:]*:Nald:7120:/
 
 7105.7 "As Above, So Below" sync / 1[56]:[^:]*:Nald'thal:(70E8|70E9):/
-7119.9 "Hearth Above, Flight Below" sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC)/
+7119.9 "Hearth Above, Flight Below" sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC):/
 7121.1 "Far-flung Fire?" sync / 1[56]:[^:]*:Nald:73AD:/
 7125.7 "Deepest Pit?" sync / 1[56]:[^:]*:Thal:73C7:/ duration 4
 7131.1 "Golden Tenet/Hells' Trial" sync / 1[56]:[^:]*:Nald'thal:(7121|711A):/
@@ -504,7 +511,7 @@ hideall "Fan Flames"
 8097.5 "Smelting?" sync / 1[56]:[^:]*:Nald:7120:/
 
 8105.7 "As Above, So Below" sync / 1[56]:[^:]*:Nald'thal:(70E8|70E9):/
-8119.9 "Hearth Above, Flight Below" sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC)/
+8119.9 "Hearth Above, Flight Below" sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC):/
 8121.1 "Far-flung Fire?" sync / 1[56]:[^:]*:Nald:73AD:/
 8125.7 "Deepest Pit?" sync / 1[56]:[^:]*:Thal:73C7:/ duration 4
 8131.1 "Golden Tenet/Hells' Trial" sync / 1[56]:[^:]*:Nald'thal:(7121|711A):/
@@ -532,7 +539,7 @@ hideall "Fan Flames"
 8265.8 "Smelting?" sync / 1[56]:[^:]*:Nald:7120:/
 
 8274.0 "As Above, So Below" sync / 1[56]:[^:]*:Nald'thal:(70E8|70E9):/
-8288.2 "Hearth Above, Flight Below" sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC)/
+8288.2 "Hearth Above, Flight Below" sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC):/
 8289.4 "Far-flung Fire?" sync / 1[56]:[^:]*:Nald:73AD:/
 8294.0 "Deepest Pit?" sync / 1[56]:[^:]*:Thal:73C7:/ duration 4
 8299.4 "Golden Tenet/Hells' Trial" sync / 1[56]:[^:]*:Nald'thal:(7121|711A):/
@@ -558,4 +565,4 @@ hideall "Fan Flames"
 8428.4 "Smelting?" #sync / 1[56]:[^:]*:Nald:7120:/
 
 8436.6 "As Above, So Below" #sync / 1[56]:[^:]*:Nald'thal:70E9:/
-8450.8 "Hearth Above, Flight Below" #sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC)/
+8450.8 "Hearth Above, Flight Below" #sync / 1[56]:[^:]*:Nald'thal:(741B|73CA|73CB|73CC):/
diff --git a/timelines/src/main/resources/timeline/akadaemia_anyder.txt b/timelines/src/main/resources/timeline/akadaemia_anyder.txt
index 381c3b45da7e..dc93c674f8c4 100644
--- a/timelines/src/main/resources/timeline/akadaemia_anyder.txt
+++ b/timelines/src/main/resources/timeline/akadaemia_anyder.txt
@@ -10,7 +10,8 @@ hideall "--sync--"
 # to have a little bit of leeway on them as the bosses might swim around more.
 # This is maybe like +/- 1-2 seconds?
 
-100.0 "--sync--" sync / 00:0839::Ichthyology will be sealed off/ window 100,0
+# Ichthyology will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BC0:/ window 100,0
 110.5 "Protolithic Puncture" sync / 1[56]:[^:]*:Cladoselache:3E04:/ window 111,8
 119.5 "Tidal Guillotine" sync / 1[56]:[^:]*:Cladoselache:3E08:/
 128.7 "--2x targetable--" sync / 22:........:Doliodus:........:Doliodus:01/
@@ -55,7 +56,8 @@ hideall "--sync--"
 
 ### Morbol Marquis
 # -p 3E16:508.5 -ii 3E11 3E14
-500.0 "--sync--" sync / 00:0839::Phytobiology will be sealed off/ window 500,0
+# Phytobiology will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BC1:/ window 500,0
 505.0 "--sync--" sync / 1[56]:[^:]*:Morbol Marquis:3E14:/ window 505,5
 508.5 "Lash" sync / 1[56]:[^:]*:Morbol Marquis:3E16:/
 516.1 "Sap Shower" sync / 1[56]:[^:]*:Morbol Marquis:3E15:/
@@ -105,7 +107,8 @@ hideall "--sync--"
 
 ### Quetzalcoatl
 # -ii 3E1A 3E1B 3E22 3E20 -p 3E23:1008.2
-1000.0 "--sync--" sync / 00:0839::Phantomology will be sealed off/ window 1000,0
+# Phantomology will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BC2:/ window 1000,0
 1008.2 "Shockbolt" sync / 1[56]:[^:]*:Quetzalcoatl:3E23:/ window 1010,5
 1017.9 "Thunderbolt" sync / 1[56]:[^:]*:Quetzalcoatl:3E24:/
 1031.4 "Thunderstorm" sync / 1[56]:[^:]*:Quetzalcoatl:3E1C:/
diff --git a/timelines/src/main/resources/timeline/ala_mhigo.txt b/timelines/src/main/resources/timeline/ala_mhigo.txt
index e6916dfdb781..47fb0fcc42c7 100644
--- a/timelines/src/main/resources/timeline/ala_mhigo.txt
+++ b/timelines/src/main/resources/timeline/ala_mhigo.txt
@@ -4,7 +4,8 @@ hideall "--sync--"
 # Guard Scorpion
 # -ii 2049 204A 204B 204C
 # boss will walk center before using 2048 Tail Laser, causes timeline drift
-0.0 "--Start--" sync / 00:0839::Rhalgr's Gate will be sealed off/
+# Rhalgr's Gate will be sealed off
+0.0 "--Start--" sync / 29:[^:]*:7DC:[^:]*:8F1:/
 9.6 "Electromagnetic Field" sync / 1[56]:[^:]*:Magitek Scorpion:204D:/ window 10,5
 18.8 "Target Search" sync / 1[56]:[^:]*:Magitek Scorpion:2046:/
 29.4 "Lock On" sync / 1[56]:[^:]*:Magitek Scorpion:2047:/
@@ -28,7 +29,8 @@ hideall "--sync--"
 
 # Aulus Mal Asina
 # -ii 2051 2052 205E
-1000.0 "--Start--" sync / 00:0839::The Chamber Of Knowledge will be sealed off/ window 1000,5
+# The Chamber of Knowledge will be sealed off
+1000.0 "--Start--" sync / 29:[^:]*:7DC:[^:]*:8F2:/ window 1000,5
 1013.0 "Mana Burst" sync / 1[56]:[^:]*:Aulus mal Asina:204F:/ window 14,5
 1019.1 "Order to Charge" sync / 1[56]:[^:]*:Aulus mal Asina:2057:/
 1020.0 "--sync--" sync / 1[56]:[^:]*:Prototype Bit:2053:/
@@ -91,7 +93,8 @@ hideall "--sync--"
 # Zenos Yae Galvus
 # -ii 2061 2062 2064 2067 2069 2589
 # boss will walk center before using 2065/2066/2068 Art of the Swell/Storm/Sword, causes timeline drift
-2000.0 "--Start--" sync / 00:0839::The Hall of the Griffin will be sealed off/ window 2000,5
+# The Hall of the Griffin will be sealed off
+2000.0 "--Start--" sync / 29:[^:]*:7DC:[^:]*:8F3:/ window 2000,5
 2009.7 "--sync--" sync / 1[56]:[^:]*:Zenos Yae Galvus:205F:/ window 10,5
 2023.4 "Storm?/Swell?" sync / 1[56]:[^:]*:Zenos Yae Galvus:206[56]:/ window 5,5
 
diff --git a/timelines/src/main/resources/timeline/aloalo_island.txt b/timelines/src/main/resources/timeline/aloalo_island.txt
index 0cf4e7c1681e..63f85b4fac8b 100644
--- a/timelines/src/main/resources/timeline/aloalo_island.txt
+++ b/timelines/src/main/resources/timeline/aloalo_island.txt
@@ -4,7 +4,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~~~~~~~~~~~#
 # Quaqua (left path) #
@@ -13,7 +14,8 @@ hideall "--sync--"
 # -p 8B94:1012.4
 # -ii 8B89 8B98 8B9C 8B9D 8B93
 
-#1000.0 "--sync--" sync / 00:0839::Ketulu Cove will be sealed off/ window 10000,0
+# Ketulu Cove will be sealed off
+#1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1128:/ window 10000,0
 1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1128:/ window 10000,0
 1006.1 "--middle--" sync / 1[56]:[^:]*:Quaqua:8B8F:/
 1007.4 "--sync--" sync / 14:[^:]*:Quaqua:8B94:/ window 10,10
@@ -152,7 +154,8 @@ hideall "--sync--"
 # -p 8AA5:2014
 # -ii 8A78 8AA6 8A7A 8A7B 8A81 8D1D 8AA4 8A89 8A8A 8A82 8A83 8A8C 8D10 8A94 8A98 8A99 8A96
 
-#2000.0 "--sync--" sync / 00:0839::Seasong's Rest will be sealed off/ window 10000,0
+# Seasong's Rest will be sealed off
+#2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112B:/ window 10000,0
 2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112B:/ window 10000,0
 2009.0 "--sync--" sync / 14:[^:]*:Ketuduke:8AA5:/
 2014.0 "Tidal Roar" sync / 1[56]:[^:]*:Ketuduke:8AA5:/
@@ -311,7 +314,8 @@ hideall "--sync--"
 # -p 8B94:3013.4
 # -ii 8B89 8BA2 8CD1 8B93
 
-#3000.0 "--sync--" sync / 00:0839::The Elder Stump will be sealed off/ window 10000,0
+# Elder Stump will be sealed off
+#3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1129:/ window 10000,0
 3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1129:/ window 10000,0
 
 3007.0 "--middle--" sync / 1[56]:[^:]*:Quaqua:8B8F:/
@@ -430,7 +434,8 @@ hideall "--sync--"
 # -p 887F:4016.2
 # -ii 8878 8879 8873 8CDD
 
-#4000.0 "--sync--" sync / 00:0839::The Origin Spring will be sealed off/ window 10000,0
+# The Origin Spring will be sealed off
+#4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112C:/ window 10000,0
 4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112C:/ window 10000,0
 4011.2 "--sync--" sync / 14:[^:]*:Lala:887F:/ window 10,10
 4016.2 "Inferno Theorem" sync / 1[56]:[^:]*:Lala:887F:/
@@ -598,7 +603,8 @@ hideall "--sync--"
 # -p 8B94:5014.1
 # -ii 8B89 8B93
 
-#5000.0 "--sync--" sync / 00:0839::The ancient forum will be sealed off/ window 10000,0
+# Ancient Forum will be sealed off
+#5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112A:/ window 10000,0
 5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112A:/ window 10000,0
 5007.8 "--middle--" sync / 1[56]:[^:]*:Quaqua:8B8F:/
 5009.1 "--sync--" sync / 14:[^:]*:Quaqua:8B94:/ window 10,10
@@ -725,7 +731,8 @@ hideall "--sync--"
 # -p 892E:6026.6
 # -ii 8A04 8932 892C 8986 8925 8926 8981 8935 89F6 89F7 8CEB 89FB 8941 8942 8943
 
-#6000.0 "--sync--" sync / 00:0839::The Slumbering Canopy will be sealed off/ window 10000,0
+# Slumbering Canopy will be sealed off
+#6000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112D:/ window 10000,0
 6000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112D:/ window 10000,0
 # Can be triggered by players earlier
 6004.0 "Hidden Mine" #sync / 1[56]:[^:]*:Mine:892D:/
@@ -918,7 +925,8 @@ hideall "--sync--"
 # -p 87BC:7011.8
 # -ii 87C1 87C3 8C34 8C35 8D38 8E47
 
-#7000.0 "--sync--" sync / 00:0839::Kairimai Loquloqai will be sealed off/ window 10000,0
+# Kairimai Loquloqai will be sealed off
+#7000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:112E:/ window 10000,0
 7000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:11DE:/ window 10000,0
 7006.8 "--sync--" sync / 14:[^:]*:Loquloqui:87BC:/ window 10,10
 7011.8 "Long-lost Light" sync / 1[56]:[^:]*:Loquloqui:87BC:/
diff --git a/timelines/src/main/resources/timeline/alzadaals_legacy.txt b/timelines/src/main/resources/timeline/alzadaals_legacy.txt
index a941228d85ce..5dc28b9851ec 100644
--- a/timelines/src/main/resources/timeline/alzadaals_legacy.txt
+++ b/timelines/src/main/resources/timeline/alzadaals_legacy.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~#
 # ABUJAM #
@@ -11,7 +12,8 @@ hideall "--sync--"
 
 # -ii 71E5
 
-0.0 "--sync--" sync / 00:0839::The Undersea Entrance will be sealed off/ window 0,1
+# Undersea Entrance will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:103E:/ window 0,1
 11.0 "Big Wave" sync / 1[56]:[^:]*:Ambujam:6F60:/ window 11,5
 20.8 "Tentacle Dig" sync / 1[56]:[^:]*:Ambujam:6F55:/ window 20.8
 33.0 "--sync--" sync / 1[56]:[^:]*:Scarlet Tentacle:6F5B:/
@@ -43,7 +45,8 @@ hideall "--sync--"
 
 # -ii 71CC 6F1A 6F1C 6F1D 6F26 6F27
 
-1000.0 "--sync--" sync / 00:0839::The Threshold Of Bounty will be sealed off/ window 1000,1
+# The Threshold of Bounty will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:103F:/ window 1000,1
 1011.0 "Articulated Bits" sync / 1[56]:[^:]*:Armored Chariot:6F19:/ window 1011,0
 1013.2 "Assail" sync / 1[56]:[^:]*:Armored Chariot:6F29:/
 1015.3 "--sync--" sync / 1[56]:[^:]*:Armored Chariot:(6F20|6F21):/
@@ -106,7 +109,8 @@ hideall "--sync--"
 
 # -ii 6F71 6F64 6F65 6F66 6F67 6F6D 6F6F
 
-2000.0 "--sync--" sync / 00:0839::Weaver'S Warding will be sealed off/ window 2000,1
+# Weaver's Warding will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1040:/ window 2000,1
 2015.2 "Billowing Bolts" sync / 1[56]:[^:]*:Kapikulu:6F70:/ window 2016,5
 2023.4 "--sync--" sync / 1[56]:[^:]*:Kapikulu:6F62:/
 2027.8 "Spin Out" sync / 1[56]:[^:]*:Kapikulu:6F63:/
diff --git a/timelines/src/main/resources/timeline/amaurot.txt b/timelines/src/main/resources/timeline/amaurot.txt
index 28e8313c49df..ea22433c4eee 100644
--- a/timelines/src/main/resources/timeline/amaurot.txt
+++ b/timelines/src/main/resources/timeline/amaurot.txt
@@ -6,7 +6,8 @@ hideall "--sync--"
 ### The First Beast
 # -p 3CCE:113.5 -ii 3CC6 3CCA 3CC8
 
-100.0 "--sync--" sync / 00:0839::The First Doom will be sealed off/ window 100,0
+# The First Doom will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:C8B:/ window 100,0
 113.5 "Venomous Breath" sync / 1[56]:[^:]*:The First Beast:3CCE:/ window 114,9
 122.7 "Meteor Rain" sync / 1[56]:[^:]*:The First Beast:3CC4:/
 132.9 "The Falling Sky" sync / 1[56]:[^:]*:The First Beast:3CC9:/
@@ -36,7 +37,8 @@ hideall "--sync--"
 
 ### Terminus Bellwether
 # -p 3CCF:523 -ii 465D 3CE4 3CD3 3CD2 3CD5 417D
-500.0 "--sync--" sync / 00:0839::The Second Doom will be sealed off/ window 500,0
+# The Second Doom will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:C8C:/ window 500,0
 523.0 "Shrill Shriek" sync / 1[56]:[^:]*:Terminus Bellwether:3CCF:/ window 523,5
 525.0 "--untargetable--"
 525.0 "Adds (N)"
@@ -48,7 +50,8 @@ hideall "--sync--"
 
 ### Therion
 # -ii 3CD6 3CDD 3CD9 3CDE 3CE1 3CDB 4191 4192 -p 3CE3:1013
-1000.0 "--sync--" sync / 00:0839::The Third Doom will be sealed off/ window 1000,0
+# The Third Doom will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:C8D:/ window 1000,0
 1013.0 "Shadow Wreck" sync / 1[56]:[^:]*:Therion:3CE3:/ window 1013,10
 1026.2 "Apokalypsis" sync / 1[56]:[^:]*:Therion:3CD7:/ duration 5.9
 1042.8 "Therion Charge" sync / 1[56]:[^:]*:Therion:3CDA:/
diff --git a/timelines/src/main/resources/timeline/anamnesis_anyder.txt b/timelines/src/main/resources/timeline/anamnesis_anyder.txt
index 483f59e5fcda..444cc8a0db08 100644
--- a/timelines/src/main/resources/timeline/anamnesis_anyder.txt
+++ b/timelines/src/main/resources/timeline/anamnesis_anyder.txt
@@ -6,7 +6,8 @@ hideall "--sync--"
 ### Unknown
 # -p 4B69:1013.5 4E4B:1313
 # -ii 4B78 4B6D 4B6F
-1000.0 "--sync--" sync / 00:0839::Katharsis will be sealed off/ window 1000,0
+# Katharsis will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D86:/ window 1000,0
 1013.5 "Fetid Fang" sync / 1[56]:[^:]*:Unknown:4B69:/ window 1014,10
 1032.3 "Scrutiny" sync / 1[56]:[^:]*:Unknown:4E25:/
 1034.3 "Explosion" sync / 1[56]:[^:]*:Sinister Bubble:4B6E:/
@@ -63,7 +64,8 @@ hideall "--sync--"
 ### Kyklops
 # -p 4B58:2011
 # -ii 4B53 4B5C 4B5B
-2000.0 "--sync--" sync / 00:0839::Doxa will be sealed off/ window 2000,0
+# Doxa will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D87:/ window 2000,0
 2011.0 "The Final Verse" sync / 1[56]:[^:]*:Kyklops:4B58:/ window 2012,5
 2020.6 "Swing/Swipe/Cyclone" sync / 1[56]:[^:]*:Kyklops:4B5[457]:/
 2030.9 "Hammer/Blade Mark" sync / 1[56]:[^:]*:Kyklops:4B5[9A]:/
@@ -94,7 +96,8 @@ hideall "--sync--"
 ### Rukshs Dheem
 # -p 4B8C:3013
 # -ii 4B7C 4B7E 4B8A 4B86 4B85 4B80 4B82 4B87
-3000.0 "--sync--" sync / 00:0839::Noesis will be sealed off/ window 3000,0
+# Noesis will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D89:/ window 3000,0
 3013.0 "Bonebreaker" sync / 1[56]:[^:]*:Rukshs Dheem:4B8C:/ window 3013,10
 3019.2 "Swift Shift" sync / 1[56]:[^:]*:Rukshs Dheem:4B83:/
 3026.5 "Seabed Ceremony" sync / 1[56]:[^:]*:Rukshs Dheem:4B7B:/
diff --git a/timelines/src/main/resources/timeline/another_mount_rokkon-savage.txt b/timelines/src/main/resources/timeline/another_mount_rokkon-savage.txt
index de3e2ba650d8..71e4b449c806 100644
--- a/timelines/src/main/resources/timeline/another_mount_rokkon-savage.txt
+++ b/timelines/src/main/resources/timeline/another_mount_rokkon-savage.txt
@@ -1,5 +1,7 @@
 # This file was autogenerated from running ts-node util/sync_files.ts.
 # DO NOT EDIT THIS FILE DIRECTLY.
+# Edit the source file below and then run `npm run sync-files`
+# Source: ui/raidboss/data/06-ew/dungeon/another_mount_rokkon.txt
 
 ### ANOTHER MOUNT ROKKON
 # ZoneId: 483
@@ -7,7 +9,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~#
 # SHISHIO #
@@ -22,7 +25,8 @@ hideall "--sync--"
 # skipped. Triggers will probably do a better job for the "circles" case, while "lines"
 # is just a dodge check.
 
-1000.0 "--sync--" sync / 00:0839::The Trial Of Benevolence will be sealed off/ window 10000,0
+# Trial of Benevolence will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10F8:/ window 10000,0
 1007.0 "--sync--" sync / 14:[^:]*:Shishio:8441:/ window 10000,0
 1012.0 "Enkyo" sync / 1[56]:[^:]*:Shishio:8441:/
 
@@ -155,7 +159,8 @@ hideall "--sync--"
 # -p 8534:2014.3
 # -ii 8502 8504 8555 8504 8545 851D 851E 8584 8585 852F 854B 8257 8549 8554 8628 8544 854E 853E 852B 854C 854A
 
-2000.0 "--sync--" sync / 00:0839::The Trial Of Wisdom will be sealed off/ window 10000,0
+# Trial of Wisdom will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10F9:/ window 10000,0
 2009.3 "--sync--" sync / 14:[^:]*:Gorai the Uncaged:8534:/ window 10000,0
 2014.3 "Unenlightenment" sync / 1[56]:[^:]*:Gorai the Uncaged:8534:/
 
@@ -293,7 +298,8 @@ hideall "--sync--"
 # -p 860C:3016.4
 # -ii 8507 85EC 85ED 8601 860B 8C28 8607 85FD 8604 8606 8537 8538
 
-3000.0 "--sync--" sync / 00:0839::The Trial Of Responsibility will be sealed off/ window 10000,0
+# Trial of Responsibility will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10FA:/ window 10000,0
 3011.4 "--sync--" sync / 14:[^:]*:Moko the Restless:860C:/ window 10000,10
 3016.4 "Kenki Release" sync / 1[56]:[^:]*:Moko the Restless:860C:/
 
diff --git a/timelines/src/main/resources/timeline/another_mount_rokkon.txt b/timelines/src/main/resources/timeline/another_mount_rokkon.txt
index 0155bfc2e5a0..f5bce5f6b0d6 100644
--- a/timelines/src/main/resources/timeline/another_mount_rokkon.txt
+++ b/timelines/src/main/resources/timeline/another_mount_rokkon.txt
@@ -4,7 +4,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~#
 # SHISHIO #
@@ -19,7 +20,8 @@ hideall "--sync--"
 # skipped. Triggers will probably do a better job for the "circles" case, while "lines"
 # is just a dodge check.
 
-1000.0 "--sync--" sync / 00:0839::The Trial Of Benevolence will be sealed off/ window 10000,0
+# Trial of Benevolence will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10F8:/ window 10000,0
 1007.0 "--sync--" sync / 14:[^:]*:Shishio:841A:/ window 10000,0
 1012.0 "Enkyo" sync / 1[56]:[^:]*:Shishio:841A:/
 
@@ -152,7 +154,8 @@ hideall "--sync--"
 # -p 8534:2014.3
 # -ii 8502 8504 8535 8504 851A 851D 851E 8513 8515 852F 8525 8257 8522 8533 8528 8519 852A 852D 852B 8527 8523
 
-2000.0 "--sync--" sync / 00:0839::The Trial Of Wisdom will be sealed off/ window 10000,0
+# Trial of Wisdom will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10F9:/ window 10000,0
 2009.3 "--sync--" sync / 14:[^:]*:Gorai the Uncaged:8534:/ window 10000,0
 2014.3 "Unenlightenment" sync / 1[56]:[^:]*:Gorai the Uncaged:8534:/
 
@@ -290,7 +293,8 @@ hideall "--sync--"
 # -p 85E0:3016.4
 # -ii 8507 85B8 85B9 85D2 85DF 8C27 85DA 85CE 85D5 85D7 8537 8538
 
-3000.0 "--sync--" sync / 00:0839::The Trial Of Responsibility will be sealed off/ window 10000,0
+# Trial of Responsibility will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10FA:/ window 10000,0
 3011.4 "--sync--" sync / 14:[^:]*:Moko the Restless:85E0:/ window 10000,10
 3016.4 "Kenki Release" sync / 1[56]:[^:]*:Moko the Restless:85E0:/
 
diff --git a/timelines/src/main/resources/timeline/another_sildihn_subterrane-savage.txt b/timelines/src/main/resources/timeline/another_sildihn_subterrane-savage.txt
index fd0e70ee5c3f..9404e3b9dbc7 100644
--- a/timelines/src/main/resources/timeline/another_sildihn_subterrane-savage.txt
+++ b/timelines/src/main/resources/timeline/another_sildihn_subterrane-savage.txt
@@ -1,12 +1,15 @@
 # This file was autogenerated from running ts-node util/sync_files.ts.
 # DO NOT EDIT THIS FILE DIRECTLY.
+# Edit the source file below and then run `npm run sync-files`
+# Source: ui/raidboss/data/06-ew/dungeon/another_sildihn_subterrane.txt
 
 # Another Sil'dihn Subterrane (Savage)
 
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~#
 # SILKIE #
@@ -14,7 +17,8 @@ hideall "--sync--"
 
 # -ii 7783 7784 7785 778B 778C 778D 77ED 77EE
 
-0.0 "--sync--" sync / 00:0839::The Trial of Knowledge is sealed off/ window 0,1
+# Trial of Knowledge is sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DD:[^:]*:1087:/ window 0,1
 12.2 "--sync--" sync / 14:[^:]*:Silkie:777C:/ window 15,15
 14.9 "Fizzling Suds" sync / 1[56]:[^:]*:Silkie:777C:/
 21.0 "Soap's Up" sync / 1[56]:[^:]*:Silkie:777D:/
@@ -102,7 +106,8 @@ hideall "--sync--"
 
 # -ii 77B1 77B2 77B8 77B9 77BF 77A2 79F4
 
-1000.0 "--sync--" sync / 00:0839::The Trial of Might will be sealed off/ window 1000,1
+# Trial of Might will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1088:/ window 1000,1
 1006.8 "--sync--" sync / 14:[^:]*:Gladiator of Sil'dih:77B3:/ window 1007.3,5
 1011.5 "Flash of Steel" sync / 1[56]:[^:]*:Gladiator of Sil'dih:77B3:/
 1023.6 "Specter of Might" sync / 1[56]:[^:]*:Gladiator of Sil'dih:77B5:/
@@ -172,7 +177,8 @@ hideall "--sync--"
 
 # -ii 76CA 74B8
 
-2000.0 "--sync--" sync / 00:0839::The Trial of Balance will be sealed off/ window 2000,1
+# Trial of Balance will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1089:/ window 2000,1
 2006.8 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:76C5:/ window 2007.3,5
 2011.5 "Show of Strength" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:76C5:/
 2023.7 "Infern Brand" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:7491:/
diff --git a/timelines/src/main/resources/timeline/another_sildihn_subterrane.txt b/timelines/src/main/resources/timeline/another_sildihn_subterrane.txt
index c7e8c513a530..1756d25c30ac 100644
--- a/timelines/src/main/resources/timeline/another_sildihn_subterrane.txt
+++ b/timelines/src/main/resources/timeline/another_sildihn_subterrane.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~#
 # SILKIE #
@@ -11,7 +12,8 @@ hideall "--sync--"
 
 # -ii 7760 7761 7762 7768 7769 776A 77ED 77EE
 
-0.0 "--sync--" sync / 00:0839::The Trial of Knowledge is sealed off/ window 0,1
+# Trial of Knowledge is sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DD:[^:]*:1087:/ window 0,1
 12.2 "--sync--" sync / 14:[^:]*:Silkie:7759:/ window 15,15
 14.9 "Fizzling Suds" sync / 1[56]:[^:]*:Silkie:7759:/
 21.0 "Soap's Up" sync / 1[56]:[^:]*:Silkie:775A:/
@@ -99,7 +101,8 @@ hideall "--sync--"
 
 # -ii 766F 7670 7676 7677 77BF 7660 79F3
 
-1000.0 "--sync--" sync / 00:0839::The Trial of Might will be sealed off/ window 1000,1
+# Trial of Might will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1088:/ window 1000,1
 1006.8 "--sync--" sync / 14:[^:]*:Gladiator of Sil'dih:7671:/ window 1007.3,5
 1011.5 "Flash of Steel" sync / 1[56]:[^:]*:Gladiator of Sil'dih:7671:/
 1023.6 "Specter of Might" sync / 1[56]:[^:]*:Gladiator of Sil'dih:7673:/
@@ -169,7 +172,8 @@ hideall "--sync--"
 
 # -ii 74B7 74B8
 
-2000.0 "--sync--" sync / 00:0839::The Trial of Balance will be sealed off/ window 2000,1
+# Trial of Balance will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1089:/ window 2000,1
 2006.8 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:74AF:/ window 2007.3,5
 2011.5 "Show of Strength" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:74AF:/
 2023.7 "Infern Brand" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:7491:/
diff --git a/timelines/src/main/resources/timeline/baelsars_wall.txt b/timelines/src/main/resources/timeline/baelsars_wall.txt
index de84e40d5882..8bdb4f50203c 100644
--- a/timelines/src/main/resources/timeline/baelsars_wall.txt
+++ b/timelines/src/main/resources/timeline/baelsars_wall.txt
@@ -15,7 +15,8 @@ hideall "--sync--"
 # When solo, the second Missile is skipped and the timeline just keeps on.
 # We sync on Magitek Ray and hope for the best. It's all bad.
 
-0 "Start" sync / 00:0839::Via Praetoria will be sealed off/ window 0,1
+# Via Praetoria will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:746:/ window 0,1
 10.5 "Magitek Claw" sync / 1[56]:[^:]*:Magitek Predator:1CB2:/
 26.8 "Magitek Ray" sync / 1[56]:[^:]*:Magitek Predator:1CB3:/
 34.1 "Magitek Missile" sync / 1[56]:[^:]*:Magitek Predator:1CB4:/
@@ -37,7 +38,8 @@ hideall "--sync--"
 
 # -ii 1CB7 1CBA
 
-1000.0 "Start" sync / 00:0839::The Magitek Installation will be sealed off/ window 1000,5
+# The Magitek Installation will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:747:/ window 1000,5
 1007.1 "Magitek Cannon" sync / 1[56]:[^:]*:Armored Weapon:1CB8:/ window 7.1,5
 1013.2 "Launcher" sync / 1[56]:[^:]*:Armored Weapon:1CBC:/
 1019.4 "Dynamic Sensory Jammer" sync / 1[56]:[^:]*:Armored Weapon:1CB9:/ duration 6
@@ -81,8 +83,8 @@ hideall "--sync--"
 # THE GRIFFIN #
 #~~~~~~~~~~~~~#
 
-
-2000.0 "Start" sync / 00:0839::The Airship Landing will be sealed off/ window 2000,5
+# The Airship Landing will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:748:/ window 2000,5
 2006.1 "Dull Blade" sync / 1[56]:[^:]*:The Griffin:1CC1:/ window 6.1,5
 2012.2 "Beak Of The Griffin" sync / 1[56]:[^:]*:The Griffin:1CC3:/
 2019.3 "Flash Powder" sync / 1[56]:[^:]*:The Griffin:1CC4:/
diff --git a/timelines/src/main/resources/timeline/bardams_mettle.txt b/timelines/src/main/resources/timeline/bardams_mettle.txt
index 32b7c1296950..1f13469098bf 100644
--- a/timelines/src/main/resources/timeline/bardams_mettle.txt
+++ b/timelines/src/main/resources/timeline/bardams_mettle.txt
@@ -9,7 +9,8 @@ hideall "Reconstruct"
 
 # -ic "Steppe Coeurl" "Steppe Sheep" "Steppe Yamaa"
 
-0 "Start" sync / 00:0839::Bardam's Hunt will be sealed off/
+# Bardam's Hunt will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:7B8:/
 11.7 "Heave" sync / 1[56]:[^:]*:Garula:1EF7:/ window 11.7,5
 20.9 "--sync--" sync / 1[56]:[^:]*:Garula:1EF8:/
 22.4 "Crumbling Crust" sync / 1[56]:[^:]*:Garula:1F13:/
@@ -32,7 +33,8 @@ hideall "Reconstruct"
 
 # -ii 1EFE 2578 2579 257A 257E 257B
 
-1000.0 "Start" sync / 00:0839::.*Rebirth of Bardam the Brave will be sealed off/ window 1000,5
+# The Rebirth of Bardam the Brave will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:7B9:/ window 1000,5
 1007.8 "Travail" sync / 1[56]:[^:]*:Bardam:1EFF:/ window 7.8,5
 1014.1 "Magnetism" sync / 1[56]:[^:]*:Hunter Of Bardam:1F08:/
 1020.3 "Tremblor" sync / 1[56]:[^:]*:Bardam:257C:/
@@ -69,7 +71,8 @@ hideall "Reconstruct"
 
 # -ii 1F0B 1F0E
 
-2000.0 "Start" sync / 00:0839::.*Voiceless Muse will be sealed off/ window 2000,5
+# The Voiceless Muse will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:7BA:/ window 2000,5
 2008.1 "Feathercut" sync / 1[56]:[^:]*:Yol:1F09:/
 2015.2 "Wind Unbound" sync / 1[56]:[^:]*:Yol:1F0A:/
 2023.9 "Pinion" sync / 1[56]:[^:]*:Yol Feather:1F11:/
diff --git a/timelines/src/main/resources/timeline/bozjan_southern_front.txt b/timelines/src/main/resources/timeline/bozjan_southern_front.txt
index 930cd878e291..f2212ce0e0ea 100644
--- a/timelines/src/main/resources/timeline/bozjan_southern_front.txt
+++ b/timelines/src/main/resources/timeline/bozjan_southern_front.txt
@@ -8,7 +8,8 @@ hideall "--sync--"
 # Trigger set contains 'resetWhenOutOfCombat: false'
 
 0.0 "--Reset--" sync / 21:........:80000014:00:/ window 100000 jump 0
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 # TODO: fill in CEs
 # The idea with each of them is that you have at most two minutes of standing
@@ -65,8 +66,10 @@ hideall "--sync--"
 #16000.0 "--sync--" sync / 21:........:80000014:1D7:/ window 100000,0
 
 ### Brionac / 4th Legion Helldiver
-20000.0 "--sync--" sync / 00:0839::The grand gates will be sealed off/ window 100000,0
-20000.0 "--sync--" sync / 00:0839::Eaglesight will be sealed off/ window 100000,0
+# The Grand Gates will be sealed off
+20000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DD9:/ window 100000,0
+# Eaglesight will be sealed off
+20000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DD8:/ window 100000,0
 # JavaScript will insert a sync to jump to 4th Legion Helldiver if you are on the bottom.
 # Unfortunately, there is nothing in the log to differentiate otherwise.
 
@@ -139,7 +142,8 @@ hideall "--sync--"
 # Chain Cannon is not a trustworthy sync, even when it's on its own.
 
 # Uncomment this to more easily test this timeline.
-# 30000.0 "--sync--" sync / 00:0839::Eaglesight will be sealed off/ window 100000,0
+# Eaglesight will be sealed off
+# 30000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DD8:/ window 100000,0
 
 # Fake intro, where you don't know if you're on the top or the bottom.
 # Don't sync because sometimes these bosses are +/- 3 seconds @_@
@@ -193,7 +197,8 @@ hideall "--sync--"
 
 
 ### Albeleo the Maleficent
-40000.0 "--sync--" sync / 00:0839::Bladesmeet will be sealed off/ window 100000,0
+# Bladesmeet will be sealed off
+40000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DD5:/ window 100000,0
 
 
 ### Adrammelech
@@ -201,7 +206,8 @@ hideall "--sync--"
 # -ii 4F94 4F91 4F8D 504E 504F 5050 5051 5052 4F8B 4F7E 504C 545C 4F90 4F7C 4F84 4F88 4F89 4F82 4F83 4F93
 # note: accursed becoming IV casts have different ability ids the first time through.
 
-50000.0 "--sync--" sync / 00:0839::The airship landing will be sealed off/ window 100000,0
+# The airship landing will be sealed off
+50000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DDA:/ window 100000,0
 50014.3 "Holy IV" sync / 1[56]:[^:]*:Adrammelech:4F96:/
 
 50021.8 "Curse Of The Fiend" sync / 1[56]:[^:]*:Adrammelech:4F7A:/
@@ -278,7 +284,8 @@ hideall "--sync--"
 # -ii 5165 5177 51BB 5190 5170 5160
 
 # Phase 1
-60000.0 "--sync--" sync / 00:0839::Majesty's Auspice will be sealed off/ window 100000,0
+# Majesty's Auspice will be sealed off
+60000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DDB:/ window 100000,0
 60014.3 "Molting Plumage" sync / 1[56]:[^:]*:Dawon:517A:/
 60025.9 "Explosion" sync / 1[56]:[^:]*:Verdant Plume:5182:/
 60033.5 "Scratch" sync / 1[56]:[^:]*:Dawon:517B:/
diff --git a/timelines/src/main/resources/timeline/castrum_abania.txt b/timelines/src/main/resources/timeline/castrum_abania.txt
index 45b45330f09a..516d963c4e9d 100644
--- a/timelines/src/main/resources/timeline/castrum_abania.txt
+++ b/timelines/src/main/resources/timeline/castrum_abania.txt
@@ -7,7 +7,8 @@ hideall "--sync--"
 # -it "Magna Roader"
 
 # initial
-0.0 "--sync--" sync / 00:0839::Terrestrial Weaponry will be sealed off/ window 0,1
+# Terrestrial Weaponry will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:790:/ window 0,1
 13.5 "Magitek Fire II" sync / 1[56]:[^:]*:Magna Roader:1F15:/
 18.6 "Magitek Fire II" sync / 1[56]:[^:]*:Magna Roader:1F15:/
 25.7 "Magitek Fire III" sync / 1[56]:[^:]*:Magna Roader:1F16:/
@@ -75,7 +76,8 @@ hideall "--sync--"
 # first phase is random, cycle order is always fire > ice > thunder > fire (repeat)
 # -ii 82B1 82B2 83D3 82AE 82AF 82B0 83D4 83D5 83D6 82B9
 
-1000.0 "Start" sync / 00:0839::Project Aegis will be sealed off/ window 10000,0
+# Project Aegis will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:791:/ window 10000,0
 1008.3 "--sync--" sync / 14:[^:]*:Subject Number XXIV:82A9:/ window 10,10 jump 1095.0 # fire phase first
 1008.3 "--sync--" sync / 14:[^:]*:Subject Number XXIV:82A8:/ window 10,10 jump 1144.7 # ice phase first
 1008.3 "--sync--" sync / 14:[^:]*:Subject Number XXIV:82AA:/ window 10,10 jump 1193.6 # thunder phase first
@@ -140,7 +142,8 @@ hideall "--sync--"
 # * Ketu Wave (1F28): 1, 2, or 3 large circles
 # * Ketu Cutter (1F27): 180/360 degree pinwheel
 # * Ketu Cut (2086) / Rahu Cut (2087) is powering up.
-2000.0 "Start" sync / 00:0839::The Assessment Grounds will be sealed off/ window 10000,0
+# Assessment Grounds will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:792:/ window 10000,0
 2010.4 "Ketu Slash" sync / 1[56]:[^:]*:Inferno:1F26:/
 2017.9 "Rahu Blaster" sync / 1[56]:[^:]*:Inferno:1F29:/
 2028.8 "Ketu & Rahu" sync / 1[56]:[^:]*:Inferno:1F25:/
diff --git a/timelines/src/main/resources/timeline/delubrum_reginae.txt b/timelines/src/main/resources/timeline/delubrum_reginae.txt
index 0ca7d96b6c4d..1fd63d1dc474 100644
--- a/timelines/src/main/resources/timeline/delubrum_reginae.txt
+++ b/timelines/src/main/resources/timeline/delubrum_reginae.txt
@@ -17,7 +17,8 @@ hideall "--sync--"
 # Merciful -> Baleful -> Iron -> random non-repeating from [merciful v2, baleful v2, iron v2]
 
 # Initial Merciful Air
-1000.0 "--sync--" sync / 00:0839::The Theater of One will be sealed off/ window 10000,0
+# The Theater of One will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1B:/ window 10000,0
 1012.2 "Verdant Tempest" sync / 1[56]:[^:]*:Trinity Seeker:5AB6:/
 1019.4 "First Mercy" sync / 1[56]:[^:]*:Trinity Seeker:5B5D:/
 1022.6 "Second Mercy" sync / 1[56]:[^:]*:Trinity Seeker:5B5E:/
@@ -158,7 +159,8 @@ hideall "--sync--"
 ### Dahu
 # -p 5755:2023
 # -ii 575A 575C
-2000.0 "--sync--" sync / 00:0839::The Hall of Supplication will be sealed off/ window 10000,0
+# The Hall of Supplication will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1D:/ window 10000,0
 2007.0 "--sync--" sync / 14:[^:]*:Dahu:576[12]:/ window 10,2
 2010.0 "Right-Sided Shockwave/Left-Sided Shockwave" #sync / 1[56]:[^:]*:Dahu:576[12]:/
 2012.6 "Left-Sided Shockwave/Right-Sided Shockwave" #sync / 1[56]:[^:]*:Dahu:576[12]:/
@@ -210,7 +212,8 @@ hideall "--sync--"
 # -ii 5B70 5806 5838 5857 580D 580F 5B71 5A93 57F3 57F2 57F8 57F7
 # All four (just autos) -> randomly each individually -> final phase with aetherial wards
 
-3000.0 "--sync--" sync / 00:0839::The Hall of Hieromancy will be sealed off/ window 10000,0
+# The Hall of Hieromancy will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1E:/ window 10000,0
 # ranged auto should be reasonably timed
 3002.5 "--sync--" sync / 1[56]:[^:]*:Queen's Gunner:5857:/ window 3,1
 # can't sync this untargetable as the mobs will hop away sooner if they are damaged enough.
@@ -366,7 +369,8 @@ hideall "--sync--"
 ### Bozjan Phantom
 # -p 57A3:5011.3
 # (no -ii, a refreshingly direct timeline)
-5000.0 "--sync--" sync / 00:0839::Pride of the Lion will be sealed off/ window 10000,0
+# Pride of the Lion will be sealed off
+5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1F:/ window 10000,0
 
 # one circle, one square
 5008.3 "--sync--" sync / 14:[^:]*:Bozjan Phantom:57A3:/ window 10,10
@@ -441,7 +445,8 @@ hideall "--sync--"
 ### Trinity Avowed
 # -p 5975:7013
 # -ii 5962 4F55 4F99 5B24 5968 4F56 4F9A 5964 5969 5965 5967 596A 596C
-7000.0 "--sync--" sync / 00:0839::The Vault of Singing Crystal will be sealed off/ window 10000,0
+# The Vault of Singing Crystal will be sealed off
+7000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E20:/ window 10000,0
 7008.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5975:/ window 10,10
 7013.0 "Wrath Of Bozja" sync / 1[56]:[^:]*:Trinity Avowed:5975:/
 7021.1 "Glory Of Bozja" sync / 1[56]:[^:]*:Trinity Avowed:5976:/
@@ -528,7 +533,8 @@ hideall "--sync--"
 # -it "The Queen"
 # -p 59C8:9015.5
 # -ii 5B83 5B82 59E0 59E2 59DA 59CC 5B40 59CD 5B8D
-9000.0 "--sync--" sync / 00:0839::Queensheart will be sealed off/ window 10000,0
+# Queensheart will be sealed off
+9000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E23:/ window 10000,0
 9010.5 "--sync--" sync / 14:[^:]*:The Queen:59C8:/ window 15,15
 9015.5 "Empyrean Iniquity" sync / 1[56]:[^:]*:The Queen:59C8:/
 9025.7 "Cleansing Slash" sync / 1[56]:[^:]*:The Queen:59C5:/
diff --git a/timelines/src/main/resources/timeline/delubrum_reginae_savage.txt b/timelines/src/main/resources/timeline/delubrum_reginae_savage.txt
index 7e0305cf5718..6fbedebae545 100644
--- a/timelines/src/main/resources/timeline/delubrum_reginae_savage.txt
+++ b/timelines/src/main/resources/timeline/delubrum_reginae_savage.txt
@@ -122,8 +122,10 @@ hideall "--sync--"
 ### Trinity Seeker
 # -p 5AD3:4011.4 5A98:4079.5 5A99:4171.7 5A97:4265.8
 # -ii 1961 1963 5B33 5AB8 5AB9 5ABA 5ABB 5ABC 5AD1 5B2A 5B2B 5AC1 5AC2 5AC3 5AC4 5AC5 5AC6 5ACB 5BBC 5ACD
-4000.0 "--sync--" sync / 00:0839::The Theater of One will be sealed off/ window 20000,0
-4000.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 0,2000 jump 0
+# The Theater of One will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1B:/ window 20000,0
+# .*is no longer sealed
+4000.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 0,2000 jump 0
 
 # Note: it is likely that there are additional hp pushes on later Verdant Paths.
 # It is known that the first one is 80%, but I have seen 0-10 second variations
@@ -160,7 +162,7 @@ hideall "--sync--"
 4105.5 "Baleful Onslaught" sync / 1[56]:[^:]*:Trinity Seeker:5AD6:/
 4115.6 "Phantom Edge?" sync / 1[56]:[^:]*:Trinity Seeker:5ABD:/
 4117.8 "--middle--" sync / 1[56]:[^:]*:Trinity Seeker:5A9A:/
-4118.4 "--chains--" duration 3.1 # sync / 00:0000:0080:/
+4118.4 "--chains--" duration 3.1
 4126.9 "Baleful Blade" sync / 1[56]:[^:]*:Trinity Seeker:5AB[EF]:/
 4132.1 "Manifest Avatar" sync / 1[56]:[^:]*:Trinity Seeker:5ADA:/
 4138.8 "Baleful Comet 1" #sync / 1[56]:[^:]*:Seeker Avatar:5AD7:/
@@ -224,7 +226,7 @@ hideall "--sync--"
 4315.8 "Merciful Moon" sync / 1[56]:[^:]*:Aetherial Orb:5AC9:/
 4318.4 "Merciful Breeze" sync / 1[56]:[^:]*:Trinity Seeker:5AC8:/
 4321.8 "Merciful Blooms" sync / 1[56]:[^:]*:Trinity Seeker:5ACA:/
-4325.1 "--chains--" duration 3.1 # sync / 23:0000:0000:0080:/
+4325.1 "--chains--" duration 3.1
 4335.2 "Verdant Tempest" sync / 1[56]:[^:]*:Trinity Seeker:5AD3:/
 4346.5 "Merciful Arc" sync / 1[56]:[^:]*:Trinity Seeker:5AD4:/
 4349.7 "--middle--" sync / 1[56]:[^:]*:Trinity Seeker:5A9A:/
@@ -267,7 +269,7 @@ hideall "--sync--"
 4465.0 "Mercy Fourfold 2" #sync / 1[56]:[^:]*:Trinity Seeker:5B94:/
 4466.9 "Mercy Fourfold 3" #sync / 1[56]:[^:]*:Trinity Seeker:5B94:/
 4468.8 "Mercy Fourfold 4" #sync / 1[56]:[^:]*:Trinity Seeker:5B94:/
-4472.2 "--chains--" duration 3.1 # sync / 00:0000:0080:/
+4472.2 "--chains--" duration 3.1
 4482.4 "Verdant Tempest" sync / 1[56]:[^:]*:Trinity Seeker:5AD3:/
 4484.6 "--middle--" sync / 1[56]:[^:]*:Trinity Seeker:5A9A:/
 4488.8 "Manifest Avatar" sync / 1[56]:[^:]*:Trinity Seeker:5ADA:/
@@ -279,7 +281,7 @@ hideall "--sync--"
 4518.7 "Manifest Avatar" sync / 1[56]:[^:]*:Trinity Seeker:5ADA:/
 4530.9 "First Mercy" sync / 1[56]:[^:]*:Seeker Avatar:5B61:/
 4534.1 "Second Mercy" sync / 1[56]:[^:]*:Seeker Avatar:5B62:/
-4534.7 "--chains--" duration 3.1 # sync / 00:0000:0080:/
+4534.7 "--chains--" duration 3.1
 4537.3 "Third Mercy" sync / 1[56]:[^:]*:Seeker Avatar:5B63:/
 4540.5 "Fourth Mercy" sync / 1[56]:[^:]*:Seeker Avatar:5B64:/
 4541.8 "Phantom Edge?" sync / 1[56]:[^:]*:Trinity Seeker:5ABD:/
@@ -308,7 +310,8 @@ hideall "--sync--"
 # Dahu will only start if you are not in the Duel, and if Dahu starts first, the Duel will
 # override it.  Dahu will only end when Dahu is killed, which can only be seen if you
 # are in the Dahu fight.
-6000.0 "--sync--" sync / 00:0839::The Hall of Supplication will be sealed off/ window 6000,0
+# The Hall of Supplication will be sealed off
+6000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1D:/ window 6000,0
 6000.0 "--Reset--" sync / 19:[^:]*:Dahu:/ window 0,2000 jump 0
 6008.4 "Reverberating Roar" sync / 1[56]:[^:]*:Dahu:576D:/ window 10,2.5
 6014.5 "Reverberating Roar" sync / 1[56]:[^:]*:Dahu:576D:/
@@ -407,7 +410,8 @@ hideall "--sync--"
 # https://www.youtube.com/watch?v=5Q0m1F0MKQQ
 
 # This is the zone, but can't use this sync as it can be seen by Dahu.  Sync to autos instead.
-#8000.0 "--sync--" sync / 00:0839::Pride of the Lioness will be sealed off/ window 20000,0
+# Pride of the Lioness will be sealed off
+#8000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1C:/ window 20000,0
 8000.0 "--Reset--" sync / 00:0044:Stygimoloch Warrior:Why\.\.\.won't\.\.\.you\.\.\./ window 0,2000 jump 0
 # TODO: is there a reset dialog line for losing?
 # Alternatively, we could always insert " 19:${data.me} was defeated by" from script.
@@ -500,8 +504,10 @@ hideall "--sync--"
 # - 5820 (581F)
 # - 5823 (59BE)
 
-10000.0 "--sync--" sync / 00:0839::The Hall of Hieromancy will be sealed off/ window 20000,0
-10000.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 0,2000 jump 0
+# The Hall of Hieromancy will be sealed off
+10000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1E:/ window 20000,0
+# .*is no longer sealed
+10000.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 0,2000 jump 0
 # ranged auto should be reasonably timed
 10002.5 "--sync--" sync / 1[56]:[^:]*:Queen's Gunner:5858:/ window 3,1
 
@@ -590,7 +596,7 @@ hideall "--sync--"
 10322.2 "Blood and Bone Enrage" sync / 1[56]:[^:]*:Queen's Knight:5B9D:/
 
 # Phase 3: Soldier + Gunner section
-10600.0 "--sync--" sync / 22:........:Queen's Gunner::........::Queen's Gunner:01/ window 600,0
+10600.0 "--sync--" sync / 22:........:Queen's Gunner:........:Queen's Gunner:01/ window 600,0
 10612.0 "--sync--" sync / 14:[^:]*:Queen's Gunner:5844:/ window 600,0
 10617.0 "Relentless Battery" sync / 1[56]:[^:]*:Queen's Gunner:5844:/
 10623.2 "Great Ball Of Fire" sync / 1[56]:[^:]*:Queen's Soldier:583B:/
@@ -675,8 +681,10 @@ hideall "--sync--"
 # Phases:
 # Manipulate -> Invert -> Adds -> then loop Manipulate+Buster OR Invert+Buster
 
-12000.0 "--sync--" sync / 00:0839::Pride of the Lion will be sealed off/ window 20000,0
-12000.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 0,2000 jump 0
+# Pride of the Lion will be sealed off
+12000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E1F:/ window 20000,0
+# .*is no longer sealed
+12000.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 0,2000 jump 0
 12007.1 "--sync--" sync / 14:[^:]*:Bozjan Phantom:57BD:/ window 20000,0
 12011.1 "Malediction of Agony" sync / 1[56]:[^:]*:Bozjan Phantom:57BD:/
 12019.2 "Weave Miasma" sync / 1[56]:[^:]*:Bozjan Phantom:57B2:/
@@ -841,8 +849,10 @@ hideall "--sync--"
 
 # Note: Blade of Entropy is `sync / 1[56]:[^:]*:(Trinity Avowed|Avowed Avatar):594[23456789]|595[6789ABCD]:/``
 
-14000.0 "--sync--" sync / 00:0839::The Vault of Singing Crystal will be sealed off/ window 20000,0
-14000.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 0,2000 jump 0
+# The Vault of Singing Crystal will be sealed off
+14000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E20:/ window 20000,0
+# .*is no longer sealed
+14000.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 0,2000 jump 0
 14006.7 "--sync--" sync / 14:[^:]*:Trinity Avowed:594E:/ window 10,10
 14011.8 "Wrath Of Bozja" sync / 1[56]:[^:]*:Trinity Avowed:594E:/
 14019.9 "Glory Of Bozja" sync / 1[56]:[^:]*:Trinity Avowed:594F:/
@@ -1245,8 +1255,10 @@ hideall "--sync--"
 # -p 57D7:18015.3 57C3:18204.5 57D2:19013.2
 # -ii 1961 55A6 57D0 57CE 57DD 57DC 57C8 57CA 57C6 57CC 5B38 57D3 57D6 57E2 501B 57DF 501A
 # -it "Stygimoloch Lord"
-18000.0 "--sync--" sync / 00:0839::The Path of Divine Clarity will be sealed off/ window 20000,0
-18000.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 0,2000 jump 0
+# The Path of Divine Clarity will be sealed off
+18000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E22:/ window 20000,0
+# .*is no longer sealed
+18000.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 0,2000 jump 0
 
 # Note: 57CF is the cast for Whack but 57D1 is the instant damage.
 # Similarly, 57C4 is the cast for Devastating Bolt, but 57C5/57C6 is the delayed damage.
@@ -1339,7 +1351,7 @@ hideall "--sync--"
 
 
 # Phase 3: Victory Lap (once adds are dead)
-19000.0 "--targetable--" sync / 22:........:Stygimoloch Lord:........:Stygimoloch Lord/ window 800,0
+19000.0 "--targetable--" sync / 22:........:Stygimoloch Lord:........:Stygimoloch Lord:01/ window 800,0
 19008.2 "--sync--" sync / 14:[^:]*:Stygimoloch Lord:57D2:/ window 1010,0
 19013.2 "Thunderous Discharge" sync / 1[56]:[^:]*:Stygimoloch Lord:57D2:/
 19028.4 "Rapid Bolts 1" sync / 1[56]:[^:]*:Stygimoloch Lord:57CD:/ duration 12.8
@@ -1372,8 +1384,10 @@ hideall "--sync--"
 # -it "The Queen"
 # TODO: what is 5BCB? (--middle--?)
 # TODO: what is 55A8?
-20000.0 "--sync--" sync / 00:0839::Queensheart will be sealed off/ window 20000,0
-20000.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 0,2000 jump 0
+# Queensheart will be sealed off
+20000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E23:/ window 20000,0
+# .*is no longer sealed
+20000.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 0,2000 jump 0
 20010.3 "--sync--" sync / 14:[^:]*:The Queen:59F9:/ window 20,20
 20015.3 "Empyrean Iniquity" sync / 1[56]:[^:]*:The Queen:59F9:/
 20025.5 "--sync--" sync / 1[56]:[^:]*:The Queen:5BCB:/
@@ -1481,7 +1495,8 @@ hideall "--sync--"
 20515.5 "Above Board" sync / 1[56]:[^:]*:Queen's Warrior:5A0B:/
 20515.5 "--sync--" sync / 1[56]:[^:]*:Queen's Warrior:5B8E:/
 20516.5 "--stunned--" # 3 or 7 second stun
-20518.5 "Lots Cast" sync / 1[56]:[^:]*:(Aetherial Burst:5B89|Aetherial Bolt:5A0D):/
+# Aetherial Burst does 5B89 and Aetherial Bolt does 5A0D
+20518.5 "Lots Cast" sync / 1[56]:[^:]*:(Aetherial Burst|Aetherial Bolt):(5B89|5A0D):/
 20521.5 "Lots Cast" #sync / 1[56]:[^:]*:Aetherial Bolt:5B88:/
 20522.7 "Lots Cast" #sync / 1[56]:[^:]*:Aetherial Bolt:5BB6:/
 20523.5 "--unstunned--"
diff --git a/timelines/src/main/resources/timeline/dohn_mheg.txt b/timelines/src/main/resources/timeline/dohn_mheg.txt
index 6c8223d2c973..ac6e7aa9dde5 100644
--- a/timelines/src/main/resources/timeline/dohn_mheg.txt
+++ b/timelines/src/main/resources/timeline/dohn_mheg.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 ### Aenc Thon, Lord of the Lingering Gaze
 # -ii 1EDB 22BD -p 2299:112.2
-100.0 "--sync--" sync / 00:0839::Teag Gye will be sealed off/ window 100,0
+# Teag Gye will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B93:/ window 100,0
 
 112.2 "Candy Cane" sync / 1[56]:[^:]*:Aenc Thon, Lord of the Lingering Gaze:2299:/ window 113,5
 120.4 "Hydrofall" sync / 1[56]:[^:]*:Aenc Thon, Lord of the Lingering Gaze:22A7:/
@@ -33,7 +34,8 @@ hideall "--sync--"
 
 ### Griaule
 # -p 2873:507.5
-500.0 "--sync--" sync / 00:0839::The Atelier will be sealed off/ window 500,0
+# The Atelier will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B96:/ window 500,0
 
 507.5 "Rake" sync / 1[56]:[^:]*:Griaule:2873:/ window 508,5
 518.0 "Swinge" sync / 1[56]:[^:]*:Griaule:22CA:/
@@ -73,7 +75,8 @@ hideall "--sync--"
 
 ### Aenc Thon, Lord of the Lengthsome Gate
 # -p 35A4:1011 34D2:1300 -ii 34EC 3681 3396
-1000.0 "--sync--" sync / 00:0839::The throne room will be sealed off/ window 1000,0
+# The Throne Room will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B98:/ window 1000,0
 
 1011.0 "Crippling Blow" sync / 1[56]:[^:]*:Aenc Thon, Lord of the Lengthsome Gait:35A4:/ window 1011,5
 1018.2 "Virtuosic Capriccio" sync / 1[56]:[^:]*:Aenc Thon, Lord of the Lengthsome Gait:358C:/
diff --git a/timelines/src/main/resources/timeline/doma_castle.txt b/timelines/src/main/resources/timeline/doma_castle.txt
index 1b672f1c28f1..550b679b64c8 100644
--- a/timelines/src/main/resources/timeline/doma_castle.txt
+++ b/timelines/src/main/resources/timeline/doma_castle.txt
@@ -4,7 +4,8 @@ hideall "--sync--"
 ### Magitek Rearguard
 # -ii 209F 20A0
 # boss will walk center before using 209D Cermet Pile, causes timeline drift
-0 "Start" sync / 00:0839::The Third Armory will be sealed off/
+# The Third Armory will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:7C1:/
 7.4 "Cermet Pile" sync / 1[56]:[^:]*:Magitek Rearguard:209D:/ window 10,10
 15.0 "Garlean Fire" sync / 1[56]:[^:]*:Magitek Rearguard:209E:/
 30.6 "Magitek Ray" sync / 1[56]:[^:]*:Rearguard Bit:20A1:/
@@ -47,7 +48,8 @@ hideall "--sync--"
 ### Magitek Hexadrone
 # -ii 20A4 20A6 20A7 2447
 # boss does not re-center
-1000 "Start" sync / 00:0839::The Training Grounds will be sealed off/ window 1000,0
+# Training Grounds will be sealed off
+1000 "Start" sync / 29:[^:]*:7DC:[^:]*:7C2:/ window 1000,0
 1010.6 "Circle Of Death" sync / 1[56]:[^:]*:Magitek Hexadrone:20A2:/
 1018.9 "2-Tonze Magitek Missile" sync / 1[56]:[^:]*:Magitek Hexadrone:20A3:/
 1024.1 "Hexadrone Bits" sync / 03:........:Hexadrone Bit:/
@@ -88,7 +90,8 @@ hideall "--sync--"
 ### Hypertuned Grynewaht
 # -ii 20A9 20AB 20AC 20AE 20A7 2447
 # boss will walk center on 20B0 and stay center for 20AA Gunsaw, causes timeline drift
-2000 "Start" sync / 00:0839::The Hall Of The Scarlet Swallow will be sealed off/ window 2000,0
+# Hall of the Scarlet Swallow will be sealed off
+2000 "Start" sync / 29:[^:]*:7DC:[^:]*:7C3:/ window 2000,0
 2009.4 "Chainsaw" duration 5.5 sync / 1[56]:[^:]*:Hypertuned Grynewaht:20A8:/
 2022.7 "--center--"
 2022.7 "Delay-Action Charge" sync / 1[56]:[^:]*:Hypertuned Grynewaht:20AD:/ window 10,10 # boss walks center before using
diff --git a/timelines/src/main/resources/timeline/drowned_city_of_skalla.txt b/timelines/src/main/resources/timeline/drowned_city_of_skalla.txt
index 3ccd24c65c28..aa0936deda26 100644
--- a/timelines/src/main/resources/timeline/drowned_city_of_skalla.txt
+++ b/timelines/src/main/resources/timeline/drowned_city_of_skalla.txt
@@ -8,7 +8,8 @@ hideall "--sync--"
 
 # -ii 2655
 
-0 "Start" sync / 00:0839::The Green Screams will be sealed off/ window 0,1
+# The Green Screams will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:93A:/ window 0,1
 7.4 "Torpedo" sync / 1[56]:[^:]*:Kelpie:264F:/ window 7.4,5
 15.0 "Rising Seas" sync / 1[56]:[^:]*:Kelpie:2650:/
 26.7 "Gallop" sync / 1[56]:[^:]*:Kelpie:2653:/
@@ -44,7 +45,8 @@ hideall "--sync--"
 
 
 
-1000.0 "Start" sync / 00:0839::A Door Unopened will be sealed off/ window 1000,5
+# A Door Unopened will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:93C:/ window 1000,5
 1009.2 "Mystic Light" sync / 1[56]:[^:]*:The Old One:2657:/
 1015.0 "Mystic Flame" sync / 1[56]:[^:]*:The Old One:2658:/
 1018.1 "Order To Detonate (cast)" sync / 14:[^:]*:The Old One:265B:/ window 18.1,5 duration 19.7
@@ -95,7 +97,8 @@ hideall "--sync--"
 # Hrodric Poisontongue #
 #~~~~~~~~~~~~~~~~~~~~~~#
 
-2000.0 "Start" sync / 00:0839::The Golden Walls Of Ruin will be sealed off/ window 2000,5
+# The Golden Walls of Ruin will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:93E:/ window 2000,5
 2012.6 "Rusting Claw" sync / 1[56]:[^:]*:Hrodric Poisontongue:2661:/ window 2012.6
 2026.2 "Tail Drive" sync / 1[56]:[^:]*:Hrodric Poisontongue:2663:/
 2035.9 "The Spin" sync / 1[56]:[^:]*:Hrodric Poisontongue:2664:/ window 35.9,5
diff --git a/timelines/src/main/resources/timeline/dun_scaith.txt b/timelines/src/main/resources/timeline/dun_scaith.txt
index b1b3aac0f03f..62909c2b82f1 100644
--- a/timelines/src/main/resources/timeline/dun_scaith.txt
+++ b/timelines/src/main/resources/timeline/dun_scaith.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 1C90 1ABC -ic "Fierce Wind" "Void Sprite"
 
-0 "--sync--" sync / 00:0839::The main deck will be sealed off/ window 0,5
+# Main Deck will be sealed off
+0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:755:/ window 0,5
 6.7 "Spike Of Darkness" sync / 1[56]:[^:]*:Deathgaze Hollow:1E51:/
 11.8 "--sync--" sync / 1[56]:[^:]*:Deathgaze Hollow:1C91:/
 16.6 "--sync--" sync / 1[56]:[^:]*:Deathgaze Hollow:1C92:/
@@ -115,7 +116,8 @@ hideall "--sync--"
 # -ii 1C97 1CA8 1CA9 1CAB -ic "Abyssal Scythe"
 # -ic "Ferdiad's Fool"
 
-1000.0 "--sync--" sync / 00:0839::The Rostrum will be sealed off/ window 1000,5
+# The Rostrum will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:758:/ window 1000,5
 1014.2 "Black Wind x3" # sync / 1[56]:[^:]*:Ferdiad Hollow:1CAC:/
 1020.3 "Sleight" sync / 1[56]:[^:]*:Ferdiad Hollow:1C99:/
 1028.0 "Wormhole" sync / 1[56]:[^:]*:Ferdiad Hollow:1C9A:/
@@ -186,7 +188,8 @@ hideall "--sync--"
 # -ii 1D9B
 # -ic "Allagan Dreadnaught" "Proto Bit"
 
-2000.0 "--sync--" sync / 00:0839::The Queen's Pride will be sealed off/ window 2000,5
+# The Queen's Pride will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:759:/ window 2000,5
 
 2007.8 "Aether Bend" sync / 1[56]:[^:]*:Proto Ultima:1D99:/
 2018.4 "Aetherochemical Laser 1" sync / 1[56]:[^:]*:Proto Ultima:1D96:/
@@ -245,7 +248,8 @@ hideall "--sync--"
 # -ii 1D2C 1D2D 1D2E 1D30 1DD4 1DD5 1E50
 # -ic Shadowcourt Jester" "Chimera Poppet"
 
-3000.0 "--sync--" sync / 00:0839::The Queen's Graces will be sealed off/ window 3000,5
+# The Queen's Graces will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:75A:/ window 3000,5
 3013.1 "Thirty Thorns" sync / 1[56]:[^:]*:Scathach:1D2B:/
 3030.2 "Thirty Arrows" sync / 1[56]:[^:]*:Scathach:1D2F:/ window 30,5
 3037.4 "Manos" sync / 1[56]:[^:]*:Scathach:1CD3:/ window 30,5
diff --git a/timelines/src/main/resources/timeline/emerald_weapon-ex.txt b/timelines/src/main/resources/timeline/emerald_weapon-ex.txt
index 1f95039ef486..6ff99f1f0339 100644
--- a/timelines/src/main/resources/timeline/emerald_weapon-ex.txt
+++ b/timelines/src/main/resources/timeline/emerald_weapon-ex.txt
@@ -3,14 +3,11 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-# Use autos instead of InCombat lines to start timelines for each phase
-# as timeline resets out of combat.
-
 ### Phase 1
 # -p 55B0:17.1
 # -ii 55AF 55AE 557B 58D3 557D 557F 5BA6 5BA7 5596 557A 5579 5BD3 5017 559E 55A0 5597 5018 55A4 5BA3 554B 554C 5593 559A 5B03 5598 5B1A
 
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 1.1 "--sync--" sync / 1[56]:[^:]*:The Emerald Weapon:5B1A:/ window 1.1,0
 17.1 "Emerald Shot" sync / 1[56]:[^:]*:The Emerald Weapon:55B0:/ window 18,10
 28.2 "Optimized Ultima" sync / 1[56]:[^:]*:The Emerald Weapon:55B1:/
diff --git a/timelines/src/main/resources/timeline/endsinger.txt b/timelines/src/main/resources/timeline/endsinger.txt
index c695c8f59b87..074b209c6d8d 100644
--- a/timelines/src/main/resources/timeline/endsinger.txt
+++ b/timelines/src/main/resources/timeline/endsinger.txt
@@ -83,7 +83,7 @@ hideall "--sync--"
 1101.1 "Katastrophe"
 1112.2 "Katastrophe"
 1123.3 "Katastrophe"
-1200.0 "--sync--" sync / 00:0039::10 seconds until oblivion is sealed/ window 200,0
+1200.0 "--sync--" sync / 00:0039:[^:]*:10 seconds until oblivion is sealed/ window 200,0
 1212.2 "Ultimate Fate" sync / 1[56]:[^:]*:The Endsinger:6B59:/ window 10,10
 1218.9 "--targetable--"
 
diff --git a/timelines/src/main/resources/timeline/euphrosyne.txt b/timelines/src/main/resources/timeline/euphrosyne.txt
index 9d4ebc4075ac..45cc243ed6dc 100644
--- a/timelines/src/main/resources/timeline/euphrosyne.txt
+++ b/timelines/src/main/resources/timeline/euphrosyne.txt
@@ -4,7 +4,8 @@ hideall "--Reset--"
 hideall "--sync--"
 hideall "Season's Passing"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~#
 # NOPHICA #
@@ -13,7 +14,8 @@ hideall "Season's Passing"
 # -p 7C24:1012
 # -ii 7C26 7C09 7C10 7C0F 7C14 7C15 7C23
 
-1000.0 "--sync--" sync / 00:0839::The Fertile Plains will be sealed off/ window 10000,0
+# Fertile Plains will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10A9:/ window 10000,0
 1007.0 "--sync--" sync / 14:[^:]*:Nophica:7C24:/ window 20,20
 1012.0 "Abundance" sync / 1[56]:[^:]*:Nophica:7C24:/
 1020.7 "Matron's Plenty" sync / 1[56]:[^:]*:Nophica:7C08:/
@@ -90,7 +92,8 @@ hideall "Season's Passing"
 # 7A4A = Althyk teleporting mid, 7A4B = Nymeia teleporting south; hard to label both
 # This is overall an awkward timeline.  The two bosses can definitely desync by ~1-2s.
 
-2000.0 "--sync--" sync / 00:0839::The Bole will be sealed off/ window 10000,0
+# The Bole will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10AB:/ window 10000,0
 2009.0 "--sync--" sync / 14:[^:]*:Nymeia:7A38:/ window 10,10
 2013.5 "Spinner's Wheel" sync / 1[56]:[^:]*:Nymeia:7A38:/
 2019.2 "--sync--" sync / 14:[^:]*:Althyk:7A46:/ window 10,10
@@ -176,7 +179,8 @@ hideall "Season's Passing"
 # -it "Halone"
 # -it "Glacial Spear"
 
-3000.0 "--sync--" sync / 00:0839::The Barbs will be sealed off/ window 10000,0
+# The Barbs will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10AD:/ window 10000,0
 3009.0 "--sync--" sync / 14:[^:]*:Halone:7D79:/
 3013.0 "Rain of Spears x3" sync / 1[56]:[^:]*:Halone:7D79:/
 
@@ -314,7 +318,8 @@ hideall "Season's Passing"
 # -it "Menphina"
 # -it "Ceremonial Pillar"
 
-4000.0 "--sync--" sync / 00:0839::The Chamber Of Revolutions will be sealed off/ window 10000,0
+# The Chamber of Revolutions will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10BC:/ window 10000,0
 4013.1 "Blue Moon" sync / 1[56]:[^:]*:Menphina:7BFA:/
 4020.9 "Love's Light" sync / 1[56]:[^:]*:Menphina:7BB8:/
 4026.6 "Full Bright" sync / 1[56]:[^:]*:Menphina:7BBB:/
diff --git a/timelines/src/main/resources/timeline/eureka_hydatos.txt b/timelines/src/main/resources/timeline/eureka_hydatos.txt
index 36afa25ea234..977052431ce4 100644
--- a/timelines/src/main/resources/timeline/eureka_hydatos.txt
+++ b/timelines/src/main/resources/timeline/eureka_hydatos.txt
@@ -8,7 +8,8 @@ hideall "--sync--"
 # Use zone-unseal & Proto Ozma Reset lines
 # Trigger set contains 'resetWhenOutOfCombat: false'
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 0.0 "--Reset--" sync / 04:........:Proto Ozma:/ window 100000 jump 0
 
 
@@ -111,7 +112,8 @@ hideall "--sync--"
 # Raiden #
 ##########
 # -ii 39B9 3994 3996 3995 3997 3872 3871 3873 -p 387A:3013 386D:3091
-3000.0 "--sync--" sync / 00:0839::The Shin-Zantetsuken Containment Unit will be sealed off/ window 3000,0
+# Shin-Zantetsuken Containment Unit will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B51:/ window 3000,0
 3013.0 "Spirits of the Fallen" sync / 1[56]:[^:]*:Raiden:387A:/ # drift -0.041
 3023.0 "Shingan" sync / 1[56]:[^:]*:Raiden:387B:/ # drift 0.05
 3034.1 "Thundercall" sync / 1[56]:[^:]*:Raiden:387F:/
@@ -134,7 +136,7 @@ hideall "--sync--"
 3124.4 "Streak Lightning" #sync / 1[56]:[^:]*:Streak Lightning:3877:/
 3134.9 "Ultimate Zantetsuken" sync / 14:[^:]*:Raiden:3878:/ duration 20
 
-3154.9 "--sync--" sync / 17:[^:]:Raiden:3878:/ window 40,0
+3154.9 "--sync--" sync / 17:[^:]*:Raiden:3878:/ window 40,0
 3164.9 "Spirits of the Fallen" sync / 1[56]:[^:]*:Raiden:387A:/ window 40,5
 3171.2 "Booming Lament" sync / 1[56]:[^:]*:Raiden:387D:/
 3177.3 "Cloud to Ground" sync / 1[56]:[^:]*:Raiden:3870:/
@@ -156,7 +158,7 @@ hideall "--sync--"
 3316.0 "Lateral Zantetsuken" sync / 1[56]:[^:]*:Raiden:386[BC]:/
 3321.7 "Ultimate Zantetsuken" sync / 14:[^:]*:Raiden:3878:/ duration 20
 
-3341.7 "--sync--" sync / 17:[^:]:Raiden:3878:/ window 40,0
+3341.7 "--sync--" sync / 17:[^:]*:Raiden:3878:/ window 40,0
 3347.7 "Spirits of the Fallen" sync / 1[56]:[^:]*:Raiden:387A:/ window 40,5
 3353.8 "Shingan" sync / 1[56]:[^:]*:Raiden:387B:/
 3365.4 "Ame-no-Sakahoko" sync / 1[56]:[^:]*:Raiden:3868:/
@@ -171,7 +173,8 @@ hideall "--sync--"
 # Absolute Virtue #
 ###################
 # -p 3799:4016 -ii 38C4 378F 3791 3792 3954 378C
-4000.0 "--sync--" sync / 00:0839::The Lance of Virtue Containment Unit will be sealed off/ window 4000,0
+# Lance of Virtue Containment Unit will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B52:/ window 4000,0
 4016.0 "Meteor" sync / 1[56]:[^:]*:Absolute Virtue:3799:/
 4022.0 "Eidos" sync / 1[56]:[^:]*:Absolute Virtue:378[67]:/
 4033.6 "Hostile Aspect" sync / 1[56]:[^:]*:Absolute Virtue:378B:/
@@ -246,7 +249,8 @@ hideall "--sync--"
 # Proto Ozma #
 ##############
 # -ii 37AB 37B8 37A2 37AC 396E 397B 397C -p 37B2:5021.5
-5000.0 "--sync--" sync / 00:0839::The Proto Ozma Containment Unit will be sealed off/ window 5000,0
+# Proto Ozma Containment Unit will be sealed off
+5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B53:/ window 5000,0
 
 ### Initial Star Form (no meteor)
 5021.5 "Star Form" sync / 1[56]:[^:]*:Proto Ozma:37B2:/
diff --git a/timelines/src/main/resources/timeline/fractal_continuum.txt b/timelines/src/main/resources/timeline/fractal_continuum.txt
index f0af9e4af291..d38179089be1 100644
--- a/timelines/src/main/resources/timeline/fractal_continuum.txt
+++ b/timelines/src/main/resources/timeline/fractal_continuum.txt
@@ -4,7 +4,8 @@ hideall "--sync--"
 ###Phantom Ray
 #-ii F7D -p F7F:100
 
-0.0 "--sync--" sync / 00:0839::Exhibit level III will be sealed off/ window 0,1
+# Exhibit Level III will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:60D:/ window 0,1
 10.3 "Rapid Sever" sync / 1[56]:[^:]*:Phantom Ray:F7A:/ window 15,15
 16.6 "Atmospheric Displacement" sync / 1[56]:[^:]*:Phantom Ray:F7E:/
 21.4 "Double Sever 1" sync / 1[56]:[^:]*:Phantom Ray:F7[BC]:/
@@ -47,7 +48,8 @@ hideall "--sync--"
 176.6 "Atmospheric Displacement"
 
 ###Minotaur
-1000.0 "--sync--" sync / 00:0839::The high-level incubation bay will be sealed off/ window 1999,5
+# High-level Incubation Bay will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:60E:/ window 1999,5
 1008.8 "11-Tonze Swipe" sync / 1[56]:[^:]*:Minotaur:F81:/ window 9,9
 1019.0 "111-Tonze Swing" sync / 1[56]:[^:]*:Minotaur:F82:/ window 20,20
 1028.2 "Disorienting Groan" sync / 1[56]:[^:]*:Minotaur:F84:/
@@ -91,7 +93,8 @@ hideall "--sync--"
 # and there's no way to disambiguate where.
 # Phase length is the same regardless of added abilities.
 
-2000 "--sync--" sync / 00:0839::The reality augmentation bay will be sealed off/ window 2000,0
+# Reality Augmentation Bay will be sealed off
+2000 "--sync--" sync / 29:[^:]*:7DC:[^:]*:612:/ window 2000,0
 2006.2 "Sanctification" sync / 1[56]:[^:]*:The Curator:F89:/ window 7,7
 2011.4 "Unholy" sync / 1[56]:[^:]*:The Curator:F8A:/
 2020.6 "Sanctification" sync / 1[56]:[^:]*:The Curator:F89:/
diff --git a/timelines/src/main/resources/timeline/fractal_continuum_hard.txt b/timelines/src/main/resources/timeline/fractal_continuum_hard.txt
index 527f5d9b4ba6..e400c684844b 100644
--- a/timelines/src/main/resources/timeline/fractal_continuum_hard.txt
+++ b/timelines/src/main/resources/timeline/fractal_continuum_hard.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 27A3 27A7 27A9
 
-0 "Start" sync / 00:0839::The reality augmentation bay will be sealed off/
+# Reality Augmentation Bay will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:612:/
 
 10.1 "Electrochemical Transfer" sync / 1[56]:[^:]*:Motherbit:27A4:/ window 11,5
 15.7 "--sync--" sync / 1[56]:[^:]*:Prototype Bit:27AB:/
@@ -49,7 +50,8 @@ hideall "--sync--"
 # That is, for Form X into whatever, the dead time is determined solely by X,
 # regardless of whether X is followed by Y or by Z.
 
-1000.0 "Start" sync / 00:0839::Exhibit level VIII will be sealed off/ window 1000,5
+# Exhibit Level VIII will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:95D:/ window 1000,5
 1008.5 "Aetheroplasm" sync / 1[56]:[^:]*:The Ultima Warrior:2793:/ window 8.5,5
 1018.9 "Citadel Buster" sync / 1[56]:[^:]*:The Ultima Warrior:2792:/
 1029.8 "Ceruleum Vent" sync / 1[56]:[^:]*:The Ultima Warrior:2794:/
@@ -141,7 +143,8 @@ hideall "--sync--"
 
 # -ii 27B9 27BC 27BA 27BB
 
-2000.0 "Start" sync / 00:0839::The Genesis Engine will be sealed off/ window 2000,5
+# Genesis Engine will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:95E:/ window 2000,5
 2012.0 "Death Spin" sync / 1[56]:[^:]*:The Ultima Beast:27AD:/ window 12,5
 2025.6 "Aether Bend" sync / 1[56]:[^:]*:The Ultima Beast:27AF:/
 2035.2 "--sync--" sync / 1[56]:[^:]*:The Ultima Beast:27B6:/
diff --git a/timelines/src/main/resources/timeline/ghimlyt_dark.txt b/timelines/src/main/resources/timeline/ghimlyt_dark.txt
index 8b57aa647831..439518e009c4 100644
--- a/timelines/src/main/resources/timeline/ghimlyt_dark.txt
+++ b/timelines/src/main/resources/timeline/ghimlyt_dark.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 394F 3775
 
-0 "Start" sync / 00:0839::The Field Of Dust will be sealed off/ window 0,1
+# The Field of Dust will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:AB8:/ window 0,1
 12.9 "Jarring Blow" sync / 1[56]:[^:]*:Mark III-B Magitek Colossus:376E:/
 15.0 "--sync--" sync / 1[56]:[^:]*:Mark III-B Magitek Colossus:3771:/
 22.1 "Wild Fire Beam" sync / 1[56]:[^:]*:Mark III-B Magitek Colossus:3772:/ window 30,30
@@ -45,7 +46,8 @@ hideall "--sync--"
 # -ic "Lyse" "Pipin Of The Steel Heart" "Schola Centurion" "Schola Laquearius" "Schola Signifer"
 # -ii 3AC6
 
-1000.0 "Start" sync / 00:0839::The Impact Crater will be sealed off/ window 1000,1
+# Impact Crater will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:ABB:/ window 1000,1
 1012.2 "Nitrospin" sync / 1[56]:[^:]*:Prometheus:3455:/
 1023.4 "Needle Gun" sync / 1[56]:[^:]*:Prometheus:345A:/
 1031.1 "--untargetable--"
@@ -74,7 +76,8 @@ hideall "--sync--"
 # SORANUS DUO #
 #~~~~~~~~~~~~~#
 
-2000.0 "Start" sync / 00:0839::The Provisional Imperial Landing will be sealed off/ window 2000,5
+# Provisional Imperial Landing will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:ABD:/ window 2000,5
 2000.4 "--sync--" sync / 1[56]:[^:]*:Annia Quo Soranus:370F:/ jump 2097.0
 2000.4 "--sync--" sync / 1[56]:[^:]*:Julia Quo Soranus:370E:/ jump 2297.0
 2003.4 "Artificial Plasma?"
diff --git a/timelines/src/main/resources/timeline/ghimlyt_dark64.txt b/timelines/src/main/resources/timeline/ghimlyt_dark64.txt
index 7a0e836184fc..6e3786563f6e 100644
--- a/timelines/src/main/resources/timeline/ghimlyt_dark64.txt
+++ b/timelines/src/main/resources/timeline/ghimlyt_dark64.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 394F 3775
 
-0 "Start" sync / 00:0839::The Field Of Dust will be sealed off/ window 0,1
+# The Field of Dust will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:AB8:/ window 0,1
 12.9 "Jarring Blow" sync / 1[56]:[^:]*:Mark III-B Magitek Colossus:376E:/
 15.0 "--sync--" sync / 1[56]:[^:]*:Mark III-B Magitek Colossus:3771:/
 22.1 "Wild Fire Beam" sync / 1[56]:[^:]*:Mark III-B Magitek Colossus:3772:/ window 30,30
@@ -45,7 +46,8 @@ hideall "--sync--"
 # -ic "Lyse" "Pipin Of The Steel Heart" "Schola Centurion" "Schola Laquearius" "Schola Signifer"
 # -ii 3AC6
 
-1000.0 "Start" sync / 00:0839::The Impact Crater will be sealed off/ window 1000,1
+# Impact Crater will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:ABB:/ window 1000,1
 1012.2 "Nitrospin" sync / 1[56]:[^:]*:Prometheus:3455:/
 1023.4 "Needle Gun" sync / 1[56]:[^:]*:Prometheus:345A:/
 1031.1 "--untargetable--"
@@ -74,7 +76,8 @@ hideall "--sync--"
 # SORANUS DUO #
 #~~~~~~~~~~~~~#
 
-2000.0 "Start" sync / 00:0839::The Provisional Imperial Landing will be sealed off/ window 2000,5
+# Provisional Imperial Landing will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:ABD:/ window 2000,5
 2000.4 "--sync--" sync / 1[56]:[^:]*:Annia Quo Soranus:370F:/ jump 2097.0
 2000.4 "--sync--" sync / 1[56]:[^:]*:Julia Quo Soranus:370E:/ jump 2297.0
 2003.4 "Artificial Plasma?"
diff --git a/timelines/src/main/resources/timeline/gubal_library_hard.txt b/timelines/src/main/resources/timeline/gubal_library_hard.txt
index b29a67be175d..e7dbfd9ea4c7 100644
--- a/timelines/src/main/resources/timeline/gubal_library_hard.txt
+++ b/timelines/src/main/resources/timeline/gubal_library_hard.txt
@@ -4,7 +4,8 @@ hideall "--sync--"
 # Demon of the Tome
 # -ii 1951 1952
 
-0 "--sync--" sync / 00:0839::The Hall of Magicks will be sealed off/
+# Hall of Magicks will be sealed off
+0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:657:/
 6.1 "Triclip" sync / 1[56]:[^:]*:Demon of the Tome:193A:/ window 6.1,5
 17.3 "Folio" sync / 1[56]:[^:]*:Demon of the Tome:193C:/
 23.4 "--sync--" sync / 1[56]:[^:]*:Top Shelf Tome:193D:/
@@ -52,7 +53,8 @@ hideall "--sync--"
 # We use game log lines for the phases because the ACT log lines are unreliable
 # Whichever intermission comes second ends up with phantom "Gains Effect" lines
 
-1000.0 "--sync--"  sync / 00:0839::The Astrology and Astromancy Camera will be sealed off/ window 1000,0
+# Astrology and Astromancy Camera will be sealed off
+1000.0 "--sync--"  sync / 29:[^:]*:7DC:[^:]*:658:/ window 1000,0
 1007.3 "Searing Wind" sync / 1[56]:[^:]*:Liquid Flame:1944:/ window 7.3,5
 1014.3 "Bibliocide" sync / 1[56]:[^:]*:Liquid Flame:1945:/
 1025.7 "Sea Of Flames x3"
@@ -105,7 +107,8 @@ hideall "--sync--"
 # Strix
 # -ii 194F 1950 1958 195B 1969
 
-2000.0 "--sync--" sync / 00:0839::The Rare Tomes Room will be sealed off/ window 2000,5
+# Rare Tomes Room will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:706:/ window 2000,5
 2009.2 "Check Out" sync / 1[56]:[^:]*:Strix:194E:/ window 9.2,10
 2017.5 "Properties Of Darkness (buster)" sync / 1[56]:[^:]*:Strix:1954:/
 2029.6 "Properties Of Quakes" sync / 1[56]:[^:]*:Strix:1956:/
diff --git a/timelines/src/main/resources/timeline/hades.txt b/timelines/src/main/resources/timeline/hades.txt
index 1c5dd20a3b62..0bc988572a4e 100644
--- a/timelines/src/main/resources/timeline/hades.txt
+++ b/timelines/src/main/resources/timeline/hades.txt
@@ -92,7 +92,7 @@ hideall "Double"
 903.0 "--sync--" sync / 1[56]:[^:]*:Hades:417F:/
 905.0 "Gaol Add"
 906.5 "--sync--" sync / 14:[^:]*:Hades:416C:/
-936.2 "Chorus Of The Lost" sync / 1[56]:[^:]*:416C:Hades:/
+936.2 "Chorus Of The Lost" sync / 1[56]:[^:]*:Hades:416C:/
 # FIXME: I've never seen this go off, so unclear how far 416D is from 416C.
 # Chorus of the lost does seem likely to be 30 seconds.
 939.0 "--sync--" sync / 1[56]:[^:]*:Hades:416D:/ window 100,0
diff --git a/timelines/src/main/resources/timeline/hells_lid.txt b/timelines/src/main/resources/timeline/hells_lid.txt
index 4437f6d48a0f..636620256958 100644
--- a/timelines/src/main/resources/timeline/hells_lid.txt
+++ b/timelines/src/main/resources/timeline/hells_lid.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 27C0
 
-0 "Start" sync / 00:0839::Demonsgate will be sealed off/ window 0,1
+# Demonsgate will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:954:/ window 0,1
 19.7 "100-Tonze Swing" sync / 1[56]:[^:]*:Otake-Maru:27BE:/ window 19.7,5
 27.3 "Volcanic Debris x8" # sync / 1[56]:[^:]*:Volcanic Debris:27C5:/
 28.3 "10-Tonze Slash" sync / 1[56]:[^:]*:Otake-Maru:27BF:/
@@ -52,7 +53,8 @@ hideall "--sync--"
 
 # -ic "Tsumuji-Kaze"
 
-1000.0  "Start" sync / 00:0839::The Furnace will be sealed off/ window 1000,1
+# The Furnace will be sealed off
+1000.0  "Start" sync / 29:[^:]*:7DC:[^:]*:956:/ window 1000,1
 1011.5 "Whipping Whittret" sync / 1[56]:[^:]*:Kamaitachi:27C6:/ window 11.5,5
 1024.1 "Circling Winds" sync / 1[56]:[^:]*:Kamaitachi:27C8:/
 1037.8 "The Patient Blade" sync / 1[56]:[^:]*:Kamaitachi:27C7:/
@@ -88,7 +90,8 @@ hideall "--sync--"
 
 # -ii 27D2 27D5
 
-2000.0 "Start" sync / 00:0839::The Polished Shell will be sealed off/ window 2000,1
+# The Polished Shell will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:959:/ window 2000,1
 2005.0 "Caduceus" sync / 1[56]:[^:]*:Genbu:27CF:/ window 5,5
 2013.1 "Hell Of Water" sync / 1[56]:[^:]*:Genbu:27D0:/
 2021.9 "Hell Of Waste" sync / 1[56]:[^:]*:Genbu:27D1:/
diff --git a/timelines/src/main/resources/timeline/heroes_gauntlet.txt b/timelines/src/main/resources/timeline/heroes_gauntlet.txt
index afdf0ee3dd65..b8e3e23290f8 100644
--- a/timelines/src/main/resources/timeline/heroes_gauntlet.txt
+++ b/timelines/src/main/resources/timeline/heroes_gauntlet.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 4FCD 4FCE 4FCF 4FD0 4FD5 5015
 
-0 "Start" sync / 00:0839::The Mount Argai Mines will be sealed off/ window 0,1
+# Mount Argai Mines will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:DBB:/ window 0,1
 9.8 "Spectral Dream" sync / 1[56]:[^:]*:Spectral Thief:4FCB:/ window 9.8,5
 16.9 "Dash" sync / 1[56]:[^:]*:Spectral Thief:4FD3:/
 26.7 "Vacuum Blade" sync / 1[56]:[^:]*:Spectral Thief:506[12]:/
@@ -51,7 +52,8 @@ hideall "--sync--"
 # -ic Mustardseed "Tupaq Amaro" "Nu Mou" Peaseblossom
 # -ii 4F51 4F62 4F64 53B5 53B6 53B7 53B8 53B9 53BA
 
-1000.0 "Start" sync / 00:0839::The Summer Ballroom will be sealed off/ window 1000,5
+# Summer Ballroom will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:DBC:/ window 1000,5
 1012.8 "Absolute Dark II" sync / 1[56]:[^:]*:Spectral Necromancer:4F61:/ window 1012.8,5
 1020.0 "Necromancy" sync / 1[56]:[^:]*:Spectral Necromancer:4F57:/
 1030.2 "Twisted Touch" sync / 1[56]:[^:]*:Spectral Necromancer:4F5E:/ window 30,30
@@ -95,7 +97,8 @@ hideall "--sync--"
 # -ii 5203 5204 5209
 # -ic "Steelarm Cerigg" "Giott The Aleforged" "Lue-Reeq Of The Gilded Bow" "Granson Of The Mournful Blade"
 
-2000.0 "Start" sync / 00:0839::The Illuminated Plaza will be sealed off/ window 2000,5
+# Illuminated Plaza will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:DBD:/ window 2000,5
 2012.0 "Beastly Fury" sync / 1[56]:[^:]*:Spectral Berserker:520C:/ window 2012,5
 2024.4 "Wild Anguish" sync / 1[56]:[^:]*:Spectral Berserker:5208:/
 2036.3 "Raging Slice" sync / 1[56]:[^:]*:Spectral Berserker:520A:/
diff --git a/timelines/src/main/resources/timeline/holminster_switch.txt b/timelines/src/main/resources/timeline/holminster_switch.txt
index f4219b5836ba..a7876eb58e3c 100644
--- a/timelines/src/main/resources/timeline/holminster_switch.txt
+++ b/timelines/src/main/resources/timeline/holminster_switch.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 ### Forgiven Dissonance
 # -p 3DC5:112
-100.0 "--sync--" sync / 00:0839::The Wound will be sealed off/ window 100,0
+# The Wound will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:CD4:/ window 100,0
 112.0 "The Path Of Light" sync / 1[56]:[^:]*:Forgiven Dissonance:3DC5:/ window 112,0
 120.4 "Brazen Bull" sync / 1[56]:[^:]*:Forgiven Dissonance:3DC9:/
 126.5 "Gibbet Cage" sync / 1[56]:[^:]*:Forgiven Dissonance:3DC8:/
@@ -46,7 +47,8 @@ hideall "--sync--"
 
 ### Tesleen, the Forgiven
 # -ii 3DD6 3DD3 -p 3DCF:513.5
-500.0 "--sync--" sync / 00:0839::The Auction will be sealed off/ window 500,0
+# The Auction will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:CD5:/ window 500,0
 513.5 "The Tickler" sync / 1[56]:[^:]*:Tesleen, the Forgiven:3DCF:/ window 514,5
 523.6 "Scold's Bridle" sync / 1[56]:[^:]*:Tesleen, the Forgiven:3DD0:/
 533.8 "Fevered Flagellation" sync / 1[56]:[^:]*:Tesleen, the Forgiven:3DD5:/
@@ -76,7 +78,8 @@ hideall "--sync--"
 
 ### Philia
 # -ii 3DDD 3DDF 3DDE 3DDC 3DDB 3DE1 3DE0 3DE9 4196 3DE5 4181 -p 3DD8:1012.5
-1000.0 "--sync--" sync / 00:0839::The manor house courtyard will be sealed off/ window 1000,0
+# The Manor House Courtyard will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:CD7:/ window 1000,0
 1012.5 "Scavenger's Daughter" sync / 1[56]:[^:]*:Philia:3DD8:/ window 1012.5,10
 1022.8 "Head Crusher" sync / 1[56]:[^:]*:Philia:3DD7:/
 1032.9 "Pendulum Tank" sync / 1[56]:[^:]*:Philia:4189:/
diff --git a/timelines/src/main/resources/timeline/ktisis_hyperboreia.txt b/timelines/src/main/resources/timeline/ktisis_hyperboreia.txt
index 7b989e688a25..35049bd486e6 100644
--- a/timelines/src/main/resources/timeline/ktisis_hyperboreia.txt
+++ b/timelines/src/main/resources/timeline/ktisis_hyperboreia.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~#
 # LYSSA #
@@ -11,7 +12,8 @@ hideall "--sync--"
 
 # -ii 1961 6258 6E90 -it Lyssa
 
-0.0 "--sync--" sync / 00:0839::The Frozen Sphere will be sealed off/ window 0,1
+# Frozen Sphere will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:EB6:/ window 0,1
 10.7 "Skull Dasher" sync / 1[56]:[^:]*:Lyssa:625E:/ window 10.7,10
 21.2 "Frostbite and Seek" sync / 1[56]:[^:]*:Lyssa:6257:/
 23.2 "--untargetable--"
@@ -61,7 +63,8 @@ hideall "--sync--"
 
 # "Pyric Breath" sync / 1[56]:[^:]*:Ladon Lord:(6486|6487|6488|6489|648A|648B):/
 
-1000.0 "--sync--" sync / 00:0839::Concept Review will be sealed off/ window 1000,5
+# Concept Review will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:EB7:/ window 1000,5
 1010.3 "Scratch" sync / 1[56]:[^:]*:Ladon Lord:648F:/ window 1010.3,10
 1019.3 "Inhale" sync / 1[56]:[^:]*:Ladon Lord:6484:/
 1025.5 "--sync--" sync / 1[56]:[^:]*:Ladon Lord:6485:/
@@ -112,7 +115,8 @@ hideall "--sync--"
 
 # -ii 368
 
-2000.0 "--sync--" sync / 00:0839::The Celestial Sphere will be sealed off/ window 2000,10
+# Celestial Sphere will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:EB8:/ window 2000,10
 2013.1 "Trismegistos" sync / 1[56]:[^:]*:Hermes:651E:/ window 2013.1,10
 2020.2 "--middle--"
 2024.2 "Hermetica" sync / 1[56]:[^:]*:Hermes:6520:/
diff --git a/timelines/src/main/resources/timeline/kugane_castle.txt b/timelines/src/main/resources/timeline/kugane_castle.txt
index c72d9466430e..db0def7280d8 100644
--- a/timelines/src/main/resources/timeline/kugane_castle.txt
+++ b/timelines/src/main/resources/timeline/kugane_castle.txt
@@ -11,7 +11,8 @@ hideall "--sync--"
 
 # The Harakiri Kosho adds seem to be on a separate timer and thus aren't included here.
 
-0 "Start" sync / 00:0839::The Keisen Garden will be sealed off/ window 0,1
+# Keisen Garden will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:7AF:/ window 0,1
 9.6 "Clearout" sync / 1[56]:[^:]*:Zuiko-Maru:1E92:/ window 9.6,5
 21.8 "Kenki Release" sync / 1[56]:[^:]*:Zuiko-Maru:1E93:/ window 21.8,10
 30.9 "Clearout" sync / 1[56]:[^:]*:Zuiko-Maru:1E92:/
@@ -40,7 +41,8 @@ hideall "--sync--"
 
 # -ii 1E9C 1E9E
 
-1000.0 "Start" sync / 00:0839::The Budokan Training Grounds will be sealed off/ window 1000,5
+# Budokan Training Grounds will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:7B3:/ window 1000,5
 1006.5 "Issen" sync / 1[56]:[^:]*:Dojun-Maru:1E97:/ window 1006.5,5
 1016.6 "Clockwork Medium" sync / 1[56]:[^:]*:Dojun-Maru:1E99:/
 1019.8 "Issen" sync / 1[56]:[^:]*:Dojun-Maru:1E97:/
@@ -79,7 +81,8 @@ hideall "--sync--"
 # -ii 1EA8 1EA9 1EA4
 
 # Short opener
-2000.0 "Start" sync / 00:0839::The Noh Theater will be sealed off/ window 2000,5
+# Noh Theater will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:7B5:/ window 2000,5
 2009.5 "Iai-Giri" sync / 1[56]:[^:]*:Yojimbo:1EA2:/ window 2009.5,5
 2012.7 "Wakizashi" sync / 1[56]:[^:]*:Yojimbo:1EA1:/
 2018.9 "Wakizashi" sync / 1[56]:[^:]*:Yojimbo:1EA1:/
diff --git a/timelines/src/main/resources/timeline/lakshmi-ex.txt b/timelines/src/main/resources/timeline/lakshmi-ex.txt
index 157113c54aad..6eff089131e1 100644
--- a/timelines/src/main/resources/timeline/lakshmi-ex.txt
+++ b/timelines/src/main/resources/timeline/lakshmi-ex.txt
@@ -16,92 +16,88 @@ hideall "Alluring Arm"
 28.1 "Inner Demons" sync / 1[56]:[^:]*:Dreaming Kshatriya:258D:/
 29.0 "Tail Slap" sync / 1[56]:[^:]*:Dreaming Kshatriya:258C:/
 
-# infinite loop
-60.0 "--sync--" sync /.*/ window 0,30 jump 30
 
 ### Warmup
 # first auto comes out before rp text.
-107.2 "Hand Of Grace" sync / 1[56]:[^:]*:Lakshmi:214C:/ window 110,0
-114.4 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
-121.4 "Blissful Arrow" sync / 1[56]:[^:]*:Lakshmi:214F:/
-122.0 "Blissful Spear" sync / 1[56]:[^:]*:Lakshmi:2151:/
-124.6 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
-135.8 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
-143.1 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
-153.2 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
-160.4 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
-167.5 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DC:/
-170.6 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
-177.8 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215C:/
-187.0 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+500.0 "Hand Of Grace" sync / 1[56]:[^:]*:Lakshmi:214C:/ window 500,0
+507.2 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+514.2 "Blissful Arrow" sync / 1[56]:[^:]*:Lakshmi:214F:/
+514.8 "Blissful Spear" sync / 1[56]:[^:]*:Lakshmi:2151:/
+517.4 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
+528.6 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+535.9 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
+546.0 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
+553.2 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+560.3 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DC:/
+563.4 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
+570.6 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215C:/
+579.8 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
 
 ### Chanchala #1
-195.2 "Chanchala #1" sync / 1[56]:[^:]*:Lakshmi:2148:/
-209.0 "Divine Denial" sync / 1[56]:[^:]*:Lakshmi:2149:/
-217.2 "Hand Of Beauty" sync / 1[56]:[^:]*:Lakshmi:214D:/
-224.4 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215F:/
-231.4 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DD:/
-231.7 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215B:/
-245.0 "Divine Desire" sync / 1[56]:[^:]*:Lakshmi:214B:/
-247.1 "--chanchala end--"
+588.0 "Chanchala #1" sync / 1[56]:[^:]*:Lakshmi:2148:/
+601.8 "Divine Denial" sync / 1[56]:[^:]*:Lakshmi:2149:/
+610.0 "Hand Of Beauty" sync / 1[56]:[^:]*:Lakshmi:214D:/
+617.2 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215F:/
+624.2 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DD:/
+624.5 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215B:/
+637.8 "Divine Desire" sync / 1[56]:[^:]*:Lakshmi:214B:/
+639.9 "--chanchala end--"
 
-257.3 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
-269.7 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
-277.8 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
-281.5 "--untargetable--"
+650.1 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+662.5 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
+670.6 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
+674.3 "--untargetable--"
 
 ### More Adds
-287.1 "--targetable--"
-# infinite loop
-335.0 "--sync--" sync /.*/ window 0,50 jump 300
+679.9 "--targetable--"
 
 ### Hugging
-400.0 "Jagadishwari" sync / 1[56]:[^:]*:Lakshmi:2342:/ window 400,0
-421.4 "/dance"
-421.4 "--sync--" sync / 1[56]:[^:]*:Lakshmi:2159:/
-437.1 "Alluring Embrace" sync / 1[56]:[^:]*:Lakshmi:2343:/
-441.5 "--targetable--"
+2000.0 "Jagadishwari" sync / 1[56]:[^:]*:Lakshmi:2342:/ window 2000,0
+2021.4 "/dance"
+2021.4 "--sync--" sync / 1[56]:[^:]*:Lakshmi:2159:/
+2037.1 "Alluring Embrace" sync / 1[56]:[^:]*:Lakshmi:2343:/
+2041.5 "--targetable--"
 
 ### Chanchala #2
-441.7 "--sync--" sync / 14:[^:]*:Lakshmi:2148:/ window 50,10
-444.7 "Chanchala #2" sync / 1[56]:[^:]*:Lakshmi:2148:/
-458.5 "Divine Doubt" sync / 1[56]:[^:]*:Lakshmi:214A:/
-473.9 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215B:/
-484.0 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215F:/
-486.0 "--chanchala end--"
-509.5 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
-511.5 "Blissful Spear (Z)" sync / 1[56]:[^:]*:Lakshmi:2166:/
+2041.7 "--sync--" sync / 14:[^:]*:Lakshmi:2148:/ window 50,10
+2044.7 "Chanchala #2" sync / 1[56]:[^:]*:Lakshmi:2148:/
+2058.5 "Divine Doubt" sync / 1[56]:[^:]*:Lakshmi:214A:/
+2073.9 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215B:/
+2084.0 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215F:/
+2086.0 "--chanchala end--"
+2109.5 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+2111.5 "Blissful Spear (Z)" sync / 1[56]:[^:]*:Lakshmi:2166:/
 
-525.9 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
-528.8 "Blissful Spear (mid)" sync / 1[56]:[^:]*:Lakshmi:2156:/
-533.1 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215C:/
-544.3 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
-551.5 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
-558.6 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DC:/
-558.9 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
-569.0 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
+2125.9 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
+2128.8 "Blissful Spear (mid)" sync / 1[56]:[^:]*:Lakshmi:2156:/
+2133.1 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215C:/
+2144.3 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
+2151.5 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+2158.6 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DC:/
+2158.9 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
+2169.0 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
 
 ### Chanchala #3
-580.3 "Chanchala #3" sync / 1[56]:[^:]*:Lakshmi:2148:/
-595.6 "Divine Doubt" sync / 1[56]:[^:]*:Lakshmi:214A:/
-610.8 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215D:/
-636.5 "Divine Desire" sync / 1[56]:[^:]*:Lakshmi:214B:/
-638.2 "Blissful Spear (out)" sync / 1[56]:[^:]*:Lakshmi:2154:/
-650.8 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215D:/
-651.8 "Blissful Spear (Z)" sync / 1[56]:[^:]*:Lakshmi:2166:/
-664.0 "Stotram" sync / 1[56]:[^:]*:Lakshmi:249D:/
-666.1 "--chanchala end--"
-675.3 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
-682.5 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215C:/
-689.5 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DC:/
-689.8 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
-697.9 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
+2180.3 "Chanchala #3" sync / 1[56]:[^:]*:Lakshmi:2148:/
+2195.6 "Divine Doubt" sync / 1[56]:[^:]*:Lakshmi:214A:/
+2210.8 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215D:/
+2236.5 "Divine Desire" sync / 1[56]:[^:]*:Lakshmi:214B:/
+2238.2 "Blissful Spear (out)" sync / 1[56]:[^:]*:Lakshmi:2154:/
+2250.8 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215D:/
+2251.8 "Blissful Spear (Z)" sync / 1[56]:[^:]*:Lakshmi:2166:/
+2264.0 "Stotram" sync / 1[56]:[^:]*:Lakshmi:249D:/
+2266.1 "--chanchala end--"
+2275.3 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
+2282.5 "The Pall Of Light" sync / 1[56]:[^:]*:Lakshmi:215C:/
+2289.5 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DC:/
+2289.8 "The Path Of Light" sync / 1[56]:[^:]*:Lakshmi:215A:/
+2297.9 "Stotram" sync / 1[56]:[^:]*:Lakshmi:2147:/
 
-708.1 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
-718.3 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
-732.6 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DD:/
+2308.1 "The Pull Of Light" sync / 1[56]:[^:]*:Lakshmi:215E:/
+2318.3 "Alluring Arm" sync / 1[56]:[^:]*:Lakshmi:214E:/
+2332.6 "Blissful Hammer" sync / 1[56]:[^:]*:Lakshmi:21DD:/
 
 ### Chanchala #4
-732.8 "Chanchala #4" sync / 1[56]:[^:]*:Lakshmi:2148:/
-735.0 "--sync--" sync / 14:[^:]*:Lakshmi:2560:/ window 1000,1000
-750.0 "Divine Denial Enrage" sync / 1[56]:[^:]*:Lakshmi:2560:/
+2332.8 "Chanchala #4" sync / 1[56]:[^:]*:Lakshmi:2148:/
+2335.0 "--sync--" sync / 14:[^:]*:Lakshmi:2560:/ window 1000,1000
+2350.0 "Divine Denial Enrage" sync / 1[56]:[^:]*:Lakshmi:2560:/
diff --git a/timelines/src/main/resources/timeline/lapis_manalis.txt b/timelines/src/main/resources/timeline/lapis_manalis.txt
index d4ddc0ccb715..3c9d22ec8223 100644
--- a/timelines/src/main/resources/timeline/lapis_manalis.txt
+++ b/timelines/src/main/resources/timeline/lapis_manalis.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~#
 # Albion #
@@ -11,7 +12,8 @@ hideall "--sync--"
 
 # -ii 7A7D 7A7E
 
-0.0 "--sync--" sync / 00:0839::The Silvan Throne will be sealed off/ window 0,1
+# The Silvan Throne will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10B2:/ window 0,1
 6.0 "--sync--" sync / 1[56]:[^:]*:Albion:802C:/
 10.6 "Call of the Mountain" sync / 1[56]:[^:]*:Albion:7A7C:/
 
@@ -59,7 +61,8 @@ hideall "--sync--"
 
 # -ii 7F71 7A9D
 
-1000.0 "--sync--" sync / 00:0839::The Forum Messorum will be sealed off/ window 1000,1
+# Forum Messorum will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10B3:/ window 1000,1
 1010.2 "--sync--" sync / 1[56]:[^:]*:Galatea Magna:7F71:/ # manually added for early sync
 1015.2 "Waxing Cycle/Waning Cycle" sync / 1[56]:[^:]*:Galatea Magna:(7A91|7F6E):/
 1016.8 "--sync--" sync / 1[56]:[^:]*:Galatea Magna:7F6F:/
@@ -130,7 +133,8 @@ hideall "--sync--"
 # -ii 7FB7 7FB5 7FB8
 # -it "Cagnazzo"
 
-2000.0 "--sync--" sync / 00:0839::Deepspine will be sealed off/ window 2000,1
+# Deepspine will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10B4:/ window 2000,1
 2015.6 "Stygian Deluge" sync / 1[56]:[^:]*:Cagnazzo:79A3:/
 2025.4 "--sync--" sync / 1[56]:[^:]*:Cagnazzo:798F:/
 2038.0 "Antediluvian 1" sync / 1[56]:[^:]*:Cagnazzo:7990:/
diff --git a/timelines/src/main/resources/timeline/malikahs_well.txt b/timelines/src/main/resources/timeline/malikahs_well.txt
index b3c190212c12..4fbe34648018 100644
--- a/timelines/src/main/resources/timeline/malikahs_well.txt
+++ b/timelines/src/main/resources/timeline/malikahs_well.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 ### Greater Armadillo
 # -ii 3CEA 3CE8 -p 3CE5:115
-100.0 "--sync--" sync / 00:0839::Terminus will be sealed off/ window 100,0
+# Terminus will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BD5:/ window 100,0
 
 115.0 "Stone Flail" sync / 1[56]:[^:]*:Greater Armadillo:3CE5:/ window 115,5
 133.6 "Head Toss" sync / 1[56]:[^:]*:Greater Armadillo:3CE6:/
@@ -42,7 +43,8 @@ hideall "--sync--"
 
 ### Amphibious Talos
 # -ii 3CF0 -p 3CEB:515.5
-500.0 "--sync--" sync / 00:0839::Malikah's Gift will be sealed off/ window 500,0
+# Malikah's Gift will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BD6:/ window 500,0
 515.5 "Efface" sync / 1[56]:[^:]*:Amphibious Talos:3CEB:/ window 515.5,10
 527.1 "Wellbore" sync / 1[56]:[^:]*:Amphibious Talos:3CED:/
 531.3 "Geyser Eruption" sync / 1[56]:[^:]*:Amphibious Talos:3CEE:/
@@ -68,7 +70,8 @@ hideall "--sync--"
 
 ### Storge
 # -ii 3CF7 3CA8 41A8 -p 3CF1:1015
-1000.0 "--sync--" sync / 00:0839::Unquestioned Acceptance will be sealed off/ window 1000,0
+# Unquestioned Acceptance will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BD7:/ window 1000,0
 1015.0 "Intestinal Crank" sync / 1[56]:[^:]*:Storge:3CF1:/ window 1015,5
 1028.2 "Heretic's Fork" sync / 1[56]:[^:]*:Storge:3CF2:/
 1043.0 "Breaking Wheel" sync / 1[56]:[^:]*:Storge:3CF5:/
diff --git a/timelines/src/main/resources/timeline/matoyas_relict.txt b/timelines/src/main/resources/timeline/matoyas_relict.txt
index 5120c779b697..ecfcc8e30f24 100644
--- a/timelines/src/main/resources/timeline/matoyas_relict.txt
+++ b/timelines/src/main/resources/timeline/matoyas_relict.txt
@@ -6,7 +6,8 @@ hideall "--sync--"
 ### Mudman
 # -p 547F:1011
 # -ii 368 5481 5487 548E 548F 5490 5492
-1000.0 "--sync--" sync / 00:0839::The Clayclot Cauldron will be sealed off/ window 1000,0
+# Clayclot Cauldron will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E02:/ window 1000,0
 # Loop 3 times
 1011.0 "Hard Rock" sync / 1[56]:[^:]*:Mudman:547F:/ window 1012,10
 1020.2 "Petrified Peat" sync / 1[56]:[^:]*:Mudman:5480:/
@@ -45,7 +46,8 @@ hideall "--sync--"
 ### Nixie
 # -p 598F:2009.2
 # -ii 598E 5990 5992 5993 5994 5995 5996 5BB9
-2000.0 "--sync--" sync / 00:0839::The Clearnote Cauldron will be sealed off/ window 2000,0
+# Clearnote Cauldron will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E03:/ window 2000,0
 
 2009.2 "Crash-Smash" sync / 1[56]:[^:]*:Nixie:598F:/ window 2010,10
 2023.4 "Shower Power" sync / 1[56]:[^:]*:Nixie:5991:/
@@ -68,7 +70,8 @@ hideall "--sync--"
 ### Mother Porxie
 # -p 5913:3010.0
 # -ii 4A8F 5912 5914 5917 5918 591E 591F 5923 5925
-3000.0 "--sync--" sync / 00:0839::The Woebegone Workshop will be sealed off/ window 3000,0
+# Woebegone Workshop will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E05:/ window 3000,0
 
 3011.3 "Tender Loin" sync / 1[56]:[^:]*:Mother Porxie:5913:/ window 3012,10
 3029.5 "Huff And Puff" sync / 1[56]:[^:]*:Mother Porxie:5919:/
diff --git a/timelines/src/main/resources/timeline/mount_rokkon.txt b/timelines/src/main/resources/timeline/mount_rokkon.txt
index 6ea8e7c70c0d..75bf378e24a7 100644
--- a/timelines/src/main/resources/timeline/mount_rokkon.txt
+++ b/timelines/src/main/resources/timeline/mount_rokkon.txt
@@ -11,7 +11,8 @@ hideall "--sync--"
 # -p 83A9:1011.6 837E:1365.9 838F:1663.8
 # -ii 838A 8391 8382
 
-1000.0 "--sync--" sync / 00:0839::Last Glimpse will be sealed off/ window 10000,0
+# Last Glimpse will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10DC:/ window 10000,0
 1011.6 "Glory Neverlasting" sync / 1[56]:[^:]*:Yozakura the Fleeting:83A9:/
 1021.6 "Art of the Windblossom" sync / 1[56]:[^:]*:Yozakura the Fleeting:8369:/
 1030.7 "Oka Ranman" sync / 1[56]:[^:]*:Yozakura the Fleeting:836E:/
@@ -168,7 +169,8 @@ hideall "--sync--"
 # -p 85AD:2011.9
 # -ii 8597 86D2 878A 85A0 859A 859E 871C 85A4 85A7
 
-2000.0 "--sync--" sync / 00:0839::The Hall Of The Unseen will be sealed off/ window 10000,0
+# Hall of the Unseen will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10DF:/ window 10000,0
 2011.9 "Kenki Release" sync / 1[56]:[^:]*:Moko the Restless:85AD:/
 2022.1 "--middle--" sync / 1[56]:[^:]*:Moko the Restless:85AF:/
 2028.5 "Iai-kasumi-giri" sync / 1[56]:[^:]*:Moko the Restless:8587:/
@@ -418,7 +420,8 @@ hideall "--sync--"
 # -p 83A9:4011.6
 # -ii 8396 8399 839A 839D 839F
 
-4000.0 "--sync--" sync / 00:0839::The Hall Of Temptation will be sealed off/ window 10000,0
+# Hall of Temptation will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10DD:/ window 10000,0
 4011.6 "Glory Neverlasting" sync / 1[56]:[^:]*:Yozakura the Fleeting:83A9:/
 
 # -> door
@@ -536,7 +539,8 @@ hideall "--sync--"
 # -it "Shishu White Baboon"
 # -ii 84D4 8501 84EE 84E6 84E5 84E9 84E0 84FF 84F9 84F7 84F4 84F5
 
-5000.0 "--sync--" sync / 00:0839::The Hall Of Becoming will be sealed off/ window 10000,0
+# Hall of Becoming will be sealed off
+5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10E0:/ window 10000,0
 5012.6 "--sync--" sync / 14:[^:]*:Gorai the Uncaged:8500:/
 5017.6 "Unenlightenment" sync / 1[56]:[^:]*:Gorai the Uncaged:8500:/
 
@@ -715,7 +719,8 @@ hideall "--sync--"
 # -p 83A9:6012
 # -ii 83A2 83A3 83A8 8382 838A
 
-6000.0 "--sync--" sync / 00:0839::Autumn Rivers' End will be sealed off/ window 10000,0
+# Autumn Rivers' End will be sealed off
+6000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10DE:/ window 10000,0
 6012.0 "Glory Neverlasting" sync / 1[56]:[^:]*:Yozakura the Fleeting:83A9:/
 
 # -> no dogu
@@ -838,7 +843,8 @@ hideall "--sync--"
 # -p 83F5:7015.7
 # -ii 86DE 83DA 83DE 83DF 83E0 83E3 83E4 83E5 83E2 87F9 87FB 83DB 87A3 87A4 87A6 87AB 83ED 872B 83F2
 
-7000.0 "--sync--" sync / 00:0839::Stone's Silence will be sealed off/ window 10000,0
+# Stone's Silence will be sealed off
+7000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10E1:/ window 10000,0
 7015.7 "Enkyo" sync / 1[56]:[^:]*:Shishio:83F5:/
 7017.8 "--middle--" sync / 1[56]:[^:]*:Shishio:83F7:/
 7022.0 "Stormcloud Summons" sync / 1[56]:[^:]*:Shishio:83D7:/
@@ -1020,7 +1026,8 @@ hideall "--sync--"
 # -p 8042:8013
 # -ii 8058 8049 804A 804B 8047
 
-8000.0 "--sync--" sync / 00:0839::The Pond Of Spring Rain will be sealed off/ window 10000,0
+# Pond of Spring Rain will be sealed off
+8000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:10E2:/ window 10000,0
 8013.0 "Flagrant Combustion" sync / 1[56]:[^:]*:Enenra:8042:/
 8016.1 "--jump--" sync / 1[56]:[^:]*:Enenra:84C2:/
 8029.9 "Out of the Smoke" sync / 1[56]:[^:]*:Enenra:804C:/
diff --git a/timelines/src/main/resources/timeline/mt_gulg.txt b/timelines/src/main/resources/timeline/mt_gulg.txt
index 5765d07c49a2..6c2978ec0673 100644
--- a/timelines/src/main/resources/timeline/mt_gulg.txt
+++ b/timelines/src/main/resources/timeline/mt_gulg.txt
@@ -8,7 +8,8 @@ hideall "Rite Of The Sacrament"
 
 ### Forgiven Cruelty
 # -p 3CFB:113 -ii 3CFE 3CFD 4301 3CFF
-100.0 "--sync--" sync / 00:0839::The Perished Path will be sealed off/ window 100,0
+# The Perished Path will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BB6:/ window 100,0
 113.0 "Rake" sync / 1[56]:[^:]*:Forgiven Cruelty:3CFB:/ window 115,5
 121.2 "Lumen Infinitum" sync / 1[56]:[^:]*:Forgiven Cruelty:41B2:/
 138.3 "Typhoon Wing" sync / 1[56]:[^:]*:Forgiven Cruelty:3D00:/
@@ -44,7 +45,8 @@ hideall "Rite Of The Sacrament"
 
 ### Forgiven Whimsy
 # -p 3D0B:514.5 -ii 3D0C 3D07 3D0A
-500.0 "--sync--" sync / 00:0839::The White Gate will be sealed off/ window 500,0
+# The White Gate will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BB7:/ window 500,0
 514.5 "Sacrament Of Penance" sync / 1[56]:[^:]*:Forgiven Whimsy:3D0B:/ window 515,5
 518.3 "Reformation" sync / 1[56]:[^:]*:Forgiven Whimsy:3D04:/
 530.4 "Exegesis" sync / 1[56]:[^:]*:Forgiven Whimsy:425C:/
@@ -80,7 +82,8 @@ hideall "Rite Of The Sacrament"
 
 ### Forgiven Obscenity
 # -ii 3D15 4669 3D19 3D19 3D21 3D13 41CE 3D1B 3D20 -p 3D14:1014
-1000.0 "--sync--" sync / 00:0839::The Winding Flare will be sealed off/ window 1000,0
+# The Winding Flare will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BB8:/ window 1000,0
 1014.0 "Orison Fortissimo" sync / 1[56]:[^:]*:Forgiven Obscenity:3D14:/ window 1014,5
 1023.2 "Divine Diminuendo" sync / 1[56]:[^:]*:Forgiven Obscenity:3D16:/
 1032.4 "--sync--" sync / 1[56]:[^:]*:Forgiven Obscenity:3D17:/
diff --git a/timelines/src/main/resources/timeline/o10s.txt b/timelines/src/main/resources/timeline/o10s.txt
index 364acd269ffd..6488c094c29a 100644
--- a/timelines/src/main/resources/timeline/o10s.txt
+++ b/timelines/src/main/resources/timeline/o10s.txt
@@ -7,7 +7,7 @@ hideall "--sync--"
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.3 "Flip" sync / 1[56]:[^:]*:Midgardsormr:31AD:/ window 13,10
 23.5 "Spin" sync / 1[56]:[^:]*:Midgardsormr:31AE:/
-27.4 "Cardinals" sync /::31B3:/ # X hit, not sure of sync yet
+27.4 "Cardinals" sync / 1[56]:[^:]*:Midgardsormr:31B3:/ # X hit, not sure of sync yet
 
 35.9 "Spin" sync / 1[56]:[^:]*:Midgardsormr:31AC:/ # drift 0.029
 47.1 "Akh Morn" sync / 1[56]:[^:]*:Midgardsormr:31AB:/
diff --git a/timelines/src/main/resources/timeline/o12n.txt b/timelines/src/main/resources/timeline/o12n.txt
index 46fedfeaa4cc..adabdf7c0778 100644
--- a/timelines/src/main/resources/timeline/o12n.txt
+++ b/timelines/src/main/resources/timeline/o12n.txt
@@ -183,7 +183,8 @@ hideall "--sync--"
 ### Phase 4: Laser Show Forever
 1800.0 "Enrage" sync / 00:0044:[^:]*:\<blip\> Warning\. Calculations indicate/ window 1800,0
 
-1806.0 "Laser Shower Enrage" sync / 1[56]:[^:]*:(Omega-M:3311|Omega:3312):/ window 20,20
+1806.0 "Laser Shower Enrage" sync / 1[56]:[^:]*:Omega-M:3311:/ window 20,20
+1806.0 "Laser Shower Enrage" sync / 1[56]:[^:]*:Omega:3312:/ window 20,20
 1812.0 "Laser Shower Enrage"
 1818.0 "Laser Shower Enrage"
 1824.0 "Laser Shower Enrage"
diff --git a/timelines/src/main/resources/timeline/o6s.txt b/timelines/src/main/resources/timeline/o6s.txt
index efeeddc4361c..b712c4cb928e 100644
--- a/timelines/src/main/resources/timeline/o6s.txt
+++ b/timelines/src/main/resources/timeline/o6s.txt
@@ -24,7 +24,7 @@ hideall "--sync--"
 130 "Release" sync / 1[56]:[^:]*:Demon Chadarnook:2804:/
 
 143 "Possession" sync / 1[56]:[^:]*:Demon Chadarnook:2803:/ window 20
-150 "Easterlies" sync / 03:........:Easterly:/ 
+150 "Easterlies" sync / 03:........:Easterly:/
 153 "Rock Hard" sync / 1[56]:[^:]*:Portrayal of Earth:2812:/
 155 "Demonic Shear" sync / 1[56]:[^:]*:Demon Chadarnook:2829:/
 164 "Demonic Howl" sync / 1[56]:[^:]*:Demon Chadarnook:282B:/
@@ -57,7 +57,7 @@ hideall "--sync--"
 352 "Release" sync / 1[56]:[^:]*:Demon Chadarnook:2804:/
 
 365 "Possession" sync / 1[56]:[^:]*:Demon Chadarnook:2803:/ window 20
-373 "Easterlies" sync / 03:........:Easterly:/ 
+373 "Easterlies" sync / 03:........:Easterly:/
 375 "Rock Hard" sync / 1[56]:[^:]*:Portrayal of Earth:2812:/
 376 "Demonic Wave" sync / 1[56]:[^:]*:Portrayal of Water:2830:/
 384 "Demonic Howl" sync / 1[56]:[^:]*:Demon Chadarnook:282B:/
@@ -93,11 +93,11 @@ hideall "--sync--"
 590 "Release" sync / 1[56]:[^:]*:Demon Chadarnook:2804:/
 
 603 "Possession" sync / 1[56]:[^:]*:Demon Chadarnook:2803:/ window 20
-611 "Easterlies" sync / 03:........:Easterly:/ 
+611 "Easterlies" sync / 03:........:Easterly:/
 613 "Rock Hard" sync / 1[56]:[^:]*:Portrayal of Earth:2812:/
 614 "Demonic Wave" sync / 1[56]:[^:]*:Portrayal of Water:2830:/
 622 "Demonic Howl" sync / 1[56]:[^:]*:Demon Chadarnook:282B:/
 626 "Featherlance" sync / 1[56]:[^:]*:Easterly:283E:/
 
-626 "--sync--" sync / 1[56]:[^:]*:284D:Demon Chadarnook:/
+626 "--sync--" sync / 14:[^:]*:Demon Chadarnook:284D:/
 641 "Enrage"
diff --git a/timelines/src/main/resources/timeline/o7s.txt b/timelines/src/main/resources/timeline/o7s.txt
index ff772fc8c752..3d830acd7ef0 100644
--- a/timelines/src/main/resources/timeline/o7s.txt
+++ b/timelines/src/main/resources/timeline/o7s.txt
@@ -8,7 +8,7 @@ hideall "--sync--"
 31 "Atomic Ray" sync / 1[56]:[^:]*:Guardian:278D:/
 40 "Prey" sync / 1[56]:[^:]*:Guardian:278A:/
 49 "Load?" sync / 1[56]:[^:]*:Guardian:275C:/
-50 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]+:[^:]*:[^:]*:[^:]*:Guardian:/ jump 1050
+50 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 1050
 52 "Shockwave?"
 
 # This is Version A of the encounter, with Bibliotaph first
@@ -92,8 +92,8 @@ hideall "--sync--"
 
 # Divergence point
 509 "Load/Skip?" sync / 1[56]:[^:]*:Guardian:(275C|2773):/
-510 "--sync--" sync / 1A:5D4:Bibliotaph Simulation:[^:]+:[^:]*:[^:]*:[^:]*:Guardian:/ jump 2510       # Bibliotaph buff, jump to A1
-510 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]+:[^:]*:[^:]*:[^:]*:Guardian:/ jump 3510         # Dadaluma buff, jump to A2
+510 "--sync--" sync / 1A:5D4:Bibliotaph Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 2510       # Bibliotaph buff, jump to A1
+510 "--sync--" sync / 1A:5D3:Dadaluma Simulation:[^:]*:[^:]*:[^:]*:[^:]*:Guardian:/ jump 3510         # Dadaluma buff, jump to A2
 512 "Shockwave?"
 519 "Demon Simulation?"
 
diff --git a/timelines/src/main/resources/timeline/orbonne_monastery.txt b/timelines/src/main/resources/timeline/orbonne_monastery.txt
index 25c2c0269714..1f2448b022ca 100644
--- a/timelines/src/main/resources/timeline/orbonne_monastery.txt
+++ b/timelines/src/main/resources/timeline/orbonne_monastery.txt
@@ -10,7 +10,8 @@ hideall "--sync--"
 # -p 373B:1012 -ii 3744 3742
 
 ### Phase 1
-1000.0 "--sync--" sync / 00:0839::The Realm of the Machinists will be sealed off/ window 1000,0
+# Realm of the Machinists will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B35:/ window 1000,0
 1012.0 "Energy Burst" sync / 1[56]:[^:]*:Mustadio:373B:/
 1022.7 "Arm Shot" sync / 1[56]:[^:]*:Mustadio:3739:/
 1033.2 "L/R Handgonne" sync / 1[56]:[^:]*:Mustadio:373[EF]:/
@@ -92,7 +93,8 @@ hideall "--sync--"
 # -p 3867:2012.8 3861:2504 -ii 3865 3853 3859 3AD2 3851 3860
 
 ### Phase 1
-2000.0 "--sync--" sync / 00:0839::The Realm of the Templars will be sealed off/ window 2000,0
+# Realm of the Templars will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B36:/ window 2000,0
 2012.8 "Divine Light" sync / 1[56]:[^:]*:Agrias:3867:/
 2023.3 "Thunder Slash" sync / 1[56]:[^:]*:Agrias:3866:/
 2043.5 "Judgment Blade" sync / 1[56]:[^:]*:Agrias:3857:/
@@ -152,7 +154,8 @@ hideall "--sync--"
 # Dark Crusader Trash #
 #######################
 # -p 377F:3500 -ii 3780
-3000.0 "--sync--" sync / 00:0839::The lifeless alley will be sealed off/ window 3000,0
+# Lifeless Alley will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B37:/ window 3000,0
 3491.0 "--sync--" sync / 14:[^:]*:Dark Crusader:377F:/ window 500,0
 3500.0 "Dark Rite" sync / 1[56]:[^:]*:Dark Crusader:377F:/
 3509.0 "Noahionto" sync / 1[56]:[^:]*:Dark Crusader:377E:/
@@ -180,7 +183,8 @@ hideall "--sync--"
 #-p 3751:4015 36EB:4400 -ii 375F 3756 3757 3759 376B 3753 3752 375E 374B 3AD4 3AD3 3766 3767 3764 375B 374E
 
 ### Phase 1
-4000.0 "--sync--" sync / 00:0839::The Realm of the Thunder God will be sealed off/ window 4000,0
+# Realm of the Thunder God will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B38:/ window 4000,0
 4015.0 "Cleansing Strike" sync / 1[56]:[^:]*:The Thunder God:3751:/
 4032.5 "Sword L/R" sync / 1[56]:[^:]*:The Thunder God:374[9A]:/
 4042.5 "Sword In/Out" sync / 1[56]:[^:]*:The Thunder God:37(50|4F):/
@@ -236,7 +240,8 @@ hideall "--sync--"
 # -p 3899:5015 38D8:5413 3A79:5800 38C2:6007 -ii 389A 3897 38EA 38CC 3896 3C78 3A9B 38B6 389E 38BC 38B9 38BA 38BB 38BE 38AB 38A8 38A9 389F 38A6 38BD 38AE 38AD 3C78 38CF 38CD
 
 ### Phase 1: Throwbacks
-5000.0 "--sync--" sync / 00:0839::The Crystalline Gaol will be sealed off/ window 5000,0
+# Crystalline Gaol will be sealed off
+5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B39:/ window 5000,0
 5015.0 "Holy IV Ground" sync / 1[56]:[^:]*:Ultima, the High Seraph:3899:/
 5029.2 "Auralight" sync / 1[56]:[^:]*:Ultima, the High Seraph:3898:/
 5035.7 "Holy IV" sync / 1[56]:[^:]*:Ultima, the High Seraph:389B:/
diff --git a/timelines/src/main/resources/timeline/p10n.txt b/timelines/src/main/resources/timeline/p10n.txt
index 752e1e18e1f7..0d2d914983f2 100644
--- a/timelines/src/main/resources/timeline/p10n.txt
+++ b/timelines/src/main/resources/timeline/p10n.txt
@@ -26,7 +26,7 @@ hideall "--sync--"
 0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
 
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-7.9 "--sync--" sync / 14:[^:]*::Pand\u00e6monium:8259:/ window 15,15
+7.9 "--sync--" sync / 14:[^:]*:Pand\u00e6monium:8259:/ window 15,15
 10.9 "Silkspit (marked)" sync / 1[56]:[^:]*:Pand\u00e6monium:8259:/
 23.0 "Silkspit (resolves)" sync / 1[56]:[^:]*:Pand\u00e6monium:825A:/
 35.4 "Pandaemoniac Pillars" sync / 1[56]:[^:]*:Pand\u00e6monium:825D:/
diff --git a/timelines/src/main/resources/timeline/paglthan.txt b/timelines/src/main/resources/timeline/paglthan.txt
index c9d299573e3f..2c6c4d29e6c8 100644
--- a/timelines/src/main/resources/timeline/paglthan.txt
+++ b/timelines/src/main/resources/timeline/paglthan.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 5C52 5C53
 
-0 "Start" sync / 00:0839::The Gathering Ring will be sealed off/ window 0,1
+# Gathering Ring will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:B7B:/ window 0,1
 12.6 "Critical Rip" sync / 1[56]:[^:]*:Amhuluk:5C4E:/ window 12.6,10
 18.8 "--sync--" sync / 1[56]:[^:]*:Amhuluk:5C51:/
 30.2 "Lightning Bolt" sync / 1[56]:[^:]*:Amhuluk:5C4B:/
@@ -49,7 +50,8 @@ hideall "--sync--"
 
 # -ii 5B56 5B50
 
-2000.0 "Start" sync / 00:0839::Sunseat will be sealed off/ window 2000,5
+# Sunseat will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:B7D:/ window 2000,5
 2010.0 "Twisted Scream" sync / 1[56]:[^:]*:Lunar Bahamut:5B47:/ window 2010,10
 2015.0 "Upburst x4" # sync / 1[56]:[^:]*:Lunar Nail:605B:/
 2021.6 "Big Burst x4" # sync / 1[56]:[^:]*:Lunar Nail:5B48:/
diff --git a/timelines/src/main/resources/timeline/qitana_ravel.txt b/timelines/src/main/resources/timeline/qitana_ravel.txt
index 93d26932dca2..15e95f111de1 100644
--- a/timelines/src/main/resources/timeline/qitana_ravel.txt
+++ b/timelines/src/main/resources/timeline/qitana_ravel.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 ### Lozatl
 # -p 3C89:113.7
-100.0 "--sync--" sync / 00:0839::The Divine Threshold will be sealed off/ window 100,0
+# The Divine Threshold will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BCC:/ window 100,0
 
 113.7 "Stonefist" sync / 1[56]:[^:]*:Lozatl:3C89:/ window 114,5
 121.0 "Sun Toss" sync / 1[56]:[^:]*:Lozatl:3C8A:/
@@ -42,7 +43,8 @@ hideall "--sync--"
 
 ### Batsquatch
 # -ii 3C94 3C96 3C97 3C95 -p 3C91:514.5
-500.0 "--sync--" sync / 00:0839::Shadowed Hollow will be sealed off/ window 500,0
+# Shadowed Hollow will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BCF:/ window 500,0
 
 514.5 "Ripper Fang" sync / 1[56]:[^:]*:Batsquatch:3C91:/ window 515,5
 525.7 "Soundwave" sync / 1[56]:[^:]*:Batsquatch:3C92:/
@@ -73,7 +75,8 @@ hideall "--sync--"
 
 ### Eros
 #
-1000.0 "--sync--" sync / 00:0839::The Song of Ox'Gatorl will be sealed off/ window 1000,0
+# The Song of Ox'Gatorl will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BD2:/ window 1000,0
 
 1015.0 "Rend" sync / 1[56]:[^:]*:Eros:3C99:/ window 1015,5
 1026.2 "Hound Out Of Heaven" sync / 1[56]:[^:]*:Eros:3C9A:/
diff --git a/timelines/src/main/resources/timeline/ridorana_lighthouse.txt b/timelines/src/main/resources/timeline/ridorana_lighthouse.txt
index c1d4c67054fb..a45b4c69504e 100644
--- a/timelines/src/main/resources/timeline/ridorana_lighthouse.txt
+++ b/timelines/src/main/resources/timeline/ridorana_lighthouse.txt
@@ -7,7 +7,8 @@ hideall "--sync--"
 ###########
 # Famfrit #
 ###########
-0 "Start" sync / 00:0839::Echoes from Time's Garden will be sealed off/ window 0,1
+# Echoes from Time's Garden will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:998:/ window 0,1
 13 "Tide Pod" sync / 1[56]:[^:]*:Famfrit, The Darkening Cloud:2C3E:/ window 13,1
 26 "Water IV" sync / 1[56]:[^:]*:Famfrit, The Darkening Cloud:2C3D:/
 35 "Briny Cannonade" sync / 1[56]:[^:]*:Famfrit, The Darkening Cloud:2C45:/
@@ -63,7 +64,8 @@ hideall "--sync--"
 # Belias #
 ##########
 
-1000 "Start" sync / 00:0839::The Spire's Bounds will be sealed off/ window 1000,0
+# The Spire's Bounds will be sealed off
+1000 "Start" sync / 29:[^:]*:7DC:[^:]*:99A:/ window 1000,0
 1012 "Fire" sync / 1[56]:[^:]*:Belias, the Gigas:2CDB:/ window 1012,5
 1024 "Fire IV" sync / 1[56]:[^:]*:Belias, the Gigas:2CDC:/
 1033 "Time Eruption" sync / 1[56]:[^:]*:Belias, the Gigas:2CDE:/
@@ -123,7 +125,8 @@ hideall "--sync--"
 ###############
 # Construct 7 #
 ###############
-2000 "Start" sync / 00:0839::The Cleft of Profaning Wind will be sealed off/ window 2000,0
+# The Cleft of Profaning Wind will be sealed off
+2000 "Start" sync / 29:[^:]*:7DC:[^:]*:99C:/ window 2000,0
 2016 "Destroy" sync / 1[56]:[^:]*:Construct 7:2C5A:/ window 2016,0
 2026 "Ignite" sync / 1[56]:[^:]*:Construct 7:2C67:/
 2029 "Accelerate" sync / 1[56]:[^:]*:Construct 7:2C65:/
@@ -185,7 +188,8 @@ hideall "--sync--"
 
 
 ### Yiazmat
-3000 "Start" sync / 00:0839::The Clockwork Coliseum will be sealed off/ window 3000,0
+# The Clockwork Coliseum will be sealed off
+3000 "Start" sync / 29:[^:]*:7DC:[^:]*:99D:/ window 3000,0
 3016 "Rake (single)" sync / 1[56]:[^:]*:Yiazmat:2C26:/ window 3016,0
 3026 "Gust Front" duration 4
 3034 "Stone Breath" sync / 1[56]:[^:]*:Yiazmat:2C29:/
diff --git a/timelines/src/main/resources/timeline/royal_city_of_rabanastre.txt b/timelines/src/main/resources/timeline/royal_city_of_rabanastre.txt
index 22263196844a..cceb95731f9f 100644
--- a/timelines/src/main/resources/timeline/royal_city_of_rabanastre.txt
+++ b/timelines/src/main/resources/timeline/royal_city_of_rabanastre.txt
@@ -10,7 +10,8 @@ hideall "--start--"
 # -ii 2638 2639 2634 263E 2714 273E 263F 2646 2642
 # -it "Mateus, The Corrupt"
 
-0.0 "--start--" sync / 00:0839::The Crumbling Bridge will be sealed off/ window 0,1
+# Crumbling Bridge will be sealed off
+0.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:949:/ window 0,1
 # TODO: does this only start when the adds are dead?
 22.6 "--sync--" sync / 14:[^:]*:Mateus, The Corrupt:2633:/ window 30,10
 
@@ -60,7 +61,8 @@ hideall "--start--"
 # -ii 25C2 25C6 266E
 # -it "Hashmal, Bringer of Order"
 
-1000.0 "--start--" sync / 00:0839::The Palace Square will be sealed off/ window 10000,0
+# Palace Square will be sealed off
+1000.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:94C:/ window 10000,0
 1011.0 "--sync--" sync / 14:[^:]*:Hashmal, Bringer of Order:25D8:/ window 20,20
 1015.0 "Quake IV" sync / 1[56]:[^:]*:Hashmal, Bringer of Order:25D8:/
 1020.4 "Jagged Edge 1" #sync / 1[56]:[^:]*:Hashmal, Bringer of Order:25CD:/
@@ -171,7 +173,8 @@ hideall "--start--"
 # -ii 2681 2682 2684 2677 2678 2679 267A 267B 267C 267D 267E 267F 268C 2672 2673 268B 2686 2687 367 368
 # -it "Rofocale"
 
-2000.0 "--start--" sync / 00:0839::The Lesalia Garden Ruins will be sealed off/ window 10000,0
+# Lesalia Garden Ruins will be sealed off
+2000.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:94D:/ window 10000,0
 2012.8 "--sync--" sync / 14:[^:]*:Rofocale:2680:/ window 20,20
 2015.8 "Crush Helm" sync / 1[56]:[^:]*:Rofocale:2680:/ duration 3.4
 2035.5 "Chariot" sync / 1[56]:[^:]*:Rofocale:2674:/
@@ -286,7 +289,8 @@ hideall "--start--"
 # Note: Coldblood (2625) is ignored because that's when the boss disappears?
 
 ## Phase 1
-4000.0 "--start--" sync / 00:0839::The Lesalia Temple Ruins will be sealed off/ window 10000,0
+# Lesalia Temple Ruins will be sealed off
+4000.0 "--start--" sync / 29:[^:]*:7DC:[^:]*:94E:/ window 10000,0
 4006.7 "--sync--" sync / 14:[^:]*:Argath Thadalfus:262D:/ window 20,20
 4009.7 "Crippling Blow" sync / 1[56]:[^:]*:Argath Thadalfus:262D:/
 4017.9 "Crush Weapon x3" sync / 1[56]:[^:]*:Argath Thadalfus:2628:/
diff --git a/timelines/src/main/resources/timeline/sephirot-un.txt b/timelines/src/main/resources/timeline/sephirot-un.txt
index cb045efa71da..14930e55a679 100644
--- a/timelines/src/main/resources/timeline/sephirot-un.txt
+++ b/timelines/src/main/resources/timeline/sephirot-un.txt
@@ -7,8 +7,7 @@ hideall "--sync--"
 
 0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
 
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.5 "--sync--" sync / 1[56]:[^:]*:Sephirot:368:/ window 2.5,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 7.1 "Triple Trial" sync / 1[56]:[^:]*:Sephirot:7693:/ window 7.1,5
 11.2 "Tiferet" sync / 1[56]:[^:]*:Sephirot:7695:/
 17.4 "Tiferet" sync / 1[56]:[^:]*:Sephirot:7695:/
diff --git a/timelines/src/main/resources/timeline/shinryu.txt b/timelines/src/main/resources/timeline/shinryu.txt
index 2853da5b1101..e98d4e0c703b 100644
--- a/timelines/src/main/resources/timeline/shinryu.txt
+++ b/timelines/src/main/resources/timeline/shinryu.txt
@@ -8,7 +8,7 @@ hideall "--sync--"
 
 0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
 
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 20.6 "Tidal Wave" sync / 1[56]:[^:]*:Shinryu:1FAA:/ window 20.6,5
 38.8 "Hypernova/Levinbolt" sync / 1[56]:[^:]*:Right Wing:1F9[9B]:/
 49.9 "Akh Morn" sync / 1[56]:[^:]*:Shinryu:1FA4:/
diff --git a/timelines/src/main/resources/timeline/shisui_of_the_violet_tides.txt b/timelines/src/main/resources/timeline/shisui_of_the_violet_tides.txt
index 79ffec6753fd..de9a29132edc 100644
--- a/timelines/src/main/resources/timeline/shisui_of_the_violet_tides.txt
+++ b/timelines/src/main/resources/timeline/shisui_of_the_violet_tides.txt
@@ -7,7 +7,8 @@ hideall "--sync--"
 # -ic "Kamikiri"
 
 # Phase 1: 100% -> 90%, autos + mini busters
-0.0 "Start" sync / 00:0839::The Harutsuge Gate will be sealed off/ window 10000,0
+# Harutsuge Gate will be sealed off
+0.0 "Start" sync / 29:[^:]*:7DC:[^:]*:796:/ window 10000,0
 4.5 "Sharp Strike" sync / 1[56]:[^:]*:Amikiri:1F72:/ window 20,20
 12.7 "Sharp Strike" #sync / 1[56]:[^:]*:Amikiri:1F72:/
 20.9 "Sharp Strike" #sync / 1[56]:[^:]*:Amikiri:1F72:/
@@ -42,7 +43,8 @@ hideall "--sync--"
 # -ii 1F7E 1F7D
 
 # Phase 1: 100 -> 90%, autos + mini busters
-1000.0 "Start" sync / 00:0839::The Akashio Hall will be sealed off/ window 10000,0
+# Akashio Hall will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:797:/ window 10000,0
 1006.4 "Tornadogenesis" sync / 1[56]:[^:]*:Ruby Princess:1F7F:/ window 20,20
 1013.5 "Tornadogenesis" #sync / 1[56]:[^:]*:Ruby Princess:1F7F:/
 1020.6 "Tornadogenesis" #sync / 1[56]:[^:]*:Ruby Princess:1F7F:/
@@ -116,7 +118,8 @@ hideall "--sync--"
 # -it "Shisui Yohi"
 
 # Phase 1: 100% -> 90%, autos and mini busters
-2000.0 "Start" sync / 00:0839::Shisui Gokagura will be sealed off/ window 10000,0
+# Shisui Gokagura will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:798:/ window 10000,0
 2006.5 "Foul Nail" sync / 1[56]:[^:]*:Shisui Yohi:1F87:/
 2013.6 "Foul Nail" sync / 1[56]:[^:]*:Shisui Yohi:1F87:/
 
diff --git a/timelines/src/main/resources/timeline/sirensong_sea.txt b/timelines/src/main/resources/timeline/sirensong_sea.txt
index e02bbe98af97..2e42c7d84b22 100644
--- a/timelines/src/main/resources/timeline/sirensong_sea.txt
+++ b/timelines/src/main/resources/timeline/sirensong_sea.txt
@@ -7,7 +7,8 @@ hideall "--sync--"
 # -p 1F56:18.5
 # -ii 1F5A
 
-0.0 "Start" sync / 00:0839::Spae Rock will be sealed off/ window 0,1
+# Spae Rock will be sealed off
+0.0 "Start" sync / 29:[^:]*:7DC:[^:]*:7A9:/ window 0,1
 18.5 "Amorphous Applause" sync / 1[56]:[^:]*:Lugat:1F56:/
 29.6 "Hydroball" sync / 1[56]:[^:]*:Lugat:1F57:/
 
@@ -34,7 +35,8 @@ hideall "--sync--"
 # -p 1F5E:1017.5
 # -ii 1F5D
 
-1000.0 "Start" sync / 00:0839::Warden's Delight will be sealed off/ window 1000,5
+# Warden's Delight will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:7AB:/ window 1000,5
 1017.5 "Shadowflow" sync / 1[56]:[^:]*:The Governor:1F5E:/
 1018.0 "--sync--" sync / 1[56]:[^:]*:The Governor:1F5F:/
 1034.6 "Bloodburst" sync / 1[56]:[^:]*:The Governor:1F5C:/
@@ -67,7 +69,8 @@ hideall "--sync--"
 # -p 1F69:2011.5
 # -ii 1F63
 
-2000.0 "Start" sync / 00:0839::Glowering Krautz will be sealed off/ window 2000,5
+# Glowering Krautz will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:7AD:/ window 2000,5
 2011.5 "Virgin Tears" sync / 1[56]:[^:]*:Lorelei:1F69:/
 2024.7 "Morbid Advance/Morbid Retreat" sync / 1[56]:[^:]*:Lorelei:1F6[56]:/
 2033.9 "Head Butt" sync / 1[56]:[^:]*:Lorelei:1F64:/
diff --git a/timelines/src/main/resources/timeline/smileton.txt b/timelines/src/main/resources/timeline/smileton.txt
index 5087ddb3d7f1..02dbb225455d 100644
--- a/timelines/src/main/resources/timeline/smileton.txt
+++ b/timelines/src/main/resources/timeline/smileton.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~#
 # FACE #
@@ -12,7 +13,8 @@ hideall "--sync--"
 # -p 6735:1009
 # -ii 6741 6736 6737 6C5E 673A 673B 673C 673D
 
-1000.0 "--sync--" sync / 00:0839::Smileport will be sealed off/ window 10000,0
+# Smileport will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:EBE:/ window 10000,0
 1009.0 "Lines of Fire" sync / 1[56]:[^:]*:Face:6735:/
 1018.1 "Mixed Feelings" sync / 1[56]:[^:]*:Face:6738:/
 1023.2 "Lines of Fire" sync / 1[56]:[^:]*:Face:6735:/
@@ -53,7 +55,8 @@ hideall "--sync--"
  # -p 6745:2011
  # -ii 6749 674B
 
-2000.0 "--sync--" sync / 00:0839::The Welcome Wheel will be sealed off/ window 10000,0
+# The Welcome Wheel will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:EBF:/ window 10000,0
 2011.0 "Circular Saw" sync / 1[56]:[^:]*:Frameworker:6745:/
 2017.6 "--sync--" sync / 1[56]:[^:]*:Frameworker:674A:/
 2022.8 "Leap Forward" sync / 1[56]:[^:]*:Frameworker:6746:/
@@ -80,7 +83,8 @@ hideall "--sync--"
 # -p 674E:3009
 # -ii 674C 6755
 
-3000.0 "--sync--" sync / 00:0839::The Frame will be sealed off/ window 10000,0
+# The Frame will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:EC0:/ window 10000,0
 3009.0 "Explosives Distribution" sync / 1[56]:[^:]*:The Big Cheese:674E:/
 3022.2 "Iron Kiss" sync / 1[56]:[^:]*:Bomb:674D:/
 3028.2 "Piercing Missile" sync / 1[56]:[^:]*:The Big Cheese:6751:/
diff --git a/timelines/src/main/resources/timeline/sohm_al.txt b/timelines/src/main/resources/timeline/sohm_al.txt
index 53a839721afb..19ee9cb933af 100644
--- a/timelines/src/main/resources/timeline/sohm_al.txt
+++ b/timelines/src/main/resources/timeline/sohm_al.txt
@@ -7,7 +7,8 @@ hideall "--Reset--"
 ### Raskovnik
 # -p ED1:6.2
 
-0 "Start" sync / 00:0839::Greenlinn will be sealed off/ window 0,1
+# Greenlinn will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:649:/ window 0,1
 6.2 "Bloody Caress" sync / 1[56]:[^:]*:Raskovnik:ED1:/ window 6.2,0
 12.3 "--sync--" sync / 1[56]:[^:]*:Raskovnik:ED2:/
 17.9 "Acid Rain" sync / 1[56]:[^:]*:Raskovnik:ED7:/
@@ -71,7 +72,8 @@ hideall "--Reset--"
 # -p 1382:1006.1
 # -ic "Chyme Of The Mountain"
 
-1000.0 "Start" sync / 00:0839::The Wound will be sealed off/ window 1000,1
+# The Wound will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:64C:/ window 1000,1
 
 1006.1 "Third Leg Forward" sync / 1[56]:[^:]*:Myath:1382:/ window 6.1,5
 1011.2 "Overbite" sync / 1[56]:[^:]*:Myath:EDB:/
@@ -114,7 +116,8 @@ hideall "--Reset--"
 # -p EE3:2006
 # -ic "Comet"
 
-2000.0 "Start" sync / 00:0839::Hess Afah will be sealed off/ window 2000,1
+# Hess Afah will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:64D:/ window 2000,1
 
 2006.0 "Abyssic Buster" sync / 1[56]:[^:]*:Tioman:EE3:/ window 6,6
 2013.2 "Chaos Blast" sync / 1[56]:[^:]*:Tioman:EE5:/
diff --git a/timelines/src/main/resources/timeline/sohm_al_hard.txt b/timelines/src/main/resources/timeline/sohm_al_hard.txt
index 2446707cd0f3..feda47218118 100644
--- a/timelines/src/main/resources/timeline/sohm_al_hard.txt
+++ b/timelines/src/main/resources/timeline/sohm_al_hard.txt
@@ -10,7 +10,8 @@ hideall "--Reset--"
 
 # -ic "Spore Sac"
 
-0.0 "--sync--" sync / 00:0839::The Wound will be sealed off/ window 0,1
+# The Wound will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:64C:/ window 0,1
 2.4 "--sync--" sync / 1[56]:[^:]*:The Leightonward:5B5:/ window 2.4,1
 6.1 "Wild Horn" sync / 1[56]:[^:]*:The Leightonward:1C2D:/ window 6.1,5
 13.2 "Inflammable Fumes (Readies)" sync / 1[56]:[^:]*:The Leightonward:1C30:/
@@ -62,7 +63,8 @@ hideall "--Reset--"
 
 # -ii 1C3F
 
-2000.0 "--sync--" sync / 00:0839::The Lava Tube will be sealed off/ window 2000,1
+# The Lava Tube will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:763:/ window 2000,1
 2012.0 "Molten Silk (Front)" sync / 1[56]:[^:]*:Lava Scorpion:1C43:/ window 12,5
 2022.2 "Flying Press" sync / 1[56]:[^:]*:Lava Scorpion:1C3E:/
 2038.4 "Deadly Thrust" sync / 1[56]:[^:]*:Lava Scorpion:1C40:/
diff --git a/timelines/src/main/resources/timeline/sophia-un.txt b/timelines/src/main/resources/timeline/sophia-un.txt
index e7a267706aeb..8a5af712fbd5 100644
--- a/timelines/src/main/resources/timeline/sophia-un.txt
+++ b/timelines/src/main/resources/timeline/sophia-un.txt
@@ -1,5 +1,7 @@
 # This file was autogenerated from running ts-node util/sync_files.ts.
 # DO NOT EDIT THIS FILE DIRECTLY.
+# Edit the source file below and then run `npm run sync-files`
+# Source: ui/raidboss/data/03-hw/trial/sophia-ex.txt
 
 # Containment Bay S1-T6 (Unreal)
 # Sophia Unreal
diff --git a/timelines/src/main/resources/timeline/st_mocianne_hard.txt b/timelines/src/main/resources/timeline/st_mocianne_hard.txt
index a8a72b50fa68..8f1fc23226c2 100644
--- a/timelines/src/main/resources/timeline/st_mocianne_hard.txt
+++ b/timelines/src/main/resources/timeline/st_mocianne_hard.txt
@@ -8,7 +8,8 @@ hideall "--sync--"
 
 # -ii 2E51 2E4C
 
-0 "Start" sync / 00:0839::Zymology will be sealed off/ window 0,1
+# Zymology will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:68D:/ window 0,1
 9.7 "Odious Air" sync / 1[56]:[^:]*:Nullchu:2E49:/ window 9.7,5
 21.8 "Vine Whip" sync / 1[56]:[^:]*:Nullchu:2E48:/
 33.9 "--sync--" sync / 1[56]:[^:]*:Nullchu:2E4D:/
@@ -51,7 +52,8 @@ hideall "--sync--"
 # -ii 312D 3131 3133 313F
 
 
-1000.0 "Start" sync / 00:0839::The Soil Bed will be sealed off/ window 1000,5
+# The Soil Bed will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:AAA:/ window 1000,5
 1008.9 "Stone II" sync / 1[56]:[^:]*:Lakhamu:312A:/ window 1008.9,10
 1019.5 "Tectonics" sync / 1[56]:[^:]*:Lakhamu:312C:/
 1039.1 "Landslip" sync / 1[56]:[^:]*:Lakhamu:3132:/
@@ -111,7 +113,8 @@ hideall "--sync--"
 
 # -ii 3139 321C 33A0
 
-2000.0 "Start" sync / 00:0839::Kingsloam will be sealed off/ window 2000,5
+# Kingsloam will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:AAF:/ window 2000,5
 2008.6 "Mudsling" sync / 1[56]:[^:]*:Tokkapchi:3135:/
 2021.8 "Quickmire" sync / 1[56]:[^:]*:Tokkapchi:3136:/
 2028.8 "Quagmire" sync / 1[56]:[^:]*:Tokkapchi:3138:/
diff --git a/timelines/src/main/resources/timeline/stigma_dreamscape.txt b/timelines/src/main/resources/timeline/stigma_dreamscape.txt
index 1ee76fa0208b..a078661868b7 100644
--- a/timelines/src/main/resources/timeline/stigma_dreamscape.txt
+++ b/timelines/src/main/resources/timeline/stigma_dreamscape.txt
@@ -3,14 +3,16 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 
 #~~~~~~~~~~~~~#
 # PROTO-OMEGA #
 #~~~~~~~~~~~~~#
 
-0.0 "--sync--" sync / 00:0839::A-4 Command will be sealed off/ window 0,1
+# A-4 Command will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:ECF:/ window 0,1
 12.6 "Side Cannons" sync / 1[56]:[^:]*:Proto-Omega:(6320|6321):/ window 12.6,10
 24.2 "Forward Interceptors/Rear Interceptors" sync / 1[56]:[^:]*:Proto-Omega:(6322|6324):/
 29.3 "Chemical Missile" sync / 1[56]:[^:]*:Proto-Omega:6328:/
@@ -42,7 +44,8 @@ hideall "--sync--"
 
 # -ii 368 63AE 63B2
 
-1000.0 "--sync--" sync / 00:0839::A-4 Conquest will be sealed off/ window 1000,10
+# A-4 Conquest will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:ED0:/ window 1000,10
 1010.7 "Wheel" sync / 1[56]:[^:]*:Arch-Lambda:63B5:/ window 1010.7,10
 1021.0 "--sync--" sync / 1[56]:[^:]*:Arch-Lambda:63AA:/
 1028.4 "Auto-mobile Assault Cannon" sync / 1[56]:[^:]*:Arch-Lambda:63AB:/
@@ -81,7 +84,8 @@ hideall "--sync--"
 
 # -ii 6435
 
-2000.0 "--sync--" sync / 00:0839::A-4 Headquarters will be sealed off/ window 2000,1
+# A-4 Headquarters will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:ED2:/ window 2000,1
 2010.0 "AI Takeover" sync / 1[56]:[^:]*:Stigma-4:6429:/
 2015.6 "Touchdown?" sync / 1[56]:[^:]*:Hybrid Dragon:68F9:/
 2024.7 "Proto-wave Cannon?" sync / 1[56]:[^:]*:Omega Frame:(642A|642B):/
diff --git a/timelines/src/main/resources/timeline/swallows_compass.txt b/timelines/src/main/resources/timeline/swallows_compass.txt
index a8d0f83507af..c23052b4b08b 100644
--- a/timelines/src/main/resources/timeline/swallows_compass.txt
+++ b/timelines/src/main/resources/timeline/swallows_compass.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 2B99
 
-0 "Start" sync / 00:0839::The Heart Of The Dragon will be sealed off/ window 0,1
+# The Heart of the Dragon will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:98B:/ window 0,1
 11.6 "Clout Of The Tengu" sync / 1[56]:[^:]*:Otengu:2B95:/
 22.5 "Yama-Kagura" sync / 1[56]:[^:]*:Otengu:2B96:/ window 22.5,5
 33.1 "Might Of The Tengu" sync / 1[56]:[^:]*:Otengu:2B94:/
@@ -39,7 +40,8 @@ hideall "--sync--"
 
 # -ii 2CD1 2B9B 2B9C 2B9F
 
-1000.0 "Start" sync / 00:0839::The Dragon's Mouth will be sealed off/ window 1000,1
+# The Dragon's Mouth will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:98E:/ window 1000,1
 1011.2 "Greater Palm" sync / 1[56]:[^:]*:Daidarabotchi:2B9[DE]:/ window 11.2,5
 1023.1 "Greater Palm" sync / 1[56]:[^:]*:Daidarabotchi:2B9[DE]:/
 1035.3 "Tributary" sync / 1[56]:[^:]*:Daidarabotchi:2BA0:/ window 35,0
@@ -76,7 +78,8 @@ hideall "--sync--"
 
 # The opening block repeats without interrruption above 50% HP.
 # Note that Dasheng's abilities are not the same as those of the shadows!
-2000.0 "Start" sync / 00:0839::Serenity will be sealed off/ window 2000,5
+# Serenity will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:98F:/ window 2000,5
 2011.8 "The Short End" sync / 1[56]:[^:]*:Qitian Dasheng:2BA6:/ window 11.8,5
 2025.5 "Both Ends" sync / 1[56]:[^:]*:Qitian Dasheng:2BA[89]:/
 2036.1 "Mount Huaguo" sync / 1[56]:[^:]*:Qitian Dasheng:2BAA:/ window 36.1,5
diff --git a/timelines/src/main/resources/timeline/t10.txt b/timelines/src/main/resources/timeline/t10.txt
index eb68bd269336..940c35bcf372 100644
--- a/timelines/src/main/resources/timeline/t10.txt
+++ b/timelines/src/main/resources/timeline/t10.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # Initial Phase: Tankbuster, Charge, Repeat
 0.0 "Start"
-0.0 "--sync--" sync / 00:0839::The Alpha Concourse will be sealed off/ window 5,5
+# Alpha Concourse will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:588:/ window 5,5
 8.0 "Crackle Hiss" sync / 1[56]:[^:]*:Imdugud:B55:/
 16.0 "Critical Rip" sync / 1[56]:[^:]*:Imdugud:B56:/
 20.0 "Crackle Hiss" sync / 1[56]:[^:]*:Imdugud:B55:/
diff --git a/timelines/src/main/resources/timeline/t11.txt b/timelines/src/main/resources/timeline/t11.txt
index 3b42ddaf4914..5e6e1ef789ca 100644
--- a/timelines/src/main/resources/timeline/t11.txt
+++ b/timelines/src/main/resources/timeline/t11.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 ### Phase 1
 0.0 "Start"
-0.0 "--sync--" sync / 00:0839::The Core Override will be sealed off/ window 10,10
+# Core Override will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:592:/ window 10,10
 9.4 "Resonance" sync / 1[56]:[^:]*:Kaliya:B6B:/ window 10,10
 
 19.7 "Nerve Gas"
diff --git a/timelines/src/main/resources/timeline/t6.txt b/timelines/src/main/resources/timeline/t6.txt
index 704bb993b011..a727a6dd21d3 100644
--- a/timelines/src/main/resources/timeline/t6.txt
+++ b/timelines/src/main/resources/timeline/t6.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 ### Phase 1
 0.0 "Start"
-0.0 "--sync--" sync / 00:0839::Scar's Edge will be sealed off/ window 10,10
+# Scar's Edge will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:51C:/ window 10,10
 7.5 "Bloody Caress" sync / 1[56]:[^:]*:Rafflesia:797:/ window 8,8
 11.5 "Thorn Whip" sync / 1[56]:[^:]*:Rafflesia:879:/
 18.5 "Briary Growth" sync / 1[56]:[^:]*:Rafflesia:884:/ window 20,20
diff --git a/timelines/src/main/resources/timeline/t7.txt b/timelines/src/main/resources/timeline/t7.txt
index a1826a5c888a..c546197c8211 100644
--- a/timelines/src/main/resources/timeline/t7.txt
+++ b/timelines/src/main/resources/timeline/t7.txt
@@ -8,7 +8,9 @@ hideall "--sync--"
 # as there are pre-boss adds to start the encounter.
 
 ### Phase 1 (100%)
-0.0 "--sync--" sync / 00:0839::Bioweapon Storage will be sealed off/ window 10,10
+
+# Bioweapon Storage will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:51E:/ window 10,10
 6.4 "Tail Slap" sync / 1[56]:[^:]*:Melusine:7A8:/ window 7,0
 12.3 "Cursed Voice" sync / 1[56]:[^:]*:Melusine:7AC:/
 14.3 "Circle Of Flames x2" #sync / 1[56]:[^:]*:Melusine:7AA:/
diff --git a/timelines/src/main/resources/timeline/t8.txt b/timelines/src/main/resources/timeline/t8.txt
index f2e1b4cd0e0b..2523f484c40e 100644
--- a/timelines/src/main/resources/timeline/t8.txt
+++ b/timelines/src/main/resources/timeline/t8.txt
@@ -12,7 +12,8 @@ hideall "--sync--"
 
 ### Phase 1: introduction to towers
 0.0 "Start"
-0.0 "--sync--" sync / 00:0839::The central bow will be sealed off/ window 10,10
+# Central Bow will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:532:/ window 10,10
 6.1 "Diffusion Ray" sync / 1[56]:[^:]*:The Avatar:7C2:/ window 7,10
 26.0 "Homing Missile" sync / 1[56]:[^:]*:The Avatar:7C7:/
 27.2 "Diffusion Ray" sync / 1[56]:[^:]*:The Avatar:7C2:/
diff --git a/timelines/src/main/resources/timeline/temple_of_the_fist.txt b/timelines/src/main/resources/timeline/temple_of_the_fist.txt
index 226640d2cd07..3fdb937a0037 100644
--- a/timelines/src/main/resources/timeline/temple_of_the_fist.txt
+++ b/timelines/src/main/resources/timeline/temple_of_the_fist.txt
@@ -4,7 +4,8 @@ hideall "--sync--"
 # Coeurl Twins
 # -ii 1FD2 1FD8
 
-0.0 "--sync--" sync / 00:0839::Tourmaline Pond will be sealed off/
+# Tourmaline Pond will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:788:/
 6.4 "Pounce" sync / 1[56]:[^:]*:Coeurl Sruti:1FD1:/ window 7,7
 17.8 "Radial Blaster" sync / 1[56]:[^:]*:Coeurl Sruti:1FD3:/
 22.0 "Pounce" sync / 1[56]:[^:]*:Coeurl Sruti:1FD1:/
@@ -51,7 +52,8 @@ hideall "--sync--"
 
 # Arbuda
 
-1000.0 "--sync--" sync / 00:0839::Harmony will be sealed off/ window 1000,10
+# Harmony will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:789:/ window 1000,10
 1006.5 "Cardinal Shift" sync / 1[56]:[^:]*:Arbuda:1FDA:/ window 7,7
 1014.6 "Fourfold Shear" sync / 1[56]:[^:]*:Arbuda:1FD9:/
 1022.6 "Front/Back?Sides?" sync / 1[56]:[^:]*:Arbuda:1FD[BC]:/
@@ -89,7 +91,8 @@ hideall "--sync--"
 # Ivon Coeurlfist
 # -ii 1FF0 1FE8 1FEC
 
-2000.0 "--sync--" sync / 00:0839::Guidance will be sealed off/ window 2000,10
+# Guidance will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:78A:/ window 2000,10
 2010.9 "Spirit Wave" sync / 1[56]:[^:]*:Ivon Coeurlfist:1FE7:/
 2018.6 "Hurricane Kick" sync / 1[56]:[^:]*:Ivon Coeurlfist:1FE5:/
 2026.7 "Touch of Slaughter" sync / 1[56]:[^:]*:Ivon Coeurlfist:1FE6:/
diff --git a/timelines/src/main/resources/timeline/test.txt b/timelines/src/main/resources/timeline/test.txt
index 14e7aee9c724..182dfc1f01bd 100644
--- a/timelines/src/main/resources/timeline/test.txt
+++ b/timelines/src/main/resources/timeline/test.txt
@@ -16,20 +16,24 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0 "--Reset--" sync /You bid farewell to the striking dummy/ window 10000 jump 0
+0 "--Reset--" sync / 00:001D:[^:]*:You bid farewell to the striking dummy/ window 10000 jump 0
 
-0 "--sync--" sync /:Engage!/ window 100000,100000
-0 "--sync--" sync /:You bow courteously to the striking dummy/ window 0,1
+# two examples with different quoting which should both be supported
+0 "--sync--" GameLog { line: 'testNetRegexTimeline' } window 100000,100000
+0 "--sync--" GameLog { "line": "testNetRegexTimeline" } window 100000,100000
+
+0 "--sync--" sync / 00:0039:[^:]*:Engage!/ window 100000,100000
+0 "--sync--" sync / 00:001D:[^:]*:You bow courteously to the striking dummy/ window 0,1
 3 "Almagest"
 6 "Angry Dummy"
 10 "Long Castbar" duration 10
 15 "Final Sting"
 18 "Pentacle Sac (DPS)"
-25 "Super Tankbuster" sync /:test sync:/ window 30,30
+25 "Super Tankbuster" sync / 00:0038:[^:]*:test sync/ window 30,30
 30 "Dummy Stands Still"
 40 "Death"
 
-50 "--sync--" sync /:test sync2:/ window 100,1 forcejump "loop"
+50 "--sync--" sync / 00:0038:[^:]*:test sync2/ window 100,1 forcejump "loop"
 
 # Loop test!
 100 label "loop"
@@ -40,5 +44,5 @@ hideall "--sync--"
 106 "Six"
 110 "Ten" #duration 100
 115 "Fifteen"
-118 "Force Jump Three" sync /:test sync3:/ window 10,10 forcejump "three"
-120 "Invisible" sync /:test sync4:/ forcejump 1000
+118 "Force Jump Three" sync / 00:0038:[^:]*:test sync3/ window 10,10 forcejump "three"
+120 "Invisible" sync / 00:0038:[^:]*:test sync4/ forcejump 1000
diff --git a/timelines/src/main/resources/timeline/thaleia.txt b/timelines/src/main/resources/timeline/thaleia.txt
index af5ffc183628..431fa000ac04 100644
--- a/timelines/src/main/resources/timeline/thaleia.txt
+++ b/timelines/src/main/resources/timeline/thaleia.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~#
 # Thaliak #
@@ -14,7 +15,7 @@ hideall "--sync--"
 # Long pull: https://www.fflogs.com/reports/a:ZBxnrKWpPfdt2gCV#fight=11&type=damage-done
 
 # The River of Knowledge will be sealed off
-1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1169/ window 10000,0
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1169:/ window 10000,0
 1005.0 "--sync--" sync / 14:[^:]*:Thaliak:88D1:/ window 10,10
 1010.0 "Katarraktes" sync / 1[56]:[^:]*:Thaliak:88D1:/
 
@@ -133,7 +134,7 @@ hideall "--sync--"
 # Long pull: https://www.fflogs.com/reports/qW8TMthAcD1JbmNk#fight=21&type=damage-done
 
 # The Briny Deep will be sealed off
-2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:116A/ window 10000,0
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:116A:/ window 10000,0
 2007.1 "--sync--" sync / 14:[^:]*:Llymlaen:880B:/ window 10,10
 2012.1 "Tempest" sync / 1[56]:[^:]*:Llymlaen:880B:/
 2023.2 "Seafoam Spiral/Wind Rose" sync / 1[56]:[^:]*:Llymlaen:(880D|880C):/
@@ -321,7 +322,7 @@ hideall "--sync--"
 # Long pull: https://www.fflogs.com/reports/GzjrkH97xXWFZvAM#fight=4&type=damage-done
 
 # The Windward Pass will be sealed off
-3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:116B/ window 10000,0
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:116B:/ window 10000,0
 
 # Phase 1
 3010.0 "--sync--" sync / 1[56]:[^:]*:Oschon:8999:/ window 10,10
@@ -499,7 +500,7 @@ hideall "--sync--"
 # Long pull: https://www.fflogs.com/reports/wRA1yPgGx8McNjnf#fight=7&type=damage-done
 
 # The Twelve's Embrace will be sealed off
-4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:116D/ window 10000,0
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:116D:/ window 10000,0
 4009.6 "--sync--" sync / 14:[^:]*:Eulogia:8A03:/ window 10,10
 4014.6 "Dawn of Time" sync / 1[56]:[^:]*:Eulogia:8A03:/
 
diff --git a/timelines/src/main/resources/timeline/the_aitiascope.txt b/timelines/src/main/resources/timeline/the_aitiascope.txt
index c38423ce06c1..71423a29a156 100644
--- a/timelines/src/main/resources/timeline/the_aitiascope.txt
+++ b/timelines/src/main/resources/timeline/the_aitiascope.txt
@@ -5,7 +5,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~~~~~~~~~~~~~#
 # LIVIA THE UNDETERRED #
@@ -14,7 +15,8 @@ hideall "--sync--"
 # -p 6448:1012
 # -ii 60C3 6444 6446
 
-1000.0 "--sync--" sync / 00:0839::The Central Observatory will be sealed off/ window 10000,0
+# Central Observatory will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:F98:/ window 10000,0
 1012.0 "Frustration" sync / 1[56]:[^:]*:Livia the Undeterred:6448:/
 1022.2 "Aglaea Bite" sync / 1[56]:[^:]*:Livia the Undeterred:6449:/
 1029.3 "--middle--"
@@ -63,7 +65,8 @@ hideall "--sync--"
 # -p 6455:2012
 # -ii 6454
 
-2000.0 "--sync--" sync / 00:0839::The Saltcrystal Strings will be sealed off/ window 10000,0
+# Saltcrystal Strings will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:F99:/ window 10000,0
 2012.0 "Tartarean Impact" sync / 1[56]:[^:]*:Rhitahtyn the Unshakable:6455:/
 2020.5 "Tartarean Spark" sync / 1[56]:[^:]*:Rhitahtyn the Unshakable:6457:/
 
@@ -111,7 +114,8 @@ hideall "--sync--"
 # -p 6464:3012
 # -ii 6088
 
-3000.0 "--sync--" sync / 00:0839::The Midnight Downwell will be sealed off/ window 10000,0
+# Midnight Downwell will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:F9A:/ window 10000,0
 3012.0 "Dark Forte" sync / 1[56]:[^:]*:Amon the Undying:6464:/
 3022.2 "Thundaga Forte (proximity)" sync / 1[56]:[^:]*:Amon the Undying:645A:/
 3028.0 "Thundaga Forte 1" sync / 1[56]:[^:]*:Amon the Undying:645B:/
diff --git a/timelines/src/main/resources/timeline/the_burn.txt b/timelines/src/main/resources/timeline/the_burn.txt
index c988c2c5da08..687f9c3372cf 100644
--- a/timelines/src/main/resources/timeline/the_burn.txt
+++ b/timelines/src/main/resources/timeline/the_burn.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 3198 3199
 
-0 "Start" sync / 00:0839::The Scorpion's Den will be sealed off/ window 0,1
+# The Scorpion's Den will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:9B7:/ window 0,1
 10.4 "Crystal Needle" sync / 1[56]:[^:]*:Hedetet:3193:/
 25.8 "Hailfire" sync / 1[56]:[^:]*:Hedetet:3194:/ window 25,30
 29.8 "Resonant Frequency" sync / 1[56]:[^:]*:Dim Crystal:3198:/
@@ -38,7 +39,8 @@ hideall "--sync--"
 
 # -ii 2D76 2D77 34D5 34D6 34D9
 
-1000.0 "Start" sync / 00:0839::The Gamma Segregate will be sealed off/ window 1000,5
+# The Gamma Segregate will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:9BA:/ window 1000,5
 1012.7 "Aetherochemical Flame" sync / 1[56]:[^:]*:Defective Drone:2D73:/
 1026.7 "Aetherochemical Residue" sync / 1[56]:[^:]*:Defective Drone:2D74:/
 1030.9 "--untargetable--"
@@ -66,7 +68,8 @@ hideall "--sync--"
 
 # -ii 3142 3145 3146 3149
 
-2000.0 "Start" sync / 00:0839::The Aspersory will be sealed off/ window 2000,5
+# The Aspersory will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:9BD:/ window 2000,5
 2013.2 "Rime Wreath" sync / 1[56]:[^:]*:Mist Dragon:314B:/
 2021.4 "Frost Breath" sync / 1[56]:[^:]*:Mist Dragon:314C:/
 2030.7 "Fog Plume" sync / 1[56]:[^:]*:Mist Dragon:3144:/
diff --git a/timelines/src/main/resources/timeline/the_burn64.txt b/timelines/src/main/resources/timeline/the_burn64.txt
index 74a639186490..793806f641fc 100644
--- a/timelines/src/main/resources/timeline/the_burn64.txt
+++ b/timelines/src/main/resources/timeline/the_burn64.txt
@@ -9,7 +9,8 @@ hideall "--sync--"
 
 # -ii 3198 3199
 
-0 "Start" sync / 00:0839::The Scorpion's Den will be sealed off/ window 0,1
+# The Scorpion's Den will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:9B7:/ window 0,1
 10.4 "Crystal Needle" sync / 1[56]:[^:]*:Hedetet:3193:/
 25.8 "Hailfire" sync / 1[56]:[^:]*:Hedetet:3194:/ window 25,30
 29.8 "Resonant Frequency" sync / 1[56]:[^:]*:Dim Crystal:3198:/
@@ -38,7 +39,8 @@ hideall "--sync--"
 
 # -ii 2D76 2D77 34D5 34D6 34D9
 
-1000.0 "Start" sync / 00:0839::The Gamma Segregate will be sealed off/ window 1000,5
+# The Gamma Segregate will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:9BA:/ window 1000,5
 1012.7 "Aetherochemical Flame" sync / 1[56]:[^:]*:Defective Drone:2D73:/
 1026.7 "Aetherochemical Residue" sync / 1[56]:[^:]*:Defective Drone:2D74:/
 1030.9 "--untargetable--"
@@ -66,7 +68,8 @@ hideall "--sync--"
 
 # -ii 3142 3145 3146 3149
 
-2000.0 "Start" sync / 00:0839::The Aspersory will be sealed off/ window 2000,5
+# The Aspersory will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:9BD:/ window 2000,5
 2013.2 "Rime Wreath" sync / 1[56]:[^:]*:Mist Dragon:314B:/
 2021.4 "Frost Breath" sync / 1[56]:[^:]*:Mist Dragon:314C:/
 2030.7 "Fog Plume" sync / 1[56]:[^:]*:Mist Dragon:3144:/
diff --git a/timelines/src/main/resources/timeline/the_copied_factory.txt b/timelines/src/main/resources/timeline/the_copied_factory.txt
index 2ca3eea7680b..9f0abab469ed 100644
--- a/timelines/src/main/resources/timeline/the_copied_factory.txt
+++ b/timelines/src/main/resources/timeline/the_copied_factory.txt
@@ -6,7 +6,8 @@ hideall "--sync--"
 ### Serial-jointed Command Model
 # -ic 2P -p 48B2:108.5 -ii 4B31 48B3 48B4 48B7 48B6 48CB 48CC 48BA 4B32 48FA 48BC 48BD 48BE 48BF 48C0 48C1 48C2 48C9
 
-100.0 "--sync--" sync / 00:0839::Warehouse A will be sealed off/ window 100,0
+# Warehouse A will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D4C:/ window 100,0
 108.5 "Systematic Siege" sync / 1[56]:[^:]*:Serial-jointed Command Model:48B2:/ window 108.5,10
 122.6 "Clanging Blow" sync / 1[56]:[^:]*:Serial-jointed Command Model:48CE:/
 134.1 "Energy Bombardment" sync / 1[56]:[^:]*:Serial-jointed Command Model:48B8:/
@@ -55,7 +56,8 @@ hideall "--sync--"
 
 ### Trash
 # -ic 2P -ii 491D 491C -p 491B:715.5
-600.0 "--sync--" sync / 00:0839::Warehouse B will be sealed off/ window 600,0
+# Warehouse B will be sealed off
+600.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D4D:/ window 600,0
 700.0 "--sync--" sync / 22:........:Small Flyer:........:Small Flyer:01/ window 100,0
 715.5 "Frontal Somersault" sync / 1[56]:[^:]*:Small Biped:491B:/ window 116,2.5
 721.4 "Frontal Somersault" sync / 1[56]:[^:]*:Small Biped:491B:/
@@ -108,7 +110,8 @@ hideall "--sync--"
 # six possibilities you're in, then collapse back to three timelines, and then
 # branch out to six timelines again for the second half, but it'd be, well, a lot.
 
-900.0 "--sync--" sync / 00:0839::Quality assurance will be sealed off/ window 900,0
+# Quality Assurance will be sealed off
+900.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D4E:/ window 900,0
 913.0 "Laser-Resistance Test x3" sync / 1[56]:[^:]*:Hobbes:4805:/ duration 2.3 window 913,10
 
 924.5 "--sync--" sync / 1[56]:[^:]*:Hobbes:480A:/
@@ -195,7 +198,8 @@ hideall "--sync--"
 
 ### Goliath Tank
 # -ic 2P -p 4932:1509 493D:1800 -ii 4937 4934 4938 4935 4939 4936 493A 4933 470D 4943 493E
-1500.0 "--sync--" sync / 00:0839::Warehouse C will be sealed off/ window 1500,0
+# Warehouse C will be sealed off
+1500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D50:/ window 1500,0
 1509.0 "Energy Ring" sync / 1[56]:[^:]*:Goliath Tank:4932:/ duration 15.1 window 1509,10
 1516.9 "Exploding Tethers"
 1526.0 "Convenient Self-Destruction" sync / 1[56]:[^:]*:Medium Exploder:493C:/
@@ -229,7 +233,8 @@ hideall "--sync--"
 # TODO: are the Marx Smashes after the crushers more specific?
 # One log has 472[6,7,7,A] as the four.  Left as all random for now.
 
-2000.0 "--sync--" sync / 00:0839::The forward deck will be sealed off/ window 2000,0
+# Forward Deck will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D52:/ window 2000,0
 2015.7 "Marx Smash L/R" sync / 1[56]:[^:]*:Engels:472[67]:/ window 2015.7,5
 2029.6 "Marx Smash R/L" sync / 1[56]:[^:]*:Engels:472[67]:/
 2044.4 "Precision Guided Missile" sync / 1[56]:[^:]*:Engels:4754:/
@@ -321,7 +326,8 @@ hideall "--sync--"
 
 ### 9S
 # -ic 2P -p 48F5:3013.3 48E7:3310 48EB:3510 -ii 49C4 48F9 48F7 48DC 485E 48E3 48E6 48E0 48EC 48A5 48A7 48D6 4ABE
-3000.0 "--sync--" sync / 00:0839::The rear deck will be sealed off/ window 3000,0
+# Rear Deck will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D53:/ window 3000,0
 3013.3 "Neutralization" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:48F5:/ window 3013.3,10
 3021.5 "Laser Saturation" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:48F6:/
 3030.2 "Laser Turret" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:4A74:/
diff --git a/timelines/src/main/resources/timeline/the_dead_ends.txt b/timelines/src/main/resources/timeline/the_dead_ends.txt
index fa904339bb40..7417d2518077 100644
--- a/timelines/src/main/resources/timeline/the_dead_ends.txt
+++ b/timelines/src/main/resources/timeline/the_dead_ends.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~~~~~~~~~~#
 # CAUSTIC GREBULOFF #
@@ -12,7 +13,8 @@ hideall "--sync--"
 # -p 653C:1018.1
 # -ii 6542 6EBC 6544 653E
 
-1000.0 "--sync--" sync / 00:0839::The Shell Mound will be sealed off/ window 10000,0
+# Shell Mound will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1008:/ window 10000,0
 1013.1 "--sync--" sync / 14:[^:]*:Caustic Grebuloff:653C:/
 1018.1 "Miasmata" sync / 1[56]:[^:]*:Caustic Grebuloff:653C:/
 1028.5 "Necrotic Fluid" sync / 1[56]:[^:]*:Weeping Miasma:653F:/ duration 10.6
@@ -43,7 +45,8 @@ hideall "--sync--"
 
 hideall "Disengage Hatch"
 
-2000.0 "--sync--" sync / 00:0839::The Deterrence Grounds will be sealed off/ window 10000,0
+# Deterrence Grounds will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1009:/ window 10000,0
 2007.0 "--sync--" sync / 14:[^:]*:Peacekeeper:6550:/
 2012.0 "Decimation" sync / 1[56]:[^:]*:Peacekeeper:6550:/
 2018.1 "Electromagnetic Repellant" sync / 1[56]:[^:]*:Peacekeeper:6EC8:/
@@ -93,7 +96,8 @@ hideall "Disengage Hatch"
 # -p 655E:3013.5
 # -ii 655A 655C 655F
 
-3000.0 "--sync--" sync / 00:0839::The World Tree will be sealed off/ window 10000,0
+# The World Tree will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:100A:/ window 10000,0
 3008.5 "--sync--" sync / 14:[^:]*:Ra-la:655E:/
 3013.5 "Warm Glow" sync / 1[56]:[^:]*:Ra-la:655E:/
 3023.7 "Pity" sync / 1[56]:[^:]*:Ra-la:655D:/
diff --git a/timelines/src/main/resources/timeline/the_epic_of_alexander.txt b/timelines/src/main/resources/timeline/the_epic_of_alexander.txt
index 53cbb3b176b4..f22802c8bf23 100644
--- a/timelines/src/main/resources/timeline/the_epic_of_alexander.txt
+++ b/timelines/src/main/resources/timeline/the_epic_of_alexander.txt
@@ -191,7 +191,7 @@ hideall "--sync--"
 982.6 "Fate Calibration α" sync / 1[56]:[^:]*:Perfect Alexander:487C:/
 985.6 "--untargetable--"
 989.8 "Ordained Motion/Stillness" sync / 1[56]:[^:]*:Perfect Alexander:49A[BC]:/
-992.8 "Obloquy, Solidarity and 3x Severity" sync  /:Perfect Alexander:4861:/
+992.8 "Obloquy, Solidarity and 3x Severity" sync / 1[56]:[^:]*:Perfect Alexander:4861:/
 993.8 "Ordained Motion/Stillness" sync / 1[56]:[^:]*:Perfect Alexander:49A[BC]:/
 993.8 "Sacrament x3" duration 1.5
 998.8 "--targetable--"
diff --git a/timelines/src/main/resources/timeline/the_fell_court_of_troia.txt b/timelines/src/main/resources/timeline/the_fell_court_of_troia.txt
index 21380e154c16..0fba26f3d85e 100644
--- a/timelines/src/main/resources/timeline/the_fell_court_of_troia.txt
+++ b/timelines/src/main/resources/timeline/the_fell_court_of_troia.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~~~~~~~~#
 # EVIL DREAMER(s) #
@@ -15,7 +16,8 @@ hideall "--sync--"
 # Phase pushes here push when adds are all dead.
 # Hard to tell if there's a time based push, but have seen it push when some adds still alive?
 
-1000.0 "--sync--" sync / 00:0839::Penitence will be sealed off/ window 10000,0
+# Penitence will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1058:/ window 10000,0
 
 1200.0 "--sync--" sync / 14:[^:]*:Evil Dreamer:73B8:/ window 200,0
 1208.0 "Dark Vision" sync / 1[56]:[^:]*:Evil Dreamer:73B8:/
@@ -47,7 +49,8 @@ hideall "--sync--"
 
 # TODO: Beatific Scorn is 747 + 5/8/4/7, or 3/8/6/7, are these directions??
 
-2000.0 "--sync--" sync / 00:0839::The Seat Of The Foremost will be sealed off/ window 10000,0
+# Seat of the Foremost will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1059:/ window 10000,0
 2011.3 "--middle--" sync / 1[56]:[^:]*:Beatrice:747C:/
 2016.5 "Eye of Troia" sync / 1[56]:[^:]*:Beatrice:747A:/
 2022.5 "Death Foreseen" sync / 1[56]:[^:]*:Beatrice:747D:/
@@ -103,7 +106,8 @@ hideall "--sync--"
 # -ii 7632 7634 7618 7619 7637 7627 7628 7629
 # -it "Scarmiglione"
 
-3000.0 "--sync--" sync / 00:0839::The Garden Of Epopts will be sealed off/ window 10000,0
+# The Garden of Epopts will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:105A:/ window 10000,0
 3005.1 "--sync--" sync / 1[56]:[^:]*:Scarmiglione:7631:/ window 10,10
 3009.1 "Cursed Echo" sync / 1[56]:[^:]*:Scarmiglione:7631:/
 3016.3 "--sync--" sync / 1[56]:[^:]*:Scarmiglione:761D:/
diff --git a/timelines/src/main/resources/timeline/the_grand_cosmos.txt b/timelines/src/main/resources/timeline/the_grand_cosmos.txt
index f5218e5aa926..5bb04a214092 100644
--- a/timelines/src/main/resources/timeline/the_grand_cosmos.txt
+++ b/timelines/src/main/resources/timeline/the_grand_cosmos.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 ### Seeker of Solitude
 # -ii 4768 49A4 476C 476F 4771 4770 -p 4769:111.7
-100.0 "--sync--" sync / 00:0839::The Martial Court will be sealed off/ window 100,0
+# The Martial Court will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D2F:/ window 100,0
 111.7 "Shadowbolt" sync / 1[56]:[^:]*:Seeker of Solitude:4769:/ window 112,5
 119.4 "Immortal Anathema" sync / 1[56]:[^:]*:Seeker of Solitude:49A3:/
 
@@ -36,7 +37,8 @@ hideall "--sync--"
 
 ### Leannan Sith
 # -ii 4724 471F -p 471B:512
-500.0 "--sync--" sync / 00:0839::The Font of Quintessence will be sealed off/ window 500,0 
+# The Font of Quintessence will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D30:/ window 500,0 
 512.0 "Storm Of Color" sync / 1[56]:[^:]*:Leannan Sith:471B:/ window 512,10
 522.3 "Ode To Lost Love" sync / 1[56]:[^:]*:Leannan Sith:471C:/
 
@@ -78,7 +80,8 @@ hideall "--sync--"
 
 ### Lugus
 # -ii 475B 4766 475A 475E -p 475D:1026.8
-1000.0 "--sync--" sync / 00:0839::The Chamber of Celestial Song will be sealed off/ window 1000,0
+# The Chamber of Celestial Song will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:D31:/ window 1000,0
 1015.3 "Scorching Left/Right" sync / 1[56]:[^:]*:Lugus:476[23]:/ window 1015.3,10
 1026.8 "Black Flame" sync / 1[56]:[^:]*:Lugus:475D:/
 1030.3 "Otherworldly Heat" sync / 1[56]:[^:]*:Lugus:475C:/
diff --git a/timelines/src/main/resources/timeline/the_lost_city_of_amdapor_hard.txt b/timelines/src/main/resources/timeline/the_lost_city_of_amdapor_hard.txt
index ad6aa1034d2f..f088acc764ee 100644
--- a/timelines/src/main/resources/timeline/the_lost_city_of_amdapor_hard.txt
+++ b/timelines/src/main/resources/timeline/the_lost_city_of_amdapor_hard.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 # Use zone-unseal Reset line
 # Trigger set contains 'resetWhenOutOfCombat: false'
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~#
 # ACHAMOTH #
@@ -15,7 +16,8 @@ hideall "--sync--"
 # 15C4 Proboscis does little damage and makes this encounter hard to time, so ignored.
 # Timings seem to get off if the boss moves around, so extra syncs are added.
 
-1000.0 "--sync--" sync / 00:0839::The Tower Of White will be sealed off/ window 10000,0
+# Tower of White will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:541:/ window 10000,0
 1022.7 "Psycho Squama" sync / 1[56]:[^:]*:Achamoth:15C6:/
 1044.0 "Psycho Squama" sync / 1[56]:[^:]*:Achamoth:15C6:/
 1055.1 "Neuro Squama" sync / 1[56]:[^:]*:Achamoth:15C5:/
@@ -50,7 +52,8 @@ hideall "--sync--"
 # -it "Winged Lion"
 # -ii 15D1 15D3 15D4 15CF 15CC 15D6 1706 15CD 167B
 
-2000.0 "--sync--" sync / 00:0839::Dark Wings will be sealed off/ window 10000,0
+# Dark Wings will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:698:/ window 10000,0
 2012.0 "Ancient Aero" sync / 1[56]:[^:]*:Winged Lion:15CE:/
 2025.1 "Scratch" sync / 1[56]:[^:]*:Winged Lion:15D5:/
 2033.2 "Ancient Stone" sync / 1[56]:[^:]*:Winged Lion:15D2:/
@@ -115,7 +118,8 @@ hideall "--sync--"
 #~~~~~~~~#
 
 # Phase 1
-3000.0 "--sync--" sync / 00:0839::The Protectorate will be sealed off/ window 10000,0
+# The Protectorate will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:69A:/ window 10000,0
 3007.0 "Glory" sync / 1[56]:[^:]*:Kuribu:15E4:/
 3015.1 "Regen" sync / 1[56]:[^:]*:Kuribu:15DC:/
 3022.2 "Transference" sync / 1[56]:[^:]*:Kuribu:15DE:/
diff --git a/timelines/src/main/resources/timeline/the_lunar_subterrane.txt b/timelines/src/main/resources/timeline/the_lunar_subterrane.txt
index f74dd5b505cd..70c44bbc47a0 100644
--- a/timelines/src/main/resources/timeline/the_lunar_subterrane.txt
+++ b/timelines/src/main/resources/timeline/the_lunar_subterrane.txt
@@ -4,7 +4,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~#
 # DARK ELF #
@@ -13,7 +14,8 @@ hideall "--sync--"
 # -p 87D9:1009
 # -ii  87E5 89B6 87DF
 
-1000.0 "--sync--" sync / 00:0839::The Cloven Crystal Square will be sealed off/ window 10000,0
+# Cloven Crystal Square will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1153:/ window 10000,0
 1006.0 "--sync--" sync / 14:[^:]*:Dark Elf:87D9:/ window 10,10
 1009.0 "Hexing Staves" sync / 1[56]:[^:]*:Dark Elf:87D9:/
 1017.1 "Ruinous Confluence" sync / 1[56]:[^:]*:Dark Elf:8985:/
@@ -65,7 +67,8 @@ hideall "--sync--"
 # Note: Antlion March 8800 is into 5x Antlion March (8801) segments
 # Note: timing is the same, even once all towers have fallen
 
-2000.0 "--sync--" sync / 00:0839::The Bloodied Barbican will be sealed off/ window 10000,0
+# Bloodied Barbican will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1154:/ window 10000,0
 2009.5 "--sync--" sync / 14:[^:]*:Damcyan Antlion:87FD:/ window 10,10
 2014.5 "Sandblast" sync / 1[56]:[^:]*:Damcyan Antlion:87FD:/
 2023.6 "Landslip" sync / 1[56]:[^:]*:Damcyan Antlion:8802:/
@@ -148,7 +151,8 @@ hideall "--sync--"
 # -p 88C3:3012.3
 # -ii 8CDA 88B2 88B6 8CD8 88C0 88B9 8C20 88B4
 
-3000.0 "--sync--" sync / 00:0839::The Carnelian Courtyard will be sealed off/ window 10000,0
+# Carnelian Courtyard will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1155:/ window 10000,0
 3007.3 "--sync--" sync / 14:[^:]*:Durante:88C3:/ window 10,10
 3012.3 "Old Magic" sync / 1[56]:[^:]*:Durante:88C3:/
 3014.4 "--middle--" sync / 1[56]:[^:]*:Durante:88AF:/
diff --git a/timelines/src/main/resources/timeline/the_puppets_bunker.txt b/timelines/src/main/resources/timeline/the_puppets_bunker.txt
index ff98fc17834d..b7b0cc262f41 100644
--- a/timelines/src/main/resources/timeline/the_puppets_bunker.txt
+++ b/timelines/src/main/resources/timeline/the_puppets_bunker.txt
@@ -6,7 +6,8 @@ hideall "--sync--"
 ### 813P-Operated Aegis Unit
 # -p 508D:112.8 -ii 5074 5075 5076 5091 5092 5081 5099 507E 5090 51BC
 
-100.0 "--sync--" sync / 00:0839::The elevated detritus will be sealed off/ window 100,0
+# Elevated Detritus will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DB0:/ window 100,0
 112.8 "Firing Order: Anti-Personnel Laser" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:508D:/ window 112.8,20
 125.1 "--sync--" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:507[789A]:/
 140.1 "Maneuver: Beam Cannons" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:5073:/
@@ -103,7 +104,8 @@ hideall "--sync--"
 ### Light Artillery Unit x3 and friends
 # -ic "Yorha Close-Combat Unit: Spear" "Yorha Close-Combat Unit: Blade" "Yorha Close-Combat Unit: Martial"
 # -p 5212:1013.9 -ii 5214
-1000.0 "--sync--" sync / 00:0839::The sunken detritus will be sealed off/ window 1000,0
+# Sunken Detritus will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DB1:/ window 1000,0
 1013.9 "Maneuver: Long-Barreled Laser" sync / 1[56]:[^:]*:Light Artillery Unit:5212:/ window 1013.9,20
 1025.7 "Maneuver: Volt Array" sync / 1[56]:[^:]*:Light Artillery Unit:5211:/
 1036.0 "Authorization: No Restrictions" sync / 1[56]:[^:]*:Light Artillery Unit:520E:/
@@ -136,7 +138,8 @@ hideall "--sync--"
 #   * Sharp Turn has unique ability ids per plane, but they all do it.
 # * however, syncing against multiple planes simultaneously might cause timeline jitter
 
-2000.0 "--sync--" sync / 00:0839::The launch deck will be sealed off/ window 2000,0
+# Launch Deck will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DB2:/ window 2000,0
 2005.1 "Apply Shield Protocol" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FA6:/ window 2005.1,20
 2018.3 "Maneuver: Missile Command" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FBD:/
 2031.5 "Maneuver: Incendiary Bombing" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FC3:/
@@ -220,7 +223,8 @@ hideall "--sync--"
 ### 905P-Operated Heavy Artillery Unit
 # -p 5006:3012.1 -ii 4FF6 4FF7 4FF8 4FF9 4FFC 5004 4FFA 4FFF 4FFE 5002
 
-3000.0 "--sync--" sync / 00:0839::Core Command will be sealed off/ window 3000,0
+# Core Command will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DB3:/ window 3000,0
 3012.1 "Maneuver: Volt Array" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:5006:/ window 3012.1,20
 3024.5 "Operation: Activate Laser Turret" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:4FED:/
 3028.2 "Lower Laser" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:5086:/ duration 3.5
@@ -295,7 +299,8 @@ hideall "--sync--"
 
 
 ### Heavy Artillery Unit: caster-friendly hallway section
-4000.0 "--sync--" sync / 00:0839::The passage will be sealed off/ window 4000,0
+# Passage will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DB4:/ window 4000,0
 
 
 ### The Compound
@@ -304,7 +309,8 @@ hideall "--sync--"
 # * Contusion is 51B5 (cast) 51B6 (ground) 51B7 (headmarker).  Left as 51B5 for simplicity.
 # * Can't use "The Bridge" area sync due to checkpoint with Compound 2P.
 
-#5000.0 "--sync--" sync / 00:0839::The bridge will be sealed off/ window 5000,0
+# The bridge will be sealed off
+#5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:DB5:/ window 5000,0
 5002.0 "--sync--" sync / 1[56]:[^:]*:The Compound:53CA:/ window 5002,0
 5013.2 "Mechanical Laceration" sync / 1[56]:[^:]*:The Compound:51B8:/ window 6000,20
 5024.4 "Mechanical Decapitation/Dissection" sync / 1[56]:[^:]*:The Compound:51B[34]:/
diff --git a/timelines/src/main/resources/timeline/the_sildihn_subterrane.txt b/timelines/src/main/resources/timeline/the_sildihn_subterrane.txt
index 0ada87e69bcc..fbec9334e012 100644
--- a/timelines/src/main/resources/timeline/the_sildihn_subterrane.txt
+++ b/timelines/src/main/resources/timeline/the_sildihn_subterrane.txt
@@ -3,13 +3,15 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 ### Geryon the Steer (left door, 1st boss)
 # -p 74CF:1010.6 74D2:2019.7
 # -ii 7A1C 74D3
 
-1000.0 "--sync--" sync / 00:0839::The Silt Pump will be sealed off/ window 100000,0
+# Silt Pump will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1068:/ window 100000,0
 1005.6 "--sync--" sync / 14:[^:]*:Geryon the Steer:74CF:/
 1010.6 "Colossal Strike" sync / 1[56]:[^:]*:Geryon the Steer:74CF:/
 
@@ -140,7 +142,8 @@ hideall "--sync--"
 # -p 74CF:3010 74D9:3276.2 74DA:4078.2
 # -ii 7A1C 74D3
 
-3000.0 "--sync--" sync / 00:0839::The Sifting Site will be sealed off/ window 100000,0
+# Sifting Site will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1070:/ window 100000,0
 3005.0 "--sync--" sync / 14:[^:]*:Geryon the Steer:74CF:/
 3010.0 "Colossal Strike" sync / 1[56]:[^:]*:Geryon the Steer:74CF:/
 3019.1 "Exploding Catapult" sync / 1[56]:[^:]*:Geryon the Steer:74C7:/
@@ -277,7 +280,8 @@ hideall "--sync--"
 # -p 74CF:5010
 # -ii 7A1C 74D3
 
-5000.0 "--sync--" sync / 00:0839::The Settling Basin will be sealed off/ window 100000,0
+# Settling Basin will be sealed off
+5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:106D:/ window 100000,0
 5005.0 "--sync--" sync / 14:[^:]*:Geryon the Steer:74CF:/
 5010.0 "Colossal Strike" sync / 1[56]:[^:]*:Geryon the Steer:74CF:/
 
@@ -406,7 +410,8 @@ hideall "--sync--"
 # -p 772C:7014.3
 # -ii 772F 7730 7731 7732 7733 7734 7743 7749 7741 7746 774B 774C 77C0
 
-7000.0 "--sync--" sync / 00:0839::The Forgotten Forecourt will be sealed off/ window 100000,0
+# Forgotten Forecourt will be sealed off
+7000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1069:/ window 100000,0
 7009.3 "--sync--" sync / 14:[^:]*:Silkie:772C:/ window 10,10
 7014.3 "Total Wash" sync / 1[56]:[^:]*:Silkie:772C:/
 7022.0 "Squeaky Left/Squeaky Right" sync / 1[56]:[^:]*:Silkie:(772E|772D):/
@@ -510,7 +515,8 @@ hideall "--sync--"
 # -p 7656:8012
 # -ii 764E 763A 763B 763C 764D 7654 7655
 
-8000.0 "--sync--" sync / 00:0839::The Cornice Of Favor will be sealed off/ window 100000,0
+# The Cornice of Favor will be sealed off
+8000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1071:/ window 100000,0
 8007.0 "--sync--" sync / 14:[^:]*:Gladiator of Sil'dih:7656:/ window 20,20
 8012.0 "Flash of Steel" sync / 1[56]:[^:]*:Gladiator of Sil'dih:7656:/
 8019.2 "--middle--" sync / 1[56]:[^:]*:Gladiator of Sil'dih:7639:/
@@ -608,7 +614,8 @@ hideall "--sync--"
 # -p 74AE:9015.6
 # -ii 7498 7497 74
 
-9000.0 "--sync--" sync / 00:0839::Eternal Ease will be sealed off/ window 100000,0
+# Eternal Ease will be sealed off
+9000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:106E:/ window 100000,0
 9010.6 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:74AE:/ window 20,20
 9015.6 "Show of Strength" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:74AE:/
 
@@ -626,7 +633,8 @@ hideall "--sync--"
 
 ### Path 05
 # Note: this could be combined with Path 07 with knockback/draw-in replacements
-10000.0 "--sync--" sync / 00:0839::Eternal Ease will be sealed off/
+# Eternal Ease will be sealed off
+10000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:106E:/
 10010.6 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:74AE:/ window 20,20
 10015.6 "Show of Strength" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:74AE:/
 10019.7 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:74A2:/
@@ -712,7 +720,8 @@ hideall "--sync--"
 10377.1 "--sync--" #sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:7495:/
 
 ### Path 06
-11000.0 "--sync--" sync / 00:0839::Eternal Ease will be sealed off/
+# Eternal Ease will be sealed off
+11000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:106E:/
 11010.6 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:74AE:/ window 20,20
 11015.6 "Show of Strength" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:74AE:/
 # 2 static portals
@@ -798,7 +807,8 @@ hideall "--sync--"
 
 ### Path 07
 # Note: this could be combined with Path 05 with knockback/draw-in replacements
-12000.0 "--sync--" sync / 00:0839::Eternal Ease will be sealed off/
+# Eternal Ease will be sealed off
+12000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:106E:/
 12010.6 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:74AE:/ window 20,20
 12015.6 "Show of Strength" sync / 1[56]:[^:]*:Shadowcaster Zeless Gah:74AE:/
 12019.7 "--sync--" sync / 14:[^:]*:Shadowcaster Zeless Gah:74A7:/
@@ -897,7 +907,8 @@ hideall "--sync--"
 # Note: Slashburn is 70EF, 70F0, 70F1, 70F2
 # It's possible that 70EF/7102 are "normal" and 70F0/70F1 are reversed.
 
-13000.0 "--sync--" sync / 00:0839::Cold Arms' Quietus will be sealed off/ window 100000,0
+# Cold Arms' Quietus will be sealed off
+13000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:1076:/ window 100000,0
 13011.8 "--sync--" sync / 14:[^:]*:Thorne Knight:70EB:/
 13016.8 "Cogwheel" sync / 1[56]:[^:]*:Thorne Knight:70EB:/
 13030.3 "Spring to Life" sync / 1[56]:[^:]*:Thorne Knight:(70ED|70EE):/
diff --git a/timelines/src/main/resources/timeline/the_tower_at_paradigms_breach.txt b/timelines/src/main/resources/timeline/the_tower_at_paradigms_breach.txt
index e0347f201b7a..6032539d18bf 100644
--- a/timelines/src/main/resources/timeline/the_tower_at_paradigms_breach.txt
+++ b/timelines/src/main/resources/timeline/the_tower_at_paradigms_breach.txt
@@ -15,7 +15,8 @@ hideall "--sync--"
 # to come up with any timeline that will perfectly time both of them.
 # So, give up, and add extra syncs on abilities after.
 
-1000.0 "--sync--" sync / 00:0839::Closed Area A will be sealed off/ window 10000,0
+# Closed Area A will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E46:/ window 10000,0
 1012.0 "Roar" sync / 1[56]:[^:]*:Knave Of Hearts:5EB5:/ window 1012,10
 1022.1 "Colossal Impact" sync / 1[56]:[^:]*:Knave Of Hearts:5EA7:/
 1033.2 "Colossal Impact" sync / 1[56]:[^:]*:Knave Of Hearts:5EA4:/
@@ -96,7 +97,8 @@ hideall "--sync--"
 # -ic "2B"
 # -it "Hansel"
 
-2000.0 "--sync--" sync / 00:0839::Staging Node B will be sealed off/ window 2000,0
+# Staging Node B will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E49:/ window 2000,0
 2012.0 "Upgraded Shield" sync / 1[56]:[^:]*:Gretel:5C6[89]:/ window 2012,10
 2012.0 "Upgraded Lance" sync / 1[56]:[^:]*:Hansel:5C6[AB]:/ window 2012,10
 2025.2 "Wail" sync / 1[56]:[^:]*:Hansel:5C77:/
@@ -212,13 +214,14 @@ hideall "--sync--"
 # Enrage (when one dies)
 2700.0 "--sync--" sync / 14:[^:]*:Gretel:5C73:/ window 700,0
 2700.0 "--sync--" sync / 14:[^:]*:Hansel:5C74:/ window 700,0
-2708.0 "Lamentation" sync / 1[56]:[^:]*:(Gretel:5C73|Hansel:5C74):/ window 100,100
+# Gretel does 57C3 and Hansel does 57C4, and they both do 5C75
+2708.0 "Lamentation" sync / 1[56]:[^:]*:(Gretel|Hansel):(5C73|5C74):/ window 100,100
 2713.8 "Seed Of Magic Beta" sync / 1[56]:[^:]*:(Gretel|Hansel):5C75:/
-2718.1 "Lamentation" #sync / 1[56]:[^:]*:(Gretel:5C73|Hansel:5C74):/
+2718.1 "Lamentation" #sync / 1[56]:[^:]*:(Gretel|Hansel):(5C73|5C74):/
 2723.9 "Seed Of Magic Beta" #sync / 1[56]:[^:]*:(Gretel|Hansel):5C75:/
-2728.2 "Lamentation" #sync / 1[56]:[^:]*:(Gretel:5C73|Hansel:5C74):/
+2728.2 "Lamentation" #sync / 1[56]:[^:]*:(Gretel|Hansel):(5C73|5C74):/
 2734.0 "Seed Of Magic Beta" #sync / 1[56]:[^:]*:(Gretel|Hansel):5C75:/
-2738.3 "Lamentation" #sync / 1[56]:[^:]*:(Gretel:5C73|Hansel:5C74):/
+2738.3 "Lamentation" #sync / 1[56]:[^:]*:(Gretel|Hansel):(5C73|5C74):/
 
 
 ### Assorted Trash
@@ -226,7 +229,8 @@ hideall "--sync--"
 # -it "2P-Operated Flight Unit"
 # -ii 5BFD 5BF7 5BF8 592A
 # -p 5BFE:3513.1
-3000.0 "--sync--" sync / 00:0839::Staging Node C will be sealed off/ window 10000,0
+# Staging Node C will be sealed off
+3000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E4A:/ window 10000,0
 
 # A bunch of 2P doing 5FB7/5BF8 blade flurry, but hard to sync this.
 # Presumably once they die, then flight units show up.
@@ -259,7 +263,8 @@ hideall "--sync--"
 # -it "Red Girl"
 
 # Phase 1
-4000.0 "--sync--" sync / 00:0839::Staging Node D will be sealed off/ window 4000,0
+# Staging Node D will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E4B:/ window 4000,0
 4009.0 "--sync--" sync / 14:[^:]*:Red Girl:6012:/ window 4009,10
 4014.0 "Cruelty" sync / 1[56]:[^:]*:Red Girl:6012:/
 4019.9 "Shockwave" sync / 1[56]:[^:]*:Red Girl:600E:/
@@ -357,7 +362,8 @@ hideall "--sync--"
 # -it "Xun-Zi"
 # -p 5C00:5013.3
 # -ii 5CEC 5CED 5CEE 5C02 5C05 5C07 5C08
-5000.0 "--sync--" sync / 00:0839::The Ascension Platform will be sealed off/ window 5000,0
+# Ascension Platform will be sealed off
+5000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E4C:/ window 5000,0
 5013.3 "Deploy Armaments" sync / 1[56]:[^:]*:Xun-Zi:5C0[03]:/ window 5013.3,7
 5023.4 "Deploy Armaments" sync / 1[56]:[^:]*:Xun-Zi:5C0[03]:/
 5036.4 "Universal Assault" sync / 1[56]:[^:]*:Xun-Zi:5C06:/
@@ -396,7 +402,8 @@ hideall "--sync--"
 # -it "False Idol"
 # -p 5BDD:6012.3
 # -ii 5CEC 5CED 5CEE 5CEF 5FFC 5FFF 5BDA 5BDC
-6000.0 "--sync--" sync / 00:0839::Beyond will be sealed off/ window 6000,0
+# Beyond will be sealed off
+6000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E4D:/ window 6000,0
 6007.3 "--sync--" sync / 14:[^:]*:False Idol:5BDD:/ window 6007.3,10
 6012.3 "Screaming Score" sync / 1[56]:[^:]*:False Idol:5BDD:/
 6025.5 "Made Magic" sync / 1[56]:[^:]*:False Idol:5BD[67]:/
diff --git a/timelines/src/main/resources/timeline/the_tower_of_babil.txt b/timelines/src/main/resources/timeline/the_tower_of_babil.txt
index 3637a0675461..e794a1d13339 100644
--- a/timelines/src/main/resources/timeline/the_tower_of_babil.txt
+++ b/timelines/src/main/resources/timeline/the_tower_of_babil.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 
 #~~~~~~~~~~#
@@ -13,7 +14,8 @@ hideall "--sync--"
 # -ii 6076 61DE
 
 # Common opener
-0.0 "--sync--" sync / 00:0839::Magitek Servicing will be sealed off/ window 0,1
+# Magitek Servicing will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:101C:/ window 0,1
 5.7 "--sync--" sync / 14:[^:]*:Barnabas:6247:/ window 5.7,5
 8.9 "Ground and Pound" sync / 1[56]:[^:]*:Barnabas:6247:/
 27.3 "Ground and Pound" sync / 1[56]:[^:]*:Barnabas:62EA:/
@@ -86,7 +88,8 @@ hideall "--sync--"
 # DR. LUGAE #
 #~~~~~~~~~~~#
 
-1000.0 "--sync--" sync / 00:0839::Martial Conditioning will be sealed off/ window 1000,5
+# Martial Conditioning will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:101D:/ window 1000,5
 1009.7 "Thermal Suppression" sync / 1[56]:[^:]*:Lugae:62FA:/ window 1009.7,10
 1018.2 "Magitek Missile" sync / 1[56]:[^:]*:Lugae:62F6:/
 1022.5 "Surface Missile" sync / 1[56]:[^:]*:Lugae:62F7:/
@@ -139,7 +142,8 @@ hideall "--sync--"
 
 # -ii 52BE 5E68 6305
 
-2000.0 "--sync--" sync / 00:0839::Iron Womb will be sealed off/ window 2000,1
+# The Iron Womb will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:101E:/ window 2000,1
 2009.8 "Lunar Nail" sync / 1[56]:[^:]*:Anima:62FE:/ window 2009.8,10
 2020.7 "Phantom Pain" sync / 1[56]:[^:]*:Anima:62FF:/
 2029.8 "Mega Graviton" sync / 1[56]:[^:]*:Anima:6300:/
diff --git a/timelines/src/main/resources/timeline/the_tower_of_zot.txt b/timelines/src/main/resources/timeline/the_tower_of_zot.txt
index c17b319f4a42..60139ff4b0b9 100644
--- a/timelines/src/main/resources/timeline/the_tower_of_zot.txt
+++ b/timelines/src/main/resources/timeline/the_tower_of_zot.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~~#
 # MINDURUVA #
@@ -12,7 +13,8 @@ hideall "--sync--"
 # -ii 366 6291 6292
 
 ## Fixed-ish opening block
-0.0 "--sync--" sync / 00:0839::Ingenuity's Ingress will be sealed off/ window 0,1
+# Ingenuity's Ingress will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E95:/ window 0,1
 8.9 "Manusya Bio" sync / 1[56]:[^:]*:Minduruva:62A0:/ window 8.9,5
 12.1 "--sync--" sync / 1[56]:[^:]*:Minduruva:6299:/
 17.5 "Manusya Blizzard III" sync / 1[56]:[^:]*:Minduruva:6296:/
@@ -85,7 +87,8 @@ hideall "--sync--"
 # -ii 367
 
 # Opening block
-1000.0 "--sync--" sync / 00:0839::Prosperity's Promise will be sealed off/ window 1000,5
+# Prosperity's Promise will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E96:/ window 1000,5
 1009.3 "Isitva Siddhi" sync / 1[56]:[^:]*:Sanduruva:62A9:/ window 1009.3,5
 1015.7 "Prapti Siddhi #1" sync / 1[56]:[^:]*:Sanduruva:62A8:/
 1019.6 "Prapti Siddhi #2" #sync / 1[56]:[^:]*:Sanduruva:62A8:/
@@ -126,7 +129,8 @@ hideall "--sync--"
 # Because we have no idea which sister will die first,
 # we sync aggressively all over the rotation block.
 
-2000.0 "--sync--" sync / 00:0839::Wisdom's Ward will be sealed off/ window 2000,5
+# Wisdom's Ward will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E97:/ window 2000,5
 2002.5 "--sync--" sync / 1[56]:[^:]*:Cinduruva:62BA:/ window 2002.5,2
 2009.8 "Samsara" sync / 1[56]:[^:]*:Cinduruva:62B9:/
 2025.6 "Manusya Faith" sync / 1[56]:[^:]*:Sanduruva:62AA:/
diff --git a/timelines/src/main/resources/timeline/the_vault.txt b/timelines/src/main/resources/timeline/the_vault.txt
index 26ef51274cf8..3c396a095489 100644
--- a/timelines/src/main/resources/timeline/the_vault.txt
+++ b/timelines/src/main/resources/timeline/the_vault.txt
@@ -7,7 +7,8 @@ hideall "--sync--"
 # Pre-phase
 # Barely worth including, but oh well.
 
-0.0 "--sync--" sync / 00:0839::The Quire will be sealed off/ window 0,1
+# The Quire will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:622:/ window 0,1
 5.4 "Fast Blade" sync / 1[56]:[^:]*:Ser Adelphel Brightblade:2CD:/ window 5.4,5
 12.5 "Bloodstain" sync / 1[56]:[^:]*:Ser Adelphel Brightblade:44B:/
 15.8 "Fast Blade" sync / 1[56]:[^:]*:Ser Adelphel Brightblade:2CD:/
@@ -90,7 +91,8 @@ hideall "--sync--"
 # -ii 101A
 
 # Pre-phase
-1000 "--sync--" sync / 00:0839::The chapter house will be sealed off/ window 1000,1
+# Chapter House will be sealed off
+1000 "--sync--" sync / 29:[^:]*:7DC:[^:]*:623:/ window 1000,1
 1006.7 "Overpower" sync / 1[56]:[^:]*:Ser Grinnaux the Bull:88C:/ window 6.7,5
 1015.6 "Rive" sync / 1[56]:[^:]*:Ser Grinnaux the Bull:46F:/
 1018.9 "Overpower" sync / 1[56]:[^:]*:Ser Grinnaux the Bull:88C:/
@@ -152,7 +154,8 @@ hideall "--sync--"
 
 ###Ser Charibert
 
-2000.0 "--sync--" sync / 00:0839::The Chancel will be sealed off/ window 2000,0
+# The Chancel will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:624:/ window 2000,0
 2006.3 "Altar Candle" sync / 1[56]:[^:]*:Ser Charibert:1030:/ window 6.3,5
 2015.0 "Heavensflame" sync / 1[56]:[^:]*:Ser Charibert:1031:/
 2019.2 "Holy Chain" sync / 1[56]:[^:]*:Ser Charibert:1033:/ window 15,15
diff --git a/timelines/src/main/resources/timeline/thordan-un.txt b/timelines/src/main/resources/timeline/thordan-un.txt
index d7c963c20406..5e03e891b6a7 100644
--- a/timelines/src/main/resources/timeline/thordan-un.txt
+++ b/timelines/src/main/resources/timeline/thordan-un.txt
@@ -1,5 +1,7 @@
 # This file was autogenerated from running ts-node util/sync_files.ts.
 # DO NOT EDIT THIS FILE DIRECTLY.
+# Edit the source file below and then run `npm run sync-files`
+# Source: ui/raidboss/data/03-hw/trial/thordan-ex.txt
 
 ### THE SINGULARITY REACTOR (UNREAL)
 # ZoneId: 1
diff --git a/timelines/src/main/resources/timeline/translations/aloalo_island.txt.json b/timelines/src/main/resources/timeline/translations/aloalo_island.txt.json
index 3531dd0ff240..f17cf35719e4 100644
--- a/timelines/src/main/resources/timeline/translations/aloalo_island.txt.json
+++ b/timelines/src/main/resources/timeline/translations/aloalo_island.txt.json
@@ -1 +1 @@
-{"langs":{"de":{"replaceSync":{"Kairimai Loquloqai":"Kairimai Loquloqai","Ketuduke":"Ketuduke","Ketulu Cove":"Ketulu-Bucht","Lala":"Lala","Loquloqui":"Loquloqui","Quaqua":"Quaqua","Repuruba Loqua":"Repuruba Loqua","Seasong's Rest":"Ruh der Seesänger","Statice":"Statice","The Elder Stump":"Altenstumpf","The Origin Spring":"Urquell","The Slumbering Canopy":"Schlafende Krone","The ancient forum":"Altes Forum","Uolosapa Loqua":"Uolosapa Loqua"},"replaceText":{}},"en":{"replaceSync":{},"replaceText":{"Far Tide/Near Tide":"Far/Near Tide","Meteor/Sledgemagic/Hunks of Junk/Happy Surprise":"--dartboard result--","Receding Twintides/Encroaching Twintides":"Receding/Encroaching Twintides"}},"fr":{"replaceSync":{"Kairimai Loquloqai":"Kairimai Loquloqai","Ketuduke":"Ketuduke","Ketulu Cove":"Baie de Ketulu","Lala":"Lala","Loquloqui":"Loquloqui","Quaqua":"Quaqua","Repuruba Loqua":"repuruba loqua","Seasong's Rest":"Repos du Chant marin","Statice":"Statice","The Elder Stump":"Souche du Doyen","The Origin Spring":"Fontaine de l'Origine","The Slumbering Canopy":"Voûte apaisée","The ancient forum":"Ancienne grand-place","Uolosapa Loqua":"uolosapa loqua"},"replaceText":{}},"ja":{"replaceSync":{"Kairimai Loquloqai":"神子の祭壇","Ketuduke":"ケトゥドゥケ","Ketulu Cove":"ケトゥルの江湾","Lala":"ララ","Loquloqui":"ロクロクイ","Quaqua":"クアクア","Repuruba Loqua":"レプルバ・ロクア","Seasong's Rest":"鯨の還る地","Statice":"スターチス","The Elder Stump":"老樹の切り株","The Origin Spring":"大樹の命泉","The Slumbering Canopy":"昏き微睡の間","The ancient forum":"古き広場","Uolosapa Loqua":"オーロサパ・ロクア"},"replaceText":{}}}}
\ No newline at end of file
+{"langs":{"de":{"replaceSync":{"Aetheric Charge":"magisch(?:e|er|es|en) Sphäre","Aloalo Ahool":"Aloalo-Ahool","Aloalo Golem":"Aloalo-Holzgolem","Aloalo Ogrebon":"Aloalo-Ogerbon","Aloalo Zaratan":"Aloalo-Zaratan","Anala Familiar":"Anala-Familiar","Drake Familiar":"Drakon-Familiar","Kairimai Loquloqai":"Kairimai Loquloqai","Kapokapo":"Kapokapo","Ketuduke":"Ketuduke","Ketulu Cove":"Ketulu-Bucht","Lala":"Lala","Loquloqui":"Loquloqui","Needle":"Nadel","Quaqua":"Quaqua","Repuruba Loqua":"Repuruba Loqua","Rodiaki":"Rodiaki","Seasong's Rest":"Ruh der Seesänger","Spring Crystal":"Wasserquell-Kristall","Statice":"Statice","Summoned Anila":"Anila-Beschwörung","Summoned Apa":"Apa-Beschwörung","Surprising Staff":"Überraschungsstab","The Elder Stump":"Altenstumpf","The Origin Spring":"Urquell","The Slumbering Canopy":"Schlafende Krone","The ancient forum":"Altes Forum","Treasure Box":"Schatzkiste","Uolosapa Loqua":"Uolosapa Loqua","Zeal-blind Zozone":"Zozone vom Feuereifer"},"replaceText":{"(?<! )Roar":"Brüllen","--cleanse--":"--reinigen--","4-tonze Weight":" 4 Tonzen","Aero II":"Windra","Aero IV":"Windka","Analysis":"Analyse","Arcane Armaments":"Arkane Armierung","Arcane Blight":"Arkane Fäule","Arcane Intervention":"Strenger Blick","Arcane Plot":"Arkane Flur","Arcane Pursuit":"Arkane Verfolgung","Blowing Bubbles":"Pusteblasen","Brilliant Blossoms":"Erblühter Grund","Bubble Net":"Blasennetz","Burst":"Explosion","Calculated Trajectory":"Marschbefehl","Cloud to Ground":"Sturmkonzentration","Constructive Figure":"Ruf der Schöpfer","Dartboard":"Dartspielchen","Elemental Impact":"Einschlag","Encroaching Twintides":"Ring der Zwiegezeiten","Faerie Ring":"Feenring","Faerie Road":"Feenpfad","Fair Flight":"Feenflug","Far Tide":"Ring der Gezeiten","Faunal Figure":"Ruf der Fauna","Fire Spread":"Brandstiftung","Flail Smash":"Dresche","Floral Figure":"Ruf der Flora","Flowing Lance":"Fließende Lanze","Fluke Typhoon":"Flossentaifun","Hammer Landing":"Hammersprung","Happy Surprise":"Fröhliche Überraschung","Hidden Mine":"Minenfalle","Howl":"Geheul","Hundred Lashings":"Auspeitschung","Hunks of Junk":"Metallschrott","Hydroblast":"Hydro-Schlag","Hydrobomb":"Hydro-Bombe","Hydrosurge":"Hydro-Wallung","Inferno Theorem":"Infernales Theorem","Islebloom Light":"Lebende Erde","Jack-in-the-box":"Springteufel","Land Wave":"Landwelle","Long-lost Light":"Verlorenes Licht","Made Magic":"Magiefeuer","Meteor":"Meteor","Near Tide":"Kreis der Gezeiten","O Isle, Bloom":"O Insel, erblühe!","O Life, Flourish":"O Leben, gedeihe!","O Petals, Unfurl":"O Blüten, erwachet!","O Sky, Be Mine":"O Himmel, werde mein!","Pinwheel":"Feuerrad","Pliant Petals":"Erwachte Blüte","Pop":"Platzen","Present Box":"Geschenkschachtel","Protective Will":"Schützender Wille","Ravaging Axe":"Verheerende Axt","Receding Twintides":"Kreis der Zwiegezeiten","Ringing Quoits":"Klingende Ringe","Rolling Spout":"Ringguss","Rout":"Kolossgalopp","Rush":"Stürmen","Sanctuary":"Zuflucht","Saturate":"Wasserfontäne","Scalding Waves":"Siedende Wogen","Shock(?!\\w)":"Entladung","Shocking Abandon":"Schockende Hingabe","Shockwave":"Schockwelle","Sledgemagic":"Vorschlagmagie","Sphere Shatter":"Sphärensplitterung","Spring Crystals":"Quellkristalle","Stirring of Spirits":"Erwachen der Geister","Strategic Strike":"Schwere Attacke","Strewn Bubbles":"Streublasen","Summon(?!\\w)":"Familiar","Summoning Rite":"Beschwörung","Surprise Balloon":"Überraschungsballon","Surprise Needle":"Überraschungsnadel","Targeted Light":"Gezieltes Licht","Thunderstorm":"Gewitter","Tidal Roar":"Schrei der Gezeiten","Tidal Wave":"Flutwelle","Trick Reload":"Trickladung","Trigger Happy":"Schießwut","Turnabout":"Umdrehung","Updraft":"Aufwind","Violet Storm":"Fliederblitz","Volcanic Coordinates":"Infernaler Durchstoß","Water III":"Aquaga","Wavefoam":"Blasenwelle","Whoopee Cushion":"Pupskissen"}},"en":{"replaceSync":{},"replaceText":{"Far Tide/Near Tide":"Far/Near Tide","Meteor/Sledgemagic/Hunks of Junk/Happy Surprise":"--dartboard result--","Receding Twintides/Encroaching Twintides":"Receding/Encroaching Twintides"}},"fr":{"replaceSync":{"Aetheric Charge":"globe magique","Aloalo Ahool":"ahool d'Aloalo","Aloalo Golem":"golem sylvestre d'Aloalo","Aloalo Ogrebon":"ogrebon d'Aloalo","Aloalo Zaratan":"zaratan d'Aloalo","Anala Familiar":"anala apprivoisé","Drake Familiar":"draconide apprivoisé","Kairimai Loquloqai":"Kairimai Loquloqai","Kapokapo":"Kapokapo","Ketuduke":"Ketuduke","Ketulu Cove":"Baie de Ketulu","Lala":"Lala","Loquloqui":"Loquloqui","Needle":"aiguille","Quaqua":"Quaqua","Repuruba Loqua":"repuruba loqua","Rodiaki":"Rodiaki","Seasong's Rest":"Repos du Chant marin","Spring Crystal":"cristal de source","Statice":"Statice","Summoned Anila":"anila d'Aloalo","Summoned Apa":"apa d'Aloalo","Surprising Staff":"sceptre surprise","The Elder Stump":"Souche du Doyen","The Origin Spring":"Fontaine de l'Origine","The Slumbering Canopy":"Voûte apaisée","The ancient forum":"Ancienne grand-place","Treasure Box":"coffre au trésor mécanique","Uolosapa Loqua":"uolosapa loqua","Zeal-blind Zozone":"Zozone le téméraire"},"replaceText":{"(?<! )Roar":"Rugissement","4-tonze Weight":"Poids de 4 tonz","Aero II":"Extra Vent","Aero IV":"Giga Vent","Analysis":"Analyse","Arcane Armaments":"Armes arcaniques","Arcane Blight":"Canon arcanique","Arcane Intervention":"Œil sévère","Arcane Plot":"Modulateur arcanique","Arcane Pursuit":"Chaîne arcanique","Blowing Bubbles":"Bulles soufflées","Brilliant Blossoms":"Tempête de pétales","Bubble Net":"Filet de bulles","Burst":"Explosion","Calculated Trajectory":"Déplacement forcé","Cloud to Ground":"Attaque fulminante","Constructive Figure":"Icône articulée","Dartboard":"Jeu de fléchettes","Elemental Impact":"Impact de canon","Encroaching Twintides":"Double marée débordante","Faerie Ring":"Cercle féérique","Faerie Road":"Route féérique","Fair Flight":"Projection féérique","Far Tide":"Marée lointaine","Faunal Figure":"Icône bestiale","Fire Spread":"Nappe de feu","Flail Smash":"Fléau fracassant","Floral Figure":"Icône florale","Flowing Lance":"Lance hydrique","Fluke Typhoon":"Typhon hasardeux","Hammer Landing":"Bondissement martelé","Happy Surprise":"Heureuse surprise","Hidden Mine":"Explosion de mine","Howl":"Hurlement","Hundred Lashings":"Cent coups de fouet","Hunks of Junk":"Débris de métal","Hydroblast":"Souffle hydrique","Hydrobomb":"Hydrobombe","Hydrosurge":"Déferlante hydrique","Inferno Theorem":"Théorème infernal","Islebloom Light":"Lueur ascendante","Jack-in-the-box":"Coffres au trésor","Land Wave":"Vague tellurique","Long-lost Light":"Lumière perdue","Made Magic":"Déferlante magique","Meteor":"Météore","Near Tide":"Marée proche","O Isle, Bloom":"Prière de fertilité","O Life, Flourish":"Prière de renaissance","O Petals, Unfurl":"Prière d'éclosion","O Sky, Be Mine":"Prière d'expansion","Pinwheel":"Moulinette","Pliant Petals":"Cercle de floraison","Pop":"Rupture","Present Box":"Boîtes cadeaux","Protective Will":"Esprit protecteur","Ravaging Axe":"Hache dévastatrice","Receding Twintides":"Double marée fuyante","Ringing Quoits":"Anneaux tintants","Rolling Spout":"Jaillissement annulaire","Rout(?!\\w)":"Charge pachydermique","Rush":"Ruée","Sanctuary":"Éclat de l'apaisement divin","Saturate":"Jet d'eau","Scalding Waves":"Ondes enflammées","Shock(?!\\w)":"Décharge électrostatique","Shocking Abandon":"Choc renonciateur","Shockwave":"Onde de choc","Sledgemagic":"Masse magique","Sphere Shatter":"Rupture","Spring Crystals":"Cristaux de source","Stirring of Spirits":"Écrasement de l'apaisement divin","Strategic Strike":"Coup violent","Strewn Bubbles":"Bulles éparpillées","Summon(?!\\w)":"Invocation","Summoning Rite":"Invocation rituelle","Surprise Balloon":"Ballon surprise","Surprise Needle":"Aiguille surprise","Targeted Light":"Rayon ciblé","Thunderstorm":"Tempête de foudre","Tidal Roar":"Vague rugissante","Tidal Wave":"Raz-de-marée","Trick Reload":"Rechargement habile","Trigger Happy":"Gâchette impulsive","Turnabout":"Rotation","Updraft":"Courants ascendants","Violet Storm":"Tempête pourpre","Volcanic Coordinates":"Théorème combustible","Water III":"Méga Eau","Wavefoam":"Vague de bulles","Whoopee Cushion":"Coussins péteurs"}},"ja":{"replaceSync":{"Aetheric Charge":"魔力球","Aloalo Ahool":"アロアロ・アフール","Aloalo Golem":"アロアロ・ウッドゴーレム","Aloalo Ogrebon":"アロアロ・オーガボン","Aloalo Zaratan":"アロアロ・ザラタン","Anala Familiar":"アナラ・ファミリア","Drake Familiar":"ドレイク・ファミリア","Kairimai Loquloqai":"神子の祭壇","Kapokapo":"カポカポ","Ketuduke":"ケトゥドゥケ","Ketulu Cove":"ケトゥルの江湾","Lala":"ララ","Loquloqui":"ロクロクイ","Needle":"ニードル","Quaqua":"クアクア","Repuruba Loqua":"レプルバ・ロクア","Rodiaki":"ロディアキ","Seasong's Rest":"鯨の還る地","Spring Crystal":"湧水のクリスタル","Statice":"スターチス","Summoned Anila":"サモン・アニラ","Summoned Apa":"サモン・アーパス","Surprising Staff":"サプライズ・ロッド","The Elder Stump":"老樹の切り株","The Origin Spring":"大樹の命泉","The Slumbering Canopy":"昏き微睡の間","The ancient forum":"古き広場","Treasure Box":"トレジャーボックス","Uolosapa Loqua":"オーロサパ・ロクア","Zeal-blind Zozone":"粗忽のゾゾネ"},"replaceText":{"(?<! )Roar":"咆哮","4-tonze Weight":"4トンズ","Aero II":"エアロラ","Aero IV":"エアロジャ","Analysis":"アナライズ","Arcane Armaments":"魔力成形","Arcane Blight":"魔紋砲","Arcane Intervention":"魔眼","Arcane Plot":"変光魔紋","Arcane Pursuit":"魔力の呪鎖","Blowing Bubbles":"バブルブロワー","Brilliant Blossoms":"地に満つる風花","Bubble Net":"バブルネットフィーディング","Burst":"爆発","Calculated Trajectory":"強制移動","Cloud to Ground":"襲雷","Constructive Figure":"人形召喚","Dartboard":"ダーツチャレンジ","Elemental Impact":"着弾","Encroaching Twintides":"リング・ダブルタイド","Faerie Ring":"フェアリーリング","Faerie Road":"フェアリーロード","Fair Flight":"フェアリーノックアップ","Far Tide":"リングタイド","Faunal Figure":"動物召喚","Fire Spread":"放火","Flail Smash":"フレイルスマッシュ","Floral Figure":"植物召喚","Flowing Lance":"水槍","Fluke Typhoon":"フリッパータイフーン","Hammer Landing":"衝槌撃","Happy Surprise":"サプライズハッピー","Hidden Mine":"地雷爆発","Howl":"遠吠え","Hundred Lashings":"めった打ち","Hunks of Junk":"メタルジャンク","Hydroblast":"ハイドロブラスト","Hydrobomb":"ハイドロボム","Hydrosurge":"ハイドロサージ","Inferno Theorem":"散火法","Islebloom Light":"地より昇る光","Jack-in-the-box":"ジャック・イン・ザ・ボックス","Land Wave":"地霊波","Long-lost Light":"忘れられた光","Made Magic":"魔力放出","Meteor":"メテオ","Near Tide":"ラウンドタイド","O Isle, Bloom":"祈願：地に満ちよ","O Life, Flourish":"祈願：生い育て","O Petals, Unfurl":"祈願：咲き誇れ","O Sky, Be Mine":"祈願：伸び育て","Pinwheel":"ピンウィール","Pliant Petals":"咲き誇る大輪","Pop":"破裂","Present Box":"プレゼントボックス","Protective Will":"霊衝","Ravaging Axe":"戦斧の一撃","Receding Twintides":"ラウンド・ダブルタイド","Ringing Quoits":"戦輪の旋撃","Rolling Spout":"リングスパウト","Rout":"猛進","Rush":"突進","Sanctuary":"地鎮の輝き","Saturate":"放水","Scalding Waves":"炎波","Shock(?!\\w)":"放電","Shocking Abandon":"アバンドンショック","Shockwave":"衝撃波","Sledgemagic":"マジック・スレッジハンマー","Sphere Shatter":"破裂","Spring Crystals":"湧水のクリスタル","Stirring of Spirits":"地鎮の足踏み","Strategic Strike":"強撃","Strewn Bubbles":"バブルストゥルー","Summon(?!\\w)":"サモン","Summoning Rite":"招来","Surprise Balloon":"サプライズバルーン","Surprise Needle":"サプライズニードル","Targeted Light":"高精度光弾","Thunderstorm":"サンダーストーム","Tidal Roar":"タイダルロア","Tidal Wave":"タイダルウェイブ","Trick Reload":"トリックリロード","Trigger Happy":"トリガーハッピー","Turnabout":"旋回","Updraft":"上昇気流","Violet Storm":"紫雷波","Volcanic Coordinates":"点火法","Water III":"ウォタガ","Wavefoam":"バブルウェイブ","Whoopee Cushion":"ウーピークッション"}}}}
\ No newline at end of file
diff --git a/timelines/src/main/resources/timeline/translations/lapis_manalis.txt.json b/timelines/src/main/resources/timeline/translations/lapis_manalis.txt.json
index 2de021b7872b..1a1d0ceddc54 100644
--- a/timelines/src/main/resources/timeline/translations/lapis_manalis.txt.json
+++ b/timelines/src/main/resources/timeline/translations/lapis_manalis.txt.json
@@ -1 +1 @@
-{"langs":{"cn":{"replaceSync":{"Albion":"白雪兽","Albus Griffin":"白岭狮鹫","Cagnazzo":"凯纳槽","Deepspine":"青炎棘刺","Galatea Magna":"大型伽拉忒亚人偶","The Forum Messorum":"收割广场","The Silvan Throne":"雪兽皇座"},"replaceText":{"Albion's Embrace":"雪兽拥抱","Antediluvian":"古洪将至","Body Slam":"猛撞","Burst":"爆炸","Call of the Mountain":"野性呼唤","Cursed Tide":"凶水之咒","Dark Harvest":"黑暗收割","Hydraulic Ram":"水力冲撞","Hydrofall":"水瀑","Hydrovent":"水涌","Icebreaker":"碎冰","Icy Throes":"投冰","Knock on Ice":"敲击冰面","Left Slam":"左侧猛击","Lifescleaver":"生命劈砍","Neap Tide":"凶水小潮","No more games!":"我要用出全部力量！","Right Slam":"右侧猛击","Roar of Albion":"雪兽怒号","Scarecrow Chase":"人偶追逐","Soul Nebula":"灵魂星云","Soul Scythe":"灵魂钐割","Spring Tide":"凶水大潮","Stony Gaze":"诅咒石眼","Stygian Deluge":"冥河泛滥","Tenebrism":"暗色主义","Tsunami":"大海啸","Void Miasma":"虚无瘴气","Void Torrent":"虚无洪流","Voidcleaver":"虚无劈砍","Waning Cycle":"环割圆切","Waxing Cycle":"圆切环割","Wildlife Crossing":"奔驰"}},"de":{"replaceSync":{"Albion":"Albion","Albus Griffin":"Albus-Greif","Cagnazzo":"Cagnazzo","Deepspine":"Erdseim-Dornen","Galatea Magna":"Galatea Magna","No more games!":"a","The Forum Messorum":"Forum Messorem","The Silvan Throne":"Thron der Schneebestie"},"replaceText":{"Albion's Embrace":"Albions Umarmung","Antediluvian":"Vorsintflutlich","Body Slam":"Bodenwelle","Burst":"Explosion","Call of the Mountain":"Ruf des Berges","Cursed Tide":"Fluch der Fluten","Dark Harvest":"Dunkle Ernte","Hydraulic Ram":"Hydroramme","Hydrofall":"Hydro-Sturz","Hydrovent":"Hydrovent","Icebreaker":"Eisbrecher","Icy Throes":"Eisige Agonie","Knock on Ice":"Eisklopfer","Left Slam":"Linker Arm von Albion","Lifescleaver":"Lebensschlitzer","Neap Tide":"Nipptide","No more games!":"Das ist euer Untergang!","Right Slam":"Rechter Arm von Albion","Roar of Albion":"Albion-Brüllen","Scarecrow Chase":"Bewegung & Kreuz","Soul Nebula":"Seelennebel","Soul Scythe":"Seelensense","Spring Tide":"Springtide","Stony Gaze":"Magisches Steinauge","Stygian Deluge":"Stygische Sintflut","Tenebrism":"Tenebrismus","Tsunami":"Tsunami","Void Miasma":"Nichtsfäule","Void Torrent":"Nichtshagel","Voidcleaver":"Nichtsschlitzer","Waning Cycle":"Kreis & Explosion","Waxing Cycle":"Explosion & Kreis","Wildlife Crossing":"Wilde Tiere"}},"en":{"replaceSync":{},"replaceText":{"Left Slam/Right Slam":"Left/Right Slam","Waxing Cycle/Waning Cycle":"Waxing/Waning Cycle"}},"fr":{"replaceSync":{"Albion":"Albion","Albus Griffin":"griffon de l'Albus","Cagnazzo":"Cagnazzo","Deepspine":"Épines céruléennes","Galatea Magna":"Galatea Magna","The Forum Messorum":"Forum Messorem","The Silvan Throne":"Trône de la Bête des neiges"},"replaceText":{"Albion's Embrace":"Étreinte d'Albion","Antediluvian":"Antédiluvienne","Body Slam":"Charge physique","Burst":"Explosion","Call of the Mountain":"Appel bestial","Cursed Tide":"Maléfice submersif","Dark Harvest":"Sombre récolte","Hydraulic Ram":"Hydrotambourinage","Hydrofall":"Pilonnage hydrique","Hydrovent":"Hydro-exutoire","Icebreaker":"Briseur de glace","Icy Throes":"Jeté de glace","Knock on Ice":"Toucher de la glace","Left Slam":"Claque gauche d'Albion","Lifescleaver":"Couperet vital","Neap Tide":"Mortes-eaux submersives","No more games!":"Vous voulez voir quand je m'énerve!?","Right Slam":"Claque droite d'Albion","Roar of Albion":"Rugissement d'Albion","Scarecrow Chase":"Mouvement et croix","Soul Nebula":"Nébuleuse animique","Soul Scythe":"Faux animique","Spring Tide":"Vives-eaux submersives","Stony Gaze":"Œil pétrifiant maudit","Stygian Deluge":"Déluge stygien","Tenebrism":"Ténébrisme","Tsunami":"Raz-de-marée","Void Miasma":"Miasmes du néant","Void Torrent":"Torrent du néant","Voidcleaver":"Couperet du néant","Waning Cycle":"Cercle et explosion","Waxing Cycle":"Explosion et cercle","Wildlife Crossing":"Traversée"}},"ja":{"replaceSync":{"Albion":"アルビオン","Albus Griffin":"アルバス・グリフィン","Cagnazzo":"カイナッツォ","Deepspine":"青炎の棘","Galatea Magna":"ガラテア・マグナ","The Forum Messorum":"フォルム・メッソルム","The Silvan Throne":"雪獣の帝座"},"replaceText":{"Albion's Embrace":"アルビオンハグ","Antediluvian":"アンテディルヴィアン","Body Slam":"ボディスラム","Burst":"爆発","Call of the Mountain":"ビーストコール","Cursed Tide":"水禍の呪い","Dark Harvest":"ダークハーベスト","Hydraulic Ram":"ハイドロラミング","Hydrofall":"ハイドロフォール","Hydrovent":"ハイドロベント","Icebreaker":"アイスブレイカー","Icy Throes":"アイススロー","Knock on Ice":"ノックオンアイス","Left Slam":"レフト・アルビオンスラム","Lifescleaver":"ライフクリーバー","Neap Tide":"水禍の小潮","No more games!":"俺様の本気を……くらいやがれェ！！","Right Slam":"ライト・アルビオンスラム","Roar of Albion":"アルビオンロア","Scarecrow Chase":"ムーブ＆クロス","Soul Nebula":"ソウルネビュラ","Soul Scythe":"ソウルサイズ","Spring Tide":"水禍の大潮","Stony Gaze":"呪いの石眼","Stygian Deluge":"スティギアンデリージュ","Tenebrism":"テネブリズム","Tsunami":"つなみ","Void Miasma":"ヴォイドの瘴気","Void Torrent":"ヴォイドトーレント","Voidcleaver":"ヴォイドクリーバー","Waning Cycle":"サークル＆バースト","Waxing Cycle":"バースト＆サークル","Wildlife Crossing":"駆け抜け"}},"ko":{"replaceSync":{"Albion":"알비온","Albus Griffin":"알부스 그리핀","Cagnazzo":"카냐초","Deepspine":"푸른불 가시","Galatea Magna":"갈라테아 마그나","The Forum Messorum":"수확자의 광장","The Silvan Throne":"눈짐승의 왕좌"},"replaceText":{"Albion's Embrace":"알비온의 포옹","Antediluvian":"태고의 물","Body Slam":"몸통 박기","Burst":"폭발","Call of the Mountain":"짐승 부르기","Cursed Tide":"수마의 저주","Dark Harvest":"어둠의 수확","Hydraulic Ram":"수력 격돌","Hydrofall":"물 쏟기","Hydrovent":"솟구치는 물","Icebreaker":"얼음 부수기","Icy Throes":"얼음 던지기","Knock on Ice":"얼음 두드리기","Left Slam":"알비온의 왼주먹","Lifescleaver":"생명의 살육자","Neap Tide":"수마의 작은물","No more games!":"내 진짜 실력을…… 받아라!!","Right Slam":"알비온의 오른주먹","Roar of Albion":"알비온의 포효","Scarecrow Chase":"이동 십자베기","Soul Nebula":"영혼의 성운","Soul Scythe":"영혼의 낫","Spring Tide":"수마의 큰물","Stony Gaze":"석화 저주의 눈","Stygian Deluge":"지저 대홍수","Tenebrism":"테네브리즘","Tsunami":"해일","Void Miasma":"보이드의 독기","Void Torrent":"보이드 급류","Voidcleaver":"보이드의 살육자","Waning Cycle":"회전 연속베기","Waxing Cycle":"연속 회전베기","Wildlife Crossing":"짐승 질주"}}}}
\ No newline at end of file
+{"langs":{"cn":{"replaceSync":{"Albion":"白雪兽","Albus Griffin":"白岭狮鹫","Cagnazzo":"凯纳槽","Deepspine":"青炎棘刺","Galatea Magna":"大型伽拉忒亚人偶","No more games!":"我要用出全部力量！","The Forum Messorum":"收割广场","The Silvan Throne":"雪兽皇座"},"replaceText":{"Albion's Embrace":"雪兽拥抱","Antediluvian":"古洪将至","Body Slam":"猛撞","Burst":"爆炸","Call of the Mountain":"野性呼唤","Cursed Tide":"凶水之咒","Dark Harvest":"黑暗收割","Hydraulic Ram":"水力冲撞","Hydrofall":"水瀑","Hydrovent":"水涌","Icebreaker":"碎冰","Icy Throes":"投冰","Knock on Ice":"敲击冰面","Left Slam":"左侧猛击","Lifescleaver":"生命劈砍","Neap Tide":"凶水小潮","Right Slam":"右侧猛击","Roar of Albion":"雪兽怒号","Scarecrow Chase":"人偶追逐","Soul Nebula":"灵魂星云","Soul Scythe":"灵魂钐割","Spring Tide":"凶水大潮","Stony Gaze":"诅咒石眼","Stygian Deluge":"冥河泛滥","Tenebrism":"暗色主义","Tsunami":"大海啸","Void Miasma":"虚无瘴气","Void Torrent":"虚无洪流","Voidcleaver":"虚无劈砍","Waning Cycle":"环割圆切","Waxing Cycle":"圆切环割","Wildlife Crossing":"奔驰"}},"de":{"replaceSync":{"Albion":"Albion","Albus Griffin":"Albus-Greif","Cagnazzo":"Cagnazzo","Deepspine":"Erdseim-Dornen","Galatea Magna":"Galatea Magna","No more games!":"Das ist euer Untergang!","The Forum Messorum":"Forum Messorem","The Silvan Throne":"Thron der Schneebestie"},"replaceText":{"Albion's Embrace":"Albions Umarmung","Antediluvian":"Vorsintflutlich","Body Slam":"Bodenwelle","Burst":"Explosion","Call of the Mountain":"Ruf des Berges","Cursed Tide":"Fluch der Fluten","Dark Harvest":"Dunkle Ernte","Hydraulic Ram":"Hydroramme","Hydrofall":"Hydro-Sturz","Hydrovent":"Hydrovent","Icebreaker":"Eisbrecher","Icy Throes":"Eisige Agonie","Knock on Ice":"Eisklopfer","Left Slam":"Linker Arm von Albion","Lifescleaver":"Lebensschlitzer","Neap Tide":"Nipptide","Right Slam":"Rechter Arm von Albion","Roar of Albion":"Albion-Brüllen","Scarecrow Chase":"Bewegung & Kreuz","Soul Nebula":"Seelennebel","Soul Scythe":"Seelensense","Spring Tide":"Springtide","Stony Gaze":"Magisches Steinauge","Stygian Deluge":"Stygische Sintflut","Tenebrism":"Tenebrismus","Tsunami":"Tsunami","Void Miasma":"Nichtsfäule","Void Torrent":"Nichtshagel","Voidcleaver":"Nichtsschlitzer","Waning Cycle":"Kreis & Explosion","Waxing Cycle":"Explosion & Kreis","Wildlife Crossing":"Wilde Tiere"}},"en":{"replaceSync":{},"replaceText":{"Left Slam/Right Slam":"Left/Right Slam","Waxing Cycle/Waning Cycle":"Waxing/Waning Cycle"}},"fr":{"replaceSync":{"Albion":"Albion","Albus Griffin":"griffon de l'Albus","Cagnazzo":"Cagnazzo","Deepspine":"Épines céruléennes","Galatea Magna":"Galatea Magna","No more games!":"Vous voulez voir quand je m'énerve!?","The Forum Messorum":"Forum Messorem","The Silvan Throne":"Trône de la Bête des neiges"},"replaceText":{"Albion's Embrace":"Étreinte d'Albion","Antediluvian":"Antédiluvienne","Body Slam":"Charge physique","Burst":"Explosion","Call of the Mountain":"Appel bestial","Cursed Tide":"Maléfice submersif","Dark Harvest":"Sombre récolte","Hydraulic Ram":"Hydrotambourinage","Hydrofall":"Pilonnage hydrique","Hydrovent":"Hydro-exutoire","Icebreaker":"Briseur de glace","Icy Throes":"Jeté de glace","Knock on Ice":"Toucher de la glace","Left Slam":"Claque gauche d'Albion","Lifescleaver":"Couperet vital","Neap Tide":"Mortes-eaux submersives","Right Slam":"Claque droite d'Albion","Roar of Albion":"Rugissement d'Albion","Scarecrow Chase":"Mouvement et croix","Soul Nebula":"Nébuleuse animique","Soul Scythe":"Faux animique","Spring Tide":"Vives-eaux submersives","Stony Gaze":"Œil pétrifiant maudit","Stygian Deluge":"Déluge stygien","Tenebrism":"Ténébrisme","Tsunami":"Raz-de-marée","Void Miasma":"Miasmes du néant","Void Torrent":"Torrent du néant","Voidcleaver":"Couperet du néant","Waning Cycle":"Cercle et explosion","Waxing Cycle":"Explosion et cercle","Wildlife Crossing":"Traversée"}},"ja":{"replaceSync":{"Albion":"アルビオン","Albus Griffin":"アルバス・グリフィン","Cagnazzo":"カイナッツォ","Deepspine":"青炎の棘","Galatea Magna":"ガラテア・マグナ","No more games!":"俺様の本気を……くらいやがれェ！！","The Forum Messorum":"フォルム・メッソルム","The Silvan Throne":"雪獣の帝座"},"replaceText":{"Albion's Embrace":"アルビオンハグ","Antediluvian":"アンテディルヴィアン","Body Slam":"ボディスラム","Burst":"爆発","Call of the Mountain":"ビーストコール","Cursed Tide":"水禍の呪い","Dark Harvest":"ダークハーベスト","Hydraulic Ram":"ハイドロラミング","Hydrofall":"ハイドロフォール","Hydrovent":"ハイドロベント","Icebreaker":"アイスブレイカー","Icy Throes":"アイススロー","Knock on Ice":"ノックオンアイス","Left Slam":"レフト・アルビオンスラム","Lifescleaver":"ライフクリーバー","Neap Tide":"水禍の小潮","Right Slam":"ライト・アルビオンスラム","Roar of Albion":"アルビオンロア","Scarecrow Chase":"ムーブ＆クロス","Soul Nebula":"ソウルネビュラ","Soul Scythe":"ソウルサイズ","Spring Tide":"水禍の大潮","Stony Gaze":"呪いの石眼","Stygian Deluge":"スティギアンデリージュ","Tenebrism":"テネブリズム","Tsunami":"つなみ","Void Miasma":"ヴォイドの瘴気","Void Torrent":"ヴォイドトーレント","Voidcleaver":"ヴォイドクリーバー","Waning Cycle":"サークル＆バースト","Waxing Cycle":"バースト＆サークル","Wildlife Crossing":"駆け抜け"}},"ko":{"replaceSync":{"Albion":"알비온","Albus Griffin":"알부스 그리핀","Cagnazzo":"카냐초","Deepspine":"푸른불 가시","Galatea Magna":"갈라테아 마그나","No more games!":"내 진짜 실력을…… 받아라!!","The Forum Messorum":"수확자의 광장","The Silvan Throne":"눈짐승의 왕좌"},"replaceText":{"Albion's Embrace":"알비온의 포옹","Antediluvian":"태고의 물","Body Slam":"몸통 박기","Burst":"폭발","Call of the Mountain":"짐승 부르기","Cursed Tide":"수마의 저주","Dark Harvest":"어둠의 수확","Hydraulic Ram":"수력 격돌","Hydrofall":"물 쏟기","Hydrovent":"솟구치는 물","Icebreaker":"얼음 부수기","Icy Throes":"얼음 던지기","Knock on Ice":"얼음 두드리기","Left Slam":"알비온의 왼주먹","Lifescleaver":"생명의 살육자","Neap Tide":"수마의 작은물","Right Slam":"알비온의 오른주먹","Roar of Albion":"알비온의 포효","Scarecrow Chase":"이동 십자베기","Soul Nebula":"영혼의 성운","Soul Scythe":"영혼의 낫","Spring Tide":"수마의 큰물","Stony Gaze":"석화 저주의 눈","Stygian Deluge":"지저 대홍수","Tenebrism":"테네브리즘","Tsunami":"해일","Void Miasma":"보이드의 독기","Void Torrent":"보이드 급류","Voidcleaver":"보이드의 살육자","Waning Cycle":"회전 연속베기","Waxing Cycle":"연속 회전베기","Wildlife Crossing":"짐승 질주"}}}}
\ No newline at end of file
diff --git a/timelines/src/main/resources/timeline/translations/thaleia.txt.json b/timelines/src/main/resources/timeline/translations/thaleia.txt.json
index 798441086e10..7e0d7593c9d7 100644
--- a/timelines/src/main/resources/timeline/translations/thaleia.txt.json
+++ b/timelines/src/main/resources/timeline/translations/thaleia.txt.json
@@ -1 +1 @@
-{"langs":{"de":{"replaceSync":{"Eulogia":"Eulogia","Llymlaen(?!')":"Llymlaen","Oschon(?!')":"Oschon","Thaliak(?!')":"Thaliak","The Briny Deep":"Auge des Meeres","The River Of Knowledge":"Fluss der Weisheit","The Stairway To The Seventh":"Aufgang zum Firmament","The Twelve's Embrace":"Himmlische Sphäre des Segens","The Way of the Wise":"Kanal des Wissens","The Windward Pass":"Pfad des Windes"},"replaceText":{}},"en":{"replaceSync":{},"replaceText":{"Blueblossoms/Giltblossoms":"Blue/Giltblossoms","Left Bank/Right Bank":"Left/Right Bank","Left Strait/Right Strait":"Left/Right Strait","Right Bank/Left Bank":"Right/Left Bank"}},"fr":{"replaceSync":{"Eulogia":"Eulogie","Llymlaen(?!')":"Llymlaen","Oschon(?!')":"Oschon","Thaliak(?!')":"Thaliak","The Briny Deep":"Œil de l'océan","The River Of Knowledge":"Rivière du savoir","The Stairway To The Seventh":"Marches du firmament","The Twelve's Embrace":"Sphère céleste de la bénédiction","The Way of the Wise":"Canaux de la connaissance","The Windward Pass":"Voie des vents"},"replaceText":{}},"ja":{"replaceSync":{"Eulogia":"エウロギア","Llymlaen(?!')":"リムレーン","Oschon(?!')":"オシュオン","Thaliak(?!')":"サリャク","The Briny Deep":"大洋の虚","The River Of Knowledge":"知恵の河","The Stairway To The Seventh":"六天座の階","The Twelve's Embrace":"祝福の天球","The Way of the Wise":"導きの水廊","The Windward Pass":"風の通り道"},"replaceText":{}}}}
\ No newline at end of file
+{"langs":{"de":{"replaceSync":{"Eulogia":"Eulogia","Llymlaen(?!')":"Llymlaen","Oschon's Avatar":"Oschons Abbild","Oschon(?!')":"Oschon","Perykos":"Perykos","Thalaos":"Thalaos","Thaliak(?!')":"Thaliak"},"replaceText":{"Altitude":"Höhenlage","Arrow Trail":"Pfeilschweif","As Above, So Below":"Flamme von Leben und Tod","Blueblossoms":"Blaublüten","Byregot's Strike":"Byregots Schlag","Climbing Shot":"Aufsteigender Schuss","Dawn of Time":"Himmlischer Blitz","Deep Dive":"Tiefes Eintauchen","Denizens of the Deep":"Bewohner der Tiefe","Destructive Bolt":"Zerstörerischer Blitzschlag","Dire Straits":"Beidseitige Säuberung","Downhill":"Regenguss","Eudaimon Eorzea":"Eudaimon Eorzea","First Blush":"Lunarer Schuss","First Form":"Primärhaltung","Flinted Foehn":"Föhnpfeil","Full Bright":"Voller Glanz","Giltblossoms":"Goldblüten","Godsbane":"Göttliche Geißel","Great Whirlwind":"Windhose","Hand of the Destroyer":"Vernichtungsschlag des Zerstörers","Hard Water":"Reißendes Wasser","Hieroglyphika":"Hieroglyphen","Hydroptosis":"Hydroptose","Hydrostasis":"Hydrostase","Katarraktes":"Katarakt","Landing":"Schnelle Landung","Left Bank":"Linkes Ufer","Left Strait":"Linkes Fahrwasser","Lightning Bolt":"Keraunisches Feld","Lofty Peaks":"Orogenese","Love's Light":"Licht der Liebe","Maelstrom":"Mahlstrom","Matron's Breath":"Nophicas Atem","Moving Mountains":"Tektonisches Beben","Navigator's Trident":"Llymlaens Dreizack","Peak Peril":"Tektonische Turbulenz","Piton Pull":"Hakengriff","Quintessence":"Kriegerischer Übermut","Radiant Finish":"Letzter Fächertanz","Radiant Rhythm":"Fächertanz","Reproduce":"Teilung des Selbsts","Rheognosis Petrine":"Rheognose Petros","Rheognosis(?! Petrine)":"Rheognose","Rhyton":"Rhyton","Right Bank":"Rechtes Ufer","Right Strait":"Rechtes Fahrwasser","Seafoam Spiral":"Kreisförmige Welle","Second Form":"Sekundärhaltung","Serpents' Tide":"Schlangenflut","Shockwave":"Schockwelle","Soaring Minuet":"Pfeil des Wanderers","Solar Fans":"Fächerschneide","Stormwhorl":"Meerestornado","Stormwinds":"Meerestornado","Stormy Seas":"Stürmische See","Sudden Downpour":"Platzregen","Sunbeam":"Sonnenstrahl","Surging Wave":"Wellenstoß","Swinging Draw":"Schweifender Pfeil","Tempest":"Schwerer Sturm","Tetraktuos Kosmos":"Tetraktuos Kosmos","Tetraktys":"Tetraktuos","The Arrow":"Oschons Pfeil","The Builder's Art":"Byregots göttliche Macht","The Destroyer's Might":"Rhalghrs göttliche Macht","The Fury's Ambition":"Halones göttliche Macht","The Keeper's Gravity":"Althyks göttliche Macht","The Lover's Devotion":"Menphinas göttliche Macht","The Matron's Plenty":"Nophicas göttliche Macht","The Navigator's Command":"Llymlaens göttliche Macht","The Scholar's Wisdom":"Thaliaks göttliche Macht","The Spinner's Cunning":"Nymeias göttliche Macht","The Traders' Equity":"Nald'thals göttliche Macht","The Wanderer's Whimsy":"Oschons göttliche Macht","The Warden's Radiance":"Azeymas göttliche Macht","The Whorl":"Göttlicher Schöpfungswirbel","Third Form":"Tertiärhaltung","Thlipsis":"Drangsal","Thousandfold Thrust":"Tausendfacher Stoß","Time and Tide":"Zeit und Gezeiten","To the Last":"Endlose Wellen","Torrential Tridents":"Himmlische Harpunen","Trek Shot":"Langsamer Pfeil","Wandering Shot":"Umherschweifender Schuss","Wandering Volley":"Streifschüsse","Wind Rose":"Kreisförmiger Wirbel"}},"en":{"replaceSync":{},"replaceText":{"Blueblossoms/Giltblossoms":"Blue/Giltblossoms","Left Bank/Right Bank":"Left/Right Bank","Left Strait/Right Strait":"Left/Right Strait","Right Bank/Left Bank":"Right/Left Bank"}},"fr":{"replaceSync":{"Eulogia":"Eulogie","Llymlaen(?!')":"Llymlaen","Oschon's Avatar":"double d'Oschon","Oschon(?!')":"Oschon","Perykos":"Pérykos","Thalaos":"Thalaos","Thaliak(?!')":"Thaliak"},"replaceText":{"Altitude":"Altitude","Arrow Trail":"Traînées de flèches","As Above, So Below":"Flamme de vie, flamme de mort","Blueblossoms":"Pétales d'azur","Byregot's Strike":"Foreuse de Byregot","Climbing Shot":"Tir ascendant","Dawn of Time":"Éclair céleste","Deep Dive":"Noyade abyssale","Denizens of the Deep":"Appel des serpents marins","Destructive Bolt":"Foudre destructrice","Dire Straits":"Éradication totale","Downhill":"Averse pénétrante","Eudaimon Eorzea":"Eudémon éorzéen","First Blush":"Scintillement sélénien","First Form":"Posture primaire","Flinted Foehn":"Flèches de foehn","Full Bright":"Nuit de pleine lune","Giltblossoms":"Pétales dorés","Godsbane":"Fléau divin","Great Whirlwind":"Grand tourbillon","Hand of the Destroyer":"Main du Destructeur","Hard Water":"Oppression aqueuse","Hieroglyphika":"Hiéroglyphe","Hydroptosis":"Hydroptôse","Hydrostasis":"Hydrostase","Katarraktes":"Cataracte","Landing":"Atterrissage rapide","Left Bank":"Débordement rive gauche","Left Strait":"Éradication à bâbord","Lightning Bolt":"Éclair de foudre","Lofty Peaks":"Orogenèse","Love's Light":"Brillance de l'amour","Maelstrom":"Maelström","Matron's Breath":"Souffle de la Mère","Moving Mountains":"Secousse tectonique","Navigator's Trident":"Trident de Llymlaen","Peak Peril":"Turbulence tectonique","Piton Pull":"Arrachement de pitons","Quintessence":"Exaltation guerrière","Radiant Finish":"Final enflammé","Radiant Rhythm":"Rythme enflammé","Reproduce":"Clonage","Rheognosis Petrine":"Leonosis petros","Rheognosis(?! Petrine)":"Leonosis","Rhyton":"Rhyton","Right Bank":"Débordement rive droite","Right Strait":"Éradication à tribord","Seafoam Spiral":"Vague circulaire","Second Form":"Posture secondaire","Serpents' Tide":"Ruée serpentine","Shockwave":"Onde de choc","Soaring Minuet":"Flèche du menuet","Solar Fans":"Éventails solaires","Stormwhorl":"Tornade marine","Stormwinds":"Brise marine","Stormy Seas":"Déchaînement marin","Sudden Downpour":"Déluge dru","Sunbeam":"Rayon de soleil","Surging Wave":"Transperce-vague","Swinging Draw":"Tir oscillant","Tempest":"Grande tempête","Tetraktuos Kosmos":"Tetractys cosmos","Tetraktys":"Tetractys","The Arrow":"Flèche d'Oschon","The Builder's Art":"Pouvoir divin de Byregot","The Destroyer's Might":"Pouvoir divin de Rhalgr","The Fury's Ambition":"Pouvoir divin de Halone","The Keeper's Gravity":"Pouvoir divin d'Althyk","The Lover's Devotion":"Pouvoir divin de Menphina","The Matron's Plenty":"Pouvoir divin de Nophica","The Navigator's Command":"Pouvoir divin de Llymlaen","The Scholar's Wisdom":"Pouvoir divin de Thaliak","The Spinner's Cunning":"Pouvoir divin de Nymeia","The Traders' Equity":"Pouvoir divin de Nald'thal","The Wanderer's Whimsy":"Pouvoir divin d'Oschon","The Warden's Radiance":"Pouvoir divin d'Azeyma","The Whorl":"Vortex génésiaque","Third Form":"Posture tertiaire","Thlipsis":"Tribulation","Thousandfold Thrust":"Transpercement millénaire","Time and Tide":"Manipulation temporelle","To the Last":"Vagues infinies","Torrential Tridents":"Pluie de tridents","Trek Shot":"Flèches languissantes","Wandering Shot":"Tir errant","Wandering Volley":"Tir de barrage errant","Wind Rose":"Bourrasque circulaire"}},"ja":{"replaceSync":{"Eulogia":"エウロギア","Llymlaen(?!')":"リムレーン","Oschon's Avatar":"オシュオンの分体","Oschon(?!')":"オシュオン","Perykos":"ペリュコス","Thalaos":"サラオス","Thaliak(?!')":"サリャク"},"replaceText":{"Altitude":"アルティチュード","Arrow Trail":"アロートレイル","As Above, So Below":"死生択一の炎","Blueblossoms":"青花散","Byregot's Strike":"ビエルゴズ・ストライク","Climbing Shot":"クライムシュート","Dawn of Time":"星天極光","Deep Dive":"海淵落とし","Denizens of the Deep":"海蛇招来","Destructive Bolt":"壊雷撃","Dire Straits":"両舷掃討","Downhill":"ダウンヒル","Eudaimon Eorzea":"エウダイモン・エオルゼア","First Blush":"月閃","First Form":"壱の構え","Flinted Foehn":"フェーンアロー","Full Bright":"月夜の巡り","Giltblossoms":"黄花散","Godsbane":"ゴッズベーン","Great Whirlwind":"大旋風","Hand of the Destroyer":"壊神創幻撃","Hard Water":"重水塊","Hieroglyphika":"ヒエログリュフィカ","Hydroptosis":"ヒュドルピトシス","Hydrostasis":"ヒュドルスタシス","Katarraktes":"カタラクティス","Landing":"落着","Left Bank":"左岸氾濫","Left Strait":"左舷掃討","Lightning Bolt":"落雷","Lofty Peaks":"風天の霊峰","Love's Light":"慈愛の月","Maelstrom":"メイルシュトローム","Matron's Breath":"豊穣の息吹","Moving Mountains":"造山振動","Navigator's Trident":"リムレーンズトライデント","Peak Peril":"造山乱流","Piton Pull":"ハーケンブリング","Quintessence":"武気発揚","Radiant Finish":"焔扇流舞・終炎","Radiant Rhythm":"焔扇流舞","Reproduce":"分体生成","Rheognosis Petrine":"レーオノシス・ペトゥロス","Rheognosis(?! Petrine)":"レーオノシス","Rhyton":"リュトン","Right Bank":"右岸氾濫","Right Strait":"右舷掃討","Seafoam Spiral":"輪の波浪","Second Form":"弐の構え","Serpents' Tide":"海蛇の進撃","Shockwave":"衝撃波","Soaring Minuet":"メヌエットアロー","Solar Fans":"紅炎扇刃","Stormwhorl":"時化の渦風","Stormwinds":"時化の潮風","Stormy Seas":"大時化起こし","Sudden Downpour":"ダウンポール","Sunbeam":"太陽光","Surging Wave":"波穿ち","Swinging Draw":"スイングアロー","Tempest":"大海嵐","Tetraktuos Kosmos":"テトラクテュス・コスモス","Tetraktys":"テトラクテュス","The Arrow":"オシュオンの矢","The Builder's Art":"ビエルゴの神力","The Destroyer's Might":"ラールガーの神力","The Fury's Ambition":"ハルオーネの神力","The Keeper's Gravity":"アルジクの神力","The Lover's Devotion":"メネフィナの神力","The Matron's Plenty":"ノフィカの神力","The Navigator's Command":"リムレーンの神力","The Scholar's Wisdom":"サリャクの神力","The Spinner's Cunning":"ニメーヤの神力","The Traders' Equity":"ナルザルの神力","The Wanderer's Whimsy":"オシュオンの神力","The Warden's Radiance":"アーゼマの神力","The Whorl":"創世の神渦","Third Form":"参の構え","Thlipsis":"スリプシス","Thousandfold Thrust":"サウザンスラスト","Time and Tide":"時間操作","To the Last":"千波万波","Torrential Tridents":"銛の雨","Trek Shot":"トレックアロー","Wandering Shot":"ワンダリングショット","Wandering Volley":"ワンダリングバラージ","Wind Rose":"円の旋風"}}}}
\ No newline at end of file
diff --git a/timelines/src/main/resources/timeline/translations/the_lunar_subterrane.txt.json b/timelines/src/main/resources/timeline/translations/the_lunar_subterrane.txt.json
index 8fd468ec1dd0..94633f3bc7b3 100644
--- a/timelines/src/main/resources/timeline/translations/the_lunar_subterrane.txt.json
+++ b/timelines/src/main/resources/timeline/translations/the_lunar_subterrane.txt.json
@@ -1 +1 @@
-{"langs":{"de":{"replaceSync":{"Aetheric Charge":"magisch(?:e|er|es|en) Sphäre","Damcyan Antlion":"damcyanisch(?:e|er|es|en) Ameisenlöwe","Dark Elf":"Dunkelelf","Durante":"Durante","Stone Pillar":"Steinsäule","The Bloodied Barbican":"Schlosspforte","The Carnelian Courtyard":"Schlossgarten","The Cloven Crystal Square":"Kristall-Platz"},"replaceText":{"Abyssal Outburst":"Finsterschwall","Antipodal Assault":"Antipodischer Stoß","Antlion March":"Mächtiger Marsch","Arcane Edge":"Arkane Schneide","Contrapasso":"Contrapasso","Dark Impact":"Dunkler Einschlag","Death's Journey":"Ende des Weges","Duplicitous Battery":"Doppelte Barrage","Earthen Geyser":"Staubiger Geysir","Explosion":"Explosion","Fallen Grace":"Banngeschoß","Forsaken Fount":"Magische Sphären","Hard Slash":"Harter Schlitzer","Hexing Staves":"Stäbe der Dunkelheit","Landslip":"Einsturz","Old Magic":"Magiefeuer","Pound Sand":"Sandhammer","Ruinous Confluence":"Verheerender Fluch","Sandblast":"Sandschwall","Shadowy Sigil":"Wappen der Dunkelheit","Sorcerous Shroud":"Vorhang der Dunkelheit","Splinter":"Sphärensplitterung","Staff Smite":"Stabschlag","Towerfall":"Turmsturz","Twilight Phase":"Zwielichtschnitt","Void Dark II":"Nichts-Negra","\\(cast\\)":"(Wirken)","\\(spread\\)":"(Verteilen)"}},"fr":{"replaceSync":{"Aetheric Charge":"globe magique","Damcyan Antlion":"fourmilion de Damcyan","Dark Elf":"Elfe noir","Durante":"Durante","Stone Pillar":"colonne","The Bloodied Barbican":"Portes du château de Baron","The Carnelian Courtyard":"Cour du château de Baron","The Cloven Crystal Square":"Place du cristal"},"replaceText":{"Abyssal Outburst":"Onde noire","Antipodal Assault":"Percée antipodale","Antlion March":"Marche des fourmilions","Arcane Edge":"Oblitérateur magique","Contrapasso":"Contrapasso","Dark Impact":"Décharge obscure","Death's Journey":"Cortège funèbre","Duplicitous Battery":"Multi-décharges","Earthen Geyser":"Geyser terrestre","Explosion":"Explosion","Fallen Grace":"Descente obscure","Forsaken Fount":"Globes magiques","Hard Slash":"Taillade violente","Hexing Staves":"Cannes des ténèbres","Landslip":"Sol mouvant","Old Magic":"Déferlante magique","Pound Sand":"Martèlement terrestre","Ruinous Confluence":"Cruci-cannes","Sandblast":"Explosion sableuse","Shadowy Sigil":"Sceau des ténèbres","Sorcerous Shroud":"Disparition ténébreuse","Splinter":"Rupture","Staff Smite":"Coup de canne","Towerfall":"Écroulement","Twilight Phase":"Ombre du crépuscule","Void Dark II":"Extra Ténèbres du néant"}},"ja":{"replaceSync":{"Aetheric Charge":"魔力球","Damcyan Antlion":"ダムシアン・アントリオン","Dark Elf":"ダークエルフ","Durante":"ドゥランテ","Stone Pillar":"石柱","The Bloodied Barbican":"バロン城正門","The Carnelian Courtyard":"バロン城中庭","The Cloven Crystal Square":"クリスタル広場"},"replaceText":{"Abyssal Outburst":"暗黒波動","Antipodal Assault":"アンティポディース・スラスト","Antlion March":"アントリオンマーチ","Arcane Edge":"魔針弾","Contrapasso":"コントラパッソ","Dark Impact":"暗黒魔弾","Death's Journey":"ジャーニー・オブ・デス","Duplicitous Battery":"双魔連弾","Earthen Geyser":"アースゲイザー","Explosion":"爆発","Fallen Grace":"降魔弾","Forsaken Fount":"魔力球","Hard Slash":"ハードスラッシュ","Hexing Staves":"闇の杖","Landslip":"地滑り","Old Magic":"魔力放出","Pound Sand":"アースパウンド","Ruinous Confluence":"十字魔操","Sandblast":"サンドブラスト","Shadowy Sigil":"闇の紋章","Sorcerous Shroud":"闇の帳","Splinter":"破裂","Staff Smite":"杖撃","Towerfall":"倒壊","Twilight Phase":"トワイライトフェイズ","Void Dark II":"ヴォイド・ダーラ"}}}}
\ No newline at end of file
+{"langs":{"de":{"replaceSync":{"Aetheric Charge":"magisch(?:e|er|es|en) Sphäre","Damcyan Antlion":"damcyanisch(?:e|er|es|en) Ameisenlöwe","Dark Elf":"Dunkelelf","Durante":"Durante","Hexing Staff":"Stab der Dunkelheit","Stone Pillar":"Steinsäule","The Bloodied Barbican":"Schlosspforte","The Carnelian Courtyard":"Schlossgarten","The Cloven Crystal Square":"Kristall-Platz"},"replaceText":{"Abyssal Outburst":"Finsterschwall","Antipodal Assault":"Antipodischer Stoß","Antlion March":"Mächtiger Marsch","Arcane Edge":"Arkane Schneide","Contrapasso":"Contrapasso","Dark Impact":"Dunkler Einschlag","Death's Journey":"Ende des Weges","Duplicitous Battery":"Doppelte Barrage","Earthen Geyser":"Staubiger Geysir","Explosion":"Explosion","Fallen Grace":"Banngeschoß","Forsaken Fount":"Magische Sphären","Hard Slash":"Harter Schlitzer","Hexing Staves":"Stäbe der Dunkelheit","Landslip":"Einsturz","Old Magic":"Magiefeuer","Pound Sand":"Sandhammer","Ruinous Confluence":"Verheerender Fluch","Sandblast":"Sandschwall","Shadowy Sigil":"Wappen der Dunkelheit","Sorcerous Shroud":"Vorhang der Dunkelheit","Splinter":"Sphärensplitterung","Staff Smite":"Stabschlag","Towerfall":"Turmsturz","Twilight Phase":"Zwielichtschnitt","Void Dark II":"Nichts-Negra","\\(cast\\)":"(Wirken)","\\(spread\\)":"(Verteilen)"}},"fr":{"replaceSync":{"Aetheric Charge":"globe magique","Damcyan Antlion":"fourmilion de Damcyan","Dark Elf":"Elfe noir","Durante":"Durante","Hexing Staff":"canne des ténèbres","Stone Pillar":"colonne","The Bloodied Barbican":"Portes du château de Baron","The Carnelian Courtyard":"Cour du château de Baron","The Cloven Crystal Square":"Place du cristal"},"replaceText":{"Abyssal Outburst":"Onde noire","Antipodal Assault":"Percée antipodale","Antlion March":"Marche des fourmilions","Arcane Edge":"Oblitérateur magique","Contrapasso":"Contrapasso","Dark Impact":"Décharge obscure","Death's Journey":"Cortège funèbre","Duplicitous Battery":"Multi-décharges","Earthen Geyser":"Geyser terrestre","Explosion":"Explosion","Fallen Grace":"Descente obscure","Forsaken Fount":"Globes magiques","Hard Slash":"Taillade violente","Hexing Staves":"Cannes des ténèbres","Landslip":"Sol mouvant","Old Magic":"Déferlante magique","Pound Sand":"Martèlement terrestre","Ruinous Confluence":"Cruci-cannes","Sandblast":"Explosion sableuse","Shadowy Sigil":"Sceau des ténèbres","Sorcerous Shroud":"Disparition ténébreuse","Splinter":"Rupture","Staff Smite":"Coup de canne","Towerfall":"Écroulement","Twilight Phase":"Ombre du crépuscule","Void Dark II":"Extra Ténèbres du néant"}},"ja":{"replaceSync":{"Aetheric Charge":"魔力球","Damcyan Antlion":"ダムシアン・アントリオン","Dark Elf":"ダークエルフ","Durante":"ドゥランテ","Hexing Staff":"闇の杖","Stone Pillar":"石柱","The Bloodied Barbican":"バロン城正門","The Carnelian Courtyard":"バロン城中庭","The Cloven Crystal Square":"クリスタル広場"},"replaceText":{"Abyssal Outburst":"暗黒波動","Antipodal Assault":"アンティポディース・スラスト","Antlion March":"アントリオンマーチ","Arcane Edge":"魔針弾","Contrapasso":"コントラパッソ","Dark Impact":"暗黒魔弾","Death's Journey":"ジャーニー・オブ・デス","Duplicitous Battery":"双魔連弾","Earthen Geyser":"アースゲイザー","Explosion":"爆発","Fallen Grace":"降魔弾","Forsaken Fount":"魔力球","Hard Slash":"ハードスラッシュ","Hexing Staves":"闇の杖","Landslip":"地滑り","Old Magic":"魔力放出","Pound Sand":"アースパウンド","Ruinous Confluence":"十字魔操","Sandblast":"サンドブラスト","Shadowy Sigil":"闇の紋章","Sorcerous Shroud":"闇の帳","Splinter":"破裂","Staff Smite":"杖撃","Towerfall":"倒壊","Twilight Phase":"トワイライトフェイズ","Void Dark II":"ヴォイド・ダーラ"}}}}
\ No newline at end of file
diff --git a/timelines/src/main/resources/timeline/twinning.txt b/timelines/src/main/resources/timeline/twinning.txt
index b59678917747..e47574ceeab6 100644
--- a/timelines/src/main/resources/timeline/twinning.txt
+++ b/timelines/src/main/resources/timeline/twinning.txt
@@ -5,7 +5,8 @@ hideall "--sync--"
 
 ### Alpha Zaghnal
 # -p 3D65:108.5 -ii 3D66 3D67 3D68 3D69 3D6A 41CA 3D6C
-100.0 "--sync--" sync / 00:0839::Repurposing will be sealed off/ window 100,0
+# Repurposing will be sealed off
+100.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:B9F:/ window 100,0
 108.5 "Augurium" sync / 1[56]:[^:]*:Alpha Zaghnal:3D65:/ window 109,9
 117.6 "Beastly Roar" sync / 1[56]:[^:]*:Alpha Zaghnal:3D64:/
 122.9 "Beast Rampant" sync / 1[56]:[^:]*:Alpha Zaghnal:3D60:/
@@ -32,7 +33,8 @@ hideall "--sync--"
 
 ### Mithridates
 # -p 3DED:512 -ii 3DEC 3DEF
-500.0 "--sync--" sync / 00:0839::Aetherial Observation will be sealed off/ window 500,0
+# Aetherial Observation will be sealed off
+500.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BA0:/ window 500,0
 
 512.0 "Thunder Beam" sync / 1[56]:[^:]*:Mithridates:3DED:/ window 512,10
 522.2 "Electric Discharge" sync / 1[56]:[^:]*:Mithridates:3DF0:/
@@ -63,7 +65,8 @@ hideall "--sync--"
 hideall "Temporal Paradox"
 hideall "Temporal Flow"
 
-1000.0 "--sync--" sync / 00:0839::The Cornice will be sealed off/ window 1000,0
+# The Cornice will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:BA2:/ window 1000,0
 
 1013.8 "Magitek Crossray" sync / 1[56]:[^:]*:The Tycoon:3DF8:/ window 1013.8,5
 1016.2 "Temporal Paradox" sync / 1[56]:[^:]*:The Tycoon:3DF7:/
diff --git a/timelines/src/main/resources/timeline/vanaspati.txt b/timelines/src/main/resources/timeline/vanaspati.txt
index 403bd4fb2471..471d8d9ffcdf 100644
--- a/timelines/src/main/resources/timeline/vanaspati.txt
+++ b/timelines/src/main/resources/timeline/vanaspati.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 #~~~~~~~~~~~~~~~~~~~#
 # Terminus Snatcher #
@@ -12,7 +13,8 @@ hideall "--sync--"
 # -p 6238:12.1
 # -ii 366 6291 6292
 
-0.0 "--sync--" sync / 00:0839::Trnakiya will be sealed off/ window 0,1
+# Trnakiya will be sealed off
+0.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:FAC:/ window 0,1
 7.1 "--sync--" sync / 14:[^:]*:Terminus Snatcher:6238:/ window 10,10
 12.1 "Note of Despair" sync / 1[56]:[^:]*:Terminus Snatcher:6238:/
 19.6 "Mouth Off" sync / 1[56]:[^:]*:Terminus Snatcher:6231:/
@@ -49,7 +51,8 @@ hideall "--sync--"
 
 # Note: 623F is also called "Poison Heart" but that's when the stack marker appears.
 
-1000.0 "--sync--" sync / 00:0839::Insight will be sealed off/ window 1000,0
+# Insight will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:FAD:/ window 1000,0
 1006.2 "--sync--" sync / 14:[^:]*:Terminus Wrecker:6241:/ window 1010,10
 1011.2 "Meaningless Destruction" sync / 1[56]:[^:]*:Terminus Wrecker:6241:/
 1021.4 "Unholy Water" sync / 1[56]:[^:]*:Terminus Wrecker:6CCC:/
@@ -95,7 +98,8 @@ hideall "--sync--"
 # I think this is when the floor panels disappear?
 hideall "Crumbling Sky"
 
-2000.0 "--sync--" sync / 00:0839::Devatagara will be sealed off/ window 2000,0
+# Devatagara will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:FAE:/ window 2000,0
 2005.1 "--sync--" sync / 14:[^:]*:Svarbhanu:6252:/ window 2020,10
 2010.1 "Flames of Decay" sync / 1[56]:[^:]*:Svarbhanu:6252:/
 2018.0 "Chaotic Pulse" sync / 1[56]:[^:]*:Svarbhanu:6B61:/
diff --git a/timelines/src/main/resources/timeline/weeping_city.txt b/timelines/src/main/resources/timeline/weeping_city.txt
index e429b1508b15..8a36b8715761 100644
--- a/timelines/src/main/resources/timeline/weeping_city.txt
+++ b/timelines/src/main/resources/timeline/weeping_city.txt
@@ -10,7 +10,8 @@ hideall "--sync--"
 # -ii 368 1835 1836
 # -ic "Webmaiden" "Spitting Spider" "Skittering Spider" "Earth Aether"
 
-0 "--sync--" sync / 00:0839::The Queen's Room will be sealed off/
+# The Queen's Room will be sealed off
+0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6E0:/
 9.8 "Dark Spike" sync / 1[56]:[^:]*:Arachne Eve:1823:/
 21.6 "Silken Spray" sync / 1[56]:[^:]*:Arachne Eve:1824:/
 30.4 "Arachne Web x3" duration 5 # sync / 1[56]:[^:]*:Arachne Eve:185E:/
@@ -132,7 +133,8 @@ hideall "--sync--"
 
 # -ii 366 17D5 17C1 17D6
 
-1000.0 "--sync--" sync / 00:0839::The Shrine Of The Goetic will be sealed off/ window 1000,5
+# The Shrine of the Goetic will be sealed off
+1000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6E3:/ window 1000,5
 1014.2 "Necropurge" sync / 1[56]:[^:]*:Shriveled Talon:17D7:/
 1024.4 "Megiddo Flame" sync / 1[56]:[^:]*:Forgall:17C0:/
 1032.4 "Necropurge" sync / 1[56]:[^:]*:Forgall:17BE:/
@@ -192,7 +194,8 @@ hideall "--sync--"
 #                                                                         V                       |
 # Cube opening block ----> Intermission --> Sphere bridge block --> (Cube|Sphere) rotation blocks |
 
-2000.0 "--sync--" sync / 00:0839::The Gloriole will be sealed off/ window 2000,5
+# The Gloriole will be sealed off
+2000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6E5:/ window 2000,5
 2015.0 "Meteor Headmarkers"
 2024.0 "Meteor Impact" sync / 1[56]:[^:]*:Singularity Fragment:1935:/
 
@@ -322,7 +325,8 @@ hideall "--sync--"
 
 # 1811 and 180D are releasing hair after Haircut and Split End cleaves
 
-4000.0 "--sync--" sync / 00:0839::The Tomb Of The Nullstone will be sealed off/ window 4000,5
+# Tomb of the Nullstone will be sealed off
+4000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:6E6:/ window 4000,5
 4004.1 "Bloodied Nail x4" # sync / 1[56]:[^:]*:Calofisteri:181F:/
 4018.8 "Coif Change" sync / 1[56]:[^:]*:Calofisteri:180[AE]:/ window 18.8,5
 4027.8 "Haircut" sync / 1[56]:[^:]*:Calofisteri:180[BF]:/
diff --git a/timelines/src/main/resources/timeline/xelphatol.txt b/timelines/src/main/resources/timeline/xelphatol.txt
index ddcef669482a..e18cd1fb684a 100644
--- a/timelines/src/main/resources/timeline/xelphatol.txt
+++ b/timelines/src/main/resources/timeline/xelphatol.txt
@@ -10,7 +10,8 @@ hideall "--sync--"
 # -ii 19CB 19CC
 # -ic "Ixali Stitcher" "Airstone"
 
-0 "Start" sync / 00:0839::The Cage will be sealed off/ window 0,1
+# The Cage will be sealed off
+0 "Start" sync / 29:[^:]*:7DC:[^:]*:6FD:/ window 0,1
 7.0 "Short Burst" sync / 1[56]:[^:]*:Nuzal Hueloc:19C6:/ window 7,5
 15.1 "Wind Blast" sync / 1[56]:[^:]*:Nuzal Hueloc:19C7:/
 19.2 "Short Burst" sync / 1[56]:[^:]*:Nuzal Hueloc:19C6:/
@@ -69,7 +70,8 @@ hideall "--sync--"
 
 # -ii 19D2
 
-1000.0 "Start" sync / 00:0839::The Tlachtli will be sealed off/ window 1000,5
+# The Tlachtli will be sealed off
+1000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:6FE:/ window 1000,5
 1012.4 "On Low" sync / 1[56]:[^:]*:Dotoli Ciloc:19CE:/
 1024.5 "On High" sync / 1[56]:[^:]*:Dotoli Ciloc:19CF:/ window 24.5,10
 
@@ -94,7 +96,8 @@ hideall "--sync--"
 
 # -ii 19D8
 
-2000.0 "Start" sync / 00:0839::The Vortex will be sealed off/ window 2000,5
+# The Vortex will be sealed off
+2000.0 "Start" sync / 29:[^:]*:7DC:[^:]*:6FF:/ window 2000,5
 2007.1 "Ixali Aero (buster)" sync / 1[56]:[^:]*:Tozol Huatotl:19D3:/ window 7.1,5
 2014.2 "Ixali Aero III (aoe)" sync / 1[56]:[^:]*:Tozol Huatotl:19D5:/
 2023.7 "Bill" sync / 1[56]:[^:]*:Abalathian Hornbill:19DA:/
diff --git a/timelines/src/main/resources/timeline/zadnor.txt b/timelines/src/main/resources/timeline/zadnor.txt
index 0dd274585e40..9ca53535a110 100644
--- a/timelines/src/main/resources/timeline/zadnor.txt
+++ b/timelines/src/main/resources/timeline/zadnor.txt
@@ -8,7 +8,8 @@ hideall "--sync--"
 # Trigger set contains 'resetWhenOutOfCombat: false'
 
 0.0 "--Reset--" sync / 21:........:80000014:00:/ window 100000 jump 0
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
+# .*is no longer sealed
+0.0 "--Reset--" sync / 29:[^:]*:7DE:/ window 100000 jump 0
 
 # TODO: fill in CEs
 # The idea with each of them is that you have at most two minutes of standing
@@ -73,7 +74,8 @@ hideall "--sync--"
 #
 # -p 5E7C:21016 5E7E:21300
 # -ii 61BE 5E7D 5E75 5E88 5E8A 5E79 5E7B
-#21000.0 "--sync--" sync / 00:0839::The loading dock will be sealed off/ window 100000,0
+# Loading Dock will be sealed off
+#21000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E5C:/ window 100000,0
 21016.0 "Pyrokinesis" sync / 1[56]:[^:]*:Sartauvoir The Inferno:5E7C:/ window 100000,0
 21028.2 "--sync--" sync / 1[56]:[^:]*:Sartauvoir The Inferno:5E6C:/
 21034.3 "Time Eruption 1" sync / 1[56]:[^:]*:Sartauvoir The Inferno:5E6E:/
@@ -123,7 +125,8 @@ hideall "--sync--"
 # -p 5F12:22016 5F1F:22305 5F26:22512
 # -ii 6226 6227 6228 6229 5F13 5F1D 5F20 5F15 5F1C 5F29 5F31
 
-#22000.0 "--sync--" sync / 00:0839::The flagship landing will be sealed off/ window 100000,0
+# Flagship Landing will be sealed off
+#22000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E5B:/ window 100000,0
 
 # Blackburn
 22011.0 "--sync--" sync / 14:[^:]*:4Th Legion Blackburn:5F12:/ window 100000,0
@@ -185,7 +188,8 @@ hideall "--sync--"
 ### Cuchulainn
 # -p 5C8F:23013.3
 # -ii 5C89 5C90 5C83 5C84 5C85 6179 614E 5C8C 5C87
-23000.0 "--sync--" sync / 00:0839::Magitek Development will be sealed off/ window 100000,0
+# Magitek Development will be sealed off
+23000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E5E:/ window 100000,0
 23013.3 "Putrified Soul" sync / 1[56]:[^:]*:4Th-Make Cuchulainn:5C8F:/
 23022.4 "Burgeoning Dread" sync / 1[56]:[^:]*:4Th-Make Cuchulainn:5C88:/
 23043.7 "Putrified Soul" sync / 1[56]:[^:]*:4Th-Make Cuchulainn:5C8F:/
@@ -231,7 +235,8 @@ hideall "--sync--"
 # -p 5DC5:24022.9 5DC6:24306
 # -it "Saunion"
 # -ii 5DB6 5DB8 6150 5DC7 60C4 5DCF 5DB3 5DD2 61E4 61E5
-24000.0 "--sync--" sync / 00:0839::The greater hold will be sealed off/ window 100000,0
+# The Greater Hold will be sealed off
+24000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E60:/ window 100000,0
 24011.7 "Magitek Halo/Magitek Crossray" sync / 1[56]:[^:]*:Saunion:5DB[57]:/
 24022.9 "High-Powered Magitek Ray" sync / 1[56]:[^:]*:Saunion:5DC5:/
 24034.1 "Magitek Crossray/Magitek Halo" sync / 1[56]:[^:]*:Saunion:5DB[57]:/
@@ -324,7 +329,8 @@ hideall "--sync--"
 ### The Diablo Armament
 # -p 5CC6:25013 5CB7:25805
 # -ii 6143 61A2 5CC7 61C4 5CB2 5CB8 5CC5 6092 6091 6093 5CC3 5CB4 5CB5 5CC1 5CAD 5CA1 5CA2
-25000.0 "--sync--" sync / 00:0839::The fallen ring will be sealed off/ window 100000,0
+# The Fallen Ring will be sealed off
+25000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E61:/ window 100000,0
 25013.0 "Aetheric Explosion" sync / 1[56]:[^:]*:The Diablo Armament:5CC6:/
 25023.4 "Aetherochemical Laser 1" sync / 1[56]:[^:]*:The Diablo Armament:5CA[45]:/
 25027.5 "Aetherochemical Laser 2" sync / 1[56]:[^:]*:The Diablo Armament:5CA[45]:/
diff --git a/timelines/src/main/resources/timeline/zurvan-un.txt b/timelines/src/main/resources/timeline/zurvan-un.txt
index 2ff54a9d7964..21cb65151f98 100644
--- a/timelines/src/main/resources/timeline/zurvan-un.txt
+++ b/timelines/src/main/resources/timeline/zurvan-un.txt
@@ -1,5 +1,7 @@
 # This file was autogenerated from running ts-node util/sync_files.ts.
 # DO NOT EDIT THIS FILE DIRECTLY.
+# Edit the source file below and then run `npm run sync-files`
+# Source: ui/raidboss/data/03-hw/trial/zurvan-ex.txt
 
 # Containment Bay Z1-T9 (Unreal)
 # Zurvan Unreal
diff --git a/timelines/src/main/resources/timelines.csv b/timelines/src/main/resources/timelines.csv
index 07d528ad54eb..d071c1fd10bf 100644
--- a/timelines/src/main/resources/timelines.csv
+++ b/timelines/src/main/resources/timelines.csv
@@ -15,10 +15,7 @@
 359,"levi-ex.txt"
 377,"shiva-hm.txt"
 378,"shiva-ex.txt"
-421,"the_vault61.txt"
 430,"fractal_continuum.txt"
-438,"aetherochemical_research_facility62.txt"
-441,"sohm_al61.txt"
 444,"a3n.txt"
 446,"ravana-ex.txt"
 448,"thordan-ex.txt"
@@ -35,7 +32,6 @@
 531,"a7s.txt"
 532,"a8s.txt"
 556,"weeping_city.txt"
-572,"xelphatol62.txt"
 577,"sophia-ex.txt"
 578,"gubal_library_hard.txt"
 581,"a10n.txt"
@@ -44,21 +40,15 @@
 585,"a10s.txt"
 586,"a11s.txt"
 587,"a12s.txt"
-615,"baelsars_wall62.txt"
 616,"shisui_of_the_violet_tides.txt"
 617,"sohm_al_hard.txt"
-623,"bardams_mettle63.txt"
-626,"sirensong_sea63.txt"
 627,"dun_scaith.txt"
 638,"zurvan-ex.txt"
-660,"doma_castle63.txt"
-661,"castrum_abania63.txt"
 662,"kugane_castle.txt"
 663,"temple_of_the_fist.txt"
 674,"susano.txt"
 677,"susano-ex.txt"
 679,"shinryu.txt"
-689,"ala_mhigo63.txt"
 691,"o1n.txt"
 692,"o2n.txt"
 693,"o3n.txt"
diff --git a/timelines/src/test/java/gg/xp/xivsupport/timelines/TimelineParserTest.java b/timelines/src/test/java/gg/xp/xivsupport/timelines/TimelineParserTest.java
index 205ff0de5af4..6f2e8ad6330d 100644
--- a/timelines/src/test/java/gg/xp/xivsupport/timelines/TimelineParserTest.java
+++ b/timelines/src/test/java/gg/xp/xivsupport/timelines/TimelineParserTest.java
@@ -1,9 +1,13 @@
 package gg.xp.xivsupport.timelines;
 
+import gg.xp.xivsupport.events.actlines.events.AbilityUsedEvent;
+import gg.xp.xivsupport.models.XivAbility;
+import gg.xp.xivsupport.models.XivCombatant;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import java.time.Duration;
+import java.util.List;
 
 public class TimelineParserTest {
 
@@ -31,6 +35,66 @@ void timelineWithSync() {
 		Assert.assertNull(textFileTimelineEntry.jump());
 	}
 
+	@Test
+	void timelineWithEventSync() {
+		TimelineEntry textFileTimelineEntry = TimelineParser.parseRaw("2.0 \"Shield Skewer\" Ability { source: \"Rhitahtyn sas Arvina\", id: \"471\" }");
+		Assert.assertNotNull(textFileTimelineEntry);
+		Assert.assertEquals(textFileTimelineEntry.time(), 2.0d);
+		Assert.assertEquals(textFileTimelineEntry.name(), "Shield Skewer");
+		Assert.assertNull(textFileTimelineEntry.sync());
+		Assert.assertNull(textFileTimelineEntry.duration());
+		assertDefaultTimelineWindow(textFileTimelineEntry);
+		Assert.assertNull(textFileTimelineEntry.jump());
+		Assert.assertTrue(textFileTimelineEntry.shouldSync(2.0,
+				new AbilityUsedEvent(
+						new XivAbility(0x471),
+						new XivCombatant(123, "Rhitahtyn sas Arvina"),
+						new XivCombatant(456, "Foo"),
+						List.of(), 999, 0, 1)));
+		Assert.assertFalse(textFileTimelineEntry.shouldSync(2.0,
+				new AbilityUsedEvent(
+						new XivAbility(0x472),
+						new XivCombatant(123, "Rhitahtyn sas Arvina"),
+						new XivCombatant(456, "Foo"),
+						List.of(), 999, 0, 1)));
+		Assert.assertFalse(textFileTimelineEntry.shouldSync(2.0,
+				new AbilityUsedEvent(
+						new XivAbility(0x471),
+						new XivCombatant(123, "Rhitahtyn sas Arvino"),
+						new XivCombatant(456, "Foo"),
+						List.of(), 999, 0, 1)));
+	}
+
+	@Test
+	void timelineWithEventSyncRegex() {
+		TimelineEntry textFileTimelineEntry = TimelineParser.parseRaw("2.0 \"Shield Skewer\" Ability { source: \"Rhitahtyn sas Arvina\", id: \"47[1-3]\" }");
+		Assert.assertNotNull(textFileTimelineEntry);
+		Assert.assertEquals(textFileTimelineEntry.time(), 2.0d);
+		Assert.assertEquals(textFileTimelineEntry.name(), "Shield Skewer");
+		Assert.assertNull(textFileTimelineEntry.sync());
+		Assert.assertNull(textFileTimelineEntry.duration());
+		assertDefaultTimelineWindow(textFileTimelineEntry);
+		Assert.assertNull(textFileTimelineEntry.jump());
+		Assert.assertTrue(textFileTimelineEntry.shouldSync(2.0,
+				new AbilityUsedEvent(
+						new XivAbility(0x471),
+						new XivCombatant(123, "Rhitahtyn sas Arvina"),
+						new XivCombatant(456, "Foo"),
+						List.of(), 999, 0, 1)));
+		Assert.assertTrue(textFileTimelineEntry.shouldSync(2.0,
+				new AbilityUsedEvent(
+						new XivAbility(0x472),
+						new XivCombatant(123, "Rhitahtyn sas Arvina"),
+						new XivCombatant(456, "Foo"),
+						List.of(), 999, 0, 1)));
+		Assert.assertFalse(textFileTimelineEntry.shouldSync(2.0,
+				new AbilityUsedEvent(
+						new XivAbility(0x471),
+						new XivCombatant(123, "Rhitahtyn sas Arvino"),
+						new XivCombatant(456, "Foo"),
+						List.of(), 999, 0, 1)));
+	}
+
 	@Test
 	void timelineWithSyncAndWindow() {
 		TimelineEntry textFileTimelineEntry = TimelineParser.parseRaw("413.2 \"Shrapnel Shell\" sync / 1[56]:[^:]*:Rhitahtyn sas Arvina:474:/ window 20,20");