diff --git a/ui/raidboss/data/02-arr/trial/levi-ex.txt b/ui/raidboss/data/02-arr/trial/levi-ex.txt
index 428633183a..a59de41031 100644
--- a/ui/raidboss/data/02-arr/trial/levi-ex.txt
+++ b/ui/raidboss/data/02-arr/trial/levi-ex.txt
@@ -38,7 +38,7 @@ hideall "--sync--"
 ### Phase 1: Literally Just Autos (100% -> 90%)
 0.0 "Start"
 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
-25.8 "--untargetable--" sync / 22:........:Leviathan:........:Leviathan:00/ window 30,10
+25.8 "--untargetable--" NameToggle { name: "Leviathan", toggle: "00" } window 30,10
 
 ### Phase 2: One Set of Orbs (90% -> 50%?)
 33.0 "--targetable--"
diff --git a/ui/raidboss/data/03-hw/alliance/dun_scaith.txt b/ui/raidboss/data/03-hw/alliance/dun_scaith.txt
index 06d6417fba..7fc33a8e8d 100644
--- a/ui/raidboss/data/03-hw/alliance/dun_scaith.txt
+++ b/ui/raidboss/data/03-hw/alliance/dun_scaith.txt
@@ -290,7 +290,7 @@ hideall "--sync--"
 
 
 # Intermission at 45% HP. Might be a time push too? but it's uncertain.
-3300.0 "--untargetable--" sync / 22:........:Scathach:........:Scathach:00/ window 300,5
+3300.0 "--untargetable--" NameToggle { name: "Scathach", toggle: "00" } window 300,5
 3302.2 "--sync--" AddedCombatant { name: "Shadowcourt Jester" }  window 300,5
 3323.6 "--towers appear--"
 3333.6 "Particle Beam" Ability { id: "1D2[78]", source: "Scathach" }
@@ -402,7 +402,7 @@ hideall "--sync--"
 # This section leads directly into Diabolos Hollow the first time after Diabolos is defeated.
 # This is the dueling-lasers part where the party kills the big deathgate and two small ones.
 
-4274.0 "--sync--" sync / 22:........:Diabolos:........:Diabolos:00/ window 100,5
+4274.0 "--sync--" NameToggle { name: "Diabolos", toggle: "00" } window 100,5
 4286.2 "--lifegate spawn--" AddedCombatant { name: "Lifegate" }  window 300,5
 4300.0 "--sync--" Ability { id: "1C16", source: "Diabolos" } window 300,5
 4320.0 "--deathgate spawn--" AddedCombatant { name: "Deathgate" }  window 50,5
diff --git a/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt b/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt
index 08e5badeda..8c317965c8 100644
--- a/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt
+++ b/ui/raidboss/data/03-hw/dungeon/the_lost_city_of_amdapor_hard.txt
@@ -137,7 +137,7 @@ hideall "--sync--"
 3119.3 "Glory" #Ability { id: "15E4", source: "Kuribu" }
 
 # Phase 2
-3300.0 "--untargetable--" sync / 22:........:Kuribu:........:Kuribu:00/ window 300,0
+3300.0 "--untargetable--" NameToggle { name: "Kuribu", toggle: "00" } window 300,0
 3306.0 "--targetable--"
 3306.0 "Reverse" Ability { id: "15D8", source: "Kuribu" } window 306,5
 
@@ -154,7 +154,7 @@ hideall "--sync--"
 3408.2 "Glory" #Ability { id: "15E4", source: "Kuribu" }
 
 # Phase 3
-3500.0 "--untargetable--" sync / 22:........:Kuribu:........:Kuribu:00/ window 200,0
+3500.0 "--untargetable--" NameToggle { name: "Kuribu", toggle: "00" } window 200,0
 3506.0 "--targetable--"
 3506.0 "Reverse" Ability { id: "15D8", source: "Kuribu" }
 3511.0 "Decoy" Ability { id: "15E1", source: "Kuribu" } window 511,10
