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 60b7d0c544..2ca3eea768 100644
--- a/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt
+++ b/ui/raidboss/data/05-shb/alliance/the_copied_factory.txt
@@ -3,13 +3,11 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Serial-jointed Command Model
 # -ic 2P -p 48B2:108.5 -ii 4B31 48B3 48B4 48B7 48B6 48CB 48CC 48BA 4B32 48FA 48BC 48BD 48BE 48BF 48C0 48C1 48C2 48C9
 
 100.0 "--sync--" sync / 00:0839::Warehouse A will be sealed off/ window 100,0
-108.5 "Systematic Siege" sync / 1[56]:[^:]*:Serial-jointed Command Model:48B2:/
+108.5 "Systematic Siege" sync / 1[56]:[^:]*:Serial-jointed Command Model:48B2:/ window 108.5,10
 122.6 "Clanging Blow" sync / 1[56]:[^:]*:Serial-jointed Command Model:48CE:/
 134.1 "Energy Bombardment" sync / 1[56]:[^:]*:Serial-jointed Command Model:48B8:/
 143.3 "Forceful Impact" sync / 1[56]:[^:]*:Serial-jointed Command Model:48CF:/
@@ -111,7 +109,7 @@ hideall "--sync--"
 # branch out to six timelines again for the second half, but it'd be, well, a lot.
 
 900.0 "--sync--" sync / 00:0839::Quality assurance will be sealed off/ window 900,0
-913.0 "Laser-Resistance Test x3" sync / 1[56]:[^:]*:Hobbes:4805:/ duration 2.3
+913.0 "Laser-Resistance Test x3" sync / 1[56]:[^:]*:Hobbes:4805:/ duration 2.3 window 913,10
 
 924.5 "--sync--" sync / 1[56]:[^:]*:Hobbes:480A:/
 926.0 "--sync--" sync / 1[56]:[^:]*:Hobbes:4913:/
@@ -198,7 +196,7 @@ hideall "--sync--"
 ### Goliath Tank
 # -ic 2P -p 4932:1509 493D:1800 -ii 4937 4934 4938 4935 4939 4936 493A 4933 470D 4943 493E
 1500.0 "--sync--" sync / 00:0839::Warehouse C will be sealed off/ window 1500,0
-1509.0 "Energy Ring" sync / 1[56]:[^:]*:Goliath Tank:4932:/ duration 15.1
+1509.0 "Energy Ring" sync / 1[56]:[^:]*:Goliath Tank:4932:/ duration 15.1 window 1509,10
 1516.9 "Exploding Tethers"
 1526.0 "Convenient Self-Destruction" sync / 1[56]:[^:]*:Medium Exploder:493C:/
 1533.9 "Laser Turret" sync / 1[56]:[^:]*:Goliath Tank:493B:/
@@ -232,7 +230,7 @@ hideall "--sync--"
 # One log has 472[6,7,7,A] as the four.  Left as all random for now.
 
 2000.0 "--sync--" sync / 00:0839::The forward deck will be sealed off/ window 2000,0
-2015.7 "Marx Smash L/R" sync / 1[56]:[^:]*:Engels:472[67]:/
+2015.7 "Marx Smash L/R" sync / 1[56]:[^:]*:Engels:472[67]:/ window 2015.7,5
 2029.6 "Marx Smash R/L" sync / 1[56]:[^:]*:Engels:472[67]:/
 2044.4 "Precision Guided Missile" sync / 1[56]:[^:]*:Engels:4754:/
 2055.8 "Incendiary Bombing" sync / 1[56]:[^:]*:Engels:4739:/
@@ -324,7 +322,7 @@ hideall "--sync--"
 ### 9S
 # -ic 2P -p 48F5:3013.3 48E7:3310 48EB:3510 -ii 49C4 48F9 48F7 48DC 485E 48E3 48E6 48E0 48EC 48A5 48A7 48D6 4ABE
 3000.0 "--sync--" sync / 00:0839::The rear deck will be sealed off/ window 3000,0
-3013.3 "Neutralization" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:48F5:/
+3013.3 "Neutralization" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:48F5:/ window 3013.3,10
 3021.5 "Laser Saturation" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:48F6:/
 3030.2 "Laser Turret" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:4A74:/
 3039.7 "Ground-To-Ground Missile" sync / 1[56]:[^:]*:9S-Operated Walking Fortress:4974:/
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 067d7628df..ff98fc1783 100644
--- a/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt
+++ b/ui/raidboss/data/05-shb/alliance/the_puppets_bunker.txt
@@ -3,13 +3,11 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### 813P-Operated Aegis Unit
 # -p 508D:112.8 -ii 5074 5075 5076 5091 5092 5081 5099 507E 5090 51BC
 
 100.0 "--sync--" sync / 00:0839::The elevated detritus will be sealed off/ window 100,0
-112.8 "Firing Order: Anti-Personnel Laser" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:508D:/ window 20,20
+112.8 "Firing Order: Anti-Personnel Laser" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:508D:/ window 112.8,20
 125.1 "--sync--" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:507[789A]:/
 140.1 "Maneuver: Beam Cannons" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:5073:/
 158.4 "Maneuver: Collider Cannons" sync / 1[56]:[^:]*:813P-Operated Aegis Unit:507[BCD]:/
@@ -106,7 +104,7 @@ hideall "--sync--"
 # -ic "Yorha Close-Combat Unit: Spear" "Yorha Close-Combat Unit: Blade" "Yorha Close-Combat Unit: Martial"
 # -p 5212:1013.9 -ii 5214
 1000.0 "--sync--" sync / 00:0839::The sunken detritus will be sealed off/ window 1000,0
-1013.9 "Maneuver: Long-Barreled Laser" sync / 1[56]:[^:]*:Light Artillery Unit:5212:/ window 20,20
+1013.9 "Maneuver: Long-Barreled Laser" sync / 1[56]:[^:]*:Light Artillery Unit:5212:/ window 1013.9,20
 1025.7 "Maneuver: Volt Array" sync / 1[56]:[^:]*:Light Artillery Unit:5211:/
 1036.0 "Authorization: No Restrictions" sync / 1[56]:[^:]*:Light Artillery Unit:520E:/
 1041.7 "Surface Missile Impact" sync / 1[56]:[^:]*:Light Artillery Unit:520F:/
@@ -139,7 +137,7 @@ hideall "--sync--"
 # * however, syncing against multiple planes simultaneously might cause timeline jitter
 
 2000.0 "--sync--" sync / 00:0839::The launch deck will be sealed off/ window 2000,0
-2005.1 "Apply Shield Protocol" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FA6:/ window 20,20
+2005.1 "Apply Shield Protocol" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FA6:/ window 2005.1,20
 2018.3 "Maneuver: Missile Command" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FBD:/
 2031.5 "Maneuver: Incendiary Bombing" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FC3:/
 2040.7 "Maneuver: High-Powered Laser" sync / 1[56]:[^:]*:724P-Operated Superior Flight Unit \(A-Lpha\):4FB4:/
@@ -223,7 +221,7 @@ hideall "--sync--"
 # -p 5006:3012.1 -ii 4FF6 4FF7 4FF8 4FF9 4FFC 5004 4FFA 4FFF 4FFE 5002
 
 3000.0 "--sync--" sync / 00:0839::Core Command will be sealed off/ window 3000,0
-3012.1 "Maneuver: Volt Array" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:5006:/ window 20,20
+3012.1 "Maneuver: Volt Array" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:5006:/ window 3012.1,20
 3024.5 "Operation: Activate Laser Turret" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:4FED:/
 3028.2 "Lower Laser" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:5086:/ duration 3.5
 3028.2 "Upper Laser" sync / 1[56]:[^:]*:905P-Operated Heavy Artillery Unit:5087:/ duration 2.5
@@ -307,7 +305,7 @@ hideall "--sync--"
 # * Can't use "The Bridge" area sync due to checkpoint with Compound 2P.
 
 #5000.0 "--sync--" sync / 00:0839::The bridge will be sealed off/ window 5000,0
-5002.0 "--sync--" sync / 1[56]:[^:]*:The Compound:53CA:/ window 6000,0
+5002.0 "--sync--" sync / 1[56]:[^:]*:The Compound:53CA:/ window 5002,0
 5013.2 "Mechanical Laceration" sync / 1[56]:[^:]*:The Compound:51B8:/ window 6000,20
 5024.4 "Mechanical Decapitation/Dissection" sync / 1[56]:[^:]*:The Compound:51B[34]:/
 5034.9 "Mechanical Dissection/Decapitation" sync / 1[56]:[^:]*:The Compound:51B[34]:/
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 adf07301ab..e0347f201b 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
@@ -3,8 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Knave of Hearts
 # -p 5EB5:1012
 # -ii 5CEC 5CED 5CEE 5CEF 5EA5 5EA6 5CF9 5EB4 5EAF
@@ -18,7 +16,7 @@ hideall "--sync--"
 # So, give up, and add extra syncs on abilities after.
 
 1000.0 "--sync--" sync / 00:0839::Closed Area A will be sealed off/ window 10000,0
-1012.0 "Roar" sync / 1[56]:[^:]*:Knave Of Hearts:5EB5:/ window 10,10
+1012.0 "Roar" sync / 1[56]:[^:]*:Knave Of Hearts:5EB5:/ window 1012,10
 1022.1 "Colossal Impact" sync / 1[56]:[^:]*:Knave Of Hearts:5EA7:/
 1033.2 "Colossal Impact" sync / 1[56]:[^:]*:Knave Of Hearts:5EA4:/
 1040.3 "--sync--" sync / 1[56]:[^:]*:Knave Of Hearts:5EB2:/ # Magic Artillery Beta cast
@@ -98,9 +96,9 @@ hideall "--sync--"
 # -ic "2B"
 # -it "Hansel"
 
