From 7c4e47a823a3c86ee6c6ccd43fe9305da912cae2 Mon Sep 17 00:00:00 2001
From: Adrienne Walker <enne@quisquo.us>
Date: Thu, 14 Dec 2023 08:16:26 -0800
Subject: [PATCH] raidboss: timeline netregex for shb startsusing (#6005)

Done by running #5977.
A few backslash escapes were found which are listed in a PR comment
below.
---
 .../05-shb/alliance/the_copied_factory.txt    |  10 +-
 .../05-shb/alliance/the_puppets_bunker.txt    |  16 +-
 .../the_tower_at_paradigms_breach.txt         |  18 +-
 .../data/05-shb/dungeon/akadaemia_anyder.txt  |  10 +-
 ui/raidboss/data/05-shb/dungeon/amaurot.txt   |   2 +-
 .../data/05-shb/dungeon/anamnesis_anyder.txt  |   4 +-
 .../data/05-shb/dungeon/matoyas_relict.txt    |   2 +-
 .../05-shb/eureka/bozjan_southern_front.txt   |  10 +-
 .../data/05-shb/eureka/delubrum_reginae.txt   |  52 +++---
 .../05-shb/eureka/delubrum_reginae_savage.txt | 164 +++++++++---------
 ui/raidboss/data/05-shb/eureka/zadnor.txt     |  18 +-
 ui/raidboss/data/05-shb/raid/e11s.txt         |   2 +-
 ui/raidboss/data/05-shb/raid/e12n.txt         |   2 +-
 ui/raidboss/data/05-shb/raid/e12s.txt         |   4 +-
 ui/raidboss/data/05-shb/raid/e1s.txt          |   2 +-
 ui/raidboss/data/05-shb/raid/e2s.txt          |   2 +-
 ui/raidboss/data/05-shb/raid/e4s.txt          |   2 +-
 ui/raidboss/data/05-shb/raid/e7n.txt          |   2 +-
 ui/raidboss/data/05-shb/raid/e7s.txt          |   2 +-
 ui/raidboss/data/05-shb/raid/e8s.txt          |   2 +-
 ui/raidboss/data/05-shb/raid/e9n.txt          |   2 +-
 .../data/05-shb/trial/diamond_weapon-ex.txt   |   2 +-
 .../data/05-shb/trial/diamond_weapon.txt      |   2 +-
 .../data/05-shb/trial/emerald_weapon-ex.txt   |   4 +-
 .../data/05-shb/trial/emerald_weapon.txt      |   6 +-
 ui/raidboss/data/05-shb/trial/hades-ex.txt    |  10 +-
 ui/raidboss/data/05-shb/trial/hades.txt       |  16 +-
 .../data/05-shb/trial/innocence-ex.txt        |   2 +-
 .../data/05-shb/trial/ruby_weapon-ex.txt      |   4 +-
 ui/raidboss/data/05-shb/trial/ruby_weapon.txt |   2 +-
 ui/raidboss/data/05-shb/trial/shiva-un.txt    |   2 +-
 ui/raidboss/data/05-shb/trial/titan-un.txt    |   6 +-
 ui/raidboss/data/05-shb/trial/titania-ex.txt  |   6 +-
 ui/raidboss/data/05-shb/trial/titania.txt     |   2 +-
 ui/raidboss/data/05-shb/trial/varis-ex.txt    |  26 +--
 ui/raidboss/data/05-shb/trial/wol-ex.txt      | 120 ++++++-------
 ui/raidboss/data/05-shb/trial/wol.txt         |   4 +-
 .../05-shb/ultimate/the_epic_of_alexander.txt |   2 +-
 38 files changed, 272 insertions(+), 272 deletions(-)

diff --git a/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt b/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt
index 01364b6ef8..2d4c524848 100644
--- a/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt
+++ b/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt
@@ -295,7 +295,7 @@ hideall "--sync--"
 2625.2 "Crushing Wheel Enrage?"  Ability { id: "474B", source: "Marx [LR]" }
 
 2700.0 "--targetable--" sync / 22:........:Engels:........:Engels:01/ window 150,0
-2706.2 "--sync--" sync / 14:[^:]*:Engels:4733:/ window 150,5
+2706.2 "--sync--" StartsUsing { id: "4733", source: "Engels" } window 150,5
 2709.7 "Surface Missile" Ability { id: "4733", source: "Engels" }
 2718.9 "Marx Smash" Ability { id: "472[67AE]", source: "Engels" }
 2728.6 "Surface Missile" Ability { id: "4733", source: "Engels" }
@@ -355,7 +355,7 @@ hideall "--sync--"
 3146.8 "--sync--" Ability { id: "48DD", source: "9S-Operated Walking Fortress" }
 
 3151.7 "--targetable--"
-3152.0 "--sync--" sync / 14:[^:]*:9S-Operated Walking Fortress:48F5:/
+3152.0 "--sync--" StartsUsing { id: "48F5", source: "9S-Operated Walking Fortress" }
 3156.0 "Neutralization" Ability { id: "48F5", source: "9S-Operated Walking Fortress" }
 3170.7 "Anti-Personnel Missile" #Ability { id: "48E4", source: "9S-Operated Walking Fortress" }
 3172.7 "Anti-Personnel Missile" #Ability { id: "48E4", source: "9S-Operated Walking Fortress" }
@@ -379,7 +379,7 @@ hideall "--sync--"
 3270.7 "Laser Saturation"
 
 # Tank Explosions
-3300.0 "--sync--" sync / 14:[^:]*:9S-Operated Walking Fortress:48E7:/ window 200,0
+3300.0 "--sync--" StartsUsing { id: "48E7", source: "9S-Operated Walking Fortress" } window 200,0
 3310.0 "Hack Goliath Tank" Ability { id: "48E7", source: "9S-Operated Walking Fortress" }
 3310.0 "Convenient Self-Destruction" Ability { id: "48E8", source: "Goliath Tank" }
 3313.2 "Ground-To-Ground Missile" Ability { id: "48F8", source: "9S-Operated Walking Fortress" }
@@ -402,7 +402,7 @@ hideall "--sync--"
 3422.3 "Spin" Ability { id: "4A8[46]", source: "Serial-jointed Service Model" }
 3432.7 "Enrage?" # 70s ???
 
-3500.0 "--sync--" sync / 14:[^:]*:9S-Operated Walking Fortress:48EB:/ window 300,0
+3500.0 "--sync--" StartsUsing { id: "48EB", source: "9S-Operated Walking Fortress" } window 300,0
 3510.0 "Total Annihilation Maneuver" Ability { id: "48EB", source: "9S-Operated Walking Fortress" }
 3520.0 "--targetable--"
 3530.1 "Neutralization" Ability { id: "48F5", source: "9S-Operated Walking Fortress" }
@@ -433,7 +433,7 @@ hideall "--sync--"
 3638.8 "--sync--" Ability { id: "48DD", source: "9S-Operated Walking Fortress" }
 
 3643.8 "--targetable--"
-3643.9 "--sync--" sync / 14:[^:]*:9S-Operated Walking Fortress:48F6:/ window 10,10
+3643.9 "--sync--" StartsUsing { id: "48F6", source: "9S-Operated Walking Fortress" } window 10,10
 3647.9 "Laser Saturation" Ability { id: "48F6", source: "9S-Operated Walking Fortress" }
 3659.3 "Engage Marx Support" Ability { id: "48D3", source: "9S-Operated Walking Fortress" }
 3674.5 "Ground-To-Ground Missile" Ability { id: "48F8", source: "9S-Operated Walking Fortress" }
diff --git a/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt b/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt
index 4a2a97a38a..b632ddde37 100644
--- a/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt
+++ b/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt
@@ -161,9 +161,9 @@ hideall "--sync--"
 2159.0 "Sliding Swipe 3" Ability { id: "(550F|5510)", source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" }
 2161.3 "--targetable--"
 
-2172.7 "--sync--" sync / 14:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FC4:/ window 70,20
-2172.7 "--sync--" sync / 14:[^:]*:767P-Operated Superior Flight Unit \(B-Eta\):4FC4:/ window 70,20
-2172.7 "--sync--" sync / 14:[^:]*:772P-Operated Superior Flight Unit \(C-Hi\):4FC4:/ window 70,20
+2172.7 "--sync--" StartsUsing { id: "4FC4", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } window 70,20
+2172.7 "--sync--" StartsUsing { id: "4FC4", source: "767P-Operated Superior Flight Unit \\(B-Eta\\)" } window 70,20
+2172.7 "--sync--" StartsUsing { id: "4FC4", source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" } window 70,20
 2176.7 "Maneuver: Precision Guided Missile" Ability { id: "4FC4", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } window 10,10
 2191.0 "Maneuver: Area Bombardment" Ability { id: "4FB7", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } duration 15
 2206.2 "Maneuver: High-Powered Laser" Ability { id: "4FB4", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" }
@@ -193,9 +193,9 @@ hideall "--sync--"
 2408.6 "Sliding Swipe 3" Ability { id: "(550F|5510)", source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" }
 2410.9 "--targetable--"
 
-2427.2 "--sync--" sync / 14:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FBD:/ window 70,20
-2427.2 "--sync--" sync / 14:[^:]*:767P-Operated Superior Flight Unit \(B-Eta\):4FBD:/ window 70,20
-2427.2 "--sync--" sync / 14:[^:]*:772P-Operated Superior Flight Unit \(C-Hi\):4FBD:/ window 70,20
+2427.2 "--sync--" StartsUsing { id: "4FBD", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } window 70,20
+2427.2 "--sync--" StartsUsing { id: "4FBD", source: "767P-Operated Superior Flight Unit \\(B-Eta\\)" } window 70,20
+2427.2 "--sync--" StartsUsing { id: "4FBD", source: "772P-Operated Superior Flight Unit \\(C-Hi\\)" } window 70,20
 2431.2 "Maneuver: Missile Command" Ability { id: "4FBD", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } window 10,10
 2447.4 "Maneuver: Precision Guided Missile" Ability { id: "4FC4", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" }
 2467.7 "Maneuver: Area Bombardment" Ability { id: "4FB7", source: "724P-Operated Superior Flight Unit \\(A-Lpha\\)" } duration 15
@@ -398,11 +398,11 @@ hideall "--sync--"
 
 
 # Random Three Parts/ Four Parts
-6391.8 "--sync--" sync / 14:[^:]*:Compound 2P:519E:/ window 50,50
+6391.8 "--sync--" StartsUsing { id: "519E", source: "Compound 2P" } window 50,50
 6399.8 "Four Parts Resolve?" Ability { id: "519E", source: "Compound 2P" }
 
 # This is adjusted 9 seconds ahead so that Compound Pod: R012 lines up.  @_@;;
-6400.7 "--sync--" sync / 14:[^:]*:Compound 2P:519B:/ window 50,50
+6400.7 "--sync--" StartsUsing { id: "519B", source: "Compound 2P" } window 50,50
 6406.7 "Three Parts Disdain?" Ability { id: "519B", source: "Compound 2P" }
 
 
diff --git a/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt b/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt
index 3d80184d5b..0cad6d6902 100644
--- a/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt
+++ b/ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.txt
@@ -27,7 +27,7 @@ hideall "--sync--"
 1061.8 "Stacking The Deck" Ability { id: "60F0", source: "Copied Knave" }
 1072.0 "Colossal Impact 1" Ability { id: "5EA[47]", source: "Knave Of Hearts" } window 4,4
 1077.0 "Colossal Impact 2" Ability { id: "5EA[47]", source: "Copied Knave" } window 4,4
-1085.2 "--sync--" sync / 14:[^:]*:Knave Of Hearts:5EA8:/ window 10,10
+1085.2 "--sync--" StartsUsing { id: "5EA8", source: "Knave Of Hearts" } window 10,10
 1089.2 "Spheroids" Ability { id: "5EA8", source: "Knave Of Hearts" }
 1093.4 "Knavish Bullets" Ability { id: "5EAD", source: "Spheroid" }
 1094.2 "--sync--" Ability { id: "5EAA", source: "Knave Of Hearts" } # Magic Artillery Alpha cast
@@ -212,8 +212,8 @@ 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
+2700.0 "--sync--" StartsUsing { id: "5C73", source: "Gretel" } window 700,0
+2700.0 "--sync--" StartsUsing { id: "5C74", source: "Hansel" } window 700,0
 # Gretel does 57C3 and Hansel does 57C4, and they both do 5C75
 2708.0 "Lamentation" Ability { id: "(5C73|5C74)", source: "(Gretel|Hansel)" } window 100,100
 2713.8 "Seed Of Magic Beta" Ability { id: "5C75", source: "(Gretel|Hansel)" }
@@ -239,7 +239,7 @@ hideall "--sync--"
 3031.6 "Lightfast Blade 1?"
 
 3500.0 "--targetable--"
-3501.1 "--sync--" sync / 14:[^:]*:2P-Operated Flight Unit:5BFE:/ window 3501.1,0
+3501.1 "--sync--" StartsUsing { id: "5BFE", source: "2P-Operated Flight Unit" } window 3501.1,0
 3505.0 "--targetable--"
 3510.0 "--targetable--"
 3513.1 "Lightfast Blade 1" Ability { id: "5BFE", source: "2P-Operated Flight Unit" } window 3513.1,3
@@ -265,7 +265,7 @@ hideall "--sync--"
 # Phase 1
 # 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
+4009.0 "--sync--" StartsUsing { id: "6012", source: "Red Girl" } window 4009,10
 4014.0 "Cruelty" Ability { id: "6012", source: "Red Girl" }
 4019.9 "Shockwave" Ability { id: "600E", source: "Red Girl" }
 4026.0 "Generate: Barrier" Ability { id: "6004", source: "Red Girl" }
@@ -304,7 +304,7 @@ hideall "--sync--"
 
 
 # Phase 3
-4500.0 "--sync--" sync / 14:[^:]*:Red Girl:6013:/ window 300,10
+4500.0 "--sync--" StartsUsing { id: "6013", source: "Red Girl" } window 300,10
 4505.0 "Cruelty" Ability { id: "6013", source: "Red Girl" }
 4521.2 "Child's Play" Ability { id: "6024", source: "Red Girl" }
 4527.1 "Explosion" Ability { id: "6026", source: "Black Pylon" }
@@ -404,7 +404,7 @@ hideall "--sync--"
 # -ii 5CEC 5CED 5CEE 5CEF 5FFC 5FFF 5BDA 5BDC
 # 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
+6007.3 "--sync--" StartsUsing { id: "5BDD", source: "False Idol" } window 6007.3,10
 6012.3 "Screaming Score" Ability { id: "5BDD", source: "False Idol" }
 6025.5 "Made Magic" Ability { id: "5BD[67]", source: "False Idol" }
 6035.7 "Made Magic" Ability { id: "5BD[67]", source: "False Idol" }
@@ -455,12 +455,12 @@ hideall "--sync--"
 # -ii 5CEC 5CED 5CEE 5CEF 5FFF 5BDA 5BDC 5BEF 5BF2 5BE6 5BE8 5BE7
 # Whether there is a checkpoint is unclear, but sync as if there is.
 
-6963.3 "--sync--" sync / 14:[^:]*:False Idol:5DD5:/ window 1000,0
+6963.3 "--sync--" StartsUsing { id: "5DD5", source: "False Idol" } window 1000,0
 6968.3 "Eminence" Ability { id: "5DD5", source: "False Idol" }
 6968.3 "--untargetable--"
 
 7000.0 "--targetable--"
-7010.2 "--sync--" sync / 14:[^:]*:Her Inflorescence:5BE0:/ window 7010.2,0
+7010.2 "--sync--" StartsUsing { id: "5BE0", source: "Her Inflorescence" } window 7010.2,0
 7013.2 "Pervasion" Ability { id: "5BE0", source: "Her Inflorescence" }
 7019.3 "Recreate Structure" Ability { id: "5BE1", source: "Her Inflorescence" }
 7030.4 "Uneven Footing" Ability { id: "5BE2", source: "Her Inflorescence" }
diff --git a/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt b/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
index 0fb8bf7fba..5e7372d12a 100644
--- a/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
+++ b/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
@@ -48,7 +48,7 @@ hideall "--sync--"
 
 # When one dies, the other powers up and starts casting stuff after it jumps back in.
 # However, I've never seen this cast get off, so just guessing on Marine Mayhem cast length.
-300.0 "--sync--" sync / 14:[^:]*:(Doliodus|Cladoselache):3E07:/ window 300,0
+300.0 "--sync--" StartsUsing { id: "3E07", source: "(Doliodus|Cladoselache)" } window 300,0
 302.0 "Carcharian Verve" Ability { id: "3E07", source: "(Doliodus|Cladoselache)" } window 300,0
 305.5 "Marine Mayhem" Ability { id: "3E06", source: "(Doliodus|Cladoselache)" }
 
@@ -64,7 +64,7 @@ hideall "--sync--"
 524.7 "Arbor Storm" Ability { id: "3E17", source: "Morbol Marquis" }
 
 # extensible tendrils appears to have some variation on start time
-532.3 "--sync--" sync / 14:[^:]*:Morbol Marquis:3E10:/ window 30,10
+532.3 "--sync--" StartsUsing { id: "3E10", source: "Morbol Marquis" } window 30,10
 537.3 "Extensible Tendrils" Ability { id: "3E10", source: "Morbol Marquis" } duration 25
 564.7 "Putrid Breath" Ability { id: "3E12", source: "Morbol Marquis" }
 569.0 "Lash" #Ability { id: "3E16", source: "Morbol Marquis" }
@@ -72,7 +72,7 @@ hideall "--sync--"
 581.1 "Blossom" Ability { id: "3E13", source: "Morbol Marquis" }
 589.7 "Arbor Storm" Ability { id: "3E17", source: "Morbol Marquis" }
 
-598.3 "--sync--" sync / 14:[^:]*:Morbol Marquis:3E10:/ window 10,10
+598.3 "--sync--" StartsUsing { id: "3E10", source: "Morbol Marquis" } window 10,10
 603.3 "Extensible Tendrils" Ability { id: "3E10", source: "Morbol Marquis" } duration 25
 611.4 "Sap Shower" Ability { id: "3E15", source: "Morbol Marquis" }
 630.8 "Putrid Breath" Ability { id: "3E12", source: "Morbol Marquis" }
@@ -81,14 +81,14 @@ hideall "--sync--"
 653.3 "Sap Shower" Ability { id: "3E15", source: "Morbol Marquis" }
 657.1 "Lash" Ability { id: "3E16", source: "Morbol Marquis" }
 
-660.3 "--sync--" sync / 14:[^:]*:Morbol Marquis:3E10:/ window 10,10
+660.3 "--sync--" StartsUsing { id: "3E10", source: "Morbol Marquis" } window 10,10
 665.3 "Extensible Tendrils" Ability { id: "3E10", source: "Morbol Marquis" }
 692.6 "Putrid Breath" Ability { id: "3E12", source: "Morbol Marquis" }
 699.0 "Arbor Storm" Ability { id: "3E17", source: "Morbol Marquis" }
 707.6 "Blossom" Ability { id: "3E13", source: "Morbol Marquis" }
 716.1 "Arbor Storm" Ability { id: "3E17", source: "Morbol Marquis" }
 
-724.8 "--sync--" sync / 14:[^:]*:Morbol Marquis:3E10:/ window 10,10
+724.8 "--sync--" StartsUsing { id: "3E10", source: "Morbol Marquis" } window 10,10
 729.8 "Extensible Tendrils" Ability { id: "3E10", source: "Morbol Marquis" } duration 25
 737.9 "Sap Shower" Ability { id: "3E15", source: "Morbol Marquis" }
 757.3 "Putrid Breath" Ability { id: "3E12", source: "Morbol Marquis" }
diff --git a/ui/raidboss/data/05-shb/dungeon/amaurot.txt b/ui/raidboss/data/05-shb/dungeon/amaurot.txt
index 417feff7d1..a491e597d9 100644
--- a/ui/raidboss/data/05-shb/dungeon/amaurot.txt
+++ b/ui/raidboss/data/05-shb/dungeon/amaurot.txt
@@ -44,7 +44,7 @@ hideall "--sync--"
 525.0 "Adds (N)"
 561.3 "Adds (SW)" sync / 03:........:Terminus Roiler:/  window 60,60
 610.9 "Adds (S)" sync / 03:........:Terminus Pursuer:/  window 100,100
-800.0 "--sync--" sync / 14:[^:]*:Terminus Bellwether:3CD0:/ window 300,00
+800.0 "--sync--" StartsUsing { id: "3CD0", source: "Terminus Bellwether" } window 300,00
 840.0 "Burst" Ability { id: "3CD0", source: "Terminus Bellwether" } window 40,40
 
 
diff --git a/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt b/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt
index b387d8359c..556d7e4a69 100644
--- a/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt
+++ b/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt
@@ -16,7 +16,7 @@ hideall "--sync--"
 
 # Two Adds (hp push???)
 # hopefully there's not an inscrutability cast before the one preceding the add?
-1047.4 "--sync--" sync / 14:[^:]*:Unknown:4B6A:/ window 50,0
+1047.4 "--sync--" StartsUsing { id: "4B6A", source: "Unknown" } window 50,0
 1051.4 "Inscrutability" Ability { id: "4B6A", source: "Unknown" }
 1059.8 "Unknown Add" Ability { id: "4B77", source: "Unknown" } window 60,60
 1064.8 "Ectoplasmic Ray" Ability { id: "4B7A", source: "Unknown" }
@@ -47,7 +47,7 @@ hideall "--sync--"
 
 # One add (???)
 # starts 3 second cast 10 seconds after other add dies?
-1310.0 "--sync--"  sync / 14:[^:]*:Unknown:4E4B:/ window 310,0
+1310.0 "--sync--"  StartsUsing { id: "4E4B", source: "Unknown" } window 310,0
 1313.0 "Plain Weirdness" Ability { id: "4E4B", source: "Unknown" }
 1319.2 "Inscrutability" Ability { id: "4B73", source: "Unknown" }
 1329.4 "--sync--" Ability { id: "4B77", source: "Unknown" }
diff --git a/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt b/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt
index 7af7a9e550..d4532d22af 100644
--- a/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt
+++ b/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt
@@ -84,7 +84,7 @@ hideall "--sync--"
 3086.5 "Minced Meat" Ability { id: "5911", source: "Mother Porxie" } window 50,10
 3093.6 "--untargetable--"
 
-3096.6 "Huff And Puff" sync / 14:[^:]*:Mother Porxie:591A:/ window 96.6,5 duration 33.7
+3096.6 "Huff And Puff" StartsUsing { id: "591A", source: "Mother Porxie" } window 96.6,5 duration 33.7
 3101.6 "Buffet" Ability { id: "5926", source: "Aeolian Cave Sprite" }
 3107.3 "Buffet" Ability { id: "5926", source: "Aeolian Cave Sprite" }
 3112.8 "Buffet" Ability { id: "5926", source: "Aeolian Cave Sprite" }
diff --git a/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt b/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt
index d005ec6b4f..8f7350b242 100644
--- a/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt
+++ b/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt
@@ -83,7 +83,7 @@ hideall "--sync--"
 20014.7 "Electric Anvil" Ability { id: "51DC", source: "Brionac" }
 20026.8 "False Thunder" Ability { id: "51C[EF]", source: "Brionac" }
 20035.0 "Anti-Warmachina Weaponry" Ability { id: "51CD", source: "Brionac" }
-20135.0 "--sync--" sync / 14:[^:]*:Brionac:53C4:/ window 100,50
+20135.0 "--sync--" StartsUsing { id: "53C4", source: "Brionac" } window 100,50
 20139.0 "Lightning Shower" Ability { id: "53C4", source: "Brionac" }
 
 20146.1 "Energy Generation" Ability { id: "51D0", source: "Brionac" }
@@ -106,7 +106,7 @@ hideall "--sync--"
 20254.9 "Lightburst" Ability { id: "51D1", source: "Lightsphere" }
 
 20263.2 "Anti-Warmachina Weaponry" Ability { id: "51CD", source: "Brionac" }
-20363.2 "--sync--" sync / 14:[^:]*:Brionac:53C4:/ window 100,50
+20363.2 "--sync--" StartsUsing { id: "53C4", source: "Brionac" } window 100,50
 20367.2 "Lightning Shower" Ability { id: "53C4", source: "Brionac" }
 20374.3 "Energy Generation" Ability { id: "51D0", source: "Brionac" }
 20384.4 "Magitek Magnetism" Ability { id: "51D5", source: "Brionac" }
@@ -119,7 +119,7 @@ hideall "--sync--"
 20411.7 "Voltstream" Ability { id: "51DB", source: "Brionac" }
 20418.6 "False Thunder" Ability { id: "51CF", source: "Brionac" }
 20427.9 "Anti-Warmachina Weaponry" Ability { id: "51CD", source: "Brionac" }
-20527.9 "--sync--" sync / 14:[^:]*:Brionac:51DC:/ window 100,50
+20527.9 "--sync--" StartsUsing { id: "51DC", source: "Brionac" } window 100,50
 20531.9 "Electric Anvil" Ability { id: "51DC", source: "Brionac" }
 
 20539.0 "Energy Generation" Ability { id: "51D0", source: "Brionac" }
@@ -237,7 +237,7 @@ hideall "--sync--"
 50168.7 "Meteor" Ability { id: "4F92", source: "Adrammelech" } duration 20.7
 
 # HP push? I have seen Meteor and Tornado->Meteor all skipped.
-50194.3 "--sync--" sync / 14:[^:]*:Adrammelech:4F7A:/ window 70,20
+50194.3 "--sync--" StartsUsing { id: "4F7A", source: "Adrammelech" } window 70,20
 50197.3 "Curse Of The Fiend" Ability { id: "4F7A", source: "Adrammelech" }
 50204.4 "Accursed Becoming" Ability { id: "4F7B", source: "Adrammelech" }
 50211.6 "Orb 1" #Ability { id: "(504D|504A|4F7D|4F8[5-7])", source: "Adrammelech" }
@@ -334,7 +334,7 @@ hideall "--sync--"
 60275.7 "Raging Winds Enrage" #Ability { id: "5164", source: "Lyon The Beast King" }
 
 # Phase 3
-61000.0 "--sync--" sync / 14:[^:]*:Dawon:517D:/ window 1000,0
+61000.0 "--sync--" StartsUsing { id: "517D", source: "Dawon" } window 1000,0
 61002.0 "Ready x4" duration 6.1 #Ability { id: "5191", source: "Lyon The Beast King" }
 61012.0 "Obey" Ability { id: "517D", source: "Dawon" }
 61014.1 "Swooping Frenzy" Ability { id: "517E", source: "Dawon" }
diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
index 272d8c3da4..59294f418e 100644
--- a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
+++ b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
@@ -161,7 +161,7 @@ hideall "--sync--"
 # -ii 575A 575C
 # 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
+2007.0 "--sync--" StartsUsing { id: "576[12]", source: "Dahu" } window 10,2
 2010.0 "Right-Sided Shockwave/Left-Sided Shockwave" #Ability { id: "576[12]", source: "Dahu" }
 2012.6 "Left-Sided Shockwave/Right-Sided Shockwave" #Ability { id: "576[12]", source: "Dahu" }
 2023.0 "Feral Howl" Ability { id: "5755", source: "Dahu" } window 30,10
@@ -226,26 +226,26 @@ hideall "--sync--"
 # We can't have huge syncs on these because many of these are used
 # multiple times.  So, 22 lines get huge syncs and ability lines
 # get more local windows here and in each block.
-3036.8 "--sync--" sync / 14:[^:]*:Queen's Soldier:5805:/ window 50,50 jump 3108.1
+3036.8 "--sync--" StartsUsing { id: "5805", source: "Queen's Soldier" } window 50,50 jump 3108.1
 3039.8 "Double Gambit?" #Ability { id: "5805", source: "Queen's Soldier" }
 
-3036.8 "--sync--" sync / 14:[^:]*:Queen's Gunner:580B:/ window 50,50 jump 3308.1
+3036.8 "--sync--" StartsUsing { id: "580B", source: "Queen's Gunner" } window 50,50 jump 3308.1
 3039.8 "Automatic Turret?" #Ability { id: "580B", source: "Queen's Gunner" }
 
-3036.8 "--sync--" sync / 14:[^:]*:Queen's Warrior:5AFD:/ window 50,50 jump 3508.1
+3036.8 "--sync--" StartsUsing { id: "5AFD", source: "Queen's Warrior" } window 50,50 jump 3508.1
 3039.8 "Bombslinger?" #Ability { id: "5AFD", source: "Queen's Warrior" }
 
-3036.8 "--sync--" sync / 14:[^:]*:Queen's Knight:57F[01]:/ window 50,50 jump 3708.1
+3036.8 "--sync--" StartsUsing { id: "57F[01]", source: "Queen's Knight" } window 50,50 jump 3708.1
 3039.8 "Shield Omen/Sword Omen?" #Ability { id: "57F[01]", source: "Queen's Knight" }
 
 # Queen's Soldier
 # (local jumps to other blocks)
-3100.0 "--sync--" sync / 14:[^:]*:Queen's Gunner:580B:/ window 0,200 jump 3308.1
-3100.0 "--sync--" sync / 14:[^:]*:Queen's Warrior:5AFD:/ window 0,200 jump 3508.1
-3100.0 "--sync--" sync / 14:[^:]*:Queen's Knight:57F[01]:/ window 0,200 jump 3708.1
+3100.0 "--sync--" StartsUsing { id: "580B", source: "Queen's Gunner" } window 0,200 jump 3308.1
+3100.0 "--sync--" StartsUsing { id: "5AFD", source: "Queen's Warrior" } window 0,200 jump 3508.1
+3100.0 "--sync--" StartsUsing { id: "57F[01]", source: "Queen's Knight" } window 0,200 jump 3708.1
 
 3100.0 "--targetable--" sync / 22:........:Queen's Soldier:........:Queen's Soldier:01/ window 500,500
-3108.1 "--sync--" sync / 14:[^:]*:Queen's Soldier:5805:/ window 10,10
+3108.1 "--sync--" StartsUsing { id: "5805", source: "Queen's Soldier" } window 10,10
 3111.1 "Double Gambit" Ability { id: "5805", source: "Queen's Soldier" }
 3119.3 "Secrets Revealed" Ability { id: "5B6E", source: "Queen's Soldier" }
 3130.6 "Pawn Off" Ability { id: "5807", source: "Soldier Avatar" }
@@ -266,12 +266,12 @@ hideall "--sync--"
 
 # Queen's Gunner
 # (local jumps to other blocks)
-3300.0 "--sync--" sync / 14:[^:]*:Queen's Soldier:5805:/ window 0,200 jump 3108.1
-3300.0 "--sync--" sync / 14:[^:]*:Queen's Warrior:5AFD:/ window 0,200 jump 3508.1
-3300.0 "--sync--" sync / 14:[^:]*:Queen's Knight:57F[01]:/ window 0,200 jump 3708.1
+3300.0 "--sync--" StartsUsing { id: "5805", source: "Queen's Soldier" } window 0,200 jump 3108.1
+3300.0 "--sync--" StartsUsing { id: "5AFD", source: "Queen's Warrior" } window 0,200 jump 3508.1
+3300.0 "--sync--" StartsUsing { id: "57F[01]", source: "Queen's Knight" } window 0,200 jump 3708.1
 
 3300.0 "--targetable--" sync / 22:........:Queen's Gunner:........:Queen's Gunner:01/ window 500,500
-3308.1 "--sync--" sync / 14:[^:]*:Queen's Gunner:580B:/ window 10,10
+3308.1 "--sync--" StartsUsing { id: "580B", source: "Queen's Gunner" } window 10,10
 3311.1 "Automatic Turret" Ability { id: "580B", source: "Queen's Gunner" }
 3319.2 "Turret's Tour" Ability { id: "580C", source: "Queen's Gunner" }
 3319.8 "Turret's Tour" Ability { id: "580E", source: "Automatic Turret" }
@@ -292,12 +292,12 @@ hideall "--sync--"
 
 # Queen's Warrior
 # (local jumps to other blocks)
-3500.0 "--sync--" sync / 14:[^:]*:Queen's Soldier:5805:/ window 0,200 jump 3108.1
-3500.0 "--sync--" sync / 14:[^:]*:Queen's Gunner:580B:/ window 0,200 jump 3308.1
-3500.0 "--sync--" sync / 14:[^:]*:Queen's Knight:57F[01]:/ window 0,200 jump 3708.1
+3500.0 "--sync--" StartsUsing { id: "5805", source: "Queen's Soldier" } window 0,200 jump 3108.1
+3500.0 "--sync--" StartsUsing { id: "580B", source: "Queen's Gunner" } window 0,200 jump 3308.1
+3500.0 "--sync--" StartsUsing { id: "57F[01]", source: "Queen's Knight" } window 0,200 jump 3708.1
 
 3500.0 "--targetable--" sync / 22:........:Queen's Warrior:........:Queen's Warrior:01/ window 500,500
-3508.1 "--sync--" sync / 14:[^:]*:Queen's Warrior:5AFD:/ window 10,10
+3508.1 "--sync--" StartsUsing { id: "5AFD", source: "Queen's Warrior" } window 10,10
 3511.1 "Bombslinger" Ability { id: "5AFD", source: "Queen's Warrior" }
 3520.2 "Above Board" Ability { id: "57FC", source: "Queen's Warrior" }
 3521.2 "--stunned--"
@@ -329,12 +329,12 @@ hideall "--sync--"
 
 # Queen's Knight
 # (local jumps to other blocks)
-3700.0 "--sync--" sync / 14:[^:]*:Queen's Soldier:5805:/ window 0,200 jump 3108.1
-3700.0 "--sync--" sync / 14:[^:]*:Queen's Gunner:580B:/ window 0,200 jump 3308.1
-3700.0 "--sync--" sync / 14:[^:]*:Queen's Warrior:5AFD:/ window 0,200 jump 3508.1
+3700.0 "--sync--" StartsUsing { id: "5805", source: "Queen's Soldier" } window 0,200 jump 3108.1
+3700.0 "--sync--" StartsUsing { id: "580B", source: "Queen's Gunner" } window 0,200 jump 3308.1
+3700.0 "--sync--" StartsUsing { id: "5AFD", source: "Queen's Warrior" } window 0,200 jump 3508.1
 
 3700.0 "--targetable--" sync / 22:........:Queen's Knight:........:Queen's Knight:01/ window 500,500
-3708.1 "--sync--" sync / 14:[^:]*:Queen's Knight:57F[01]:/ window 10,10
+3708.1 "--sync--" StartsUsing { id: "57F[01]", source: "Queen's Knight" } window 10,10
 3711.1 "Shield Omen/Sword Omen" Ability { id: "57F[01]", source: "Queen's Knight" }
 3719.3 "Optimal Play" Ability { id: "57F4", source: "Queen's Knight" }
 3727.5 "Sword Omen/Shield Omen" Ability { id: "57F[01]", source: "Queen's Knight" }
@@ -356,10 +356,10 @@ hideall "--sync--"
 3842.1 "Optimal Play" #Ability { id: "57F4", source: "Queen's Knight" }
 
 # Aetherial Warded Knights
-4000.0 "--sync--" sync / 14:[^:]*:Queen's Knight:57F5:/ window 1000,0
+4000.0 "--sync--" StartsUsing { id: "57F5", source: "Queen's Knight" } window 1000,0
 4005.0 "Strongpoint Defense" Ability { id: "57F5", source: "Queen's Knight" }
 # 60s enrage cast of 5812, 580A, 5802, 57F9
-4008.0 "Enrage Cast" sync / 14:[^:]*:Queen's Gunner:5812:/ duration 60
+4008.0 "Enrage Cast" StartsUsing { id: "5812", source: "Queen's Gunner" } duration 60
 4018.8 "Coat Of Arms" Ability { id: "57F6", source: "Aetherial Ward" }
 4036.0 "Coat Of Arms" Ability { id: "57F6", source: "Aetherial Ward" }
 4053.1 "Coat Of Arms" Ability { id: "57F6", source: "Aetherial Ward" }
@@ -373,7 +373,7 @@ hideall "--sync--"
 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
+5008.3 "--sync--" StartsUsing { id: "57A3", source: "Bozjan Phantom" } window 10,10
 5011.3 "Weave Miasma" Ability { id: "57A3", source: "Bozjan Phantom" }
 5025.5 "Manipulate Miasma" Ability { id: "57A4", source: "Bozjan Phantom" }
 5026.5 "Swirling Miasma 1" Ability { id: "57A9", source: "Bozjan Phantom" }
@@ -447,7 +447,7 @@ hideall "--sync--"
 # -ii 5962 4F55 4F99 5B24 5968 4F56 4F9A 5964 5969 5965 5967 596A 596C
 # 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
+7008.0 "--sync--" StartsUsing { id: "5975", source: "Trinity Avowed" } window 10,10
 7013.0 "Wrath Of Bozja" Ability { id: "5975", source: "Trinity Avowed" }
 7021.1 "Glory Of Bozja" Ability { id: "5976", source: "Trinity Avowed" }
 7029.3 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
@@ -535,7 +535,7 @@ hideall "--sync--"
 # -ii 5B83 5B82 59E0 59E2 59DA 59CC 5B40 59CD 5B8D
 # 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
+9010.5 "--sync--" StartsUsing { id: "59C8", source: "The Queen" } window 15,15
 9015.5 "Empyrean Iniquity" Ability { id: "59C8", source: "The Queen" }
 9025.7 "Cleansing Slash" Ability { id: "59C5", source: "The Queen" }
 9036.0 "--middle--" Ability { id: "5BCB", source: "The Queen" }
diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt b/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt
index 65cf6f7b61..6984b394d5 100644
--- a/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt
+++ b/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt
@@ -81,10 +81,10 @@ hideall "--sync--"
 2025.2 "Core Combustion" Ability { id: "5745", source: "Bicolor Golem" } window 2030,10
 2026.1 "--bleed--" # from blue golem
 2029.9 "Ruins Golem x2" sync / 03:........:Ruins Golem:/
-2032.1 "--sync--" sync / 14:[^:]*:Bicolor Golem:5558:/ window 20,10
+2032.1 "--sync--" StartsUsing { id: "5558", source: "Bicolor Golem" } window 20,10
 2037.1 "Metamorphose" Ability { id: "5558", source: "Bicolor Golem" }
 2069.9 "Ruins Golem x2" sync / 03:........:Ruins Golem:/
-2071.3 "--sync--" sync / 14:[^:]*:Bicolor Golem:5558:/ window 20,10
+2071.3 "--sync--" StartsUsing { id: "5558", source: "Bicolor Golem" } window 20,10
 2076.3 "Metamorphose" Ability { id: "5558", source: "Bicolor Golem" }
 2109.7 "Ruins Golem x2" sync / 03:........:Ruins Golem:/
 2140.1 "Ruins Golem x2" sync / 03:........:Ruins Golem:/
@@ -133,7 +133,7 @@ hideall "--sync--"
 # but with lots of extra syncs to future proof possible hp pushes.
 
 # Initial Merciful Air
-4006.4 "--sync--" sync / 14:[^:]*:Trinity Seeker:5AD3:/ window 20,20
+4006.4 "--sync--" StartsUsing { id: "5AD3", source: "Trinity Seeker" } window 20,20
 4011.4 "Verdant Tempest" Ability { id: "5AD3", source: "Trinity Seeker" }
 4015.6 "--middle--" Ability { id: "5A9A", source: "Trinity Seeker" }
 4020.0 "Manifest Avatar" Ability { id: "5ADA", source: "Trinity Seeker" }
@@ -154,7 +154,7 @@ hideall "--sync--"
 4074.2 "Merciful Arc" Ability { id: "5AD4", source: "Trinity Seeker" }
 
 # Initial Baleful Air (80% or time push)
-4076.5 "--sync--" sync / 14:[^:]*:Trinity Seeker:5A98:/ window 80,20
+4076.5 "--sync--" StartsUsing { id: "5A98", source: "Trinity Seeker" } window 80,20
 4079.5 "Verdant Path" Ability { id: "5A98", source: "Trinity Seeker" }
 4084.1 "Baleful Swathe" Ability { id: "5AD0", source: "Trinity Seeker" }
 4092.2 "Baleful Onslaught" Ability { id: "5AD5", source: "Trinity Seeker" }
@@ -179,7 +179,7 @@ hideall "--sync--"
 4162.6 "Verdant Tempest" Ability { id: "5AD3", source: "Trinity Seeker" }
 
 # Initial Iron Air
-4168.7 "--sync--" sync / 14:[^:]*:Trinity Seeker:5A99:/ window 200,20
+4168.7 "--sync--" StartsUsing { id: "5A99", source: "Trinity Seeker" } window 200,20
 4171.7 "Verdant Path" Ability { id: "5A99", source: "Trinity Seeker" }
 4176.6 "Iron Impact" Ability { id: "5AD2", source: "Trinity Seeker" }
 4180.7 "--middle--" Ability { id: "5A9A", source: "Trinity Seeker" }
@@ -199,7 +199,7 @@ hideall "--sync--"
 4251.3 "Verdant Tempest" Ability { id: "5AD3", source: "Trinity Seeker" }
 
 # Merciful Air v2
-4262.8 "--sync--" sync / 14:[^:]*:Trinity Seeker:5A97:/ window 300,10
+4262.8 "--sync--" StartsUsing { id: "5A97", source: "Trinity Seeker" } window 300,10
 4265.8 "Verdant Path" Ability { id: "5A97", source: "Trinity Seeker" }
 4270.4 "Act Of Mercy" Ability { id: "5ACF", source: "Trinity Seeker" }
 4276.5 "--middle--" Ability { id: "5A9A", source: "Trinity Seeker" }
@@ -253,7 +253,7 @@ hideall "--sync--"
 4412.3 "Verdant Tempest" Ability { id: "5AD3", source: "Trinity Seeker" }
 
 # Baleful Air v2
-4422.5 "--sync--" sync / 14:[^:]*:Trinity Seeker:5A98:/ window 300,10
+4422.5 "--sync--" StartsUsing { id: "5A98", source: "Trinity Seeker" } window 300,10
 4425.5 "Verdant Path" Ability { id: "5A98", source: "Trinity Seeker" }
 4430.2 "Baleful Swathe" Ability { id: "5AD0", source: "Trinity Seeker" }
 4433.4 "--middle--" Ability { id: "5A9A", source: "Trinity Seeker" }
@@ -295,7 +295,7 @@ hideall "--sync--"
 4568.4 "Baleful Onslaught" Ability { id: "5AD[56]", source: "Trinity Seeker" }
 
 # Enrage
-4580.9 "--sync--" sync / 14:[^:]*:Trinity Seeker:5BBA:/ window 1000,10
+4580.9 "--sync--" StartsUsing { id: "5BBA", source: "Trinity Seeker" } window 1000,10
 4590.9 "Verdant Tempest Enrage" Ability { id: "5BBA", source: "Trinity Seeker" }
 4593.0 "Verdant Tempest" Ability { id: "5BBB", source: "Trinity Seeker" } window 10,10 # x infinity
 4595.0 "Verdant Tempest" Ability { id: "5BBB", source: "Trinity Seeker" }
@@ -364,7 +364,7 @@ hideall "--sync--"
 # This is a single or a double hot charge.
 6221.4 "Hot Charge 1" Ability { id: "5773", source: "Dahu" }
 6226.2 "Hot Charge 2?" Ability { id: "5773", source: "Dahu" }
-6228.0 "--sync--" sync / 14:[^:]*:Dahu:5774:/ window 20,20
+6228.0 "--sync--" StartsUsing { id: "5774", source: "Dahu" } window 20,20
 6233.0 "Firebreathe" Ability { id: "5774", source: "Dahu" }
 6246.3 "--sync--" Ability { id: "576A", source: "Crowned Marchosias" }
 6251.3 "--sync--" Ability { id: "576A", source: "Crowned Marchosias" }
@@ -397,7 +397,7 @@ hideall "--sync--"
 # Probably a loop, but you shouldn't see this charge, let alone the previous one.
 6367.8 "Hot Charge 1" Ability { id: "5773", source: "Dahu" }
 6372.6 "Hot Charge 2?" Ability { id: "5773", source: "Dahu" }
-6374.4 "--sync--" sync / 14:[^:]*:Dahu:5774:/ window 100,100 jump 6228.0
+6374.4 "--sync--" StartsUsing { id: "5774", source: "Dahu" } window 100,100 jump 6228.0
 6379.4 "Firebreathe" Ability { id: "5774", source: "Dahu" }
 6398.6 "Reverberating Roar" #Ability { id: "576D", source: "Dahu" }
 6407.7 "Reverberating Roar" #Ability { id: "576D", source: "Dahu" }
@@ -417,7 +417,7 @@ hideall "--sync--"
 # Alternatively, we could always insert " 19:${data.me} was defeated by" from script.
 
 8002.1 "--sync--" Ability { id: "1961", source: "Stygimoloch Warrior" } window 20000,0
-8009.1 "--sync--" sync / 14:[^:]*:Stygimoloch Warrior:5796:/ window 20,20
+8009.1 "--sync--" StartsUsing { id: "5796", source: "Stygimoloch Warrior" } window 20,20
 8012.1 "Surge of Vigor" Ability { id: "5796", source: "Stygimoloch Warrior" }
 8024.3 "Unrelenting Charge x3" Ability { id: "5799", source: "Stygimoloch Warrior" }
 8035.4 "--north--" Ability { id: "577C", source: "Stygimoloch Warrior" }
@@ -438,13 +438,13 @@ hideall "--sync--"
 8113.7 "Inescapable Entrapment" Ability { id: "5780", source: "Stygimoloch Warrior" }
 
 # Single Trap
-8120.8 "--sync--" sync / 14:[^:]*:Stygimoloch Warrior:578[15]:/ window 20,20
+8120.8 "--sync--" StartsUsing { id: "578[15]", source: "Stygimoloch Warrior" } window 20,20
 8133.8 "Surging Flames/Withering Curse?" Ability { id: "578[15]", source: "Stygimoloch Warrior" }
 8133.8 "--sync--" Ability { id: "5781", source: "Stygimoloch Warrior" } jump 8137.3 # if Surging Flames, skip +3.5s ahead
 8136.4 "Devour?" Ability { id: "5789", source: "Stygimoloch Warrior" } # only if Withering Curse
 
 # Round 2
-8146.6 "--sync--" sync / 14:[^:]*:Stygimoloch Warrior:5796:/ window 20,20
+8146.6 "--sync--" StartsUsing { id: "5796", source: "Stygimoloch Warrior" } window 20,20
 8149.6 "Surge of Vigor" Ability { id: "5796", source: "Stygimoloch Warrior" }
 8163.7 "Focused Tremor x16" Ability { id: "578E", source: "Stygimoloch Warrior" } duration 30.7
 8167.8 "--middle--" Ability { id: "577C", source: "Stygimoloch Warrior" }
@@ -456,11 +456,11 @@ hideall "--sync--"
 8207.2 "Inescapable Entrapment" Ability { id: "5780", source: "Stygimoloch Warrior" }
 
 # Triple Trap
-8210.4 "--sync--" sync / 14:[^:]*:Stygimoloch Warrior:578[15]:/ window 20,20
+8210.4 "--sync--" StartsUsing { id: "578[15]", source: "Stygimoloch Warrior" } window 20,20
 8223.4 "Surging Flames/Withering Curse?" Ability { id: "578[15]", source: "Stygimoloch Warrior" }
 8223.4 "--sync--" Ability { id: "5781", source: "Stygimoloch Warrior" } jump 8223.9 # if Surging Flames, skip +3.5s ahead
 8225.8 "Devour?" Ability { id: "5789", source: "Stygimoloch Warrior" } # only if Withering Curse
-8229.9 "--sync--" sync / 14:[^:]*:Stygimoloch Warrior:5783:/ window 20,20
+8229.9 "--sync--" StartsUsing { id: "5783", source: "Stygimoloch Warrior" } window 20,20
 8239.9 "Surging Flood" Ability { id: "5783", source: "Stygimoloch Warrior" }
 8248.1 "Leaping Spark x3" Ability { id: "578A", source: "Stygimoloch Warrior" }
 
@@ -512,7 +512,7 @@ hideall "--sync--"
 10002.5 "--sync--" Ability { id: "5858", source: "Queen's Gunner" } window 3,1
 
 # Phase 1: aoes (to 80%)
-10011.5 "--sync--" sync / 14:[^:]*:Queen's Warrior:5831:/ window 20,20
+10011.5 "--sync--" StartsUsing { id: "5831", source: "Queen's Warrior" } window 20,20
 10016.6 "Blood And Bone" Ability { id: "5831", source: "Queen's Warrior" }
 10025.6 "Blood And Bone" Ability { id: "5841", source: "Queen's Soldier" }
 10030.6 "--untargetable--"
@@ -520,7 +520,7 @@ hideall "--sync--"
 
 # Phase 2: Warrior + Knight section
 10033.9 "--targetable--" sync / 22:........:Queen's Knight:........:Queen's Knight:01/ window 25,0
-10051.1 "--sync--" sync / 14:[^:]*:Queen's Warrior:5825:/ window 60,20
+10051.1 "--sync--" StartsUsing { id: "5825", source: "Queen's Warrior" } window 60,20
 10056.1 "Relentless Battery" Ability { id: "5825", source: "Queen's Warrior" }
 10062.2 "Shield Omen/Sword Omen" Ability { id: "581[45]", source: "Queen's Knight" }
 
@@ -588,8 +588,8 @@ hideall "--sync--"
 10293.4 "Rapid Sever" Ability { id: "5832", source: "Queen's Warrior" }
 
 # If either die, they will start casting enrage.
-10302.9 "--sync--" sync / 14:[^:]*:Queen's Knight:5823:/ window 300,10
-10302.9 "--sync--" sync / 14:[^:]*:Queen's Warrior:5833:/ window 300,10
+10302.9 "--sync--" StartsUsing { id: "5823", source: "Queen's Knight" } window 300,10
+10302.9 "--sync--" StartsUsing { id: "5833", source: "Queen's Warrior" } window 300,10
 10312.9 "Blood and Bone Enrage" Ability { id: "5833", source: "Queen's Warrior" }
 10316.0 "Blood and Bone Enrage" Ability { id: "5B9D", source: "Queen's Knight" } window 10,10 # x infinity
 10319.1 "Blood and Bone Enrage" Ability { id: "5B9D", source: "Queen's Knight" }
@@ -597,7 +597,7 @@ hideall "--sync--"
 
 # Phase 3: Soldier + Gunner section
 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
+10612.0 "--sync--" StartsUsing { id: "5844", source: "Queen's Gunner" } window 600,0
 10617.0 "Relentless Battery" Ability { id: "5844", source: "Queen's Gunner" }
 10623.2 "Great Ball Of Fire" Ability { id: "583B", source: "Queen's Soldier" }
 10632.3 "Fool's Gambit" Ability { id: "583C", source: "Queen's Soldier" }
@@ -638,8 +638,8 @@ hideall "--sync--"
 10856.9 "Shot In The Dark" Ability { id: "5855", source: "Queen's Gunner" }
 
 # If either die, they will start casting enrage.
-10865.7 "--sync--" sync / 14:[^:]*:Queen's Soldier:5843:/ window 300,10
-10865.7 "--sync--" sync / 14:[^:]*:Queen's Gunner:5856:/ window 300,10
+10865.7 "--sync--" StartsUsing { id: "5843", source: "Queen's Soldier" } window 300,10
+10865.7 "--sync--" StartsUsing { id: "5856", source: "Queen's Gunner" } window 300,10
 10875.7 "Blood And Bone Enrage" Ability { id: "5843", source: "Queen's Soldier" }
 10878.8 "Blood And Bone Enrage" Ability { id: "5B9F", source: "Queen's Soldier" } window 10,10 # x infinity
 10881.9 "Blood And Bone Enrage" Ability { id: "5B9F", source: "Queen's Soldier" }
@@ -648,7 +648,7 @@ hideall "--sync--"
 
 
 # Phase 4: Aetherial Wards
-11000.0 "--sync--" sync / 14:[^:]*:Queen's Knight:581E:/ window 1000,0
+11000.0 "--sync--" StartsUsing { id: "581E", source: "Queen's Knight" } window 1000,0
 11005.0 "Strongpoint Defense" Ability { id: "581E", source: "Queen's Knight" }
 11005.0 "Spiteful Spirit" Ability { id: "582E", source: "Queen's Warrior" }
 11006.0 "--2x Aura Sphere--"
@@ -685,7 +685,7 @@ hideall "--sync--"
 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
+12007.1 "--sync--" StartsUsing { id: "57BD", source: "Bozjan Phantom" } window 20000,0
 12011.1 "Malediction of Agony" Ability { id: "57BD", source: "Bozjan Phantom" }
 12019.2 "Weave Miasma" Ability { id: "57B2", source: "Bozjan Phantom" }
 
@@ -745,7 +745,7 @@ hideall "--sync--"
 12157.2 "--targetable--"
 
 # Start of loop block
-12162.3 "--sync--" sync / 14:[^:]*:Bozjan Phantom:57B2:/ window 100,50
+12162.3 "--sync--" StartsUsing { id: "57B2", source: "Bozjan Phantom" } window 100,50
 12165.3 "Weave Miasma" Ability { id: "57B2", source: "Bozjan Phantom" }
 12171.5 "Summon" Ability { id: "57BA", source: "Bozjan Phantom" }
 12187.6 "Undying Hatred" Ability { id: "57C2", source: "Stuffy Wraith" }
@@ -853,7 +853,7 @@ hideall "--sync--"
 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
+14006.7 "--sync--" StartsUsing { id: "594E", source: "Trinity Avowed" } window 10,10
 14011.8 "Wrath Of Bozja" Ability { id: "594E", source: "Trinity Avowed" }
 14019.9 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 
@@ -867,18 +867,18 @@ hideall "--sync--"
 14056.0 "Allegiant Arsenal" # -> random jump to initial weapon phase
 
 # -> Sword v1 (initial)?
-14053.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 10,10 jump 14100
+14053.0 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 10,10 jump 14100
 14061.2 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v1 (initial)?
-14053.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 10,10 jump 14700
+14053.0 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 10,10 jump 14700
 14061.2 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v1 (initial)?
-14053.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 10,10 jump 15300
+14053.0 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 10,10 jump 15300
 14061.2 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Sword v1 (initial)
-14100.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/
+14100.0 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" }
 14103.0 "Allegiant Arsenal" Ability { id: "5985", source: "Trinity Avowed" }
 14108.2 "Infernal Slash" Ability { id: "594A", source: "Trinity Avowed" }
 14115.6 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" }
@@ -891,15 +891,15 @@ hideall "--sync--"
 14167.4 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 
 # -> Bow v1 (seen sword)?
-14175.3 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 70,10 jump 14900
+14175.3 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 70,10 jump 14900
 14183.5 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v1 (seen sword)?
-14175.3 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 70,10 jump 15500
+14175.3 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 70,10 jump 15500
 14183.5 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Sword v1 (seen bow)
-14300.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/
+14300.0 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" }
 14303.0 "Allegiant Arsenal" Ability { id: "5985", source: "Trinity Avowed" }
 14308.2 "Infernal Slash" Ability { id: "594A", source: "Trinity Avowed" }
 14315.6 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" }
@@ -911,7 +911,7 @@ hideall "--sync--"
 14360.3 "--sync--" Ability { id: "5982", source: "Trinity Avowed" }
 14367.4 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 # -> roll into Staff v1 (final)
-14375.3 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 70,10
+14375.3 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 70,10
 14378.3 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
 14383.5 "Fury Of Bozja" Ability { id: "594C", source: "Trinity Avowed" }
 14389.6 "Hot And Cold" Ability { id: "597B", source: "Trinity Avowed" }
@@ -924,18 +924,18 @@ hideall "--sync--"
 14444.5 "Allegiant Arsenal"
 
 # -> Sword v2?
-14441.5 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 40,10 jump 15900
+14441.5 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 40,10 jump 15900
 14449.7 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v2?
-14441.5 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 40,10 jump 16100
+14441.5 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 40,10 jump 16100
 14449.7 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v2?
-14441.5 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 40,10 jump 16300
+14441.5 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 40,10 jump 16300
 14449.7 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Sword v1 (seen staff)
-14500.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/
+14500.0 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" }
 14503.0 "Allegiant Arsenal" Ability { id: "5985", source: "Trinity Avowed" }
 14508.2 "Infernal Slash" Ability { id: "594A", source: "Trinity Avowed" }
 14515.6 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" }
@@ -947,7 +947,7 @@ hideall "--sync--"
 14560.3 "--sync--" Ability { id: "5982", source: "Trinity Avowed" }
 14567.4 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 # -> roll into Bow v1 (final)
-14575.3 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 70,10
+14575.3 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 70,10
 14578.3 "Allegiant Arsenal" Ability { id: "5986", source: "Trinity Avowed" }
 14583.5 "Flashvane" Ability { id: "594B", source: "Trinity Avowed" }
 14589.6 "Quick March" Ability { id: "5BB3", source: "Trinity Avowed" }
@@ -963,18 +963,18 @@ hideall "--sync--"
 14664.2 "Allegiant Arsenal"
 
 # -> Sword v2?
-14661.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 40,10 jump 15900
+14661.2 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 40,10 jump 15900
 14669.4 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v2?
-14661.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 40,10 jump 16100
+14661.2 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 40,10 jump 16100
 14669.4 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v2?
-14661.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 40,10 jump 16300
+14661.2 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 40,10 jump 16300
 14669.4 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Bow v1 (initial)
-14700.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/
+14700.0 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" }
 14703.0 "Allegiant Arsenal" Ability { id: "5986", source: "Trinity Avowed" }
 14708.2 "Flashvane" Ability { id: "594B", source: "Trinity Avowed" }
 14714.3 "Quick March" Ability { id: "5BB3", source: "Trinity Avowed" }
@@ -990,15 +990,15 @@ hideall "--sync--"
 14788.9 "Allegiant Arsenal"
 
 # -> Sword v1 (seen bow)?
-14785.9 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 70,10 jump 14300
+14785.9 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 70,10 jump 14300
 14794.1 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Staff v1 (seen bow)?
-14785.9 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 70,10 jump 15700
+14785.9 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 70,10 jump 15700
 14794.1 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Bow v1 (seen sword)
-14900.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/
+14900.0 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" }
 14903.0 "Allegiant Arsenal" Ability { id: "5986", source: "Trinity Avowed" }
 14908.2 "Flashvane" Ability { id: "594B", source: "Trinity Avowed" }
 14914.3 "Quick March" Ability { id: "5BB3", source: "Trinity Avowed" }
@@ -1012,7 +1012,7 @@ hideall "--sync--"
 14971.4 "--sync--" Ability { id: "5983", source: "Trinity Avowed" } window 10,10 # some variance here
 14978.5 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 # -> roll into Staff v1 (final)
-14985.9 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 70,10
+14985.9 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 70,10
 14988.9 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
 14994.1 "Fury Of Bozja" Ability { id: "594C", source: "Trinity Avowed" }
 15000.2 "Hot And Cold" Ability { id: "597B", source: "Trinity Avowed" }
@@ -1025,18 +1025,18 @@ hideall "--sync--"
 15055.1 "Allegiant Arsenal"
 
 # -> Sword v2?
-15052.1 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 40,10 jump 15900
+15052.1 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 40,10 jump 15900
 15060.3 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v2?
-15052.1 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 40,10 jump 16100
+15052.1 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 40,10 jump 16100
 15060.3 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v2?
-15052.1 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 40,10 jump 16300
+15052.1 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 40,10 jump 16300
 15060.3 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Bow v1 (seen staff)
-15100.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/
+15100.0 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" }
 15103.0 "Allegiant Arsenal" Ability { id: "5986", source: "Trinity Avowed" }
 15108.2 "Flashvane" Ability { id: "594B", source: "Trinity Avowed" }
 15114.3 "Quick March" Ability { id: "5BB3", source: "Trinity Avowed" }
@@ -1050,7 +1050,7 @@ hideall "--sync--"
 15171.4 "--sync--" Ability { id: "5983", source: "Trinity Avowed" } window 10,10 # some variance here
 15178.5 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 # -> roll into Sword v1 (final)
-15185.9 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 70,10
+15185.9 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 70,10
 15188.9 "Allegiant Arsenal" Ability { id: "5985", source: "Trinity Avowed" }
 15194.1 "Infernal Slash" Ability { id: "594A", source: "Trinity Avowed" }
 15201.5 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" }
@@ -1063,18 +1063,18 @@ hideall "--sync--"
 15253.3 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 
 # -> Sword v2?
-15261.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 40,10 jump 15900
+15261.2 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 40,10 jump 15900
 15269.4 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v2?
-15261.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 40,10 jump 16100
+15261.2 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 40,10 jump 16100
 15269.4 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v2?
-15261.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 40,10 jump 16300
+15261.2 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 40,10 jump 16300
 15269.4 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Staff v1 (initial)
-15300.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/
+15300.0 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" }
 15303.0 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
 15308.2 "Fury Of Bozja" Ability { id: "594C", source: "Trinity Avowed" }
 15314.3 "Hot And Cold" Ability { id: "597B", source: "Trinity Avowed" }
@@ -1087,15 +1087,15 @@ hideall "--sync--"
 15369.2 "Allegiant Arsenal"
 
 # -> Sword v1 (seen staff)
-15366.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 70,10 jump 14500
+15366.2 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 70,10 jump 14500
 15374.4 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v1 (seen staff)
-15366.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 70,10 jump 15100
+15366.2 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 70,10 jump 15100
 15374.4 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 
 
 # Staff v1 (seen sword)
-15500.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/
+15500.0 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" }
 15503.0 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
 15508.2 "Fury Of Bozja" Ability { id: "594C", source: "Trinity Avowed" }
 15514.3 "Hot And Cold" Ability { id: "597B", source: "Trinity Avowed" }
@@ -1106,7 +1106,7 @@ hideall "--sync--"
 15550.6 "--sync--" Ability { id: "5984", source: "Trinity Avowed" }
 15557.7 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 # -> roll into Bow v1 (final)
-15566.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 70,10
+15566.2 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 70,10
 15569.2 "Allegiant Arsenal" Ability { id: "5986", source: "Trinity Avowed" }
 15574.4 "Flashvane" Ability { id: "594B", source: "Trinity Avowed" }
 15580.5 "Quick March" Ability { id: "5BB3", source: "Trinity Avowed" }
@@ -1122,18 +1122,18 @@ hideall "--sync--"
 15655.1 "Allegiant Arsenal"
 
 # -> Sword v2?
-15652.1 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 40,10 jump 15900
+15652.1 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 40,10 jump 15900
 15660.3 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v2?
-15652.1 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 40,10 jump 16100
+15652.1 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 40,10 jump 16100
 15660.3 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v2?
-15652.1 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 40,10 jump 16300
+15652.1 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 40,10 jump 16300
 15660.3 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Staff v1 (seen bow)
-15700.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/
+15700.0 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" }
 15703.0 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
 15708.2 "Fury Of Bozja" Ability { id: "594C", source: "Trinity Avowed" }
 15714.3 "Hot And Cold" Ability { id: "597B", source: "Trinity Avowed" }
@@ -1144,7 +1144,7 @@ hideall "--sync--"
 15750.6 "--sync--" Ability { id: "5984", source: "Trinity Avowed" }
 15757.7 "Glory Of Bozja" Ability { id: "594F", source: "Trinity Avowed" }
 # -> roll into Sword v1 (final)
-15766.2 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 70,10
+15766.2 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 70,10
 15769.2 "Allegiant Arsenal" Ability { id: "5985", source: "Trinity Avowed" }
 15774.4 "Infernal Slash" Ability { id: "594A", source: "Trinity Avowed" }
 15781.8 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" }
@@ -1158,18 +1158,18 @@ hideall "--sync--"
 15844.5 "Allegiant Arsenal"
 
 # -> Sword v2?
-15841.5 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 40,10 jump 15900
+15841.5 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 40,10 jump 15900
 15849.7 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v2?
-15841.5 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 40,10 jump 16100
+15841.5 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 40,10 jump 16100
 15849.7 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v2?
-15841.5 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 40,10 jump 16300
+15841.5 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 40,10 jump 16300
 15849.7 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Sword v2
-15900.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/
+15900.0 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" }
 15903.0 "Allegiant Arsenal" Ability { id: "5985", source: "Trinity Avowed" }
 15908.2 "Infernal Slash" Ability { id: "594A", source: "Trinity Avowed" }
 15915.4 "Hot And Cold" Ability { id: "5BAF", source: "Trinity Avowed" }
@@ -1184,15 +1184,15 @@ hideall "--sync--"
 15984.6 "Allegiant Arsenal"
 
 # -> Bow v2?
-15981.6 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 70,10 jump 16100
+15981.6 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 70,10 jump 16100
 15989.8 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 # -> Staff v2?
-15981.6 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 70,10 jump 16300
+15981.6 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 70,10 jump 16300
 15989.8 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 # Bow v2
-16100.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/
+16100.0 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" }
 16103.0 "Allegiant Arsenal" Ability { id: "5986", source: "Trinity Avowed" }
 16108.2 "Flashvane" Ability { id: "594B", source: "Trinity Avowed" }
 16114.3 "Unseen Eye" Ability { id: "5BB4", source: "Trinity Avowed" }
@@ -1211,16 +1211,16 @@ hideall "--sync--"
 16203.0 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
 
 # -> Sword v2?
-16200.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 70,10 jump 15900
+16200.0 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 70,10 jump 15900
 16208.2 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Staff v2?
-16200.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/ window 70,10 jump 16300
+16200.0 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" } window 70,10 jump 16300
 16208.2 "Fury Of Bozja?" #Ability { id: "594C", source: "Trinity Avowed" }
 
 
 
 # Staff v2
-16300.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5987:/
+16300.0 "--sync--" StartsUsing { id: "5987", source: "Trinity Avowed" }
 16303.0 "Allegiant Arsenal" Ability { id: "5987", source: "Trinity Avowed" }
 16308.2 "Fury Of Bozja" Ability { id: "594C", source: "Trinity Avowed" }
 16314.3 "Hot And Cold" Ability { id: "597B", source: "Trinity Avowed" }
@@ -1235,10 +1235,10 @@ hideall "--sync--"
 16369.4 "Allegiant Arsenal"
 
 # -> Sword v2?
-16366.4 "--sync--" sync / 14:[^:]*:Trinity Avowed:5985:/ window 70,10 jump 15900
+16366.4 "--sync--" StartsUsing { id: "5985", source: "Trinity Avowed" } window 70,10 jump 15900
 16374.6 "Infernal Slash?" #Ability { id: "594A", source: "Trinity Avowed" }
 # -> Bow v2?
-16366.4 "--sync--" sync / 14:[^:]*:Trinity Avowed:5986:/ window 70,10 jump 16100
+16366.4 "--sync--" StartsUsing { id: "5986", source: "Trinity Avowed" } window 70,10 jump 16100
 16374.6 "Flashvane?" #Ability { id: "594B", source: "Trinity Avowed" }
 
 
@@ -1246,7 +1246,7 @@ hideall "--sync--"
 # This happens ~10 seconds after when the allegiant arsenal would have cast.
 # We could...technically...break up phase 2 into the same blocks like phase 1, but no.
 # TODO: Alternatively we could add this in as "Enrage?" to each block?
-16500.0 "--sync--" sync / 14:[^:]*:Trinity Avowed:5954:/ window 2500,0
+16500.0 "--sync--" StartsUsing { id: "5954", source: "Trinity Avowed" } window 2500,0
 16512.0 "Glory Of Bozja Enrage" Ability { id: "5954", source: "Trinity Avowed" }
 16512.0 "--untargetable--"
 
@@ -1265,7 +1265,7 @@ hideall "--sync--"
 # Both of these casts are renamed as --sync-- to clean up the timeline.
 
 # Phase 1
-18008.3 "--sync--" sync / 14:[^:]*:Stygimoloch Lord:57D7:/ window 15,15
+18008.3 "--sync--" StartsUsing { id: "57D7", source: "Stygimoloch Lord" } window 15,15
 18015.3 "Foe Splitter" Ability { id: "57D7", source: "Stygimoloch Lord" }
 18023.4 "Vicious Swipe" Ability { id: "5552", source: "Stygimoloch Lord" }
 18028.5 "--sync--" Ability { id: "57CF", source: "Stygimoloch Lord" }
@@ -1285,7 +1285,7 @@ hideall "--sync--"
 # loop.  Therefore, we'll just unroll this loop a few times and drop the
 # Mana Flame after a while.  Most logs don't even see the 2nd Fateful Words.
 18200.0 "--untargetable--" Ability { id: "57DA", source: "Stygimoloch Lord" }
-18201.5 "--sync--" sync / 14:[^:]*:Stygimoloch Lord:57C3:/ window 210,0
+18201.5 "--sync--" StartsUsing { id: "57C3", source: "Stygimoloch Lord" } window 210,0
 18204.5 "Memory of the Labyrinth" Ability { id: "57C3", source: "Stygimoloch Lord" }
 18205.1 "--adds--"
 18215.4 "Mana Flame" Ability { id: "57DE", source: "Ball Of Fire" }
@@ -1352,7 +1352,7 @@ hideall "--sync--"
 
 # Phase 3: Victory Lap (once adds are dead)
 19000.0 "--targetable--" sync / 22:........:Stygimoloch Lord:........:Stygimoloch Lord:01/ window 800,0
-19008.2 "--sync--" sync / 14:[^:]*:Stygimoloch Lord:57D2:/ window 1010,0
+19008.2 "--sync--" StartsUsing { id: "57D2", source: "Stygimoloch Lord" } window 1010,0
 19013.2 "Thunderous Discharge" Ability { id: "57D2", source: "Stygimoloch Lord" }
 19028.4 "Rapid Bolts 1" Ability { id: "57CD", source: "Stygimoloch Lord" } duration 12.8
 19040.5 "1111-Tonze Swing" Ability { id: "57D8", source: "Stygimoloch Lord" }
@@ -1388,7 +1388,7 @@ hideall "--sync--"
 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
+20010.3 "--sync--" StartsUsing { id: "59F9", source: "The Queen" } window 20,20
 20015.3 "Empyrean Iniquity" Ability { id: "59F9", source: "The Queen" }
 20025.5 "--sync--" Ability { id: "5BCB", source: "The Queen" }
 20033.9 "Queen's Will" Ability { id: "59E6", source: "The Queen" }
diff --git a/ui/raidboss/data/05-shb/eureka/zadnor.txt b/ui/raidboss/data/05-shb/eureka/zadnor.txt
index 0291565e8f..58a0afefae 100644
--- a/ui/raidboss/data/05-shb/eureka/zadnor.txt
+++ b/ui/raidboss/data/05-shb/eureka/zadnor.txt
@@ -84,12 +84,12 @@ hideall "--sync--"
 21053.6 "Thermal Gust" Ability { id: "5E74", source: "Sartauvoir The Inferno" }
 21057.6 "Flamedive" Ability { id: "5E73", source: "Huma" }
 # This can push.
-21059.8 "--sync--" sync / 14:[^:]*:Sartauvoir The Inferno:5E6D:/ window 70,10
+21059.8 "--sync--" StartsUsing { id: "5E6D", source: "Sartauvoir The Inferno" } window 70,10
 21066.8 "--sync--" Ability { id: "5E6D", source: "Sartauvoir The Inferno" }
 21072.9 "Reverse Time Eruption 1" Ability { id: "5E71", source: "Sartauvoir The Inferno" }
 21074.9 "Reverse Time Eruption 2" Ability { id: "5E70", source: "Sartauvoir The Inferno" }
 # This too?
-21078.0 "--sync--" sync / 14:[^:]*:Sartauvoir The Inferno:5E7C:/ window 80,10
+21078.0 "--sync--" StartsUsing { id: "5E7C", source: "Sartauvoir The Inferno" } window 80,10
 21083.0 "Pyrokinesis" Ability { id: "5E7C", source: "Sartauvoir The Inferno" }
 21091.2 "Hyperpyroplexy" Ability { id: "5E76", source: "Sartauvoir The Inferno" }
 21101.4 "Pyroplexy" Ability { id: "5E77", source: "Sartauvoir The Inferno" }
@@ -129,7 +129,7 @@ hideall "--sync--"
 #22000.0 "--sync--" sync / 29:[^:]*:7DC:[^:]*:E5B:/ window 100000,0
 
 # Blackburn
-22011.0 "--sync--" sync / 14:[^:]*:4Th Legion Blackburn:5F12:/ window 100000,0
+22011.0 "--sync--" StartsUsing { id: "5F12", source: "4Th Legion Blackburn" } window 100000,0
 22016.0 "Suppressive Magitek Rays" Ability { id: "5F12", source: "4Th Legion Blackburn" }
 22031.7 "Anti-Personnel Missile" Ability { id: "5F0D", source: "4Th Legion Blackburn" }
 22033.8 "Ballistic Impact 1" #Ability { id: "5F0E", source: "4Th Legion Blackburn" }
@@ -146,7 +146,7 @@ hideall "--sync--"
 
 # Augur
 # this cast starts almost immediately after the Augur apperas
-22300.0 "--sync--" sync / 14:[^:]*:4Th Legion Augur:5F1F:/ window 300,0
+22300.0 "--sync--" StartsUsing { id: "5F1F", source: "4Th Legion Augur" } window 300,0
 22305.0 "Sanctified Quake III" Ability { id: "5F1F", source: "4Th Legion Augur" }
 22313.2 "Void Call" Ability { id: "5F1E", source: "4Th Legion Augur" }
 22325.5 "Turbine" Ability { id: "5F14", source: "Flameborne Zirnitra" }
@@ -158,7 +158,7 @@ hideall "--sync--"
 
 # Tamed Alkonost / Tamed Carrion Crow
 22500.0 "--sync--" sync / 03:........:Tamed Carrion Crow:/  window 600,0
-22507.0 "--sync--" sync / 14:[^:]*:Tamed Alkonost:5F26:/ window 600,10
+22507.0 "--sync--" StartsUsing { id: "5F26", source: "Tamed Alkonost" } window 600,10
 22512.0 "Stormcall" Ability { id: "5F26", source: "Tamed Alkonost" }
 22526.9 "Orb 1" Ability { id: "5F27", source: "Vortical Orb" }
 22526.9 "North Wind/South Wind" Ability { id: "5F2[12]", source: "Tamed Carrion Crow" }
@@ -204,7 +204,7 @@ hideall "--sync--"
 23140.2 "Necrotic Billow?" Ability { id: "5C86", source: "4Th-Make Cuchulainn" }
 23143.3 "Fleshy Necromass?" Ability { id: "5C82", source: "4Th-Make Cuchulainn" }
 # this timing can be 8 seconds earlier if it's Billow instead of Necromass.
-23163.2 "--sync--" sync / 14:[^:]*:4Th-Make Cuchulainn:5C88:/ window 20,20
+23163.2 "--sync--" StartsUsing { id: "5C88", source: "4Th-Make Cuchulainn" } window 20,20
 23168.2 "Burgeoning Dread" Ability { id: "5C88", source: "4Th-Make Cuchulainn" }
 
 23179.3 "--sync--" Ability { id: "5C8D", source: "4Th-Make Cuchulainn" }
@@ -218,7 +218,7 @@ hideall "--sync--"
 23226.8 "Necrotic Billow?" Ability { id: "5C86", source: "4Th-Make Cuchulainn" }
 23230.9 "Fleshy Necromass?" Ability { id: "5C82", source: "4Th-Make Cuchulainn" }
 # this timing can be 8 seconds earlier if it's Billow instead of Necromass.
-23249.1 "--sync--" sync / 14:[^:]*:4Th-Make Cuchulainn:5C8B:/ window 20,5
+23249.1 "--sync--" StartsUsing { id: "5C8B", source: "4Th-Make Cuchulainn" } window 20,5
 23254.1 "Fell Flow 1" Ability { id: "5C8B", source: "4Th-Make Cuchulainn" }
 23261.4 "Fell Flow 2" Ability { id: "5C8B", source: "4Th-Make Cuchulainn" }
 23275.6 "Burgeoning Dread" Ability { id: "5C88", source: "4Th-Make Cuchulainn" }
@@ -251,7 +251,7 @@ hideall "--sync--"
 24099.8 "--sync--" Ability { id: "5DD7", source: "Saunion" }
 # ?
 
-24300.0 "--sync--" sync / 14:[^:]*:Dawon The Younger:5DC6:/ window 300,0
+24300.0 "--sync--" StartsUsing { id: "5DC6", source: "Dawon The Younger" } window 300,0
 24306.0 "Touchdown" Ability { id: "5DC6", source: "Dawon The Younger" }
 24323.3 "--targetable--"
 24342.5 "--sync--" Ability { id: "5DD7", source: "Saunion" }
@@ -417,7 +417,7 @@ hideall "--sync--"
 25532.0 "Ultimate Pseudoterror" Ability { id: "5CA3", source: "The Diablo Armament" }
 
 # final phase (hp%?)
-25800.0 "--sync--" sync / 14:[^:]*:The Diablo Armament:5CB7:/ window 1000,0
+25800.0 "--sync--" StartsUsing { id: "5CB7", source: "The Diablo Armament" } window 1000,0
 25805.0 "Void Systems Overload" Ability { id: "5CB7", source: "The Diablo Armament" }
 25815.1 "Pillar Of Shamash" Ability { id: "5CB9", source: "The Diablo Armament" }
 25816.6 "Pillar Of Shamash" Ability { id: "5CBA", source: "The Diablo Armament" }
diff --git a/ui/raidboss/data/05-shb/raid/e11s.txt b/ui/raidboss/data/05-shb/raid/e11s.txt
index 4ecf48cf04..f3a956d301 100644
--- a/ui/raidboss/data/05-shb/raid/e11s.txt
+++ b/ui/raidboss/data/05-shb/raid/e11s.txt
@@ -222,5 +222,5 @@ hideall "--sync--"
 946.7 "Shining Blade?"
 
 
-992.3 "Burnished Glory" sync / 14:[^:]*:Fatebreaker:5529:/ window 1000,0
+992.3 "Burnished Glory" StartsUsing { id: "5529", source: "Fatebreaker" } window 1000,0
 1000.0 "Burnished Glory Enrage" Ability { id: "5529", source: "Fatebreaker" }
diff --git a/ui/raidboss/data/05-shb/raid/e12n.txt b/ui/raidboss/data/05-shb/raid/e12n.txt
index c86c72336a..2cb4772764 100644
--- a/ui/raidboss/data/05-shb/raid/e12n.txt
+++ b/ui/raidboss/data/05-shb/raid/e12n.txt
@@ -46,7 +46,7 @@ hideall "--sync--"
 
 
 # Post-intermission initial block.
-500.0 "--sync--" sync / 14:[^:]*:Eden's Promise:4B48:/ window 500,10
+500.0 "--sync--" StartsUsing { id: "4B48", source: "Eden's Promise" } window 500,10
 504.9 "Paradise Lost" Ability { id: "4B48", source: "Eden's Promise" }
 511.9 "--targetable--"
 522.0 "Initialize Recall" Ability { id: "5859", source: "Eden's Promise" } window 30,30
diff --git a/ui/raidboss/data/05-shb/raid/e12s.txt b/ui/raidboss/data/05-shb/raid/e12s.txt
index e57a808f24..9bf3089cb8 100644
--- a/ui/raidboss/data/05-shb/raid/e12s.txt
+++ b/ui/raidboss/data/05-shb/raid/e12s.txt
@@ -12,7 +12,7 @@ hideall "--sync--"
 
 0 "Start"
 0.8 "--sync--" Ability { id: "4B1E", source: "Eden's Promise" } window 1,0
-11.0 "--sync--" sync / 14:[^:]*:Eden's Promise:58A8:/ window 11,20
+11.0 "--sync--" StartsUsing { id: "58A8", source: "Eden's Promise" } window 11,20
 16.0 "Maleficium" Ability { id: "58A8", source: "Eden's Promise" }
 23.2 "--middle--" Ability { id: "58AF", source: "Eden's Promise" }
 25.8 "Initialize Recall" Ability { id: "588C", source: "Eden's Promise" }
@@ -119,7 +119,7 @@ hideall "--sync--"
 # -ii 4B1F 58C5 58C6 58D7 58BF 58C9 58CB 58CC 58CE
 
 1000.0 "Start"
-1011.0 "--sync--" sync / 14:[^:]*:Oracle Of Darkness:58EF:/ window 1011,0
+1011.0 "--sync--" StartsUsing { id: "58EF", source: "Oracle Of Darkness" } window 1011,0
 1015.0 "Hell's Judgment" Ability { id: "58EF", source: "Oracle Of Darkness" }
 1023.2 "Shockwave Pulsar" Ability { id: "58F0", source: "Oracle Of Darkness" }
 
diff --git a/ui/raidboss/data/05-shb/raid/e1s.txt b/ui/raidboss/data/05-shb/raid/e1s.txt
index bcb994d356..fda4540553 100644
--- a/ui/raidboss/data/05-shb/raid/e1s.txt
+++ b/ui/raidboss/data/05-shb/raid/e1s.txt
@@ -87,4 +87,4 @@ hideall "--sync--"
 
 
 ### Enrage
-900.0 "Fragor Maximus (Enrage)" sync / 14:[^:]*:Eden Prime:45E4:/ window 500,0 duration 10.0
+900.0 "Fragor Maximus (Enrage)" StartsUsing { id: "45E4", source: "Eden Prime" } window 500,0 duration 10.0
diff --git a/ui/raidboss/data/05-shb/raid/e2s.txt b/ui/raidboss/data/05-shb/raid/e2s.txt
index db16068148..620f2cf9f9 100644
--- a/ui/raidboss/data/05-shb/raid/e2s.txt
+++ b/ui/raidboss/data/05-shb/raid/e2s.txt
@@ -82,5 +82,5 @@ hideall "Spell-In-Waiting"
 593.2 "Quietus" Ability { id: "3E71", source: "Voidwalker" }
 602.5 "Quietus" Ability { id: "3E71", source: "Voidwalker" }
 611.8 "Quietus" Ability { id: "3E71", source: "Voidwalker" }
-624.8 "--sync--" sync / 14:[^:]*:Voidwalker:3E73:/ window 700,5
+624.8 "--sync--" StartsUsing { id: "3E73", source: "Voidwalker" } window 700,5
 629.8 "Quietus Enrage"
diff --git a/ui/raidboss/data/05-shb/raid/e4s.txt b/ui/raidboss/data/05-shb/raid/e4s.txt
index ff057646e1..e60041df9a 100644
--- a/ui/raidboss/data/05-shb/raid/e4s.txt
+++ b/ui/raidboss/data/05-shb/raid/e4s.txt
@@ -10,7 +10,7 @@ hideall "Earthen Wheels"
 
 ### Warmup
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-11.0 "--sync--" sync / 14:[^:]*:Titan:4116:/ window 11,5
+11.0 "--sync--" StartsUsing { id: "4116", source: "Titan" } window 11,5
 16.0 "Stonecrusher 1" Ability { id: "4116", source: "Titan" }
 19.1 "Stonecrusher 2" #Ability { id: "4143", source: "Titan" }
 22.1 "Stonecrusher 3" #Ability { id: "4143", source: "Titan" }
diff --git a/ui/raidboss/data/05-shb/raid/e7n.txt b/ui/raidboss/data/05-shb/raid/e7n.txt
index 2b4030bf5f..8cef7fde00 100644
--- a/ui/raidboss/data/05-shb/raid/e7n.txt
+++ b/ui/raidboss/data/05-shb/raid/e7n.txt
@@ -48,7 +48,7 @@ hideall "--sync--"
 
 
 # Rotation block. 135.6 seconds
-393.3 "--sync--" sync / 14:[^:]*:The Idol Of Darkness:(4E5[46]|4C53):/ window 400,20
+393.3 "--sync--" StartsUsing { id: "(4E5[46]|4C53)", source: "The Idol Of Darkness" } window 400,20
 400.0 "Empty Flood" Ability { id: "(4E5[46]|4C53)", source: "The Idol Of Darkness" } window 400,20
 410.3 "--targetable--"
 414.4 "Unjoined Aspect" Ability { id: "4C3B", source: "The Idol Of Darkness" }
diff --git a/ui/raidboss/data/05-shb/raid/e7s.txt b/ui/raidboss/data/05-shb/raid/e7s.txt
index c7c22e8b9e..9616506cc8 100644
--- a/ui/raidboss/data/05-shb/raid/e7s.txt
+++ b/ui/raidboss/data/05-shb/raid/e7s.txt
@@ -67,7 +67,7 @@ hideall "--sync--"
 205.6 "--targetable--"
 224.9 "Overwhelming Force" Ability { id: "4C73", source: "Blasphemy" }
 231.8 "Insatiable Light" Ability { id: "4C6D", source: "Idolatry" }
-239.5 "Advent Of Light" sync / 14:[^:]*:Idolatry:4C6E:/ # use start of cast for this interrupt
+239.5 "Advent Of Light" StartsUsing { id: "4C6E", source: "Idolatry" } # use start of cast for this interrupt
 243.6 "Overwhelming Force" Ability { id: "4C73", source: "Blasphemy" }
 253.7 "Overwhelming Force" Ability { id: "4C73", source: "Blasphemy" }
 254.5 "Insatiable Light" Ability { id: "4C6D", source: "Idolatry" }
diff --git a/ui/raidboss/data/05-shb/raid/e8s.txt b/ui/raidboss/data/05-shb/raid/e8s.txt
index cfb02a104a..fc9e211665 100644
--- a/ui/raidboss/data/05-shb/raid/e8s.txt
+++ b/ui/raidboss/data/05-shb/raid/e8s.txt
@@ -68,7 +68,7 @@ hideall "--sync--"
 
 ### Wing Mirrors
 350.5 "--targetable--"
-364.2 "--sync--" sync / 14:[^:]*:Shiva:4D79:/ window 370,10
+364.2 "--sync--" StartsUsing { id: "4D79", source: "Shiva" } window 370,10
 368.6 "Akh Morn x3" Ability { id: "4D79", source: "Shiva" } duration 3.1
 378.0 "Morn Afah" Ability { id: "4D7B", source: "Shiva" }
 389.4 "Mirror, Mirror" Ability { id: "4D5A", source: "Shiva" }
diff --git a/ui/raidboss/data/05-shb/raid/e9n.txt b/ui/raidboss/data/05-shb/raid/e9n.txt
index 87848af5bb..17d9644140 100644
--- a/ui/raidboss/data/05-shb/raid/e9n.txt
+++ b/ui/raidboss/data/05-shb/raid/e9n.txt
@@ -7,7 +7,7 @@ hideall "--sync--"
 # -ii 5626 5B18 55E1 55E3 5159 532F 55DB 55E5
 
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-10.4 "--sync--" sync / 14:[^:]*:Cloud Of Darkness:55ED:/ window 10.4,5
+10.4 "--sync--" StartsUsing { id: "55ED", source: "Cloud Of Darkness" } window 10.4,5
 15.1 "Ground-Razing Particle Beam" Ability { id: "55ED", source: "Cloud Of Darkness" }
 25.3 "The Art Of Darkness" Ability { id: "522[34]", source: "Cloud Of Darkness" }
 34.8 "Wide-Angle Particle Beam" Ability { id: "5AFF", source: "Cloud Of Darkness" }
diff --git a/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt b/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt
index 3428d015ad..d2bb05c527 100644
--- a/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt
@@ -9,7 +9,7 @@ hideall "--sync--"
 
 ### Phase 1
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-16.3 "--sync--" sync / 14:[^:]*:The Diamond Weapon:5FA7:/ window 17,10
+16.3 "--sync--" StartsUsing { id: "5FA7", source: "The Diamond Weapon" } window 17,10
 21.3 "Diamond Rain" Ability { id: "5FA7", source: "The Diamond Weapon" } window 25,10
 
 # 5FA2 = Spread (Homing Laser, 5FA0)
diff --git a/ui/raidboss/data/05-shb/trial/diamond_weapon.txt b/ui/raidboss/data/05-shb/trial/diamond_weapon.txt
index 1e5d5e673e..d5354ef5ce 100644
--- a/ui/raidboss/data/05-shb/trial/diamond_weapon.txt
+++ b/ui/raidboss/data/05-shb/trial/diamond_weapon.txt
@@ -8,7 +8,7 @@ hideall "--sync--"
 
 # Phase 1
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-6.0 "--sync--" sync / 14:[^:]*:The Diamond Weapon:5FA7:/ window 10,10
+6.0 "--sync--" StartsUsing { id: "5FA7", source: "The Diamond Weapon" } window 10,10
 11.0 "Diamond Rain" Ability { id: "5FA7", source: "The Diamond Weapon" }
 40.3 "Adamant Purge" Ability { id: "5F9B", source: "The Diamond Weapon" }
 50.5 "Claw Swipe" Ability { id: "5F9F", source: "The Diamond Weapon" }
diff --git a/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt b/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt
index 943b70e470..170edd4dce 100644
--- a/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt
@@ -9,7 +9,7 @@ hideall "--sync--"
 
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 1.1 "--sync--" Ability { id: "5B1A", source: "The Emerald Weapon" } window 1.1,0
-12.1 "--sync--" sync / 14:[^:]*:The Emerald Weapon:55B0:/ window 20,20
+12.1 "--sync--" StartsUsing { id: "55B0", source: "The Emerald Weapon" } window 20,20
 17.1 "Emerald Shot" Ability { id: "55B0", source: "The Emerald Weapon" }
 28.2 "Optimized Ultima" Ability { id: "55B1", source: "The Emerald Weapon" }
 39.4 "Aetheroplasm Production" Ability { id: "55AA", source: "The Emerald Weapon" }
@@ -44,7 +44,7 @@ hideall "--sync--"
 
 1000.0 "Start"
 1001.0 "--sync--" Ability { id: "5B1C", source: "The Emerald Weapon" } window 1001,0
-1010.0 "--sync--" sync / 14:[^:]*:The Emerald Weapon:555B:/ window 1015,20
+1010.0 "--sync--" StartsUsing { id: "555B", source: "The Emerald Weapon" } window 1015,20
 1015.0 "Divide Et Impera" Ability { id: "555B", source: "The Emerald Weapon" }
 1021.3 "--sync--" Ability { id: "5B1F", source: "The Emerald Weapon" }
 1031.3 "Primus Terminus Est" Ability { id: "55C3", source: "The Emerald Weapon" }
diff --git a/ui/raidboss/data/05-shb/trial/emerald_weapon.txt b/ui/raidboss/data/05-shb/trial/emerald_weapon.txt
index e5a292fb64..e38cf4d310 100644
--- a/ui/raidboss/data/05-shb/trial/emerald_weapon.txt
+++ b/ui/raidboss/data/05-shb/trial/emerald_weapon.txt
@@ -12,7 +12,7 @@ hideall "--sync--"
 ### Phase 1
 0 "Start"
 0.5 "--sync--" Ability { id: "5B1A", source: "The Emerald Weapon" } window 1,0.5
-8.4 "--sync--" sync / 14:[^:]*:The Emerald Weapon:5554:/ window 10,5
+8.4 "--sync--" StartsUsing { id: "5554", source: "The Emerald Weapon" } window 10,5
 13.4 "Emerald Shot" Ability { id: "5554", source: "The Emerald Weapon" }
 
 26.6 "Emerald Beam" Ability { id: "552A", source: "The Emerald Weapon" }
@@ -89,13 +89,13 @@ hideall "--sync--"
 
 ### Intermission
 936.6 "--untargetable--"
-936.7 "--sync--" sync / 14:[^:]*:The Emerald Weapon:5B02:/ window 1000,10
+936.7 "--sync--" StartsUsing { id: "5B02", source: "The Emerald Weapon" } window 1000,10
 940.7 "Disruption Field" Ability { id: "5B02", source: "The Emerald Weapon" }
 1000.0 "--targetable--"
 
 
 ### Phase 2 (checkpoint)
-1006.2 "--sync--" sync / 14:[^:]*:The Emerald Weapon:5539:/ window 1200,10
+1006.2 "--sync--" StartsUsing { id: "5539", source: "The Emerald Weapon" } window 1200,10
 1011.2 "Divide Et Impera" Ability { id: "5539", source: "The Emerald Weapon" }
 1016.5 "--sync--" Ability { id: "5B1F", source: "The Emerald Weapon" }
 1025.6 "Primus Terminus Est" Ability { id: "5562", source: "The Emerald Weapon" }
diff --git a/ui/raidboss/data/05-shb/trial/hades-ex.txt b/ui/raidboss/data/05-shb/trial/hades-ex.txt
index 16c89cd009..1f8f0a9f2b 100644
--- a/ui/raidboss/data/05-shb/trial/hades-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/hades-ex.txt
@@ -8,7 +8,7 @@ hideall "--sync--"
 ### Phase 1
 0 "Start"
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-6.6 "--sync--" sync / 14:[^:]*:Hades:47A5:/ window 10,10
+6.6 "--sync--" StartsUsing { id: "47A5", source: "Hades" } window 10,10
 9.6 "Ancient Double" Ability { id: "47A5", source: "Hades" }
 18.7 "Shadow Spread 1" Ability { id: "47A9", source: "Hades" }
 21.7 "Shadow Spread 2" Ability { id: "47AA", source: "Hades" }
@@ -41,7 +41,7 @@ hideall "--sync--"
 # 00:0044:Hades:Come, Nabriales!
 # 00:0044:Hades:Tremble and fall to the ground before me!
 227.9 "--targetable--"
-232.0 "--sync--" sync / 14:[^:]*:Nabriales's Shade:47B8:/ window 232,0
+232.0 "--sync--" StartsUsing { id: "47B8", source: "Nabriales's Shade" } window 232,0
 238.0 "Comet 1" #Ability { id: "4951", source: "Nabriales's Shade" }
 241.0 "Comet 2" #Ability { id: "4951", source: "Nabriales's Shade" }
 241.2 "Dark II" Ability { id: "47BA", source: "Shadow of the Ancients" }
@@ -73,7 +73,7 @@ hideall "--sync--"
 493.0 "--sync--" sync / 00:0044:Hades:Our plea transcends/ window 500,0
 # 00:0044:Hades:At last, you are one!
 499.9 "--targetable--"
-500.0 "--sync--" sync / 14:[^:]*:Ascian Prime's Shade:47C8:/ window 500,0
+500.0 "--sync--" StartsUsing { id: "47C8", source: "Ascian Prime's Shade" } window 500,0
 510.0 "Universal Manipulation" Ability { id: "47C8", source: "Ascian Prime's Shade" }
 520.2 "Ancient Circle" Ability { id: "47CA", source: "Ascian Prime's Shade" }
 522.2 "Death Shriek" Ability { id: "47CB", source: "Ascian Prime's Shade" }
@@ -90,7 +90,7 @@ hideall "--sync--"
 ### Phase 4
 750.2 "--sync--" sync / 22:........:Ascian Prime's Shade:........:Ascian Prime's Shade:00/ window 800,0
 799.9 "--targetable--"
-800.0 "--sync--" sync / 14:[^:]*:Hades:47D5:/ window 800,0
+800.0 "--sync--" StartsUsing { id: "47D5", source: "Hades" } window 800,0
 804.0 "Again The Majestic" Ability { id: "47D5", source: "Hades" }
 810.6 "Comet 1" Ability { id: "4952", source: "Hades" }
 812.2 "Captivity" Ability { id: "47D[67]", source: "Hades" }
@@ -115,7 +115,7 @@ hideall "--sync--"
 
 
 ### Phase 5
-1200.0 "--sync--" sync / 14:[^:]*:Hades:4948:/ window 1200,0
+1200.0 "--sync--" StartsUsing { id: "4948", source: "Hades" } window 1200,0
 1204.0 "Life In Captivity" Ability { id: "4948", source: "Hades" }
 1207.2 "--sync--" Ability { id: "47D9", source: "Hades" }
 1210.2 "--sync--" Ability { id: "4949", source: "Hades" }
diff --git a/ui/raidboss/data/05-shb/trial/hades.txt b/ui/raidboss/data/05-shb/trial/hades.txt
index a76b91446a..11f90d01ac 100644
--- a/ui/raidboss/data/05-shb/trial/hades.txt
+++ b/ui/raidboss/data/05-shb/trial/hades.txt
@@ -45,13 +45,13 @@ hideall "Double"
 # Give voice to your anguish, my brethren!
 304.5 "Adds (E/W)"
 
-400.0 "--sync--" sync / 14:[^:]*:Shadow .f .he Ancients:4593:/ window 500,0
+400.0 "--sync--" StartsUsing { id: "4593", source: "Shadow .f .he Ancients" } window 500,0
 405.0 "Ancient Darkness" Ability { id: "4593", source: "Shadow .f .he Ancients" }
 405.0 "Ancient Water III" Ability { id: "4594", source: "Shadow .f .he Ancients" }
 # Give substance to our hopes, our dreams, our prayers...
 408.0 "Adds (NE/SW)"
 
-500.0 "--sync--" sync / 14:[^:]*:Shadow .f .he Ancients:4595:/ window 600,0
+500.0 "--sync--" StartsUsing { id: "4595", source: "Shadow .f .he Ancients" } window 600,0
 505.0 "Ancient Aero" Ability { id: "4595", source: "Shadow .f .he Ancients" }
 508.0 "Ancient Water III" Ability { id: "4594", source: "Shadow .f .he Ancients" }
 508.0 "Ancient Darkness" Ability { id: "4593", source: "Shadow .f .he Ancients" }
@@ -59,7 +59,7 @@ hideall "Double"
 510.0 "Adds (N/S)"
 
 # Yawn wide, the ever-hungering void!
-600.0 "--sync--" sync / 14:[^:]*:Hades:4597:/ window 600,0
+600.0 "--sync--" StartsUsing { id: "4597", source: "Hades" } window 600,0
 605.0 "Ancient Dark IV" Ability { id: "4597", source: "Hades" }
 
 
@@ -86,12 +86,12 @@ hideall "Double"
 # There is technically an echo of the lost before this captivity
 # but impossible to properly sync that given that the previous phase
 # also uses that ability.
-895.0 "--sync--" sync / 14:[^:]*:Hades:4168:/ window 300,0
+895.0 "--sync--" StartsUsing { id: "4168", source: "Hades" } window 300,0
 900.0 "Captivity" Ability { id: "4168", source: "Hades" }
 900.8 "--fetters--"
 903.0 "--sync--" Ability { id: "417F", source: "Hades" }
 905.0 "Gaol Add"
-906.5 "--sync--" sync / 14:[^:]*:Hades:416C:/
+906.5 "--sync--" StartsUsing { id: "416C", source: "Hades" }
 936.2 "Chorus Of The Lost" Ability { id: "416C", source: "Hades" }
 # 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.
@@ -116,7 +116,7 @@ hideall "Double"
 1065.0 "--sync--" Ability { id: "417F", source: "Hades" }
 1066.0 "Doom"
 1067.0 "Gaol Add"
-1068.5 "--sync--" sync / 14:[^:]*:Hades:416C:/
+1068.5 "--sync--" StartsUsing { id: "416C", source: "Hades" }
 1098.2 "Chorus Of The Lost" Ability { id: "416C", source: "Hades" }
 1101.0 "--sync--" Ability { id: "416D", source: "Hades" } window 100,0
 
@@ -131,7 +131,7 @@ hideall "Double"
 
 
 # Cutscene: Push at 30%?
-1300.0 "--sync--" sync / 14:[^:]*:Hades:4175:/ window 1300,0
+1300.0 "--sync--" StartsUsing { id: "4175", source: "Hades" } window 1300,0
 1304.0 "--untargetable--"
 1304.0 "Life In Captivity" Ability { id: "4175", source: "Hades" }
 1307.0 "--sync--" Ability { id: "417F", source: "Hades" }
@@ -147,5 +147,5 @@ hideall "Double"
 1403.0 "--sync--" Ability { id: "4159", source: "Hades" }
 
 # Gratuitous 45 second enrage.
-1412.7 "--sync--" sync / 14:[^:]*:Hades:417B:/ window 100,100
+1412.7 "--sync--" StartsUsing { id: "417B", source: "Hades" } window 100,100
 1457.7 "Enrage" Ability { id: "417B", source: "Hades" }
diff --git a/ui/raidboss/data/05-shb/trial/innocence-ex.txt b/ui/raidboss/data/05-shb/trial/innocence-ex.txt
index 0c3895cfcc..86a3023800 100644
--- a/ui/raidboss/data/05-shb/trial/innocence-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/innocence-ex.txt
@@ -128,7 +128,7 @@ hideall "Soul And Body"
 740.4 "--sync--" Ability { id: "3EA2", source: "Innocence" }
 743.9 "Holy Trinity" #Ability { id: "3EDB", source: "Innocence" }
 
-741.7 "--sync--" sync / 14:[^:]*:Innocence:3EEF:/ window 10,10
+741.7 "--sync--" StartsUsing { id: "3EEF", source: "Innocence" } window 10,10
 744.7 "Starbirth Final" Ability { id: "3EEF", source: "Innocence" }
 764.7 "Beatific Vision" Ability { id: "3EF1", source: "Innocence" }
 765.6 "Explosion Enrage" Ability { id: "3EF0", source: "Innocence" }
diff --git a/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt b/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt
index 66d78333f5..83604d4704 100644
--- a/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt
@@ -34,7 +34,7 @@ hideall "--sync--"
 108.2 "Ruby Sphere 2" #Ability { id: "4ACA", source: "The Ruby Weapon" }
 111.2 "Ruby Sphere 3" #Ability { id: "4ACA", source: "The Ruby Weapon" }
 # can be slightly delayed
-122.6 "--sync--" sync / 14:[^:]*:The Ruby Weapon:4B02:/ window 10,10
+122.6 "--sync--" StartsUsing { id: "4B02", source: "The Ruby Weapon" } window 10,10
 127.6 "Ruby Ray" Ability { id: "4B02", source: "The Ruby Weapon" }
 134.7 "Optimized Ultima" Ability { id: "4ABE", source: "The Ruby Weapon" }
 145.4 "Flexiclaw" Ability { id: "4A92", source: "The Ruby Weapon" }
@@ -82,7 +82,7 @@ hideall "--sync--"
 431.7 "Optimized Ultima" Ability { id: "4ABE", source: "The Ruby Weapon" }
 437.9 "--sync--" Ability { id: "4A9B", source: "The Ruby Weapon" }
 ### Enrage (both time and hp% pushes)
-440.2 "--sync--" sync / 14:[^:]*:The Ruby Weapon:4B2D:/ window 600,0
+440.2 "--sync--" StartsUsing { id: "4B2D", source: "The Ruby Weapon" } window 600,0
 455.2 "Enrage" Ability { id: "4B2D", source: "The Ruby Weapon" }
 
 ### Cutscene
diff --git a/ui/raidboss/data/05-shb/trial/ruby_weapon.txt b/ui/raidboss/data/05-shb/trial/ruby_weapon.txt
index 3e7a38b3fd..15f319d15b 100644
--- a/ui/raidboss/data/05-shb/trial/ruby_weapon.txt
+++ b/ui/raidboss/data/05-shb/trial/ruby_weapon.txt
@@ -56,7 +56,7 @@ hideall "--sync--"
 311.8 "--sync--" Ability { id: "4A9B", source: "The Ruby Weapon" }
 
 # FIXME: does this push at a percent like extreme?
-314.0 "--sync--" sync / 14:[^:]*:The Ruby Weapon:4AA9:/ window 500,500
+314.0 "--sync--" StartsUsing { id: "4AA9", source: "The Ruby Weapon" } window 500,500
 329.0 "Optimized Ultima Enrage" Ability { id: "4AA9", source: "The Ruby Weapon" }
 
 ### Cutscene
diff --git a/ui/raidboss/data/05-shb/trial/shiva-un.txt b/ui/raidboss/data/05-shb/trial/shiva-un.txt
index 5421bfa31e..8cbda91396 100644
--- a/ui/raidboss/data/05-shb/trial/shiva-un.txt
+++ b/ui/raidboss/data/05-shb/trial/shiva-un.txt
@@ -205,7 +205,7 @@ hideall "--Reset--"
 1302.3 "Icebrand" Ability { id: "5373", source: "Shiva" }
 1306.4 "Icicle Impact (cross)" #Ability { id: "537B", source: "Shiva" }
 1306.4 "Permafrost?" Ability { id: "5369", source: "Shiva" }
-1316.8 "--sync--" sync / 14:[^:]*:Shiva:5375:/ window 10,10
+1316.8 "--sync--" StartsUsing { id: "5375", source: "Shiva" } window 10,10
 1319.0 "Glacier Bash" Ability { id: "5375", source: "Shiva" }
 1329.4 "Whiteout" Ability { id: "5376", source: "Shiva" }
 1334.7 "Heavenly Strike" Ability { id: "5374", source: "Shiva" }
diff --git a/ui/raidboss/data/05-shb/trial/titan-un.txt b/ui/raidboss/data/05-shb/trial/titan-un.txt
index 25a31bf156..26d6da3752 100644
--- a/ui/raidboss/data/05-shb/trial/titan-un.txt
+++ b/ui/raidboss/data/05-shb/trial/titan-un.txt
@@ -32,7 +32,7 @@ hideall "--sync--"
 
 
 # Phase 2: 85%->55%
-200.0 "--sync--" sync / 14:[^:]*:Titan:58FF:/ window 200,0
+200.0 "--sync--" StartsUsing { id: "58FF", source: "Titan" } window 200,0
 203.0 "Geocrush" Ability { id: "58FF", source: "Titan" }
 
 212.6 "Landslide" Ability { id: "58FA", source: "Titan" }
@@ -78,7 +78,7 @@ hideall "--sync--"
 
 
 ### Phase 3: Heart Phase (at 55%)
-500.0 "--sync--" sync / 14:[^:]*:Titan:58FF:/ window 299,0
+500.0 "--sync--" StartsUsing { id: "58FF", source: "Titan" } window 299,0
 503.0 "Geocrush" Ability { id: "58FF", source: "Titan" }
 515.6 "Weight Of The Land" Ability { id: "58FE", source: "Titan" }
 521.2 "Rock Throw" Ability { id: "5ADD", source: "Titan" } duration 21.5
@@ -155,7 +155,7 @@ hideall "--sync--"
 
 
 ### Enrage
-1000.0 "--sync--" sync / 14:[^:]*:Titan:5901:/ window 1000,1000
+1000.0 "--sync--" StartsUsing { id: "5901", source: "Titan" } window 1000,1000
 1010.0 "Upheaval Enrage" #Ability { id: "5901", source: "Titan" }
 1022.0 "Upheaval Enrage" #Ability { id: "5901", source: "Titan" }
 1034.0 "Upheaval Enrage" #Ability { id: "5901", source: "Titan" }
diff --git a/ui/raidboss/data/05-shb/trial/titania-ex.txt b/ui/raidboss/data/05-shb/trial/titania-ex.txt
index 115ab0b811..5a5aacc39b 100644
--- a/ui/raidboss/data/05-shb/trial/titania-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/titania-ex.txt
@@ -7,7 +7,7 @@ hideall "--sync--"
 
 ### Phase 1: single mechanics
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-8.0 "--sync--" sync / 14:[^:]*:Titania:3D4B:/ window 20,20
+8.0 "--sync--" StartsUsing { id: "3D4B", source: "Titania" } window 20,20
 12.0 "Bright Sabbath" Ability { id: "3D4B", source: "Titania" }
 26.0 "Phantom Rune Out" Ability { id: "3D4C", source: "Titania" }
 37.0 "Mist Rune" Ability { id: "3D45", source: "Titania" }
@@ -19,7 +19,7 @@ hideall "--sync--"
 103.9 "Phantom Rune In" Ability { id: "3D4D", source: "Titania" }
 
 # Mini-phase skip here at least from Divination Rune to here
-110.9 "--sync--" sync / 14:[^:]*:Titania:3D30:/ window 200,10
+110.9 "--sync--" StartsUsing { id: "3D30", source: "Titania" } window 200,10
 114.9 "Midsummer Night's Dream" Ability { id: "3D30", source: "Titania" }
 128.2 "--center--" Ability { id: "3D28", source: "Titania" }
 133.8 "Thunder Rune 1" Ability { id: "3D29", source: "Titania" } window 5,1
@@ -114,5 +114,5 @@ hideall "--sync--"
 
 
 ### Phase 4: too slow
-1500.0 "--sync--" sync / 14:[^:]*:Titania:3DAE:/ window 1500,0
+1500.0 "--sync--" StartsUsing { id: "3DAE", source: "Titania" } window 1500,0
 1510.0 "Bright Sabbath Enrage" Ability { id: "3DAE", source: "Titania" }
diff --git a/ui/raidboss/data/05-shb/trial/titania.txt b/ui/raidboss/data/05-shb/trial/titania.txt
index b71d7a474f..e98e5d7f2a 100644
--- a/ui/raidboss/data/05-shb/trial/titania.txt
+++ b/ui/raidboss/data/05-shb/trial/titania.txt
@@ -6,7 +6,7 @@ hideall "--sync--"
 
 ### Phase 1
 0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
-8.5 "--sync--" sync / 14:[^:]*:Titania:3D5C:/ window 13,5
+8.5 "--sync--" StartsUsing { id: "3D5C", source: "Titania" } window 13,5
 12.5 "Bright Sabbath" Ability { id: "3D5C", source: "Titania" }
 26.7 "Phantom Rune" Ability { id: "3D5[DE]", source: "Titania" }
 37.9 "Divination Rune" Ability { id: "3D5B", source: "Titania" }
diff --git a/ui/raidboss/data/05-shb/trial/varis-ex.txt b/ui/raidboss/data/05-shb/trial/varis-ex.txt
index 7b249b26da..d65fc63d4f 100644
--- a/ui/raidboss/data/05-shb/trial/varis-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/varis-ex.txt
@@ -49,9 +49,9 @@ hideall "--sync--"
 ### Phase 3: Random Groups
 # Note: all three of these blocks occur, but can occur in any order
 269.1 "--targetable--"
-274.3 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD8:/ window 100,100 jump 500
-274.3 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD9:/ window 100,100 jump 700
-274.3 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD7:/ window 100,100 jump 900
+274.3 "--sync--" StartsUsing { id: "4CD8", source: "Varis Yae Galvus" } window 100,100 jump 500
+274.3 "--sync--" StartsUsing { id: "4CD9", source: "Varis Yae Galvus" } window 100,100 jump 700
+274.3 "--sync--" StartsUsing { id: "4CD7", source: "Varis Yae Galvus" } window 100,100 jump 900
 
 # loaded lookahead window
 279.3 "Loaded Gunshield?" #Ability { id: "4CD8", source: "Varis Yae Galvus" }
@@ -88,7 +88,7 @@ hideall "--sync--"
 
 
 ## Phase 3: Loaded Gunshield, Spread
-500.0 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD8:/
+500.0 "--sync--" StartsUsing { id: "4CD8", source: "Varis Yae Galvus" }
 505.0 "Loaded Gunshield" Ability { id: "4CD8", source: "Varis Yae Galvus" }
 513.9 "--sync--" Ability { id: "4CB5", source: "Varis Yae Galvus" }
 518.2 "--sync--" Ability { id: "4CDE", source: "Varis Yae Galvus" }
@@ -99,8 +99,8 @@ hideall "--sync--"
 529.5 "Festina Lente" Ability { id: "4CC9", source: "Varis Yae Galvus" }
 540.7 "Citius" Ability { id: "4CF0", source: "Varis Yae Galvus" }
 
-554.3 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD9:/ window 10,10 jump 700
-554.3 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD7:/ window 10,10 jump 900
+554.3 "--sync--" StartsUsing { id: "4CD9", source: "Varis Yae Galvus" } window 10,10 jump 700
+554.3 "--sync--" StartsUsing { id: "4CD7", source: "Varis Yae Galvus" } window 10,10 jump 900
 
 # reinforced lookahead window
 559.3 "Reinforced Gunshield?" #Ability { id: "4CD9", source: "Varis Yae Galvus" }
@@ -127,7 +127,7 @@ hideall "--sync--"
 
 
 ## Phase 3: Reinforced Gunshield, Block
-700.0 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD9:/
+700.0 "--sync--" StartsUsing { id: "4CD9", source: "Varis Yae Galvus" }
 705.0 "Reinforced Gunshield" Ability { id: "4CD9", source: "Varis Yae Galvus" }
 714.1 "Altius" Ability { id: "4CCA", source: "Varis Yae Galvus" }
 723.0 "--sync--" Ability { id: "4CC6", source: "Varis Yae Galvus" }
@@ -136,8 +136,8 @@ hideall "--sync--"
 731.1 "Ventus Est" Ability { id: "4CC7", source: "Ventus Est" }
 741.5 "Citius" Ability { id: "4CF0", source: "Varis Yae Galvus" }
 
-752.8 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD8:/ window 10,10 jump 500
-752.8 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD7:/ window 10,10 jump 900
+752.8 "--sync--" StartsUsing { id: "4CD8", source: "Varis Yae Galvus" } window 10,10 jump 500
+752.8 "--sync--" StartsUsing { id: "4CD7", source: "Varis Yae Galvus" } window 10,10 jump 900
 
 # loaded lookahead window
 757.8 "Loaded Gunshield?" #Ability { id: "4CD8", source: "Varis Yae Galvus" }
@@ -166,7 +166,7 @@ hideall "--sync--"
 
 
 ## Phase 3: Electrified Gunshield, Knockback
-900.0 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD7:/
+900.0 "--sync--" StartsUsing { id: "4CD7", source: "Varis Yae Galvus" }
 905.0 "Electrified Gunshield" Ability { id: "4CD7", source: "Varis Yae Galvus" }
 910.1 "Reinforcements" Ability { id: "4CEA", source: "Varis Yae Galvus" }
 916.0 "--clones appear--" Ability { id: "4CB3", source: "Phantom Varis" }
@@ -179,8 +179,8 @@ hideall "--sync--"
 944.5 "--sync--" Ability { id: "4CD5", source: "Varis Yae Galvus" }
 947.2 "--sync--" Ability { id: "4CD6", source: "Varis Yae Galvus" }
 
-958.7 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD8:/ window 10,10 jump 500
-958.7 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CD9:/ window 10,10 jump 700
+958.7 "--sync--" StartsUsing { id: "4CD8", source: "Varis Yae Galvus" } window 10,10 jump 500
+958.7 "--sync--" StartsUsing { id: "4CD9", source: "Varis Yae Galvus" } window 10,10 jump 700
 
 # loaded lookahead window
 963.7 "Loaded Gunshield?" #Ability { id: "4CD8", source: "Varis Yae Galvus" }
@@ -267,5 +267,5 @@ hideall "--sync--"
 1571.3 "Terminus Est" Ability { id: "4CB4", source: "Terminus Est" }
 1573.6 "Magitek Shock" Ability { id: "4CDA", source: "Varis Yae Galvus" }
 
-1579.7 "--sync--" sync / 14:[^:]*:Varis Yae Galvus:4CA9:/ window 30,30
+1579.7 "--sync--" StartsUsing { id: "4CA9", source: "Varis Yae Galvus" } window 30,30
 1589.7 "Altius Enrage" Ability { id: "4CA9", source: "Varis Yae Galvus" }
diff --git a/ui/raidboss/data/05-shb/trial/wol-ex.txt b/ui/raidboss/data/05-shb/trial/wol-ex.txt
index 9eac9ba080..c9e93d0a06 100644
--- a/ui/raidboss/data/05-shb/trial/wol-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/wol-ex.txt
@@ -100,30 +100,30 @@ hideall "Limit Break"
 517.3 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # BLM/WHM
-519.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F73:/ window 5,5 jump 1519.5
+519.6 "--sync--" StartsUsing { id: "4F73", source: "Warrior Of Light" } window 5,5 jump 1519.5
 522.6 "Specter -> BLM/WHM" #Ability { id: "4F73", source: "Warrior Of Light" }
-527.8 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/ window 40,40 jump 1527.8
+527.8 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" } window 40,40 jump 1527.8
 
 # DRK/BRD
-519.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[456]:/ window 5,5 jump 2519.6
+519.6 "--sync--" StartsUsing { id: "4F3[456]", source: "Warrior Of Light" } window 5,5 jump 2519.6
 522.6 "Limit -> DRK/BRD" #Ability { id: "4F3[456]", source: "Warrior Of Light" }
-534.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/ window 40,40 jump 2534.0
+534.0 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" } window 40,40 jump 2534.0
 
 # NIN
-519.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/ window 40,40 jump 3519.6
+519.6 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" } window 40,40 jump 3519.6
 522.6 "Stone/Holy -> NIN" #Ability { id: "4EF[56]", source: "Warrior Of Light" }
 
 # SMN/WAR
-519.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/ window 40,40 jump 4519.7
+519.6 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" } window 40,40 jump 4519.7
 522.6 "Fire/Ice -> SMN/WAR" #Ability { id: "4EF[34]", source: "Warrior Of Light" }
 
 
 ### Phase 3a: BLM/WHM
 1517.3 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-1519.5 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F37:/
+1519.5 "--sync--" StartsUsing { id: "4F37", source: "Warrior Of Light" }
 1522.5 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
-1525.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[56]:/
-1527.8 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/
+1525.6 "--sync--" StartsUsing { id: "4F3[56]", source: "Warrior Of Light" }
+1527.8 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" }
 1528.6 "To The Limit" Ability { id: "4F3[456]", source: "Warrior Of Light" }
 1530.8 "Twincast" Ability { id: "4F3D", source: "Spectral Black Mage" }
 1533.2 "--sync--" Ability { id: "531E", source: "Spectral White Mage" }
@@ -141,7 +141,7 @@ hideall "Limit Break"
 1568.0 "Cauterize" Ability { id: "4F07", source: "Wyrm Of Light" }
 1580.2 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" }
 ### TODO: bitter end gets moved up 0.5s if it's meteor???
-1593.1 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F0A:/ window 10,10
+1593.1 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10
 1598.1 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" }
 
 1605.4 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
@@ -156,26 +156,26 @@ hideall "Limit Break"
 1661.7 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # DRK/BRD
-1664.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[456]:/ window 5,5 jump 7002.2
+1664.0 "--sync--" StartsUsing { id: "4F3[456]", source: "Warrior Of Light" } window 5,5 jump 7002.2
 1667.0 "Limit -> DRK/BRD" #Ability { id: "4F3[456]", source: "Warrior Of Light" }
-1678.3 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/ window 40,40 jump 7016.6
+1678.3 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" } window 40,40 jump 7016.6
 
 # NIN
-1664.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/ window 40,40 jump 8002.3
+1664.0 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" } window 40,40 jump 8002.3
 1667.0 "Stone/Holy -> NIN" #Ability { id: "4EF[56]", source: "Warrior Of Light" }
 
 # SMN/WAR
-1664.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/ window 40,40 jump 9002.3
+1664.0 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" } window 40,40 jump 9002.3
 1667.0 "Fire/Ice -> SMN/WAR" #Ability { id: "4EF[34]", source: "Warrior Of Light" }
 
 
 
 ### Phase 3a: DRK/BRD
 2517.3 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-2519.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[46]:/
+2519.6 "--sync--" StartsUsing { id: "4F3[46]", source: "Warrior Of Light" }
 2522.6 "To The Limit" Ability { id: "4F3[456]", source: "Warrior Of Light" }
 2530.8 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
-2534.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/
+2534.0 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" }
 2537.0 "--sync--" Ability { id: "4F43", source: "Warrior Of Light" }
 2540.6 "Solemn Confiteor" Ability { id: "4F0C", source: "Warrior Of Light" }
 2544.1 "Brimstone Earth" Ability { id: "4F3A", source: "Spectral Dark Knight" }
@@ -186,7 +186,7 @@ hideall "Limit Break"
 2556.6 "Deluge Of Death" Ability { id: "4F02", source: "Spectral Bard" }
 2563.6 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 2571.8 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" }
-2584.1 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F0A:/ window 10,10
+2584.1 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10
 2589.1 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" }
 
 2596.4 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
@@ -201,23 +201,23 @@ hideall "Limit Break"
 2652.7 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # BLM/WHM
-2655.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F73:/ window 5,5 jump 6002.4
+2655.0 "--sync--" StartsUsing { id: "4F73", source: "Warrior Of Light" } window 5,5 jump 6002.4
 2658.0 "Specter -> BLM/WHM" #Ability { id: "4F73", source: "Warrior Of Light" }
-2663.4 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/ window 40,40 jump 6010.7
+2663.4 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" } window 40,40 jump 6010.7
 
 # NIN
-2655.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/ window 40,40 jump 8002.3
+2655.0 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" } window 40,40 jump 8002.3
 2658.0 "Stone/Holy -> NIN" #Ability { id: "4EF[56]", source: "Warrior Of Light" }
 
 # SMN/WAR
-2655.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/ window 40,40 jump 9002.3
+2655.0 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" } window 40,40 jump 9002.3
 2658.0 "Fire/Ice -> SMN/WAR" #Ability { id: "4EF[34]", source: "Warrior Of Light" }
 
 
 
 ### Phase 3a: NIN
 3517.3 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-3519.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/
+3519.6 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" }
 3522.6 "Imbued Stone/Holy" Ability { id: "4EF[56]", source: "Warrior Of Light" }
 3531.7 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
 3540.0 "--sync--" Ability { id: "4F38", source: "Spectral Ninja" }
@@ -243,23 +243,23 @@ hideall "Limit Break"
 3652.6 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # BLM/WHM
-3654.9 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F73:/ window 5,5 jump 6002.4
+3654.9 "--sync--" StartsUsing { id: "4F73", source: "Warrior Of Light" } window 5,5 jump 6002.4
 3657.9 "Specter -> BLM/WHM" #Ability { id: "4F73", source: "Warrior Of Light" }
-3663.3 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/ window 40,40 jump 6010.7
+3663.3 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" } window 40,40 jump 6010.7
 
 # DRK/BRD
-3654.9 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[456]:/ window 5,5 jump 7002.2
+3654.9 "--sync--" StartsUsing { id: "4F3[456]", source: "Warrior Of Light" } window 5,5 jump 7002.2
 3657.9 "Limit -> DRK/BRD" #Ability { id: "4F3[456]", source: "Warrior Of Light" }
-3669.2 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/ window 40,40 jump 7016.6
+3669.2 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" } window 40,40 jump 7016.6
 
 # SMN/WAR
-3654.9 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/ window 40,40 jump 9002.3
+3654.9 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" } window 40,40 jump 9002.3
 3657.9 "Fire/Ice -> SMN/WAR" #Ability { id: "4EF[34]", source: "Warrior Of Light" }
 
 
 ### Phase 3a: SMN/WAR
 4517.4 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-4519.7 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/
+4519.7 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" }
 4522.7 "Imbued Fire/Ice" Ability { id: "4EF[34]", source: "Warrior Of Light" }
 4531.9 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
 4540.2 "Summon" Ability { id: "4F3F", source: "Spectral Summoner" }
@@ -290,27 +290,27 @@ hideall "Limit Break"
 4671.2 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # BLM/WHM
-4673.5 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F73:/ window 5,5 jump 6002.4
+4673.5 "--sync--" StartsUsing { id: "4F73", source: "Warrior Of Light" } window 5,5 jump 6002.4
 4676.5 "Specter -> BLM/WHM" #Ability { id: "4F73", source: "Warrior Of Light" }
-4681.9 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/ window 40,40 jump 6010.7
+4681.9 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" } window 40,40 jump 6010.7
 
 # DRK/BRD
-4673.5 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[456]:/ window 5,5 jump 7002.2
+4673.5 "--sync--" StartsUsing { id: "4F3[456]", source: "Warrior Of Light" } window 5,5 jump 7002.2
 4676.5 "Limit -> DRK/BRD" #Ability { id: "4F3[456]", source: "Warrior Of Light" }
-4687.8 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/ window 40,40 jump 7016.6
+4687.8 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" } window 40,40 jump 7016.6
 
 # NIN
-4673.5 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/ window 40,40 jump 8002.3
+4673.5 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" } window 40,40 jump 8002.3
 4676.5 "Stone/Holy -> NIN" #Ability { id: "4EF[56]", source: "Warrior Of Light" }
 
 
 
 ### Phase 3b: BLM/WHM
 6000.0 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-6002.4 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F37:/
+6002.4 "--sync--" StartsUsing { id: "4F37", source: "Warrior Of Light" }
 6005.4 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
-6008.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[56]:/
-6010.7 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/
+6008.6 "--sync--" StartsUsing { id: "4F3[56]", source: "Warrior Of Light" }
+6010.7 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" }
 6011.6 "To The Limit" Ability { id: "4F3[456]", source: "Warrior Of Light" }
 6013.7 "Twincast" Ability { id: "4F3D", source: "Spectral Black Mage" }
 6016.2 "--sync--" Ability { id: "531E", source: "Spectral White Mage" }
@@ -327,30 +327,30 @@ hideall "Limit Break"
 6051.0 "Cauterize" Ability { id: "4F07", source: "Wyrm Of Light" }
 ### TODO: This is random (note: bitter end gets moved up 0.5s if it's meteor)
 6063.1 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" }
-6075.9 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F0A:/ window 10,10
+6075.9 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10
 6080.9 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" }
 6084.1 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # DRK/BRD
-6086.4 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[456]:/ window 5,5 jump 7002.2
+6086.4 "--sync--" StartsUsing { id: "4F3[456]", source: "Warrior Of Light" } window 5,5 jump 7002.2
 6089.4 "Limit -> DRK/BRD" #Ability { id: "4F3[456]", source: "Warrior Of Light" }
-6100.7 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/ window 40,40 jump 7016.6
+6100.7 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" } window 40,40 jump 7016.6
 
 # NIN
-6086.4 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/ window 40,40 jump 8002.3
+6086.4 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" } window 40,40 jump 8002.3
 6089.4 "Stone/Holy -> NIN" #Ability { id: "4EF[56]", source: "Warrior Of Light" }
 
 # SMN/WAR
-6086.4 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/ window 40,40 jump 9002.3
+6086.4 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" } window 40,40 jump 9002.3
 6089.4 "Fire/Ice -> SMN/WAR" #Ability { id: "4EF[34]", source: "Warrior Of Light" }
 
 
 ### Phase 3b: DRK/BRD
 7000.0 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-7002.2 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[46]:/
+7002.2 "--sync--" StartsUsing { id: "4F3[46]", source: "Warrior Of Light" }
 7005.2 "To The Limit" Ability { id: "4F3[456]", source: "Warrior Of Light" }
 7013.4 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
-7016.6 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/
+7016.6 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" }
 7019.6 "--sync--" Ability { id: "4F43", source: "Warrior Of Light" }
 7023.2 "Solemn Confiteor" Ability { id: "4F0C", source: "Warrior Of Light" }
 7026.8 "Brimstone Earth" Ability { id: "4F3A", source: "Spectral Dark Knight" }
@@ -362,27 +362,27 @@ hideall "Limit Break"
 7046.3 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 7054.6 "Limit Break" Ability { id: "(4EFB|53CB|515C)", source: "Warrior Of Light" }
 # TODO: guessing here
-7066.8 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F0A:/ window 10,10
+7066.8 "--sync--" StartsUsing { id: "4F0A", source: "Warrior Of Light" } window 10,10
 7071.8 "The Bitter End" Ability { id: "4F0A", source: "Warrior Of Light" }
 7079.1 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # BLM/WHM
-7081.4 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F73:/ window 5,5 jump 6002.4
+7081.4 "--sync--" StartsUsing { id: "4F73", source: "Warrior Of Light" } window 5,5 jump 6002.4
 7084.4 "Specter -> BLM/WHM" #Ability { id: "4F73", source: "Warrior Of Light" }
-7089.8 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/ window 40,40 jump 6010.7
+7089.8 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" } window 40,40 jump 6010.7
 
 # NIN
-7081.4 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/ window 40,40 jump 8002.3
+7081.4 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" } window 40,40 jump 8002.3
 7084.4 "Stone/Holy -> NIN" #Ability { id: "4EF[56]", source: "Warrior Of Light" }
 
 # SMN/WAR
-7081.4 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/ window 40,40 jump 9002.3
+7081.4 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" } window 40,40 jump 9002.3
 7084.4 "Fire/Ice -> SMN/WAR" #Ability { id: "4EF[34]", source: "Warrior Of Light" }
 
 
 ### Phase 3b: NIN
 8000.0 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-8002.3 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/
+8002.3 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" }
 8005.3 "Imbued Stone/Holy" Ability { id: "4EF[56]", source: "Warrior Of Light" }
 8014.4 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
 8022.7 "--sync--" Ability { id: "4F38", source: "Spectral Ninja" }
@@ -398,23 +398,23 @@ hideall "Limit Break"
 8074.7 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # BLM/WHM
-8077.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F73:/ window 5,5 jump 6002.4
+8077.0 "--sync--" StartsUsing { id: "4F73", source: "Warrior Of Light" } window 5,5 jump 6002.4
 8080.0 "Specter -> BLM/WHM" #Ability { id: "4F73", source: "Warrior Of Light" }
-8085.4 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/ window 40,40 jump 6010.7
+8085.4 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" } window 40,40 jump 6010.7
 
 # DRK/BRD
-8077.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[456]:/ window 5,5 jump 7002.2
+8077.0 "--sync--" StartsUsing { id: "4F3[456]", source: "Warrior Of Light" } window 5,5 jump 7002.2
 8080.0 "Limit -> DRK/BRD" #Ability { id: "4F3[456]", source: "Warrior Of Light" }
-8091.3 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/ window 40,40 jump 7016.6
+8091.3 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" } window 40,40 jump 7016.6
 
 # SMN/WAR
-8077.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/ window 40,40 jump 9002.3
+8077.0 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" } window 40,40 jump 9002.3
 8080.0 "Fire/Ice -> SMN/WAR" #Ability { id: "4EF[34]", source: "Warrior Of Light" }
 
 
 ### Phase 3b: SMN/WAR
 9000.0 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
-9002.3 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[34]:/
+9002.3 "--sync--" StartsUsing { id: "4EF[34]", source: "Warrior Of Light" }
 9005.3 "Imbued Fire/Ice" Ability { id: "4EF[34]", source: "Warrior Of Light" }
 9014.3 "Specter Of Light" Ability { id: "4F37", source: "Warrior Of Light" }
 9022.6 "Summon" Ability { id: "4F3F", source: "Spectral Summoner" }
@@ -435,15 +435,15 @@ hideall "Limit Break"
 9093.4 "--middle--" Ability { id: "4F45", source: "Warrior Of Light" }
 
 # BLM/WHM
-9095.7 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F73:/ window 5,5 jump 6002.4
+9095.7 "--sync--" StartsUsing { id: "4F73", source: "Warrior Of Light" } window 5,5 jump 6002.4
 9098.7 "Specter -> BLM/WHM" #Ability { id: "4F73", source: "Warrior Of Light" }
-9104.1 "--sync--" sync / 14:[^:]*:Spectral Black Mage:4F3D:/ window 40,40 jump 6010.7
+9104.1 "--sync--" StartsUsing { id: "4F3D", source: "Spectral Black Mage" } window 40,40 jump 6010.7
 
 # DRK/BRD
-9095.7 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F3[456]:/ window 5,5 jump 7002.2
+9095.7 "--sync--" StartsUsing { id: "4F3[456]", source: "Warrior Of Light" } window 5,5 jump 7002.2
 9098.7 "Limit -> DRK/BRD" #Ability { id: "4F3[456]", source: "Warrior Of Light" }
-9110.0 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F43:/ window 40,40 jump 7016.6
+9110.0 "--sync--" StartsUsing { id: "4F43", source: "Warrior Of Light" } window 40,40 jump 7016.6
 
 # NIN
-9095.7 "--sync--" sync / 14:[^:]*:Warrior Of Light:4EF[56]:/ window 40,40 jump 8002.3
+9095.7 "--sync--" StartsUsing { id: "4EF[56]", source: "Warrior Of Light" } window 40,40 jump 8002.3
 9098.7 "Stone/Holy -> NIN" #Ability { id: "4EF[56]", source: "Warrior Of Light" }
diff --git a/ui/raidboss/data/05-shb/trial/wol.txt b/ui/raidboss/data/05-shb/trial/wol.txt
index 66c6bd3334..d818a7472b 100644
--- a/ui/raidboss/data/05-shb/trial/wol.txt
+++ b/ui/raidboss/data/05-shb/trial/wol.txt
@@ -11,7 +11,7 @@ hideall "--Reset--"
 
 0.0 "Start"
 5.2 "--sync--" Ability { id: "4F45", source: "Warrior Of Light" } window 20,20 jump 475.4
-6.3 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F27:/ window 10,10
+6.3 "--sync--" StartsUsing { id: "4F27", source: "Warrior Of Light" } window 10,10
 9.3 "Terror Unleashed" Ability { id: "4F27", source: "Warrior Of Light" }
 25.1 "Solemn Confiteor" Ability { id: "4F2A", source: "Warrior Of Light" }
 31.6 "Coruscant Saber (In)" Ability { id: "4F11", source: "Warrior Of Light" }
@@ -36,7 +36,7 @@ hideall "--Reset--"
 
 ### Cutscene: 50%
 300.0 "--sync--" Ability { id: "4F45", source: "Warrior Of Light" }
-302.3 "--sync--" sync / 14:[^:]*:Warrior Of Light:5331:/ window 400,100
+302.3 "--sync--" StartsUsing { id: "5331", source: "Warrior Of Light" } window 400,100
 308.3 "Ascendance" Ability { id: "5331", source: "Warrior Of Light" }
 311.4 "--untargetable--"
 311.5 "--sync--" Ability { id: "5071", source: "Warrior Of Light" }
diff --git a/ui/raidboss/data/05-shb/ultimate/the_epic_of_alexander.txt b/ui/raidboss/data/05-shb/ultimate/the_epic_of_alexander.txt
index 4e4d5b37a0..db17e083ee 100644
--- a/ui/raidboss/data/05-shb/ultimate/the_epic_of_alexander.txt
+++ b/ui/raidboss/data/05-shb/ultimate/the_epic_of_alexander.txt
@@ -99,7 +99,7 @@ hideall "--sync--"
 423.7 "Eternal Darkness Enrage" Ability { id: "483A", source: "Cruise Chaser" }
 
 ### Transition 2: Cruise Chaser, Brute Justice and Alexander Prime
-492.0 "--sync--" sync / 14:[^:]*:Alexander Prime:485A:/ window 500,0
+492.0 "--sync--" StartsUsing { id: "485A", source: "Alexander Prime" } window 500,0
 500.0 "Temporal Stasis" Ability { id: "485A", source: "Alexander Prime" }
 503.1 "Surety and Severity" Ability { id: "4861", source: "Alexander Prime" }
 505.1 "Alpha Sword" #Ability { id: "486B", source: "Cruise Chaser" }