diff --git a/ui/raidboss/data/03-hw/dungeon/xelphatol.txt b/ui/raidboss/data/03-hw/dungeon/xelphatol.txt
index 4a5b24bd26..7dba1e4d2f 100644
--- a/ui/raidboss/data/03-hw/dungeon/xelphatol.txt
+++ b/ui/raidboss/data/03-hw/dungeon/xelphatol.txt
@@ -26,7 +26,7 @@ hideall "--sync--"
 82.6 "Air Raid"
 94.1 "Air Raid"
 
-100.0 "--sync--" sync / 22:........:Nuzal Hueloc:........:Nuzal Hueloc:01/ window 100,5
+100.0 "--sync--" NameToggle { name: "Nuzal Hueloc", toggle: "01" } window 100,5
 121.3 "Wind Blast" Ability { id: "19C7", source: "Nuzal Hueloc" } window 21.3,5
 129.5 "Long Burst" Ability { id: "19C8", source: "Nuzal Hueloc" }
 132.7 "Short Burst" Ability { id: "19C6", source: "Nuzal Hueloc" }
@@ -51,7 +51,7 @@ hideall "--sync--"
 272.1 "Air Raid"
 
 
-300.0 "--sync--" sync / 22:........:Nuzal Hueloc:........:Nuzal Hueloc:01/ window 100,5
+300.0 "--sync--" NameToggle { name: "Nuzal Hueloc", toggle: "01" } window 100,5
 305.3 "Short Burst" Ability { id: "19C6", source: "Nuzal Hueloc" } window 5,10
 314.4 "Wind Blast" Ability { id: "19C7", source: "Nuzal Hueloc" }
 323.5 "Long Burst" Ability { id: "19C8", source: "Nuzal Hueloc" }
diff --git a/ui/raidboss/data/03-hw/raid/a10n.txt b/ui/raidboss/data/03-hw/raid/a10n.txt
index 78b30db1b5..2751dcb4cf 100644
--- a/ui/raidboss/data/03-hw/raid/a10n.txt
+++ b/ui/raidboss/data/03-hw/raid/a10n.txt
@@ -58,7 +58,7 @@ hideall "--sync--"
 203.6 "Steam Roller Enrage?" Ability { id: "1ACA", source: "Gobpress R-VI" }
 
 # This targetable entry is the earliest we can re-sync the timeline.
-300.0 "--targetable--" sync /22:[^:]*:Lamebrix Strikebocks:[^:]*:Lamebrix Strikebocks:01/ window 190,10
+300.0 "--targetable--" NameToggle { name: "Lamebrix Strikebocks", toggle: "01" } window 190,10
 309.2 "Goblin Rush" Ability { id: "1A17", source: "Lamebrix Strikebocks" } window 200,10
 317.3 "Gobrush Rushgob" Ability { id: "1ACF", source: "Lamebrix Strikebocks" }
 
diff --git a/ui/raidboss/data/03-hw/raid/a10s.txt b/ui/raidboss/data/03-hw/raid/a10s.txt
index 66c882b9d7..41b5973e95 100644
--- a/ui/raidboss/data/03-hw/raid/a10s.txt
+++ b/ui/raidboss/data/03-hw/raid/a10s.txt
@@ -68,7 +68,7 @@ hideall "--sync--"
 
 
 ### Phase 2: Steam Roller (60%)
-200.5 "--untargetable--" sync / 22:........:Lamebrix Strikebocks:........:Lamebrix Strikebocks:00/ window 201,5
+200.5 "--untargetable--" NameToggle { name: "Lamebrix Strikebocks", toggle: "00" } window 201,5
 201.6 "--jump--" Ability { id: "1AA2", source: "Lamebrix Strikebocks" } window 20,5
 207.0 "Brighteyes Markers" Ability { id: "1AA9", source: "Lamebrix Strikebocks" } window 210,5
 212.0 "Brighteyes" Ability { id: "1AAA", source: "Lamebrix Strikebocks" }
@@ -98,7 +98,7 @@ hideall "--sync--"
 302.4 "Gobsway Rumblerocks" Ability { id: "1AA0", source: "Lamebrix Strikebocks" }
 
 ### Phase 3