-2000.0 "--sync--" sync / 00:0839::Staging Node B will be sealed off/ window 10000,0
-2012.0 "Upgraded Shield" sync / 1[56]:[^:]*:Gretel:5C6[89]:/
-2012.0 "Upgraded Lance" sync / 1[56]:[^:]*:Hansel:5C6[AB]:/
+2000.0 "--sync--" sync / 00:0839::Staging Node B will be sealed off/ window 2000,0
+2012.0 "Upgraded Shield" sync / 1[56]:[^:]*:Gretel:5C6[89]:/ window 2012,10
+2012.0 "Upgraded Lance" sync / 1[56]:[^:]*:Hansel:5C6[AB]:/ window 2012,10
 2025.2 "Wail" sync / 1[56]:[^:]*:Hansel:5C77:/
 2025.3 "Crippling Blow (G)" sync / 1[56]:[^:]*:Gretel:5C78:/
 2035.5 "Wail" sync / 1[56]:[^:]*:Gretel:5C76:/
@@ -237,10 +235,10 @@ hideall "--sync--"
 3031.6 "Lightfast Blade 1?"
 
 3500.0 "--targetable--"
-3501.1 "--sync--" sync / 14:[^:]*:2P-Operated Flight Unit:5BFE:/ window 3510,0
+3501.1 "--sync--" sync / 14:[^:]*:2P-Operated Flight Unit:5BFE:/ window 3501.1,0
 3505.0 "--targetable--"
 3510.0 "--targetable--"
-3513.1 "Lightfast Blade 1" sync / 1[56]:[^:]*:2P-Operated Flight Unit:5BFE:/
+3513.1 "Lightfast Blade 1" sync / 1[56]:[^:]*:2P-Operated Flight Unit:5BFE:/ window 3513.1,3
 3515.0 "--targetable--"
 3518.1 "Lightfast Blade 2" sync / 1[56]:[^:]*:2P-Operated Flight Unit:5BFE:/
 3523.1 "Lightfast Blade 3" sync / 1[56]:[^:]*:2P-Operated Flight Unit:5BFE:/
@@ -261,8 +259,8 @@ hideall "--sync--"
 # -it "Red Girl"
 
 # Phase 1
-4000.0 "--sync--" sync / 00:0839::Staging Node D will be sealed off/ window 10000,0
-4009.0 "--sync--" sync / 14:[^:]*:Red Girl:6012:/ window 10,10
+4000.0 "--sync--" sync / 00:0839::Staging Node D will be sealed off/ window 4000,0
+4009.0 "--sync--" sync / 14:[^:]*:Red Girl:6012:/ window 4009,10
 4014.0 "Cruelty" sync / 1[56]:[^:]*:Red Girl:6012:/
 4019.9 "Shockwave" sync / 1[56]:[^:]*:Red Girl:600E:/
 4026.0 "Generate: Barrier" sync / 1[56]:[^:]*:Red Girl:6004:/
@@ -359,8 +357,8 @@ hideall "--sync--"
 # -it "Xun-Zi"
 # -p 5C00:5013.3
 # -ii 5CEC 5CED 5CEE 5C02 5C05 5C07 5C08
-5000.0 "--sync--" sync / 00:0839::The Ascension Platform will be sealed off/ window 10000,0
-5013.3 "Deploy Armaments" sync / 1[56]:[^:]*:Xun-Zi:5C0[03]:/
+5000.0 "--sync--" sync / 00:0839::The Ascension Platform will be sealed off/ window 5000,0
+5013.3 "Deploy Armaments" sync / 1[56]:[^:]*:Xun-Zi:5C0[03]:/ window 5013.3,7
 5023.4 "Deploy Armaments" sync / 1[56]:[^:]*:Xun-Zi:5C0[03]:/
 5036.4 "Universal Assault" sync / 1[56]:[^:]*:Xun-Zi:5C06:/
 # ???
@@ -398,8 +396,8 @@ hideall "--sync--"
 # -it "False Idol"
 # -p 5BDD:6012.3
 # -ii 5CEC 5CED 5CEE 5CEF 5FFC 5FFF 5BDA 5BDC
-6000.0 "--sync--" sync / 00:0839::Beyond will be sealed off/ window 10000,0
-6007.3 "--sync--" sync / 14:[^:]*:False Idol:5BDD:/ window 10000,10
+6000.0 "--sync--" sync / 00:0839::Beyond will be sealed off/ window 6000,0
+6007.3 "--sync--" sync / 14:[^:]*:False Idol:5BDD:/ window 6007.3,10
 6012.3 "Screaming Score" sync / 1[56]:[^:]*:False Idol:5BDD:/
 6025.5 "Made Magic" sync / 1[56]:[^:]*:False Idol:5BD[67]:/
 6035.7 "Made Magic" sync / 1[56]:[^:]*:False Idol:5BD[67]:/
@@ -455,7 +453,7 @@ hideall "--sync--"
 6968.3 "--untargetable--"
 
 7000.0 "--targetable--"
-7010.2 "--sync--" sync / 14:[^:]*:Her Inflorescence:5BE0:/ window 10000,0
+7010.2 "--sync--" sync / 14:[^:]*:Her Inflorescence:5BE0:/ window 7010.2,0
 7013.2 "Pervasion" sync / 1[56]:[^:]*:Her Inflorescence:5BE0:/
 7019.3 "Recreate Structure" sync / 1[56]:[^:]*:Her Inflorescence:5BE1:/
 7030.4 "Uneven Footing" sync / 1[56]:[^:]*:Her Inflorescence:5BE2:/
diff --git a/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt b/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
index ab1c9f8de8..381c3b45da 100644
--- a/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
+++ b/ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.txt
@@ -3,9 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### Cladoselache, Doliodus
 # -p 3E04:110.5 3E07:302
 # helpful log regex: ( 22:.*(Cladoselache|Doliodus)| 14:[^:]*:(Cladoselache|Doliodus)| 1[56]:........:(Cladoselache|Doliodus):(?!368:)|sealed| 19:(Cladoselache|Doliodus) was defeated)
@@ -14,8 +11,7 @@ hideall "--sync--"
 # This is maybe like +/- 1-2 seconds?
 
 100.0 "--sync--" sync / 00:0839::Ichthyology will be sealed off/ window 100,0
-103.0 "--sync--" sync / 1[56]:[^:]*:Cladoselache:368:/ window 103,0
-110.5 "Protolithic Puncture" sync / 1[56]:[^:]*:Cladoselache:3E04:/
+110.5 "Protolithic Puncture" sync / 1[56]:[^:]*:Cladoselache:3E04:/ window 111,8
 119.5 "Tidal Guillotine" sync / 1[56]:[^:]*:Cladoselache:3E08:/
 128.7 "--2x targetable--" sync / 22:........:Doliodus:........:Doliodus:01/
 129.7 "--1x targetable--" sync / 22:........:Cladoselache:........:Cladoselache:00/
diff --git a/ui/raidboss/data/05-shb/dungeon/amaurot.txt b/ui/raidboss/data/05-shb/dungeon/amaurot.txt
index 65b7d1ed87..28e8313c49 100644
--- a/ui/raidboss/data/05-shb/dungeon/amaurot.txt
+++ b/ui/raidboss/data/05-shb/dungeon/amaurot.txt
@@ -3,15 +3,11 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### The First Beast
 # -p 3CCE:113.5 -ii 3CC6 3CCA 3CC8
 
 100.0 "--sync--" sync / 00:0839::The First Doom will be sealed off/ window 100,0
-101.5 "--sync--" sync / 1[56]:[^:]*:The First Beast:368:/ window 102,0
-113.5 "Venomous Breath" sync / 1[56]:[^:]*:The First Beast:3CCE:/
+113.5 "Venomous Breath" sync / 1[56]:[^:]*:The First Beast:3CCE:/ window 114,9
 122.7 "Meteor Rain" sync / 1[56]:[^:]*:The First Beast:3CC4:/
 132.9 "The Falling Sky" sync / 1[56]:[^:]*:The First Beast:3CC9:/
 136.3 "Cosmic Kiss" sync / 1[56]:[^:]*:Fallen Star:42D4:/
@@ -41,8 +37,7 @@ hideall "--sync--"
 ### Terminus Bellwether
 # -p 3CCF:523 -ii 465D 3CE4 3CD3 3CD2 3CD5 417D
 500.0 "--sync--" sync / 00:0839::The Second Doom will be sealed off/ window 500,0
-501.5 "--sync--" sync / 1[56]:[^:]*:Terminus Bellwether:368:/ window 502,0
-523.0 "Shrill Shriek" sync / 1[56]:[^:]*:Terminus Bellwether:3CCF:/
+523.0 "Shrill Shriek" sync / 1[56]:[^:]*:Terminus Bellwether:3CCF:/ window 523,5
 525.0 "--untargetable--"
 525.0 "Adds (N)"
 561.3 "Adds (SW)" sync / 03:........:Terminus Roiler:/  window 60,60
@@ -54,8 +49,7 @@ hideall "--sync--"
 ### Therion
 # -ii 3CD6 3CDD 3CD9 3CDE 3CE1 3CDB 4191 4192 -p 3CE3:1013
 1000.0 "--sync--" sync / 00:0839::The Third Doom will be sealed off/ window 1000,0
-1001.0 "--sync--" sync / 1[56]:[^:]*:Therion:3CD6:/ window 1001,0
-1013.0 "Shadow Wreck" sync / 1[56]:[^:]*:Therion:3CE3:/
+1013.0 "Shadow Wreck" sync / 1[56]:[^:]*:Therion:3CE3:/ window 1013,10
 1026.2 "Apokalypsis" sync / 1[56]:[^:]*:Therion:3CD7:/ duration 5.9
 1042.8 "Therion Charge" sync / 1[56]:[^:]*:Therion:3CDA:/
 1051.1 "Shadow Wreck" sync / 1[56]:[^:]*:Therion:3CE3:/