-500.0 "--targetable--" sync / 22:........:Lamebrix Strikebocks:........:Lamebrix Strikebocks:01/ window 500,0
+500.0 "--targetable--" NameToggle { name: "Lamebrix Strikebocks", toggle: "01" } window 500,0
 509.0 "Goblin Rush" Ability { id: "1A16", source: "Lamebrix Strikebocks" } window 305,5
 517.1 "Gobrush Rushgob" Ability { id: "1A9F", source: "Lamebrix Strikebocks" }
 521.3 "--sync--" #Ability { id: "1AB[89AB]", source: "Lamebrix Strikebocks" }
diff --git a/ui/raidboss/data/03-hw/raid/a12n.txt b/ui/raidboss/data/03-hw/raid/a12n.txt
index 9aa4ea1f35..6fe986045b 100644
--- a/ui/raidboss/data/03-hw/raid/a12n.txt
+++ b/ui/raidboss/data/03-hw/raid/a12n.txt
@@ -18,7 +18,7 @@ hideall "--sync--"
 56.4 "Divine Spear" Ability { id: "1AE3", source: "Alexander Prime" }
 
 # The intermission can be pushed early at ~75% HP.
-61.4 "--untargetable--" sync / 22:........:Alexander Prime:........:Alexander Prime:00/ window 61.4,5
+61.4 "--untargetable--" NameToggle { name: "Alexander Prime", toggle: "00" } window 61.4,5
 161.9 "--sync--" Ability { id: "1A18", source: "Alexander" } window 161.9,5
 171.6 "Divine Judgment" Ability { id: "1AEF", source: "Alexander" }
 
diff --git a/ui/raidboss/data/03-hw/raid/a12s.txt b/ui/raidboss/data/03-hw/raid/a12s.txt
index 0209c43774..c8a2143d9a 100644
--- a/ui/raidboss/data/03-hw/raid/a12s.txt
+++ b/ui/raidboss/data/03-hw/raid/a12s.txt
@@ -21,7 +21,7 @@ hideall "--sync--"
 54.0 "(Radiant?) Sacrament" Ability { id: "19E[BD]", source: "Alexander Prime" }
 58.1 "Divine Spear" Ability { id: "19E8", source: "Alexander Prime" }
 65.2 "Punishing Heat" Ability { id: "19E9", source: "Alexander Prime" }
-67.2 "--untargetable--" sync / 22:........:Alexander Prime:........:Alexander Prime:00/ window 70,5
+67.2 "--untargetable--" NameToggle { name: "Alexander Prime", toggle: "00" } window 70,5
 
 
 ### Phase 2: Adds Phase (79% push)
diff --git a/ui/raidboss/data/03-hw/raid/a4s.txt b/ui/raidboss/data/03-hw/raid/a4s.txt
index 0bcc996699..f4c98fe749 100644
--- a/ui/raidboss/data/03-hw/raid/a4s.txt
+++ b/ui/raidboss/data/03-hw/raid/a4s.txt
@@ -46,7 +46,7 @@
 
 
 ### Leg 2
-500.0 "--sync--" sync / 22:........:The Manipulator:........:The Manipulator:01/ window 500,0
+500.0 "--sync--" NameToggle { name: "The Manipulator", toggle: "01" } window 500,0
 512.1 "--untargetable--"
 516.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 517,5
 522.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" }
@@ -87,7 +87,7 @@
 
 
 ### Leg 3
-1000.0 "--sync--"  sync / 22:........:The Manipulator:........:The Manipulator:01/ window 490,0
+1000.0 "--sync--"  NameToggle { name: "The Manipulator", toggle: "01" } window 490,0
 1012.1 "--untargetable--"
 1016.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 490,5
 1022.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" }
@@ -142,7 +142,7 @@
 
 
 ### Leg 4