diff --git a/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt b/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt
index 09304ee1a3..483f59e5fc 100644
--- a/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt
+++ b/ui/raidboss/data/05-shb/dungeon/anamnesis_anyder.txt
@@ -3,13 +3,11 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Unknown
 # -p 4B69:1013.5 4E4B:1313
 # -ii 4B78 4B6D 4B6F
 1000.0 "--sync--" sync / 00:0839::Katharsis will be sealed off/ window 1000,0
-1013.5 "Fetid Fang" sync / 1[56]:[^:]*:Unknown:4B69:/
+1013.5 "Fetid Fang" sync / 1[56]:[^:]*:Unknown:4B69:/ window 1014,10
 1032.3 "Scrutiny" sync / 1[56]:[^:]*:Unknown:4E25:/
 1034.3 "Explosion" sync / 1[56]:[^:]*:Sinister Bubble:4B6E:/
 1042.2 "Luminous Ray" sync / 1[56]:[^:]*:Unknown:4E26:/
@@ -97,7 +95,7 @@ hideall "--sync--"
 # -p 4B8C:3013
 # -ii 4B7C 4B7E 4B8A 4B86 4B85 4B80 4B82 4B87
 3000.0 "--sync--" sync / 00:0839::Noesis will be sealed off/ window 3000,0
-3013.0 "Bonebreaker" sync / 1[56]:[^:]*:Rukshs Dheem:4B8C:/
+3013.0 "Bonebreaker" sync / 1[56]:[^:]*:Rukshs Dheem:4B8C:/ window 3013,10
 3019.2 "Swift Shift" sync / 1[56]:[^:]*:Rukshs Dheem:4B83:/
 3026.5 "Seabed Ceremony" sync / 1[56]:[^:]*:Rukshs Dheem:4B7B:/
 3032.6 "Depth Grip" sync / 1[56]:[^:]*:Rukshs Dheem:4B84:/
diff --git a/ui/raidboss/data/05-shb/dungeon/dohn_mheg.txt b/ui/raidboss/data/05-shb/dungeon/dohn_mheg.txt
index c8923b5ce4..6c8223d2c9 100644
--- a/ui/raidboss/data/05-shb/dungeon/dohn_mheg.txt
+++ b/ui/raidboss/data/05-shb/dungeon/dohn_mheg.txt
@@ -3,9 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### Aenc Thon, Lord of the Lingering Gaze
 # -ii 1EDB 22BD -p 2299:112.2
 100.0 "--sync--" sync / 00:0839::Teag Gye will be sealed off/ window 100,0
diff --git a/ui/raidboss/data/05-shb/dungeon/heroes_gauntlet.txt b/ui/raidboss/data/05-shb/dungeon/heroes_gauntlet.txt
index b59e355908..afdf0ee3dd 100644
--- a/ui/raidboss/data/05-shb/dungeon/heroes_gauntlet.txt
+++ b/ui/raidboss/data/05-shb/dungeon/heroes_gauntlet.txt
@@ -3,8 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 #~~~~~~~~~~~~~~~~#
 # SPECTRAL THIEF #
 #~~~~~~~~~~~~~~~~#
@@ -54,7 +52,7 @@ hideall "--sync--"
 # -ii 4F51 4F62 4F64 53B5 53B6 53B7 53B8 53B9 53BA
 
 1000.0 "Start" sync / 00:0839::The Summer Ballroom will be sealed off/ window 1000,5
-1012.8 "Absolute Dark II" sync / 1[56]:[^:]*:Spectral Necromancer:4F61:/ window 12.8,5
+1012.8 "Absolute Dark II" sync / 1[56]:[^:]*:Spectral Necromancer:4F61:/ window 1012.8,5
 1020.0 "Necromancy" sync / 1[56]:[^:]*:Spectral Necromancer:4F57:/
 1030.2 "Twisted Touch" sync / 1[56]:[^:]*:Spectral Necromancer:4F5E:/ window 30,30
 1046.7 "Necroburst" sync / 1[56]:[^:]*:Spectral Necromancer:4F5[9A]:/
@@ -98,7 +96,7 @@ hideall "--sync--"
 # -ic "Steelarm Cerigg" "Giott The Aleforged" "Lue-Reeq Of The Gilded Bow" "Granson Of The Mournful Blade"
 
 2000.0 "Start" sync / 00:0839::The Illuminated Plaza will be sealed off/ window 2000,5
-2012.0 "Beastly Fury" sync / 1[56]:[^:]*:Spectral Berserker:520C:/ window 12,5
+2012.0 "Beastly Fury" sync / 1[56]:[^:]*:Spectral Berserker:520C:/ window 2012,5
 2024.4 "Wild Anguish" sync / 1[56]:[^:]*:Spectral Berserker:5208:/
 2036.3 "Raging Slice" sync / 1[56]:[^:]*:Spectral Berserker:520A:/
 2041.0 "Raging Slice" sync / 1[56]:[^:]*:Spectral Berserker:520B:/
diff --git a/ui/raidboss/data/05-shb/dungeon/holminster_switch.txt b/ui/raidboss/data/05-shb/dungeon/holminster_switch.txt
index 2a9e0c299d..f4219b5836 100644
--- a/ui/raidboss/data/05-shb/dungeon/holminster_switch.txt
+++ b/ui/raidboss/data/05-shb/dungeon/holminster_switch.txt
@@ -3,9 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### Forgiven Dissonance
 # -p 3DC5:112
 100.0 "--sync--" sync / 00:0839::The Wound will be sealed off/ window 100,0
@@ -80,7 +77,7 @@ hideall "--sync--"
 ### Philia
 # -ii 3DDD 3DDF 3DDE 3DDC 3DDB 3DE1 3DE0 3DE9 4196 3DE5 4181 -p 3DD8:1012.5
 1000.0 "--sync--" sync / 00:0839::The manor house courtyard will be sealed off/ window 1000,0
-1012.5 "Scavenger's Daughter" sync / 1[56]:[^:]*:Philia:3DD8:/
+1012.5 "Scavenger's Daughter" sync / 1[56]:[^:]*:Philia:3DD8:/ window 1012.5,10
 1022.8 "Head Crusher" sync / 1[56]:[^:]*:Philia:3DD7:/
 1032.9 "Pendulum Tank" sync / 1[56]:[^:]*:Philia:4189:/
 1035.0 "Pendulum Center" sync / 1[56]:[^:]*:Philia:3DD9:/
diff --git a/ui/raidboss/data/05-shb/dungeon/malikahs_well.txt b/ui/raidboss/data/05-shb/dungeon/malikahs_well.txt
index a9002656aa..b3c190212c 100644
--- a/ui/raidboss/data/05-shb/dungeon/malikahs_well.txt
+++ b/ui/raidboss/data/05-shb/dungeon/malikahs_well.txt
@@ -3,9 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### Greater Armadillo
 # -ii 3CEA 3CE8 -p 3CE5:115
 100.0 "--sync--" sync / 00:0839::Terminus will be sealed off/ window 100,0
@@ -46,7 +43,7 @@ hideall "--sync--"
 ### Amphibious Talos
 # -ii 3CF0 -p 3CEB:515.5
 500.0 "--sync--" sync / 00:0839::Malikah's Gift will be sealed off/ window 500,0
-515.5 "Efface" sync / 1[56]:[^:]*:Amphibious Talos:3CEB:/
+515.5 "Efface" sync / 1[56]:[^:]*:Amphibious Talos:3CEB:/ window 515.5,10
 527.1 "Wellbore" sync / 1[56]:[^:]*:Amphibious Talos:3CED:/
 531.3 "Geyser Eruption" sync / 1[56]:[^:]*:Amphibious Talos:3CEE:/
 534.1 "High Pressure" sync / 1[56]:[^:]*:Amphibious Talos:3CEC:/
diff --git a/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt b/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt
index da6866ceab..5120c779b6 100644
--- a/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt
+++ b/ui/raidboss/data/05-shb/dungeon/matoyas_relict.txt
@@ -3,14 +3,12 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Mudman
 # -p 547F:1011
 # -ii 368 5481 5487 548E 548F 5490 5492
 1000.0 "--sync--" sync / 00:0839::The Clayclot Cauldron will be sealed off/ window 1000,0
 # Loop 3 times
-1011.0 "Hard Rock" sync / 1[56]:[^:]*:Mudman:547F:/ window 10,10
+1011.0 "Hard Rock" sync / 1[56]:[^:]*:Mudman:547F:/ window 1012,10
 1020.2 "Petrified Peat" sync / 1[56]:[^:]*:Mudman:5480:/
 1032.3 "Peat Pelt" sync / 1[56]:[^:]*:Mudman:5482:/
 1041.4 "Rocky Roll" sync / 1[56]:[^:]*:Mud Bubble:548(3|4):/
@@ -49,7 +47,7 @@ hideall "--sync--"
 # -ii 598E 5990 5992 5993 5994 5995 5996 5BB9
 2000.0 "--sync--" sync / 00:0839::The Clearnote Cauldron will be sealed off/ window 2000,0
 
-2009.2 "Crash-Smash" sync / 1[56]:[^:]*:Nixie:598F:/ window 10,10
+2009.2 "Crash-Smash" sync / 1[56]:[^:]*:Nixie:598F:/ window 2010,10
 2023.4 "Shower Power" sync / 1[56]:[^:]*:Nixie:5991:/
 2038.1 "--untargetable--"
 2044.1 "Pitter-Patter" sync / 1[56]:[^:]*:Nixie:5988:/
@@ -72,7 +70,7 @@ hideall "--sync--"
 # -ii 4A8F 5912 5914 5917 5918 591E 591F 5923 5925
 3000.0 "--sync--" sync / 00:0839::The Woebegone Workshop will be sealed off/ window 3000,0
 
-3011.3 "Tender Loin" sync / 1[56]:[^:]*:Mother Porxie:5913:/
+3011.3 "Tender Loin" sync / 1[56]:[^:]*:Mother Porxie:5913:/ window 3012,10
 3029.5 "Huff And Puff" sync / 1[56]:[^:]*:Mother Porxie:5919:/
 3031.6 "Medium Rear" sync / 1[56]:[^:]*:Mother Porxie:591D:/
 3045.7 "Meat Mallet" sync / 1[56]:[^:]*:Mother Porxie:5916:/
diff --git a/ui/raidboss/data/05-shb/dungeon/mt_gulg.txt b/ui/raidboss/data/05-shb/dungeon/mt_gulg.txt
index a785a279f4..5765d07c49 100644
--- a/ui/raidboss/data/05-shb/dungeon/mt_gulg.txt
+++ b/ui/raidboss/data/05-shb/dungeon/mt_gulg.txt
@@ -6,9 +6,6 @@ hideall "Reformation"
 hideall "Perfect Contrition"
 hideall "Rite Of The Sacrament"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### Forgiven Cruelty
 # -p 3CFB:113 -ii 3CFE 3CFD 4301 3CFF
 100.0 "--sync--" sync / 00:0839::The Perished Path will be sealed off/ window 100,0
diff --git a/ui/raidboss/data/05-shb/dungeon/paglthan.txt b/ui/raidboss/data/05-shb/dungeon/paglthan.txt
index 16198ee3be..c9d299573e 100644
--- a/ui/raidboss/data/05-shb/dungeon/paglthan.txt
+++ b/ui/raidboss/data/05-shb/dungeon/paglthan.txt
@@ -3,8 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 #~~~~~~~~~#
 # AMHULUK #
 #~~~~~~~~~#
@@ -52,7 +50,7 @@ hideall "--sync--"
 # -ii 5B56 5B50
 
 2000.0 "Start" sync / 00:0839::Sunseat will be sealed off/ window 2000,5
-2010.0 "Twisted Scream" sync / 1[56]:[^:]*:Lunar Bahamut:5B47:/
+2010.0 "Twisted Scream" sync / 1[56]:[^:]*:Lunar Bahamut:5B47:/ window 2010,10
 2015.0 "Upburst x4" # sync / 1[56]:[^:]*:Lunar Nail:605B:/
 2021.6 "Big Burst x4" # sync / 1[56]:[^:]*:Lunar Nail:5B48:/
 2029.2 "Perigean Breath" sync / 1[56]:[^:]*:Lunar Bahamut:5B59:/ window 30,10
diff --git a/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt b/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt
index b6fe5f8133..93d26932dc 100644
--- a/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt
+++ b/ui/raidboss/data/05-shb/dungeon/qitana_ravel.txt
@@ -3,9 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### Lozatl
 # -p 3C89:113.7
 100.0 "--sync--" sync / 00:0839::The Divine Threshold will be sealed off/ window 100,0
diff --git a/ui/raidboss/data/05-shb/dungeon/the_grand_cosmos.txt b/ui/raidboss/data/05-shb/dungeon/the_grand_cosmos.txt
index fd1f2bbb4f..f5218e5aa9 100644
--- a/ui/raidboss/data/05-shb/dungeon/the_grand_cosmos.txt
+++ b/ui/raidboss/data/05-shb/dungeon/the_grand_cosmos.txt
@@ -3,8 +3,6 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Seeker of Solitude
 # -ii 4768 49A4 476C 476F 4771 4770 -p 4769:111.7
 100.0 "--sync--" sync / 00:0839::The Martial Court will be sealed off/ window 100,0
@@ -39,7 +37,7 @@ hideall "--sync--"
 ### Leannan Sith
 # -ii 4724 471F -p 471B:512
 500.0 "--sync--" sync / 00:0839::The Font of Quintessence will be sealed off/ window 500,0 
-512.0 "Storm Of Color" sync / 1[56]:[^:]*:Leannan Sith:471B:/
+512.0 "Storm Of Color" sync / 1[56]:[^:]*:Leannan Sith:471B:/ window 512,10
 522.3 "Ode To Lost Love" sync / 1[56]:[^:]*:Leannan Sith:471C:/
 
 529.9 "Direct Seeding" sync / 1[56]:[^:]*:Leannan Sith:471D:/
@@ -81,7 +79,7 @@ hideall "--sync--"
 ### Lugus
 # -ii 475B 4766 475A 475E -p 475D:1026.8
 1000.0 "--sync--" sync / 00:0839::The Chamber of Celestial Song will be sealed off/ window 1000,0
-1015.3 "Scorching Left/Right" sync / 1[56]:[^:]*:Lugus:476[23]:/
+1015.3 "Scorching Left/Right" sync / 1[56]:[^:]*:Lugus:476[23]:/ window 1015.3,10
 1026.8 "Black Flame" sync / 1[56]:[^:]*:Lugus:475D:/
 1030.3 "Otherworldly Heat" sync / 1[56]:[^:]*:Lugus:475C:/
 1037.8 "Captive Bolt" sync / 1[56]:[^:]*:Lugus:4764:/
diff --git a/ui/raidboss/data/05-shb/dungeon/twinning.txt b/ui/raidboss/data/05-shb/dungeon/twinning.txt
index 6c7dd6931a..b596789177 100644
--- a/ui/raidboss/data/05-shb/dungeon/twinning.txt
+++ b/ui/raidboss/data/05-shb/dungeon/twinning.txt
@@ -3,14 +3,10 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
-
 ### Alpha Zaghnal
 # -p 3D65:108.5 -ii 3D66 3D67 3D68 3D69 3D6A 41CA 3D6C
 100.0 "--sync--" sync / 00:0839::Repurposing will be sealed off/ window 100,0
-102.5 "--sync--" sync / 1[56]:[^:]*:Cladoselache:366:/ window 103,0
-108.5 "Augurium" sync / 1[56]:[^:]*:Alpha Zaghnal:3D65:/
+108.5 "Augurium" sync / 1[56]:[^:]*:Alpha Zaghnal:3D65:/ window 109,9
 117.6 "Beastly Roar" sync / 1[56]:[^:]*:Alpha Zaghnal:3D64:/
 122.9 "Beast Rampant" sync / 1[56]:[^:]*:Alpha Zaghnal:3D60:/
 
@@ -37,9 +33,8 @@ hideall "--sync--"
 ### Mithridates
 # -p 3DED:512 -ii 3DEC 3DEF
 500.0 "--sync--" sync / 00:0839::Aetherial Observation will be sealed off/ window 500,0
-501.0 "--sync--" sync / 1[56]:[^:]*:Mithridates:366:/ window 501,0
 
-512.0 "Thunder Beam" sync / 1[56]:[^:]*:Mithridates:3DED:/
+512.0 "Thunder Beam" sync / 1[56]:[^:]*:Mithridates:3DED:/ window 512,10
 522.2 "Electric Discharge" sync / 1[56]:[^:]*:Mithridates:3DF0:/
 531.1 "Shock" sync / 1[56]:[^:]*:Levinball:3DF1:/
 543.8 "Laserblade" sync / 1[56]:[^:]*:Mithridates:3DEB:/
@@ -69,10 +64,8 @@ hideall "Temporal Paradox"
 hideall "Temporal Flow"
 
 1000.0 "--sync--" sync / 00:0839::The Cornice will be sealed off/ window 1000,0
-1001.0 "--sync--" sync / 1[56]:[^:]*:The Tycoon:3DFD:/ window 1001,0
-
 
-1013.8 "Magitek Crossray" sync / 1[56]:[^:]*:The Tycoon:3DF8:/
+1013.8 "Magitek Crossray" sync / 1[56]:[^:]*:The Tycoon:3DF8:/ window 1013.8,5
 1016.2 "Temporal Paradox" sync / 1[56]:[^:]*:The Tycoon:3DF7:/
 1023.1 "Temporal Flow" sync / 1[56]:[^:]*:The Tycoon:3DF5:/
 1024.4 "Magitek Ray" sync / 1[56]:[^:]*:The Tycoon:3DF3:/
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 8433b458a2..930cd878e2 100644
--- a/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt
+++ b/ui/raidboss/data/05-shb/eureka/bozjan_southern_front.txt
@@ -4,6 +4,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
+# Use zone-unseal and 0x21 Reset lines
+# Trigger set contains 'resetWhenOutOfCombat: false'
+
 0.0 "--Reset--" sync / 21:........:80000014:00:/ window 100000 jump 0
 0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
 
diff --git a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
index 16d66cecc5..0ca7d96b6c 100644
--- a/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
+++ b/ui/raidboss/data/05-shb/eureka/delubrum_reginae.txt
@@ -7,9 +7,6 @@ hideall "--sync--"
 # Note: various "Blast" are renamed "Elemental Blast" and various "Arrow" are renamed
 # to be "Elemental Arrow" to avoid having too many skills on the timeline.
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
-
 ### Trinity Seeker
 # -p 5AB6:1012.2
 # -ii 5AB4 5A9B 5A9C 5A9D 5A9E 5A9F 5AA4 5AA5 5AA6 5AA7 5AA8 5AA9 5B28 5B29 5AB5 5AB0 5AAE 38FC
diff --git a/ui/raidboss/data/05-shb/eureka/zadnor.txt b/ui/raidboss/data/05-shb/eureka/zadnor.txt
index 4874ad69ef..0dd274585e 100644
--- a/ui/raidboss/data/05-shb/eureka/zadnor.txt
+++ b/ui/raidboss/data/05-shb/eureka/zadnor.txt
@@ -3,6 +3,10 @@
 hideall "--Reset--"
 hideall "--sync--"
 
+
+# Use zone-unseal and 0x21 Reset lines
+# Trigger set contains 'resetWhenOutOfCombat: false'
+
 0.0 "--Reset--" sync / 21:........:80000014:00:/ window 100000 jump 0
 0.0 "--Reset--" sync / 00:0839::.*is no longer sealed/ window 100000 jump 0
 