-1500.0 "--sync--"  sync / 22:........:The Manipulator:........:The Manipulator:01/ window 490,0
+1500.0 "--sync--"  NameToggle { name: "The Manipulator", toggle: "01" } window 490,0
 1512.1 "--untargetable--"
 1516.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 490,5
 1522.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" }
@@ -177,7 +177,7 @@
 
 
 ### Final Phase
-2000.0 "--sync--"  sync / 22:........:The Manipulator:........:The Manipulator:01/ window 490,0
+2000.0 "--sync--"  NameToggle { name: "The Manipulator", toggle: "01" } window 490,0
 2012.1 "--untargetable--"
 2016.2 "--sync--" StartsUsing { id: "13E7", source: "The Manipulator" } window 490,5
 2022.2 "Mortal Revolution" Ability { id: "13E7", source: "The Manipulator" }
diff --git a/ui/raidboss/data/03-hw/raid/a6s.txt b/ui/raidboss/data/03-hw/raid/a6s.txt
index 66b1fd319c..d45e6d1eca 100644
--- a/ui/raidboss/data/03-hw/raid/a6s.txt
+++ b/ui/raidboss/data/03-hw/raid/a6s.txt
@@ -81,7 +81,7 @@ hideall "Ballistic Missile"
 1057.4 "Brawler Mechanic" #Ability { id: "160[2345]", source: "Brawler" }
 
 ## Brawler Orb Phase
-1500.0 "--sync--" sync / 22:........:Brawler:........:Brawler:00/ window 500,0
+1500.0 "--sync--" NameToggle { name: "Brawler", toggle: "00" } window 500,0
 1503.4 "Power Plasma Alpha x2" AddedCombatant { name: "Power Plasma Alpha" }  window 500,5
 1503.4 "Power Plasma Gamma x2"
 
diff --git a/ui/raidboss/data/03-hw/raid/a8n.txt b/ui/raidboss/data/03-hw/raid/a8n.txt
index aae89ff11e..9037fef040 100644
--- a/ui/raidboss/data/03-hw/raid/a8n.txt
+++ b/ui/raidboss/data/03-hw/raid/a8n.txt
@@ -47,7 +47,7 @@ hideall "Brute Force"
 # There's no way to know which robot will die first or when,
 # so we just do one full rotation and hope for the best.
 # If it would have looped past here, there are bigger problems!
-200.0 "--sync--" sync / 22:........:Onslaughter:........:Onslaughter:00/ window 200,0
+200.0 "--sync--" NameToggle { name: "Onslaughter", toggle: "00" } window 200,0
 203.8 "--sync--" AddedCombatant { name: "Brawler" }  window 150,30
 206.2 "--targetable--"
 214.3 "Magicked Mark" Ability { id: "173B", source: "Brawler" }
diff --git a/ui/raidboss/data/03-hw/raid/a8s.txt b/ui/raidboss/data/03-hw/raid/a8s.txt
index 0f45160603..1b436f1b89 100644
--- a/ui/raidboss/data/03-hw/raid/a8s.txt
+++ b/ui/raidboss/data/03-hw/raid/a8s.txt
@@ -61,7 +61,7 @@ hideall "Brute Force"
 
 
 ### Phase 2: Robots
-300.0 "--sync--" sync / 22:........:Onslaughter:........:Onslaughter:00/ window 300,0
+300.0 "--sync--" NameToggle { name: "Onslaughter", toggle: "00" } window 300,0
 303.0 "--sync--" AddedCombatant { name: "Blaster" }  window 303,30
 304.0 "Blaster (north)"
 304.0 "Brawler (middle)"
@@ -76,7 +76,7 @@ hideall "Brute Force"
 325.6 "Brute Force" Ability { id: "1638", source: "Blaster" }
 326.0 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" }
 
-329.4 "Swindler (east)" #sync / 22:........:Swindler:........:Swindler:01/
+329.4 "Swindler (east)" #NameToggle { name: "Swindler", toggle: "01" }
 330.1 "Auxiliary Power" Ability { id: "164B", source: "Brawler" }
 333.7 "Brute Force" Ability { id: "1638", source: "Blaster" }
 334.2 "Magicked Mark" Ability { id: "163B", source: "Brawler" }
@@ -88,7 +88,7 @@ hideall "Brute Force"
 348.5 "Height" Ability { id: "1647", source: "Swindler" }
 349.4 "Attachment" Ability { id: "163C", source: "Brawler" }
 
-352.4 "Vortexer (south)" #sync / 22:........:Vortexer:........:Vortexer:01/
+352.4 "Vortexer (south)" #NameToggle { name: "Vortexer", toggle: "01" }
 354.6 "Magicked Mark" Ability { id: "1646", source: "Swindler" }
 355.5 "Brawler Mechanic" Ability { id: "(163D|163E|163F|1640)", source: "Brawler" }
 359.6 "Auxiliary Power" Ability { id: "164B", source: "Brawler" }
diff --git a/ui/raidboss/data/03-hw/trial/sephirot-ex.txt b/ui/raidboss/data/03-hw/trial/sephirot-ex.txt
index b32fe700fb..277ee2d248 100644
--- a/ui/raidboss/data/03-hw/trial/sephirot-ex.txt
+++ b/ui/raidboss/data/03-hw/trial/sephirot-ex.txt
@@ -58,7 +58,7 @@ hideall "--sync--"
 # Instead we just go straight for the ultimate cast. (It has no cast time.)
 # However, we don't want timeline triggers firing during the intermission.
 
-500.0 "--sync--" sync / 22:........:Sephirot:........:Sephirot:00/ window 500,0
+500.0 "--sync--" NameToggle { name: "Sephirot", toggle: "00" } window 500,0
 1000.0 "Ein Sof Ohr" Ability { id: "1571", source: "Sephirot" } window 1000,5
 
 # Phase 2 rotation block, 197.3 seconds
diff --git a/ui/raidboss/data/04-sb/dungeon/bardams_mettle.txt b/ui/raidboss/data/04-sb/dungeon/bardams_mettle.txt
index 5c837d5296..0a553f34ed 100644
--- a/ui/raidboss/data/04-sb/dungeon/bardams_mettle.txt
+++ b/ui/raidboss/data/04-sb/dungeon/bardams_mettle.txt
@@ -100,7 +100,7 @@ hideall "Reconstruct"
 
 # Unfortunately, because there are two Corpsecleaner Eagles,
 # we can't just sync to a 04 log line.
-2189.7 "--targetable--" sync / 22:........:Yol:........:Yol:01/ window 120,5
+2189.7 "--targetable--" NameToggle { name: "Yol", toggle: "01" } window 120,5
 2196.8 "Feathercut" Ability { id: "1F09", source: "Yol" } window 125,5
 2204.0 "Wind Unbound" Ability { id: "1F0A", source: "Yol" }
 2212.7 "Pinion" Ability { id: "1F11", source: "Yol Feather" }
@@ -115,7 +115,7 @@ hideall "Reconstruct"
 2247.7 "Feathercut" Ability { id: "1F09", source: "Yol" }
 2249.4 "Pinion" Ability { id: "1F11", source: "Yol Feather" }
 
-2253.8 "--untargetable--" sync / 22:........:Yol:........:Yol:00/ window 60,5
+2253.8 "--untargetable--" NameToggle { name: "Yol", toggle: "00" } window 60,5
 2260.3 "Flutterfall" Ability { id: "1F10", source: "Yol" } window 60,5
 2267.5 "Wingbeat" Ability { id: "1F0F", source: "Yol" }
 2276.9 "Flutterfall" Ability { id: "1F0C", source: "Yol" }
@@ -135,7 +135,7 @@ hideall "Reconstruct"
 2352.5 "Pinion"
 
 
-2361.7 "--targetable--" sync / 22:........:Yol:........:Yol:01/ window 110,5
+2361.7 "--targetable--" NameToggle { name: "Yol", toggle: "01" } window 110,5
 2368.8 "Feathercut" Ability { id: "1F09", source: "Yol" } window 110,5
 2376.0 "Wind Unbound" Ability { id: "1F0A", source: "Yol" }
 2384.7 "Pinion" Ability { id: "1F11", source: "Yol Feather" }