diff --git a/ui/raidboss/data/05-shb/raid/e10n.txt b/ui/raidboss/data/05-shb/raid/e10n.txt
index 68e7a28f29..11195731c8 100644
--- a/ui/raidboss/data/05-shb/raid/e10n.txt
+++ b/ui/raidboss/data/05-shb/raid/e10n.txt
@@ -6,10 +6,7 @@ hideall "--sync--"
 
 # -ii 56B0 56B6 56B9 56BA 56BB 56BD 56BE 56C0 56C1 56CC 56D4 56D5 56D8 56D9 56E1 56E7 5B09 5B0D 5B26
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.6 "--sync--" sync / 1[56]:[^:]*:Shadowkeeper:5B09:/ window 2.6,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 17.0 "Forward Implosion" sync / 1[56]:[^:]*:Shadowkeeper:56B4:/ window 17,5
 30.5 "Forward Shadow Implosion" sync / 1[56]:[^:]*:Shadowkeeper:56B5:/
 41.8 "Deepshadow Nova" sync / 1[56]:[^:]*:Shadowkeeper:56E5:/
diff --git a/ui/raidboss/data/05-shb/raid/e10s.txt b/ui/raidboss/data/05-shb/raid/e10s.txt
index 335617b3da..0204f7476f 100644
--- a/ui/raidboss/data/05-shb/raid/e10s.txt
+++ b/ui/raidboss/data/05-shb/raid/e10s.txt
@@ -12,11 +12,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.6 "--sync--" sync / 1[56]:[^:]*:Shadowkeeper:5B0A:/ window 2,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 11.3 "Deepshadow Nova" sync / 1[56]:[^:]*:Shadowkeeper:573E:/ window 12,10
 24.5 "Implosion" sync / 1[56]:[^:]*:Shadowkeeper:56F[03]:/
 33.3 "Throne Of Shadow" sync / 1[56]:[^:]*:Shadowkeeper:5717:/
diff --git a/ui/raidboss/data/05-shb/raid/e11n.txt b/ui/raidboss/data/05-shb/raid/e11n.txt
index 9557b72e17..6b77e973b4 100644
--- a/ui/raidboss/data/05-shb/raid/e11n.txt
+++ b/ui/raidboss/data/05-shb/raid/e11n.txt
@@ -4,13 +4,10 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # -ii 366 4B18 4B19 4B1B
 
 # Opening Block. Introduces Fire/Lightning in a random order.
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.2 "--sync--" sync / 1[56]:[^:]*:Fatebreaker:366:/ window 1.2,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 11.0 "--center--" sync / 1[56]:[^:]*:Fatebreaker:5908:/ window 11,5
 21.8 "Burnt Strike" sync / 1[56]:[^:]*:Fatebreaker:562[CE]:/
 23.5 "Blastburn/Burnout" # sync / 1[56]:[^:]*:Fatebreaker:562[DF]:/
diff --git a/ui/raidboss/data/05-shb/raid/e11s.txt b/ui/raidboss/data/05-shb/raid/e11s.txt
index 76a24f16d1..a957475e0a 100644
--- a/ui/raidboss/data/05-shb/raid/e11s.txt
+++ b/ui/raidboss/data/05-shb/raid/e11s.txt
@@ -38,9 +38,8 @@ hideall "--sync--"
 
 # Phase 1
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.8 "--sync--" sync / 1[56]:[^:]*:Fatebreaker:366:/ window 3,0
-17.4 "Elemental Break" sync / 1[56]:[^:]*:Fatebreaker:566[36]:/
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+17.4 "Elemental Break" sync / 1[56]:[^:]*:Fatebreaker:566[36]:/ window 18,5
 19.9 "Sinsmoke/Sinsmite" sync / 1[56]:[^:]*:Fatebreaker:566[57]:/
 23.9 "--center--" sync / 1[56]:[^:]*:Fatebreaker:5908:/
 33.0 "Burnt Strike" sync / 1[56]:[^:]*:Fatebreaker:565[24]:/
diff --git a/ui/raidboss/data/05-shb/raid/e12n.txt b/ui/raidboss/data/05-shb/raid/e12n.txt
index 2df50da9be..4aca1b1a47 100644
--- a/ui/raidboss/data/05-shb/raid/e12n.txt
+++ b/ui/raidboss/data/05-shb/raid/e12n.txt
@@ -4,14 +4,13 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # -ii 4B47 4B1D 5865 585B 586B 5874 5875 5876 587E 587F 5882 5884 5889 588A 588B
 # -ic "Lissom Sculpture" "Beastly Sculpture"
 
+# Can use InCombat line to start timeline since the multiple phases do not
+# change the player's InCombat status.
 
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.0 "--sync--" sync / 1[56]:[^:]*:Eden's Promise:4B1D:/ window 1,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 14.9 "Maleficium" sync / 1[56]:[^:]*:Eden's Promise:5872:/ window 14.9,5
 22.1 "--sync--" sync / 1[56]:[^:]*:Eden's Promise:5879:/
 25.3 "Initialize Recall" sync / 1[56]:[^:]*:Eden's Promise:5859:/
diff --git a/ui/raidboss/data/05-shb/raid/e12s.txt b/ui/raidboss/data/05-shb/raid/e12s.txt
index 91eebe2be2..3e9e1918ce 100644
--- a/ui/raidboss/data/05-shb/raid/e12s.txt
+++ b/ui/raidboss/data/05-shb/raid/e12s.txt
@@ -1,15 +1,15 @@
-### Eden 12 (Savage)
+### Eden 12 (Savage) - Eden's Promise
 # Eden's Promise: Eternity (Savage)
 
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-### Eden's Promise
 # -ii 4B1E 58AA 58AB 4E44 4E45 4E46 4E47 589B 4E5A 58A0 58B8 5897 58B0 58B4 4F9E 58BB 58BC
 # -p 58A8:16
 
+# Use autos/abilities instead of InCombat lines to start timelines for door & final boss
+# as timeline resets out of combat.
+
 0 "Start"
 0.8 "--sync--" sync / 1[56]:[^:]*:Eden's Promise:4B1E:/ window 1,0
 11.0 "--sync--" sync / 14:[^:]*:Eden's Promise:58A8:/ window 11,20
diff --git a/ui/raidboss/data/05-shb/raid/e1n.txt b/ui/raidboss/data/05-shb/raid/e1n.txt
index b6d78c7ea1..370326457d 100644
--- a/ui/raidboss/data/05-shb/raid/e1n.txt
+++ b/ui/raidboss/data/05-shb/raid/e1n.txt
@@ -6,12 +6,9 @@ hideall "--Reset--"
 hideall "--sync--"
 hideall "Vice And Virtue"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.0 "--sync--" sync / 1[56]:[^:]*:Eden Prime:367:/ window 2,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.0 "Spear Of Paradise" sync / 1[56]:[^:]*:Eden Prime:3DA1:/ window 12,5
 13.5 "Heavensunder" sync / 1[56]:[^:]*:Eden Prime:3DA2:/
 22.5 "Eden's Gravity" sync / 1[56]:[^:]*:Eden Prime:3D94:/
diff --git a/ui/raidboss/data/05-shb/raid/e1s.txt b/ui/raidboss/data/05-shb/raid/e1s.txt
index 6346323b99..d4359b5202 100644
--- a/ui/raidboss/data/05-shb/raid/e1s.txt
+++ b/ui/raidboss/data/05-shb/raid/e1s.txt
@@ -5,12 +5,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.5 "--sync--" sync / 1[56]:[^:]*:Eden Prime:367:/ window 2,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.0 "Eden's Gravity" sync / 1[56]:[^:]*:Eden Prime:3D70:/ window 12,5
 25.6 "Vice And Virtue (D)" sync / 1[56]:[^:]*:Eden Prime:44EF:/
 32.0 "Eden's Flare" sync / 1[56]:[^:]*:Eden Prime:3D73:/
diff --git a/ui/raidboss/data/05-shb/raid/e2n.txt b/ui/raidboss/data/05-shb/raid/e2n.txt
index 34f9455c71..0a23e1619c 100644
--- a/ui/raidboss/data/05-shb/raid/e2n.txt
+++ b/ui/raidboss/data/05-shb/raid/e2n.txt
@@ -6,11 +6,8 @@ hideall "--Reset--"
 hideall "--sync--"
 hideall "Spell-In-Waiting"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.0 "--sync--" sync / 1[56]:[^:]*:Voidwalker:3E4C:/ window 1,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 10.7 "Doomvoid Guillotine" sync / 1[56]:[^:]*:Voidwalker:3E3B:/ window 11,5
 27.7 "Doomvoid Slicer" sync / 1[56]:[^:]*:Voidwalker:3E3C:/
 46.7 "Shadowflame" sync / 1[56]:[^:]*:Voidwalker:3E4D:/
diff --git a/ui/raidboss/data/05-shb/raid/e2s.txt b/ui/raidboss/data/05-shb/raid/e2s.txt
index 94984b6ffe..d8eebf34b5 100644
--- a/ui/raidboss/data/05-shb/raid/e2s.txt
+++ b/ui/raidboss/data/05-shb/raid/e2s.txt
@@ -6,11 +6,8 @@ hideall "--Reset--"
 hideall "--sync--"
 hideall "Spell-In-Waiting"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.5 "--sync--" sync / 1[56]:[^:]*:Voidwalker:3E60:/ window 2,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 10.5 "--sync--" sync / 1[56]:[^:]*:Voidwalker:3E63:/ window 11,5
 11.2 "Doomvoid Cleaver" sync / 1[56]:[^:]*:Voidwalker:3E64:/
 25.4 "Unholy Darkness" sync / 1[56]:[^:]*:Voidwalker:3E54:/