@@ -162,7 +162,7 @@ hideall "Reconstruct"
 2478.7 "Eye Of The Fierce" Ability { id: "1F0D", source: "Yol" }
 2483.9 "Feathercut" Ability { id: "1F09", source: "Yol" }
 2485.7 "Pinion" Ability { id: "1F11", source: "Yol Feather" }
-2490.0 "--untargetable--" sync / 22:........:Yol:........:Yol:00/ jump 2253.8 window 130,5
+2490.0 "--untargetable--" NameToggle { name: "Yol", toggle: "00" } jump 2253.8 window 130,5
 
 2496.5 "Flutterfall"
 2503.7 "Wingbeat"
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 e17d1f66b8..afcf324ed8 100644
--- a/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt
+++ b/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt
@@ -58,7 +58,7 @@ hideall "--sync--"
 # -ic 2P -ii 491D 491C -p 491B:715.5
 # Warehouse B will be sealed off
 600.0 "--sync--" SystemLogMessage { id: "7DC", param1: "D4D" } window 600,0
-700.0 "--sync--" sync / 22:........:Small Flyer:........:Small Flyer:01/ window 100,0
+700.0 "--sync--" NameToggle { name: "Small Flyer", toggle: "01" } window 100,0
 715.5 "Frontal Somersault" Ability { id: "491B", source: "Small Biped" } window 116,2.5
 721.4 "Frontal Somersault" Ability { id: "491B", source: "Small Biped" }
 725.7 "High-Frequency Laser" Ability { id: "491E", source: "Multi-leg Medium Model" }
@@ -294,7 +294,7 @@ hideall "--sync--"
 2621.8 "Radiate Heat" Ability { id: "474C", source: "Engels" }
 2625.2 "Crushing Wheel Enrage?"  Ability { id: "474B", source: "Marx [LR]" }
 
-2700.0 "--targetable--" sync / 22:........:Engels:........:Engels:01/ window 150,0
+2700.0 "--targetable--" NameToggle { name: "Engels", toggle: "01" } window 150,0
 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" }
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 c11ba18f88..1ffb26e624 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
@@ -370,7 +370,7 @@ hideall "--sync--"
 # ???
 
 # ~70% HP push?
-5200.0 "--untargetable--" sync / 22:........:Xun-Zi:........:Xun-Zi:00/ window 200,0
+5200.0 "--untargetable--" NameToggle { name: "Xun-Zi", toggle: "00" } window 200,0
 5210.9 "--targetable--"
 5221.0 "Deploy Armaments" Ability { id: "5C0[03]", source: "Xun-Zi" }
 5224.0 "Deploy Armaments" Ability { id: "5C0[03]", source: "Meng-Zi" }
diff --git a/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt b/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
index 66d620fee8..44eade883d 100644
--- a/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
+++ b/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
@@ -14,25 +14,25 @@ hideall "--sync--"
 100.0 "--sync--" SystemLogMessage { id: "7DC", param1: "BC0" } window 100,0
 110.5 "Protolithic Puncture" Ability { id: "3E04", source: "Cladoselache" } window 111,8
 119.5 "Tidal Guillotine" Ability { id: "3E08", source: "Cladoselache" }
-128.7 "--2x targetable--" sync / 22:........:Doliodus:........:Doliodus:01/
-129.7 "--1x targetable--" sync / 22:........:Cladoselache:........:Cladoselache:00/
+128.7 "--2x targetable--" NameToggle { name: "Doliodus", toggle: "01" }
+129.7 "--1x targetable--" NameToggle { name: "Cladoselache", toggle: "00" }
 
 138.5 "Pelagic Cleaver" Ability { id: "3E09", source: "Doliodus" }
 150.5 "Tidal Guillotine" Ability { id: "3E0A", source: "Cladoselache" } window 10,10
-152.7 "--2x targetable--" sync / 22:........:Cladoselache:........:Cladoselache:01/
-154.7 "--1x targetable--" sync / 22:........:Doliodus:........:Doliodus:00/
+152.7 "--2x targetable--" NameToggle { name: "Cladoselache", toggle: "01" }
+154.7 "--1x targetable--" NameToggle { name: "Doliodus", toggle: "00" }
 
 162.4 "Aquatic Lance" Ability { id: "3E05", source: "Cladoselache" }
 173.5 "Protolithic Puncture" Ability { id: "3E04", source: "Cladoselache" }
 179.9 "Pelagic Cleaver" Ability { id: "3E0B", source: "Doliodus" } window 10,10
-181.5 "--untargetable--" sync / 22:........:Cladoselache:........:Cladoselache:00/
-183.3 "--targetable--" sync / 22:........:Doliodus:........:Doliodus:01/
+181.5 "--untargetable--" NameToggle { name: "Cladoselache", toggle: "00" }
+183.3 "--targetable--" NameToggle { name: "Doliodus", toggle: "01" }
 
 189.4 "Marine Mayhem" Ability { id: "3E06", source: "Doliodus" }
 199.8 "Protolithic Puncture" Ability { id: "3E04", source: "Doliodus" }
 201.4 "Tidal Guillotine" Ability { id: "3E0A", source: "Cladoselache" } window 10,10
-203.8 "--2x targetable--" sync / 22:........:Cladoselache:........:Cladoselache:01/
-205.1 "--1x targetable--" sync / 22:........:Doliodus:........:Doliodus:00/
+203.8 "--2x targetable--" NameToggle { name: "Cladoselache", toggle: "01" }
+205.1 "--1x targetable--" NameToggle { name: "Doliodus", toggle: "00" }
 
 213.2 "Aquatic Lance" Ability { id: "3E05", source: "Cladoselache" } window 30,30 jump 162.4
 224.3 "Protolithic Puncture"
diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
index a55ca7dbb4..7e1859d8e0 100644
--- a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
+++ b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
@@ -244,7 +244,7 @@ hideall "--sync--"
 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
+3100.0 "--targetable--" NameToggle { name: "Queen's Soldier", toggle: "01" } window 500,500
 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" }
@@ -270,7 +270,7 @@ hideall "--sync--"
 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
+3300.0 "--targetable--" NameToggle { name: "Queen's Gunner", toggle: "01" } window 500,500
 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" }
@@ -296,7 +296,7 @@ hideall "--sync--"
 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
+3500.0 "--targetable--" NameToggle { name: "Queen's Warrior", toggle: "01" } window 500,500
 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" }
@@ -333,7 +333,7 @@ hideall "--sync--"
 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
+3700.0 "--targetable--" NameToggle { name: "Queen's Knight", toggle: "01" } window 500,500
 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" }
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 62a557c1ad..b48c515e4f 100644
--- a/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt
+++ b/ui/raidboss/data/05-shb/eureka/delubrum_reginae_savage.txt
@@ -76,7 +76,7 @@ hideall "--sync--"
 
 
 ### Golems (The Granary, right side)
-2000.0 "--sync--" sync / 22:........:Bicolor Golem:........:Bicolor Golem:01/ window 2000,0
+2000.0 "--sync--" NameToggle { name: "Bicolor Golem", toggle: "01" } window 2000,0
 2000.0 "--Reset--" AddedCombatant { name: "Trinity Seeker" }  window 0,1000 jump 0
 2025.2 "Core Combustion" Ability { id: "5745", source: "Bicolor Golem" } window 2030,10
 2026.1 "--bleed--" # from blue golem
@@ -519,7 +519,7 @@ hideall "--sync--"
 
 
 # Phase 2: Warrior + Knight section
-10033.9 "--targetable--" sync / 22:........:Queen's Knight:........:Queen's Knight:01/ window 25,0
+10033.9 "--targetable--" NameToggle { name: "Queen's Knight", toggle: "01" } window 25,0
 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" }