diff --git a/ui/raidboss/data/05-shb/raid/e3n.txt b/ui/raidboss/data/05-shb/raid/e3n.txt
index 56b53652f9..d428ca382f 100644
--- a/ui/raidboss/data/05-shb/raid/e3n.txt
+++ b/ui/raidboss/data/05-shb/raid/e3n.txt
@@ -5,10 +5,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-0.0 "--sync--" sync /:Engage!/ window 0,1
-0.5 "--sync--" sync / 1[56]:[^:]*:Leviathan:42D8:/ window 1,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.5 "Tidal Roar" sync / 1[56]:[^:]*:Leviathan:3FC4:/ window 13,5
 23.5 "Rip Current" sync / 1[56]:[^:]*:Leviathan:3FC6:/
 37.7 "Temporary Current" sync / 1[56]:[^:]*:Leviathan:3FC[DE]:/
diff --git a/ui/raidboss/data/05-shb/raid/e3s.txt b/ui/raidboss/data/05-shb/raid/e3s.txt
index ae71f49c5e..793c86dd6a 100644
--- a/ui/raidboss/data/05-shb/raid/e3s.txt
+++ b/ui/raidboss/data/05-shb/raid/e3s.txt
@@ -5,12 +5,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.0 "--sync--" sync / 1[56]:[^:]*:Leviathan:42D9:/ window 1,0
-12.8 "Tidal Roar" sync / 1[56]:[^:]*:Leviathan:3FDC:/
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+12.8 "Tidal Roar" sync / 1[56]:[^:]*:Leviathan:3FDC:/ window 13,10
 23.9 "Rip Current" sync / 1[56]:[^:]*:Leviathan:3FE0:/
 43.3 "Undersea Quake" sync / 1[56]:[^:]*:Leviathan:3FEF:/
 46.1 "Tidal Wave" sync / 1[56]:[^:]*:Leviathan:3FF2:/
diff --git a/ui/raidboss/data/05-shb/raid/e4n.txt b/ui/raidboss/data/05-shb/raid/e4n.txt
index e66b24c2cd..3a07ff9513 100644
--- a/ui/raidboss/data/05-shb/raid/e4n.txt
+++ b/ui/raidboss/data/05-shb/raid/e4n.txt
@@ -2,15 +2,12 @@
 # Eden's Gate: Sepulture
 # -p 40F7:13 -ii 413D 40EF 41B4 40FC 40FB 40ED 40F0 43E6 40EB 40FE 4101 4103 40F1 40FD
 
-
 hideall "--Reset--"
 hideall "--sync--"
 hideall "Earthen Armor"
 hideall "Earthen Gauntlets"
 hideall "Earthen Wheels"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # Phase chart
 # 1->2->3->
 #    4A->5A->6A->3A->loop to 4A
@@ -19,9 +16,8 @@ hideall "Earthen Wheels"
 
 ### Phase 1
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.0 "--sync--" sync / 1[56]:[^:]*:Titan:413D:/ window 2,0
-13.0 "Voice Of The Land" sync / 1[56]:[^:]*:Titan:40F7:/
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
+13.0 "Voice Of The Land" sync / 1[56]:[^:]*:Titan:40F7:/ window 13,8
 21.3 "Evil Earth" sync / 1[56]:[^:]*:Titan:40EE:/
 30.5 "Weight Of The Land" sync / 1[56]:[^:]*:Titan:40EA:/
 41.6 "Stonecrusher" sync / 1[56]:[^:]*:Titan:40F9:/ window 30,30
diff --git a/ui/raidboss/data/05-shb/raid/e4s.txt b/ui/raidboss/data/05-shb/raid/e4s.txt
index b31a308871..cdbed96fa2 100644
--- a/ui/raidboss/data/05-shb/raid/e4s.txt
+++ b/ui/raidboss/data/05-shb/raid/e4s.txt
@@ -8,12 +8,8 @@ hideall "Earthen Armor"
 hideall "Earthen Gauntlets"
 hideall "Earthen Wheels"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Warmup
-0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.5 "--sync--" sync / 1[56]:[^:]*:Titan:413D:/ window 3,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 11.0 "--sync--" sync / 14:[^:]*:Titan:4116:/ window 11,5
 16.0 "Stonecrusher 1" sync / 1[56]:[^:]*:Titan:4116:/
 19.1 "Stonecrusher 2" #sync / 1[56]:[^:]*:Titan:4143:/
diff --git a/ui/raidboss/data/05-shb/raid/e5n.txt b/ui/raidboss/data/05-shb/raid/e5n.txt
index 4848884ce2..783061e55d 100644
--- a/ui/raidboss/data/05-shb/raid/e5n.txt
+++ b/ui/raidboss/data/05-shb/raid/e5n.txt
@@ -4,14 +4,11 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # ic "Stormcloud" -ii 4B8F 4B93 4B97 4B99 4B9A 4BA1 4BA2
 
 # Opening block
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-0.5 "--sync--" sync / 1[56]:[^:]*:Ramuh:4BA2:/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 13.6 "Crippling Blow" sync / 1[56]:[^:]*:Ramuh:4BA3:/ window 15,15
 20.9 "--sync--" sync / 1[56]:[^:]*:Ramuh:4BCB:/
 26.8 "Stratospear Summons" sync / 1[56]:[^:]*:Ramuh:4B8D:/ window 30,30
diff --git a/ui/raidboss/data/05-shb/raid/e5s.txt b/ui/raidboss/data/05-shb/raid/e5s.txt
index 2a29407b16..94affeed08 100644
--- a/ui/raidboss/data/05-shb/raid/e5s.txt
+++ b/ui/raidboss/data/05-shb/raid/e5s.txt
@@ -5,10 +5,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.0 "Judgment Volts" sync / 1[56]:[^:]*:Ramuh:4BB5:/ window 12,20
 22.2 "Stratospear Summons" sync / 1[56]:[^:]*:Ramuh:4BA5:/
 27.1 "Impact" sync / 1[56]:[^:]*:Ramuh:4E3B:/
diff --git a/ui/raidboss/data/05-shb/raid/e6n.txt b/ui/raidboss/data/05-shb/raid/e6n.txt
index 239ebc082b..dc568c6eb4 100644
--- a/ui/raidboss/data/05-shb/raid/e6n.txt
+++ b/ui/raidboss/data/05-shb/raid/e6n.txt
@@ -7,14 +7,10 @@ hideall "--sync--"
 # -ii 4BDD 4BE1 4BEB 4BEA 4BE5 4BE9 4BEC 4BD9 4BE7 4E39 4C1D 4C20 4F98
 # -ic "Tumultuous Nexus" "Great Ball Of Fire"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-0.0 "--sync--" sync /:Engage!/ window 0,1
-
 # Garuda solo
-2.0 "--sync--" sync / 1[56]:[^:]*:Garuda:366:/ window 3,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 13.5 "Ferostorm" # sync / 1[56]:[^:]*:Garuda:4BD[DEF]:/
-20.6 "Superstorm" sync / 1[56]:[^:]*:Garuda:4BD7:/ window 20,30
+20.6 "Superstorm" sync / 1[56]:[^:]*:Garuda:4BD7:/ window 21,30
 31.4 "Air Bump" sync / 1[56]:[^:]*:Garuda:4BD1:/
 36.8 "Thorns" sync / 1[56]:[^:]*:Garuda:4BDA:/
 48.0 "Downburst" sync / 1[56]:[^:]*:Garuda:4BDB:/ window 30,30
diff --git a/ui/raidboss/data/05-shb/raid/e6s.txt b/ui/raidboss/data/05-shb/raid/e6s.txt
index da112d10b4..3a9dfed932 100644
--- a/ui/raidboss/data/05-shb/raid/e6s.txt
+++ b/ui/raidboss/data/05-shb/raid/e6s.txt
@@ -6,12 +6,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: Garuda
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.3 "--sync--" sync / 1[56]:[^:]*:Garuda:366:/ window 5,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 18.0 "Superstorm" sync / 1[56]:[^:]*:Garuda:4BF7:/ window 18,20
 27.1 "Occluded Front" sync / 1[56]:[^:]*:Garuda:4BD2:/
 36.2 "Wind Cutter" sync / 1[56]:[^:]*:Tumultuous Nexus:4C02:/
diff --git a/ui/raidboss/data/05-shb/raid/e7n.txt b/ui/raidboss/data/05-shb/raid/e7n.txt
index 62d02ad2e4..159715c9c2 100644
--- a/ui/raidboss/data/05-shb/raid/e7n.txt
+++ b/ui/raidboss/data/05-shb/raid/e7n.txt
@@ -6,12 +6,8 @@ hideall "--sync--"
 
 # -ii 4C30 4C32 4C33 4C36 4C3A 4C49 4D0A 4D0B
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-
 # Opening block
-0.0 "--sync--" sync /:Engage!/ window 0,1
-3.8 "--sync--" sync / 1[56]:[^:]*:The Idol Of Darkness:4C50:/ window 3.8,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.8 "Empty Wave" sync / 1[56]:[^:]*:The Idol Of Darkness:4C52:/ window 12.8,30
 25.0 "Unshadowed Stake" sync / 1[56]:[^:]*:The Idol Of Darkness:4C51:/
 37.8 "Words of Motion" sync / 1[56]:[^:]*:The Idol Of Darkness:4C2B:/ window 30,30
diff --git a/ui/raidboss/data/05-shb/raid/e7s.txt b/ui/raidboss/data/05-shb/raid/e7s.txt
index b2aa430d7c..70f97677da 100644
--- a/ui/raidboss/data/05-shb/raid/e7s.txt
+++ b/ui/raidboss/data/05-shb/raid/e7s.txt
@@ -9,11 +9,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1
-0.0 "--sync--" sync /:Engage!/ window 0,1
-4.0 "--sync--" sync / 1[56]:[^:]*:The Idol Of Darkness:4D59:/ window 5,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 13.0 "Empty Wave" sync / 1[56]:[^:]*:The Idol Of Darkness:4C8A:/ window 13,20
 25.2 "Unshadowed Stake" sync / 1[56]:[^:]*:The Idol Of Darkness:4C88:/
 27.8 "Silver Stake" sync / 1[56]:[^:]*:The Idol Of Darkness:4C89:/