@@ -596,7 +596,7 @@ hideall "--sync--"
 10322.2 "Blood and Bone Enrage" Ability { id: "5B9D", source: "Queen's Knight" }
 
 # Phase 3: Soldier + Gunner section
-10600.0 "--sync--" sync / 22:........:Queen's Gunner:........:Queen's Gunner:01/ window 600,0
+10600.0 "--sync--" NameToggle { name: "Queen's Gunner", toggle: "01" } 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" }
@@ -1351,7 +1351,7 @@ hideall "--sync--"
 
 
 # Phase 3: Victory Lap (once adds are dead)
-19000.0 "--targetable--" sync / 22:........:Stygimoloch Lord:........:Stygimoloch Lord:01/ window 800,0
+19000.0 "--targetable--" NameToggle { name: "Stygimoloch Lord", toggle: "01" } window 800,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
diff --git a/ui/raidboss/data/05-shb/trial/hades-ex.txt b/ui/raidboss/data/05-shb/trial/hades-ex.txt
index 4deeedc390..d8c6c95e87 100644
--- a/ui/raidboss/data/05-shb/trial/hades-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/hades-ex.txt
@@ -33,7 +33,7 @@ hideall "--sync--"
 
 
 ### Phase 2
-200.0 "--sync--" sync / 22:........:Hades:........:Hades:00/ window 200,0
+200.0 "--sync--" NameToggle { name: "Hades", toggle: "00" } window 200,0
 # 00:0044:Hades:Pitiful, malformed, wretched creatures!
 # 00:0044:Hades:Your call for aid beyond this world will avail you naught!
 # 00:0044:Hades:My brethren are legion!
@@ -88,7 +88,7 @@ hideall "--sync--"
 
 
 ### Phase 4
-750.2 "--sync--" sync / 22:........:Ascian Prime's Shade:........:Ascian Prime's Shade:00/ window 800,0
+750.2 "--sync--" NameToggle { name: "Ascian Prime's Shade", toggle: "00" } window 800,0
 799.9 "--targetable--"
 800.0 "--sync--" StartsUsing { id: "47D5", source: "Hades" } window 800,0
 804.0 "Again The Majestic" Ability { id: "47D5", source: "Hades" }
diff --git a/ui/raidboss/data/05-shb/trial/levi-un.txt b/ui/raidboss/data/05-shb/trial/levi-un.txt
index 1219ed05a5..62de35c4e4 100644
--- a/ui/raidboss/data/05-shb/trial/levi-un.txt
+++ b/ui/raidboss/data/05-shb/trial/levi-un.txt
@@ -38,7 +38,7 @@ hideall "--sync--"
 ### Phase 1: Literally Just Autos (100% -> 90%)
 0.0 "Start"
 0.0 "--sync--" InCombat { inGameCombat: "1" } window 0,1
-25.8 "--untargetable--" sync / 22:........:Leviathan:........:Leviathan:00/ window 30,10
+25.8 "--untargetable--" NameToggle { name: "Leviathan", toggle: "00" } window 30,10
 
 ### Phase 2: One Set of Orbs (90% -> 50%?)
 33.0 "--targetable--"
diff --git a/ui/raidboss/data/06-ew/trial/sephirot-un.txt b/ui/raidboss/data/06-ew/trial/sephirot-un.txt
index ecd5f57331..eb7cab71c7 100644
--- a/ui/raidboss/data/06-ew/trial/sephirot-un.txt
+++ b/ui/raidboss/data/06-ew/trial/sephirot-un.txt
@@ -58,7 +58,7 @@ hideall "--sync--"
 # Instead we just go straight for the ultimate cast. (It has no cast time.)
 # However, we don't want timeline triggers firing during the intermission.
 
-500.0 "--sync--" sync / 22:........:Sephirot:........:Sephirot:00/ window 500,0
+500.0 "--sync--" NameToggle { name: "Sephirot", toggle: "00" } window 500,0
 1000.0 "Ein Sof Ohr" Ability { id: "769E", source: "Sephirot" } window 1000,5
 
 # Phase 2 rotation block, 197.3 seconds