diff --git a/ui/raidboss/data/05-shb/raid/e8n.txt b/ui/raidboss/data/05-shb/raid/e8n.txt
index ee4819aa57..14c6e5f617 100644
--- a/ui/raidboss/data/05-shb/raid/e8n.txt
+++ b/ui/raidboss/data/05-shb/raid/e8n.txt
@@ -6,11 +6,11 @@ hideall "--sync--"
 
 # -ii 4D58 4DD3 4DDF 4DE0 4DF3 4DF5 4E0B 4E0D 4E10 4E11 4E18 4FC9 4FCA
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
+# Can use InCombat line to start timeline since the multiple phases do not
+# change the player's InCombat status.
 
 # Opening block
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.4 "--sync--" sync / 1[56]:[^:]*:Shiva:4DD3:/ window 1.4,2
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 10.1 "--sync--" sync / 1[56]:[^:]*:Shiva:4DD7:/ window 15,5
 15.1 "Absolute Zero" sync / 1[56]:[^:]*:Shiva:4DD7:/
 27.2 "Redress" sync / 1[56]:[^:]*:Shiva:4F4F:/
diff --git a/ui/raidboss/data/05-shb/raid/e8s.txt b/ui/raidboss/data/05-shb/raid/e8s.txt
index cd1ad3f49f..f19b20c084 100644
--- a/ui/raidboss/data/05-shb/raid/e8s.txt
+++ b/ui/raidboss/data/05-shb/raid/e8s.txt
@@ -5,10 +5,10 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
+# Can use InCombat line to start timeline since the multiple phases do not
+# change the player's InCombat status.
 
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.5 "--sync--" sync / 1[56]:[^:]*:Shiva:4D59:/ window 2,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 16.0 "Absolute Zero" sync / 1[56]:[^:]*:Shiva:4DCC:/ window 17,20
 27.2 "Mirror, Mirror" sync / 1[56]:[^:]*:Shiva:4D5A:/
 39.3 "Biting/Driving Frost" sync / 1[56]:[^:]*:Shiva:4D6[67]:/
diff --git a/ui/raidboss/data/05-shb/raid/e9n.txt b/ui/raidboss/data/05-shb/raid/e9n.txt
index 4342a7ee62..d83c20bd9e 100644
--- a/ui/raidboss/data/05-shb/raid/e9n.txt
+++ b/ui/raidboss/data/05-shb/raid/e9n.txt
@@ -6,12 +6,7 @@ hideall "--sync--"
 
 # -ii 5626 5B18 55E1 55E3 5159 532F 55DB 55E5
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-0.0 "--sync--" sync /:Engage!/ window 0,1
-# Unfortunately we can't sync to a first attack here,
-# as Cloud of Darkness uses an auto at random before starting her 3-second rotation.
-# 0.1 "--sync--" sync / 1[56]:[^:]*:Cloud Of Darkness:5626:/ window 0.1,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 10.4 "--sync--" sync / 14:[^:]*:Cloud Of Darkness:55ED:/ window 10.4,5
 15.1 "Ground-Razing Particle Beam" sync / 1[56]:[^:]*:Cloud Of Darkness:55ED:/
 25.3 "The Art Of Darkness" sync / 1[56]:[^:]*:Cloud Of Darkness:522[34]:/
diff --git a/ui/raidboss/data/05-shb/raid/e9s.txt b/ui/raidboss/data/05-shb/raid/e9s.txt
index bce434239e..88c87c8601 100644
--- a/ui/raidboss/data/05-shb/raid/e9s.txt
+++ b/ui/raidboss/data/05-shb/raid/e9s.txt
@@ -5,10 +5,7 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-0.0 "--sync--" sync /:Engage!/ window 0,1
-0.8 "--sync--" sync / 1[56]:[^:]*:Cloud Of Darkness:5627:/ window 1,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 16.9 "Ground-Razing Particle Beam" sync / 1[56]:[^:]*:Cloud Of Darkness:5625:/ window 17,10
 27.1 "The Art Of Darkness" sync / 1[56]:[^:]*:Cloud Of Darkness:5B4[56]:/
 36.8 "The Art Of Darkness" sync / 1[56]:[^:]*:Cloud Of Darkness:5B4[56]:/
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 97dcd90d16..9358064759 100644
--- a/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/diamond_weapon-ex.txt
@@ -3,12 +3,10 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # -it "The Diamond Weapon" -ii 5FEB 5FBE 5FAA 5FEC 5FBA 5FFD 5FBB 6055 6159 5FF9 5FCD 5FFA 5FF9 612E 5FB3 5FCE 5FD2 5FFE 5FD3 5FB4 5FB6 5FB1 5FB0 5FBF 5FAE 5FA6 5FC3 5FC9 5FCA 5FC4
 
 ### Phase 1
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 16.3 "--sync--" sync / 14:[^:]*:The Diamond Weapon:5FA7:/ window 17,10
 21.3 "Diamond Rain" sync / 1[56]:[^:]*:The Diamond Weapon:5FA7:/ window 25,10
 
diff --git a/ui/raidboss/data/05-shb/trial/diamond_weapon.txt b/ui/raidboss/data/05-shb/trial/diamond_weapon.txt
index 2a4ff32d65..44026036ab 100644
--- a/ui/raidboss/data/05-shb/trial/diamond_weapon.txt
+++ b/ui/raidboss/data/05-shb/trial/diamond_weapon.txt
@@ -6,10 +6,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # Phase 1
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 6.0 "--sync--" sync / 14:[^:]*:The Diamond Weapon:5FA7:/ window 10,10
 11.0 "Diamond Rain" sync / 1[56]:[^:]*:The Diamond Weapon:5FA7:/
 40.3 "Adamant Purge" sync / 1[56]:[^:]*:The Diamond Weapon:5F9B:/
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 decf147159..1f95039ef4 100644
--- a/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/emerald_weapon-ex.txt
@@ -3,7 +3,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
+# Use autos instead of InCombat lines to start timelines for each phase
+# as timeline resets out of combat.
 
 ### Phase 1
 # -p 55B0:17.1
diff --git a/ui/raidboss/data/05-shb/trial/emerald_weapon.txt b/ui/raidboss/data/05-shb/trial/emerald_weapon.txt
index 2502ba3c6e..5edca44990 100644
--- a/ui/raidboss/data/05-shb/trial/emerald_weapon.txt
+++ b/ui/raidboss/data/05-shb/trial/emerald_weapon.txt
@@ -6,7 +6,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
+# Use autos/unique syncs instead of InCombat lines to start timelines for each phase
+# as timeline resets out of combat.
 
 ### Phase 1
 0 "Start"
diff --git a/ui/raidboss/data/05-shb/trial/hades-ex.txt b/ui/raidboss/data/05-shb/trial/hades-ex.txt
index 0657a146a2..0d1c715c40 100644
--- a/ui/raidboss/data/05-shb/trial/hades-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/hades-ex.txt
@@ -5,13 +5,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-
 ### Phase 1
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.5 "--sync--" sync / 1[56]:[^:]*:Hades:368:/ window 3,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 10.7 "Ancient Double" sync / 1[56]:[^:]*:Hades:47A5:/ window 11,0
 19.8 "Shadow Spread" sync / 1[56]:[^:]*:Hades:47A9:/
 22.8 "Shadow Spread" sync / 1[56]:[^:]*:Hades:47AA:/
diff --git a/ui/raidboss/data/05-shb/trial/hades.txt b/ui/raidboss/data/05-shb/trial/hades.txt
index d80b94ebe9..1c5dd20a3b 100644
--- a/ui/raidboss/data/05-shb/trial/hades.txt
+++ b/ui/raidboss/data/05-shb/trial/hades.txt
@@ -5,10 +5,8 @@ hideall "--Reset--"
 hideall "--sync--"
 hideall "Double"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # Phase 1: Everybody Murdered By Circles
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 1.5 "--sync--" sync / 1[56]:[^:]*:Hades:368:/ window 2,0
 15.5 "Ravenous Assault" sync / 1[56]:[^:]*:Hades:4158:/ window 16,5
 25.9 "Bad Faith" sync / 1[56]:[^:]*:Hades:414[9A]:/
diff --git a/ui/raidboss/data/05-shb/trial/innocence-ex.txt b/ui/raidboss/data/05-shb/trial/innocence-ex.txt
index 8cfaf7c008..2bfded04a9 100644
--- a/ui/raidboss/data/05-shb/trial/innocence-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/innocence-ex.txt
@@ -7,13 +7,9 @@ hideall "--sync--"
 hideall "Holy Trinity"
 hideall "Soul And Body"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-
 ### Phase 1
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.0 "--sync--" sync / 1[56]:[^:]*:Innocence:3ECA:/ window 2,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 17.0 "Shadowreaver" sync / 1[56]:[^:]*:Innocence:3EEA:/ window 20,5
 28.0 "Winged Rep Tethers" sync / 1[56]:[^:]*:Innocence:40BD:/
 37.0 "Duel Descent" sync / 1[56]:[^:]*:Nail of Condemnation:3EA9:/
diff --git a/ui/raidboss/data/05-shb/trial/innocence.txt b/ui/raidboss/data/05-shb/trial/innocence.txt
index 62cbbd0f60..b4c0a4948e 100644
--- a/ui/raidboss/data/05-shb/trial/innocence.txt
+++ b/ui/raidboss/data/05-shb/trial/innocence.txt
@@ -4,12 +4,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.0 "--sync--" sync / 1[56]:[^:]*:Innocence:3E90:/ window 1,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 15.0 "Realmrazer" sync / 1[56]:[^:]*:Innocence:3E9A:/ window 15,5
 28.2 "Heavenly Host" sync / 1[56]:[^:]*:Innocence:3E95:/
 54.9 "Daybreak" sync / 1[56]:[^:]*:Innocence:3E9D:/
diff --git a/ui/raidboss/data/05-shb/trial/levi-un.txt b/ui/raidboss/data/05-shb/trial/levi-un.txt
index 02974aff35..ac4d1f2cbb 100644
--- a/ui/raidboss/data/05-shb/trial/levi-un.txt
+++ b/ui/raidboss/data/05-shb/trial/levi-un.txt
@@ -35,12 +35,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: Literally Just Autos (100% -> 90%)
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.7 "--sync--" sync / 1[56]:[^:]*:Leviathan:5CC8:/ window 3,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 25.8 "--untargetable--" sync / 22:........:Leviathan:........:Leviathan:00/ window 30,10
 
 ### Phase 2: One Set of Orbs (90% -> 50%?)
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 7627133f60..c8131731cb 100644
--- a/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/ruby_weapon-ex.txt
@@ -3,12 +3,13 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1
 # -p 4ABE:14.5
 # -ii 4B2F 4D05 4ACD 4ACE 4ADA 4E6C 4AE9 4AE8 4E6B 4AEA 4AE8 4A6E 4ADE 4E6E 4AE2 4A98 4AE6 4E70 4B06 4B07 4B08 4B0D 4D0D 4AD9 4AE0 4AE4 4D04 4D57 4ADC 4E79 4BCF 4E77 4AD7 4AE7 4ADD 4E6D  4E6F 4AE5 4AE1
 
+# Use autos instead of InCombat lines to start timelines for each phase
+# as timeline resets out of combat.
+
 0 "Start"
 2.0 "--sync--" sync / 1[56]:[^:]*:The Ruby Weapon:368:/ window 3,0
 14.5 "Optimized Ultima" sync / 1[56]:[^:]*:The Ruby Weapon:4ABE:/ window 15,5
diff --git a/ui/raidboss/data/05-shb/trial/ruby_weapon.txt b/ui/raidboss/data/05-shb/trial/ruby_weapon.txt
index 4259f81c13..da2924f111 100644
--- a/ui/raidboss/data/05-shb/trial/ruby_weapon.txt
+++ b/ui/raidboss/data/05-shb/trial/ruby_weapon.txt
@@ -5,7 +5,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
+# Use autos/unique syncs instead of InCombat lines to start timelines for each phase
+# as timeline resets out of combat.
 
 ### Phase 1
 # -p 4AC7:16
diff --git a/ui/raidboss/data/05-shb/trial/shiva-un.txt b/ui/raidboss/data/05-shb/trial/shiva-un.txt
index 18e0357fd0..2e8317d020 100644
--- a/ui/raidboss/data/05-shb/trial/shiva-un.txt
+++ b/ui/raidboss/data/05-shb/trial/shiva-un.txt
@@ -26,10 +26,8 @@
 hideall "--sync--"
 hideall "--Reset--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 # Phase 1: Literally Just Autos (100% -> 95%)
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 2.0 "--sync--" sync / 1[56]:[^:]*:Shiva:5365:/ window 10,10
 
 # jump to staff
diff --git a/ui/raidboss/data/05-shb/trial/titan-un.txt b/ui/raidboss/data/05-shb/trial/titan-un.txt
index b114ebaf5a..14f988ba3d 100644
--- a/ui/raidboss/data/05-shb/trial/titan-un.txt
+++ b/ui/raidboss/data/05-shb/trial/titan-un.txt
@@ -8,11 +8,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: 100->85%
 0.0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 
 10.0 "Landslide" sync / 1[56]:[^:]*:Titan:58FA:/ window 10,10
 18.7 "Weight Of The Land" sync / 1[56]:[^:]*:Titan:58FE:/ window 20,5
diff --git a/ui/raidboss/data/05-shb/trial/titania-ex.txt b/ui/raidboss/data/05-shb/trial/titania-ex.txt
index e31877a6b9..0479298919 100644
--- a/ui/raidboss/data/05-shb/trial/titania-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/titania-ex.txt
@@ -5,13 +5,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
-
 ### Phase 1: single mechanics
-0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-1.5 "--sync--" sync / 1[56]:[^:]*:Titania:366:/ window 2,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.0 "Bright Sabbath" sync / 1[56]:[^:]*:Titania:3D4B:/ window 15,5
 26.0 "Phantom Rune Out" sync / 1[56]:[^:]*:Titania:3D4C:/
 37.0 "Mist Rune" sync / 1[56]:[^:]*:Titania:3D45:/
diff --git a/ui/raidboss/data/05-shb/trial/titania.txt b/ui/raidboss/data/05-shb/trial/titania.txt
index 3dcfb2ffd3..c856d91b94 100644
--- a/ui/raidboss/data/05-shb/trial/titania.txt
+++ b/ui/raidboss/data/05-shb/trial/titania.txt
@@ -4,12 +4,8 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1
-0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-2.5 "--sync--" sync / 1[56]:[^:]*:Titania:368:/ window 3,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 12.5 "Bright Sabbath" sync / 1[56]:[^:]*:Titania:3D5C:/ window 13,5
 26.7 "Phantom Rune" sync / 1[56]:[^:]*:Titania:3D5[DE]:/
 37.9 "Divination Rune" sync / 1[56]:[^:]*:Titania:3D5B:/
diff --git a/ui/raidboss/data/05-shb/trial/varis-ex.txt b/ui/raidboss/data/05-shb/trial/varis-ex.txt
index 1095f69e55..ef66c677c8 100644
--- a/ui/raidboss/data/05-shb/trial/varis-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/varis-ex.txt
@@ -8,9 +8,7 @@ hideall "--sync--"
 0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
 
 ### Phase 1
-0 "Start!"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-0.9 "--sync--" sync / 1[56]:[^:]*:Varis Yae Galvus:4CEF:/ window 1,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 19.0 "Altius" sync / 1[56]:[^:]*:Varis Yae Galvus:4CCA:/ window 19,5
 28.5 "Alea Iacta Est" sync / 1[56]:[^:]*:Varis Yae Galvus:4CD2:/
 29.7 "--sync--" sync / 1[56]:[^:]*:Varis Yae Galvus:4CD3:/
diff --git a/ui/raidboss/data/05-shb/trial/wol-ex.txt b/ui/raidboss/data/05-shb/trial/wol-ex.txt
index 553cf1822d..4440720939 100644
--- a/ui/raidboss/data/05-shb/trial/wol-ex.txt
+++ b/ui/raidboss/data/05-shb/trial/wol-ex.txt
@@ -25,11 +25,8 @@ hideall "--sync--"
 hideall "--Reset--"
 hideall "Limit Break"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: Warmup
-0.0 "--sync--" sync /:Engage!/ window 0,1
-3.0 "--sync--" sync / 1[56]:[^:]*:Warrior Of Light:5459:/ window 3,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 9.7 "Terror Unleashed" sync / 1[56]:[^:]*:Warrior Of Light:4F09:/ window 20,20
 15.8 "To The Limit 3" sync / 1[56]:[^:]*:Warrior Of Light:4F36:/
 27.6 "Solemn Confiteor" sync / 1[56]:[^:]*:Warrior Of Light:4F0C:/
diff --git a/ui/raidboss/data/05-shb/trial/wol.txt b/ui/raidboss/data/05-shb/trial/wol.txt
index 286cedfd38..274a9588de 100644
--- a/ui/raidboss/data/05-shb/trial/wol.txt
+++ b/ui/raidboss/data/05-shb/trial/wol.txt
@@ -6,10 +6,9 @@
 hideall "--sync--"
 hideall "--Reset--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: 100%->50%
 # Note: Don't sync on engage or auto here because there's a checkpoint.
+
 0.0 "Start"
 5.2 "--sync--" sync / 1[56]:[^:]*:Warrior Of Light:4F45:/ window 20,20 jump 475.4
 6.3 "--sync--" sync / 14:[^:]*:Warrior Of Light:4F27:/ window 10,10
@@ -55,7 +54,7 @@ hideall "--Reset--"
 475.4 "--middle--" sync / 1[56]:[^:]*:Warrior Of Light:4F45:/
 480.8 "Imbued Fire/Blizzard" sync / 1[56]:[^:]*:Warrior Of Light:4F1[23]:/
 
-490.0 "Specter Of Light" sync / 1[56]:[^:]*:Warrior Of Light:4F37:/ window 350,10
+490.0 "Specter Of Light" sync / 1[56]:[^:]*:Warrior Of Light:4F37:/ window 491,10
 500.4 "Twincast" sync / 1[56]:[^:]*:Spectral Black Mage:4F3D:/
 515.0 "Meteor Impact 1" #sync / 1[56]:[^:]*:Spectral Black Mage:4F21:/
 518.0 "Meteor Impact 2" #sync / 1[56]:[^:]*:Spectral Black Mage:4F21:/
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 2ef43fea7b..53cbb3b176 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
@@ -5,12 +5,9 @@
 hideall "--Reset--"
 hideall "--sync--"
 
-0.0 "--Reset--" sync / 21:........:4000000F:/ window 100000 jump 0
-
 ### Phase 1: Living Liquid
 0 "Start"
-0.0 "--sync--" sync /:Engage!/ window 0,1
-3.2 "--sync--" sync / 1[56]:[^:]*:Living Liquid:4978:/ window 5,0
+0.0 "--sync--" sync / 104:[^:]*:1($|:)/ window 0,1
 11.4 "Fluid Swing" sync / 1[56]:[^:]*:Living Liquid:49B0:/ window 10,2.5
 19.5 "Cascade" sync / 1[56]:[^:]*:Living Liquid:4826:/
 35.8 "Hand of Prayer/Parting" sync / 1[56]:[^:]*:Liquid Hand:482[BC]:/