diff --git a/docs/fencing/FRA.ics b/docs/fencing/FRA.ics
index b96c47c77..14e16c862 100644
--- a/docs/fencing/FRA.ics
+++ b/docs/fencing/FRA.ics
@@ -117,8 +117,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -127,8 +127,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/fencing/general.ics b/docs/fencing/general.ics
index c2f073fa0..0601d282f 100644
--- a/docs/fencing/general.ics
+++ b/docs/fencing/general.ics
@@ -62,8 +62,7 @@ UID:20240727T085000Z-fencing-WOMENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240727T085000Z
 DTSTART:20240727T085000Z
 DTEND:20240727T091500Z
-DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇭🇰 KONG Man
-  Wai Vivian
+DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇨🇳 SUN Yiwen
 SUMMARY:🤺 Women's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -72,7 +71,8 @@ UID:20240727T085000Z-fencing-WOMENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240727T085000Z
 DTSTART:20240727T085000Z
 DTEND:20240727T091500Z
-DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇨🇳 SUN Yiwen
+DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇭🇰 KONG Man
+  Wai Vivian
 SUMMARY:🤺 Women's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -832,8 +832,7 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
-  KOCH
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -842,7 +841,8 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
+  KOCH
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1347,8 +1347,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1357,8 +1357,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1457,8 +1457,8 @@ UID:20240729T094000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T094000Z
 DTSTART:20240729T094000Z
 DTEND:20240729T100500Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇯🇵 EMURA
-  Misaki
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇪🇸 Lucia
+  MARTIN-PORTUGUES
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1467,8 +1467,8 @@ UID:20240729T094000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T094000Z
 DTSTART:20240729T094000Z
 DTEND:20240729T100500Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇪🇸 Lucia
-  MARTIN-PORTUGUES
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇯🇵 EMURA
+  Misaki
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1495,6 +1495,15 @@ UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
 DTEND:20240729T103500Z
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇪🇬 Mohamed HAMZA
+SUMMARY:🤺 Men's Foil Individual Table of 32
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
+DTSTAMP:20240729T100500Z
+DTSTART:20240729T100500Z
+DTEND:20240729T103500Z
 DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇮🇹 Tommaso
   MARINI
 SUMMARY:🤺 Men's Foil Individual Table of 32
@@ -1510,15 +1519,6 @@ SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
-DTSTAMP:20240729T100500Z
-DTSTART:20240729T100500Z
-DTEND:20240729T103500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇪🇬 Mohamed HAMZA
-SUMMARY:🤺 Men's Foil Individual Table of 32
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32-POL-CZE
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
@@ -1604,7 +1604,8 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
+  Long
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1613,8 +1614,7 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
-  Long
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
diff --git a/docs/general/ARG.ics b/docs/general/ARG.ics
index 59b9826d3..99434f59b 100644
--- a/docs/general/ARG.ics
+++ b/docs/general/ARG.ics
@@ -111,22 +111,6 @@ SUMMARY:🤺 Pascual Maria di TELLA 🇦🇷 - 🇨🇦 Francois CAUCHON
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-SINGLES-FIRST-ROUND-ARG-POR
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -416,6 +400,22 @@ SUMMARY:🏓 Alexis LEBRUN 🇫🇷 - 🇦🇷 Santiago LORENZO
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T104500Z-hockey-MENS-POOL-B-IND-ARG
 DTSTAMP:20240729T104500Z
 DTSTART:20240729T104500Z
diff --git a/docs/general/AUS.ics b/docs/general/AUS.ics
index 21e68cea3..1cc4c0847 100644
--- a/docs/general/AUS.ics
+++ b/docs/general/AUS.ics
@@ -186,22 +186,6 @@ SUMMARY:🏊 Women's Synchronised 3m Springboard Final
 LOCATION:Aquatics Centre
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-SINGLES-FIRST-ROUND
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -822,6 +806,22 @@ SUMMARY:🥊 Women's 60kg - Preliminaries - Round of 16
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-64-AUS-BRA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/general/BRA.ics b/docs/general/BRA.ics
index 64ad67506..704c640a7 100644
--- a/docs/general/BRA.ics
+++ b/docs/general/BRA.ics
@@ -169,22 +169,6 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-WOMENS-DOUBLES-FIRST-ROUND-CHN-BRA
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -730,6 +714,22 @@ SUMMARY:🥋 Women -57 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-64-AUS-BRA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
diff --git a/docs/general/CAN.ics b/docs/general/CAN.ics
index 1a108e3b3..b399522f3 100644
--- a/docs/general/CAN.ics
+++ b/docs/general/CAN.ics
@@ -160,22 +160,6 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-SINGLES-FIRST-ROUND-CAN-USA
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -690,6 +674,22 @@ SUMMARY:🥊 Men's 63.5kg - Preliminaries - Round of 16
 LOCATION:North Paris Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T101500Z-sailing-WOMENS-SKIFF-RACE-4
 DTSTAMP:20240729T101500Z
 DTSTART:20240729T101500Z
diff --git a/docs/general/CHN.ics b/docs/general/CHN.ics
index 6414c2dd8..8e0001e97 100644
--- a/docs/general/CHN.ics
+++ b/docs/general/CHN.ics
@@ -182,6 +182,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH-CHN
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Gold Medal Match
+SUMMARY:🔫 China 1 🇨🇳 - 🇰🇷 Korea 1
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T085000Z-fencing-WOMENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240727T085000Z
 DTSTART:20240727T085000Z
diff --git a/docs/general/COL.ics b/docs/general/COL.ics
index 7cfaaea14..44e0af7e7 100644
--- a/docs/general/COL.ics
+++ b/docs/general/COL.ics
@@ -90,22 +90,6 @@ SUMMARY:🥋 LIN Chen-Hao 🇹🇼 - 🇨🇴 Erika LASSO
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-WOMENS-SINGLES-FIRST-ROUND-LAT-COL
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -151,6 +135,22 @@ SUMMARY:🏹 COL 🇨🇴 - 🇹🇷 TUR
 LOCATION:Invalides
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T180000Z-boxing-WOMENS-60KG-PRELIMINARIES-ROUND-OF-16
 DTSTAMP:20240729T180000Z
 DTSTART:20240729T180000Z
diff --git a/docs/general/FRA.ics b/docs/general/FRA.ics
index 5546ae2dd..ed553aef6 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -248,22 +248,6 @@ SUMMARY:🤺 Renata KNAPIK-MIAZGA 🇵🇱 - 🇫🇷 Coraline VITALIS
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-DOUBLES-FIRST-ROUND-BEL-FRA
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -1187,8 +1171,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1197,8 +1181,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1250,6 +1234,22 @@ SUMMARY:🥋 Women -57 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
diff --git a/docs/general/GER.ics b/docs/general/GER.ics
index 9cb451d08..e545c80b6 100644
--- a/docs/general/GER.ics
+++ b/docs/general/GER.ics
@@ -175,6 +175,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH-K
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Bronze Medal Match
+SUMMARY:🔫 Kazakhstan 1 🇰🇿 - 🇩🇪 Germany
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T085400Z-judo-WOMEN-48-KG-ELIMINATION-ROUND-OF-32-POR-GER
 DTSTAMP:20240727T085400Z
 DTSTART:20240727T085400Z
diff --git a/docs/general/JPN.ics b/docs/general/JPN.ics
index bb47cc2b1..ff2261195 100644
--- a/docs/general/JPN.ics
+++ b/docs/general/JPN.ics
@@ -227,22 +227,6 @@ SUMMARY:🥋 Men -60 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-SINGLES-FIRST-ROUND-GBR-JPN
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -913,6 +897,22 @@ SUMMARY:🥋 Men -73 kg Elimination Round of 16
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T101500Z-sailing-WOMENS-SKIFF-RACE-4
 DTSTAMP:20240729T101500Z
 DTSTART:20240729T101500Z
diff --git a/docs/general/KAZ.ics b/docs/general/KAZ.ics
index 91f5cdb50..c76480d0a 100644
--- a/docs/general/KAZ.ics
+++ b/docs/general/KAZ.ics
@@ -86,6 +86,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH-K
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Bronze Medal Match
+SUMMARY:🔫 Kazakhstan 1 🇰🇿 - 🇩🇪 Germany
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T090600Z-judo-WOMEN-48-KG-ELIMINATION-ROUND-OF-32-KAZ-ISR
 DTSTAMP:20240727T090600Z
 DTSTART:20240727T090600Z
diff --git a/docs/general/KOR.ics b/docs/general/KOR.ics
index 32dd190f0..919873f27 100644
--- a/docs/general/KOR.ics
+++ b/docs/general/KOR.ics
@@ -134,6 +134,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH-CHN
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Gold Medal Match
+SUMMARY:🔫 China 1 🇨🇳 - 🇰🇷 Korea 1
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T084800Z-judo-MEN-60-KG-ELIMINATION-ROUND-OF-32-ZAM-KOR
 DTSTAMP:20240727T084800Z
 DTSTART:20240727T084800Z
diff --git a/docs/general/POR.ics b/docs/general/POR.ics
index e0d1a5eb5..53cc48f4f 100644
--- a/docs/general/POR.ics
+++ b/docs/general/POR.ics
@@ -52,22 +52,6 @@ SUMMARY:🥋 Catarina COSTA 🇵🇹 - 🇩🇪 Katharina MENZ
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-SINGLES-FIRST-ROUND-ARG-POR
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -144,6 +128,22 @@ SUMMARY:🏓 Tiago APOLONIA 🇵🇹 - 🇩🇪 Dang QIU
 LOCATION:South Paris Arena 4
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T110000Z-table-tennis-MENS-SINGLES-ROUND-OF-64-DEN-POR
 DTSTAMP:20240729T110000Z
 DTSTART:20240729T110000Z
diff --git a/docs/general/RSA.ics b/docs/general/RSA.ics
index cd0ae4c95..d615326da 100644
--- a/docs/general/RSA.ics
+++ b/docs/general/RSA.ics
@@ -117,22 +117,6 @@ SUMMARY:🥋 Jacqueline SOLIS 🇬🇹 - 🇿🇦 Geronay WHITEBOOI
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T104500Z-hockey-MENS-POOL-A-NED-RSA
 DTSTAMP:20240727T104500Z
 DTSTART:20240727T104500Z
@@ -251,6 +235,22 @@ SUMMARY:🏑 RSA 🇿🇦 - 🇬🇧 GBR
 LOCATION:Yves-du-Manoir Stadium
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T120000Z-rugby-sevens-WOMENS-POOL-B-GBR-RSA
 DTSTAMP:20240729T120000Z
 DTSTART:20240729T120000Z
diff --git a/docs/general/SVK.ics b/docs/general/SVK.ics
index 72c31392d..6cf0f4b20 100644
--- a/docs/general/SVK.ics
+++ b/docs/general/SVK.ics
@@ -63,22 +63,6 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-WOMENS-SINGLES-FIRST-ROUND-SVK-GBR
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -298,6 +282,22 @@ SUMMARY:🔫 Trap Men's Qualification - Day 1
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T140100Z-sailing-MENS-WINDSURFING-RACE-5
 DTSTAMP:20240729T140100Z
 DTSTART:20240729T140100Z
diff --git a/docs/general/USA.ics b/docs/general/USA.ics
index 364872bd1..802ad7011 100644
--- a/docs/general/USA.ics
+++ b/docs/general/USA.ics
@@ -237,22 +237,6 @@ SUMMARY:🤺 Rossella FIAMINGO 🇮🇹 - 🇺🇸 Anne CEBULA
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-SINGLES-FIRST-ROUND-CAN-USA
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -1144,6 +1128,22 @@ SUMMARY:🥋 Jack YONEZUKA 🇺🇸 - 🇲🇩 Adil OSMANOV
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T101500Z-sailing-WOMENS-SKIFF-RACE-4
 DTSTAMP:20240729T101500Z
 DTSTART:20240729T101500Z
diff --git a/docs/general/general.ics b/docs/general/general.ics
index cc9eb2805..0658cf9e9 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -868,21 +868,21 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH-K
 DTSTAMP:20240727T083000Z
 DTSTART:20240727T083000Z
 DTEND:20240727T085000Z
 DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Bronze Medal Match
-SUMMARY:🔫 10m Air Rifle Mixed Team Bronze Medal Match
+SUMMARY:🔫 Kazakhstan 1 🇰🇿 - 🇩🇪 Germany
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH-CHN
 DTSTAMP:20240727T083000Z
 DTSTART:20240727T083000Z
 DTEND:20240727T085000Z
 DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Gold Medal Match
-SUMMARY:🔫 10m Air Rifle Mixed Team Gold Medal Match
+SUMMARY:🔫 China 1 🇨🇳 - 🇰🇷 Korea 1
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
@@ -944,8 +944,7 @@ UID:20240727T085000Z-fencing-WOMENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240727T085000Z
 DTSTART:20240727T085000Z
 DTEND:20240727T091500Z
-DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇭🇰 KONG Man
-  Wai Vivian
+DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇨🇳 SUN Yiwen
 SUMMARY:🤺 Women's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -954,7 +953,8 @@ UID:20240727T085000Z-fencing-WOMENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240727T085000Z
 DTSTART:20240727T085000Z
 DTEND:20240727T091500Z
-DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇨🇳 SUN Yiwen
+DESCRIPTION:Fencing - Women's Épée Individual Table of 32\n🇭🇰 KONG Man
+  Wai Vivian
 SUMMARY:🤺 Women's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -1386,22 +1386,6 @@ SUMMARY:🚣 Women's Double Sculls Heats
 LOCATION:Nautical St - Flat water
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T100000Z-tennis-MENS-DOUBLES-FIRST-ROUND-BEL-FRA
 DTSTAMP:20240727T100000Z
 DTSTART:20240727T100000Z
@@ -2941,15 +2925,6 @@ SUMMARY:🏉 SAM 🇼🇸 - 🇰🇪 KEN
 LOCATION:Stade de France
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T150000Z-skateboarding-MENS-STREET-FINAL
-DTSTAMP:20240727T150000Z
-DTSTART:20240727T150000Z
-DTEND:20240727T163000Z
-DESCRIPTION:Skateboarding - Men's Street Final
-SUMMARY:🛹 Men's Street Final
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240727T150000Z-volleyball-MENS-PRELIMINARY-ROUND-POOL-B-POL-EGY
 DTSTAMP:20240727T150000Z
 DTSTART:20240727T150000Z
@@ -5307,8 +5282,7 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
-  KOCH
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -5317,7 +5291,8 @@ UID:20240728T102500Z-fencing-MENS-PE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240728T102500Z
 DTSTART:20240728T102500Z
 DTEND:20240728T105000Z
-DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇫🇷 Yannick BOREL
+DESCRIPTION:Fencing - Men's Épée Individual Table of 32\n🇭🇺 Mate Tamas
+  KOCH
 SUMMARY:🤺 Men's Épée Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -7787,8 +7762,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
-  BALZER
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
+  APITHY-BRUNET
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -7797,8 +7772,8 @@ UID:20240729T082500Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T082500Z
 DTSTART:20240729T082500Z
 DTEND:20240729T085000Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Manon
-  APITHY-BRUNET
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇫🇷 Sara
+  BALZER
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -8353,8 +8328,8 @@ UID:20240729T094000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T094000Z
 DTSTART:20240729T094000Z
 DTEND:20240729T100500Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇯🇵 EMURA
-  Misaki
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇪🇸 Lucia
+  MARTIN-PORTUGUES
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -8363,8 +8338,8 @@ UID:20240729T094000Z-fencing-WOMENS-SABRE-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T094000Z
 DTSTART:20240729T094000Z
 DTEND:20240729T100500Z
-DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇪🇸 Lucia
-  MARTIN-PORTUGUES
+DESCRIPTION:Fencing - Women's Sabre Individual Table of 32\n🇯🇵 EMURA
+  Misaki
 SUMMARY:🤺 Women's Sabre Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -8506,6 +8481,22 @@ SUMMARY:🔫 10m Air Rifle Men's Final
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T100000Z-table-tennis-MENS-SINGLES-ROUND-OF-64-AUS-BRA
 DTSTAMP:20240729T100000Z
 DTSTART:20240729T100000Z
@@ -8604,6 +8595,15 @@ UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
 DTEND:20240729T103500Z
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇪🇬 Mohamed HAMZA
+SUMMARY:🤺 Men's Foil Individual Table of 32
+LOCATION:Grand Palais
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
+DTSTAMP:20240729T100500Z
+DTSTART:20240729T100500Z
+DTEND:20240729T103500Z
 DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇮🇹 Tommaso
   MARINI
 SUMMARY:🤺 Men's Foil Individual Table of 32
@@ -8619,15 +8619,6 @@ SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
 BEGIN:VEVENT
-UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
-DTSTAMP:20240729T100500Z
-DTSTART:20240729T100500Z
-DTEND:20240729T103500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇪🇬 Mohamed HAMZA
-SUMMARY:🤺 Men's Foil Individual Table of 32
-LOCATION:Grand Palais
-END:VEVENT
-BEGIN:VEVENT
 UID:20240729T100500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32-POL-CZE
 DTSTAMP:20240729T100500Z
 DTSTART:20240729T100500Z
@@ -8916,7 +8907,8 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
+  Long
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -8925,8 +8917,7 @@ UID:20240729T113500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-32
 DTSTAMP:20240729T113500Z
 DTSTART:20240729T113500Z
 DTEND:20240729T120500Z
-DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇭🇰 CHEUNG Ka
-  Long
+DESCRIPTION:Fencing - Men's Foil Individual Table of 32\n🇺🇸 Nick ITKIN
 SUMMARY:🤺 Men's Foil Individual Table of 32
 LOCATION:Grand Palais
 END:VEVENT
@@ -9781,6 +9772,15 @@ SUMMARY:🥋 Women -57 kg Final
 LOCATION:Champ-de-Mars Arena
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T150000Z-skateboarding-MENS-STREET-FINAL
+DTSTAMP:20240729T150000Z
+DTSTART:20240729T150000Z
+DTEND:20240729T163000Z
+DESCRIPTION:Skateboarding - Men's Street Final
+SUMMARY:🛹 Men's Street Final
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240729T150000Z-table-tennis-MIXED-DOUBLES-SEMIFINAL
 DTSTAMP:20240729T150000Z
 DTSTART:20240729T150000Z
diff --git a/docs/shooting/CHN.ics b/docs/shooting/CHN.ics
index d5dca993e..ad73a07b6 100644
--- a/docs/shooting/CHN.ics
+++ b/docs/shooting/CHN.ics
@@ -39,6 +39,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH-CHN
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Gold Medal Match
+SUMMARY:🔫 China 1 🇨🇳 - 🇰🇷 Korea 1
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T103000Z-shooting-10M-AIR-PISTOL-WOMENS-QUALIFICATION
 DTSTAMP:20240727T103000Z
 DTSTART:20240727T103000Z
diff --git a/docs/shooting/GER.ics b/docs/shooting/GER.ics
index 8fc4072b4..cfc99c25e 100644
--- a/docs/shooting/GER.ics
+++ b/docs/shooting/GER.ics
@@ -39,6 +39,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH-K
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Bronze Medal Match
+SUMMARY:🔫 Kazakhstan 1 🇰🇿 - 🇩🇪 Germany
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T103000Z-shooting-10M-AIR-PISTOL-WOMENS-QUALIFICATION
 DTSTAMP:20240727T103000Z
 DTSTART:20240727T103000Z
diff --git a/docs/shooting/KAZ.ics b/docs/shooting/KAZ.ics
index bd44d4cb1..3683b57ef 100644
--- a/docs/shooting/KAZ.ics
+++ b/docs/shooting/KAZ.ics
@@ -39,6 +39,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH-K
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Bronze Medal Match
+SUMMARY:🔫 Kazakhstan 1 🇰🇿 - 🇩🇪 Germany
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T103000Z-shooting-10M-AIR-PISTOL-WOMENS-QUALIFICATION
 DTSTAMP:20240727T103000Z
 DTSTART:20240727T103000Z
diff --git a/docs/shooting/KOR.ics b/docs/shooting/KOR.ics
index bdf66dd8f..44884eae1 100644
--- a/docs/shooting/KOR.ics
+++ b/docs/shooting/KOR.ics
@@ -39,6 +39,15 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH-CHN
+DTSTAMP:20240727T083000Z
+DTSTART:20240727T083000Z
+DTEND:20240727T085000Z
+DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Gold Medal Match
+SUMMARY:🔫 China 1 🇨🇳 - 🇰🇷 Korea 1
+LOCATION:Chateauroux Shooting Ctr
+END:VEVENT
+BEGIN:VEVENT
 UID:20240727T103000Z-shooting-10M-AIR-PISTOL-WOMENS-QUALIFICATION
 DTSTAMP:20240727T103000Z
 DTSTART:20240727T103000Z
diff --git a/docs/shooting/general.ics b/docs/shooting/general.ics
index 514fd3487..9f8d6f6e3 100644
--- a/docs/shooting/general.ics
+++ b/docs/shooting/general.ics
@@ -66,21 +66,21 @@ SUMMARY:🔫 10m Air Pistol Men's Qualification
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-BRONZE-MEDAL-MATCH-K
 DTSTAMP:20240727T083000Z
 DTSTART:20240727T083000Z
 DTEND:20240727T085000Z
 DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Bronze Medal Match
-SUMMARY:🔫 10m Air Rifle Mixed Team Bronze Medal Match
+SUMMARY:🔫 Kazakhstan 1 🇰🇿 - 🇩🇪 Germany
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
-UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH
+UID:20240727T083000Z-shooting-10M-AIR-RIFLE-MIXED-TEAM-GOLD-MEDAL-MATCH-CHN
 DTSTAMP:20240727T083000Z
 DTSTART:20240727T083000Z
 DTEND:20240727T085000Z
 DESCRIPTION:Shooting - 10m Air Rifle Mixed Team Gold Medal Match
-SUMMARY:🔫 10m Air Rifle Mixed Team Gold Medal Match
+SUMMARY:🔫 China 1 🇨🇳 - 🇰🇷 Korea 1
 LOCATION:Chateauroux Shooting Ctr
 END:VEVENT
 BEGIN:VEVENT
diff --git a/docs/skateboarding/ARG.ics b/docs/skateboarding/ARG.ics
index a08123af5..2e6799b34 100644
--- a/docs/skateboarding/ARG.ics
+++ b/docs/skateboarding/ARG.ics
@@ -4,10 +4,10 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/ARG//EN
 X-WR-CALNAME:🇦🇷 Argentina Skateboarding | Paris 2024
 NAME:🇦🇷 Argentina Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
 DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
   GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
   RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
diff --git a/docs/skateboarding/AUS.ics b/docs/skateboarding/AUS.ics
index 5385ac3e2..89fde0ba8 100644
--- a/docs/skateboarding/AUS.ics
+++ b/docs/skateboarding/AUS.ics
@@ -4,22 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/AUS//EN
 X-WR-CALNAME:🇦🇺 Australia Skateboarding | Paris 2024
 NAME:🇦🇺 Australia Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T100000Z-skateboarding-WOMENS-STREET-PRELIMS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
@@ -35,4 +19,20 @@ DESCRIPTION:Skateboarding - Women's Street Prelims\n🇯🇵 AKAMA Liz\n🇿🇦
 SUMMARY:🛹 Women's Street Prelims
 LOCATION:La Concorde 3
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/skateboarding/BRA.ics b/docs/skateboarding/BRA.ics
index 533c240ce..0850c51f9 100644
--- a/docs/skateboarding/BRA.ics
+++ b/docs/skateboarding/BRA.ics
@@ -4,22 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/BRA//EN
 X-WR-CALNAME:🇧🇷 Brazil Skateboarding | Paris 2024
 NAME:🇧🇷 Brazil Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T100000Z-skateboarding-WOMENS-STREET-PRELIMS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
@@ -35,4 +19,20 @@ DESCRIPTION:Skateboarding - Women's Street Prelims\n🇯🇵 AKAMA Liz\n🇿🇦
 SUMMARY:🛹 Women's Street Prelims
 LOCATION:La Concorde 3
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/skateboarding/CAN.ics b/docs/skateboarding/CAN.ics
index 4fd277aa3..6ac6c5e33 100644
--- a/docs/skateboarding/CAN.ics
+++ b/docs/skateboarding/CAN.ics
@@ -4,10 +4,10 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/CAN//EN
 X-WR-CALNAME:🇨🇦 Canada Skateboarding | Paris 2024
 NAME:🇨🇦 Canada Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
 DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
   GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
   RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
diff --git a/docs/skateboarding/COL.ics b/docs/skateboarding/COL.ics
index a17284f95..2abdc40ce 100644
--- a/docs/skateboarding/COL.ics
+++ b/docs/skateboarding/COL.ics
@@ -4,10 +4,10 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/COL//EN
 X-WR-CALNAME:🇨🇴 Colombia Skateboarding | Paris 2024
 NAME:🇨🇴 Colombia Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
 DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
   GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
   RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
diff --git a/docs/skateboarding/FRA.ics b/docs/skateboarding/FRA.ics
index a9ef5435d..56a19bf56 100644
--- a/docs/skateboarding/FRA.ics
+++ b/docs/skateboarding/FRA.ics
@@ -4,22 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/FRA//EN
 X-WR-CALNAME:🇫🇷 France Skateboarding | Paris 2024
 NAME:🇫🇷 France Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T100000Z-skateboarding-WOMENS-STREET-PRELIMS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
@@ -35,4 +19,20 @@ DESCRIPTION:Skateboarding - Women's Street Prelims\n🇯🇵 AKAMA Liz\n🇿🇦
 SUMMARY:🛹 Women's Street Prelims
 LOCATION:La Concorde 3
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/skateboarding/JPN.ics b/docs/skateboarding/JPN.ics
index e00ade4e2..3715f6b52 100644
--- a/docs/skateboarding/JPN.ics
+++ b/docs/skateboarding/JPN.ics
@@ -4,22 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/JPN//EN
 X-WR-CALNAME:🇯🇵 Japan Skateboarding | Paris 2024
 NAME:🇯🇵 Japan Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T100000Z-skateboarding-WOMENS-STREET-PRELIMS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
@@ -35,4 +19,20 @@ DESCRIPTION:Skateboarding - Women's Street Prelims\n🇯🇵 AKAMA Liz\n🇿🇦
 SUMMARY:🛹 Women's Street Prelims
 LOCATION:La Concorde 3
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/skateboarding/POR.ics b/docs/skateboarding/POR.ics
index b76c9458e..154d50a97 100644
--- a/docs/skateboarding/POR.ics
+++ b/docs/skateboarding/POR.ics
@@ -4,10 +4,10 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/POR//EN
 X-WR-CALNAME:🇵🇹 Portugal Skateboarding | Paris 2024
 NAME:🇵🇹 Portugal Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
 DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
   GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
   RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
diff --git a/docs/skateboarding/RSA.ics b/docs/skateboarding/RSA.ics
index 2f7b579a2..4dd274552 100644
--- a/docs/skateboarding/RSA.ics
+++ b/docs/skateboarding/RSA.ics
@@ -4,22 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/RSA//EN
 X-WR-CALNAME:🇿🇦 South Africa Skateboarding | Paris 2024
 NAME:🇿🇦 South Africa Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T100000Z-skateboarding-WOMENS-STREET-PRELIMS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
@@ -35,4 +19,20 @@ DESCRIPTION:Skateboarding - Women's Street Prelims\n🇯🇵 AKAMA Liz\n🇿🇦
 SUMMARY:🛹 Women's Street Prelims
 LOCATION:La Concorde 3
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/skateboarding/SVK.ics b/docs/skateboarding/SVK.ics
index e5363d1e0..82b39fb1d 100644
--- a/docs/skateboarding/SVK.ics
+++ b/docs/skateboarding/SVK.ics
@@ -4,10 +4,10 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/SVK//EN
 X-WR-CALNAME:🇸🇰 Slovakia Skateboarding | Paris 2024
 NAME:🇸🇰 Slovakia Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
 DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
   GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
   RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
diff --git a/docs/skateboarding/USA.ics b/docs/skateboarding/USA.ics
index 025097204..69b3c7d76 100644
--- a/docs/skateboarding/USA.ics
+++ b/docs/skateboarding/USA.ics
@@ -4,22 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/USA//EN
 X-WR-CALNAME:🇺🇸 United States Skateboarding | Paris 2024
 NAME:🇺🇸 United States Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T100000Z-skateboarding-WOMENS-STREET-PRELIMS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
@@ -35,4 +19,20 @@ DESCRIPTION:Skateboarding - Women's Street Prelims\n🇯🇵 AKAMA Liz\n🇿🇦
 SUMMARY:🛹 Women's Street Prelims
 LOCATION:La Concorde 3
 END:VEVENT
+BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
 END:VCALENDAR
\ No newline at end of file
diff --git a/docs/skateboarding/general.ics b/docs/skateboarding/general.ics
index ab2b75e58..95d823da3 100644
--- a/docs/skateboarding/general.ics
+++ b/docs/skateboarding/general.ics
@@ -4,31 +4,6 @@ PRODID:-//fabrice404//olympics-calendar//skateboarding/general//EN
 X-WR-CALNAME:🛹 Skateboarding | Paris 2024
 NAME:🛹 Skateboarding | Paris 2024
 BEGIN:VEVENT
-UID:20240727T100000Z-skateboarding-MENS-STREET-PRELIMS
-DTSTAMP:20240727T100000Z
-DTSTART:20240727T100000Z
-DTEND:20240727T135000Z
-DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
-  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
-  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
-  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
-  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
-  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
-  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
-  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
-SUMMARY:🛹 Men's Street Prelims
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
-UID:20240727T150000Z-skateboarding-MENS-STREET-FINAL
-DTSTAMP:20240727T150000Z
-DTSTART:20240727T150000Z
-DTEND:20240727T163000Z
-DESCRIPTION:Skateboarding - Men's Street Final
-SUMMARY:🛹 Men's Street Final
-LOCATION:La Concorde 3
-END:VEVENT
-BEGIN:VEVENT
 UID:20240728T100000Z-skateboarding-WOMENS-STREET-PRELIMS
 DTSTAMP:20240728T100000Z
 DTSTART:20240728T100000Z
@@ -54,6 +29,31 @@ SUMMARY:🛹 Women's Street Final
 LOCATION:La Concorde 3
 END:VEVENT
 BEGIN:VEVENT
+UID:20240729T100000Z-skateboarding-MENS-STREET-PRELIMS
+DTSTAMP:20240729T100000Z
+DTSTART:20240729T100000Z
+DTEND:20240729T135000Z
+DESCRIPTION:Skateboarding - Men's Street Prelims\n🇫🇷 Aurelien
+  GIRAUD\n🇿🇦 Brandon VALJALO\n🇺🇸 Chris JOSLIN\n🇨🇦 Cordano
+  RUSSELL\n🇧🇷 Felipe GUSTAVO\n🇧🇷 Giovanni VIANNA\n🇵🇹 Gustavo
+  RIBEIRO\n🇯🇵 HORIGOME Yuto\n🇺🇸 Jagger EATON\n🇨🇴 Jhancarlos
+  GONZALEZ\n🇫🇷 Joseph GARBACCIO\n🇧🇷 Kelvin HOEFLER\n🇦🇷 Matias DELL
+  OLIO\n🇨🇦 Matt BERGER\n🇦🇷 Mauro IGLESIAS\n🇺🇸 Nyjah HUSTON\n🇯🇵
+  ONODERA Ginwoo\n🇸🇰 Richard TURY\n🇨🇦 Ryan DECENZO\n🇯🇵 SHIRAI
+  Sora\n🇦🇺 Shane O'NEILL\n🇫🇷 Vincent MILOU
+SUMMARY:🛹 Men's Street Prelims
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
+UID:20240729T150000Z-skateboarding-MENS-STREET-FINAL
+DTSTAMP:20240729T150000Z
+DTSTART:20240729T150000Z
+DTEND:20240729T163000Z
+DESCRIPTION:Skateboarding - Men's Street Final
+SUMMARY:🛹 Men's Street Final
+LOCATION:La Concorde 3
+END:VEVENT
+BEGIN:VEVENT
 UID:20240806T103000Z-skateboarding-WOMENS-PARK-PRELIMS
 DTSTAMP:20240806T103000Z
 DTSTART:20240806T103000Z
diff --git a/docs/today.html b/docs/today.html
index 1076867ae..f5cf6f16b 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -588,7 +588,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T070000Z" data-end="20240727T073000Z" data-noc="GER,KOR,IND,KAZ,NOR,CHN,CHN,FRA,AUT,USA,FRA,USA,JPN,EGY,GBR,NOR,MGL,IND,POL,KAZ,POL,HUN,MEX,ARG,EGY,ITA,KOR,CZE">
+<div class="event py-4" data-start="20240727T070000Z" data-end="20240727T073000Z" data-noc="CHN,KOR,KAZ,GER,NOR,IND,MEX,CHN,FRA,POL,EGY,IND,USA,FRA,AUT,MGL,ITA,USA,ARG,HUN,NOR,KOR,POL,CZE,JPN,GBR,KAZ,EGY">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">SHOOTING</div>
@@ -645,7 +645,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T073000Z" data-end="20240727T163000Z" data-noc="GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,CHN,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
+<div class="event py-4" data-start="20240727T073000Z" data-end="20240727T163000Z" data-noc="GER,USA,AUS,CAN,IRL,SUI,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,CHN,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">EQUESTRIAN</div>
@@ -717,7 +717,7 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T073000Z" data-end="20240727T163000Z" data-noc="GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
+<div class="event py-4" data-start="20240727T073000Z" data-end="20240727T163000Z" data-noc="GER,USA,AUS,CAN,IRL,SUI,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">EQUESTRIAN</div>
@@ -958,19 +958,19 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T083000Z" data-end="20240727T085000Z" data-noc="">
+<div class="event py-4" data-start="20240727T083000Z" data-end="20240727T085000Z" data-noc="KAZ,GER">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">SHOOTING</div>
-   <div class="">10m Air Rifle Mixed Team Bronze Medal Match
+   <div class="">Kazakhstan 1 🇰🇿 - 🇩🇪 Germany
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T083000Z" data-end="20240727T085000Z" data-noc="">
+<div class="event py-4" data-start="20240727T083000Z" data-end="20240727T085000Z" data-noc="CHN,KOR">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">SHOOTING</div>
-   <div class="">10m Air Rifle Mixed Team Gold Medal Match
+   <div class="">China 1 🇨🇳 - 🇰🇷 Korea 1
    </div>
  </div>
 </div>
@@ -1022,15 +1022,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="HKG">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">FENCING</div>
-   <div class="">Women's Épée Individual Table of 32
-<div class="competitor HKG">🇭🇰 KONG Man Wai Vivian</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="CHN">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -1040,6 +1031,15 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="HKG">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">FENCING</div>
+   <div class="">Women's Épée Individual Table of 32
+<div class="competitor HKG">🇭🇰 KONG Man Wai Vivian</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="POL,ITA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -1424,36 +1424,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T100000Z" data-end="20240727T135000Z" data-noc="AUS,CAN,ARG,BRA,COL,ARG,USA,FRA,USA,JPN,RSA,FRA,JPN,BRA,POR,CAN,BRA,JPN,SVK,CAN,USA,FRA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">SKATEBOARDING</div>
-   <div class="">Men's Street Prelims
-<div class="competitor FRA">🇫🇷 Aurelien GIRAUD</div>
-<div class="competitor RSA">🇿🇦 Brandon VALJALO</div>
-<div class="competitor USA">🇺🇸 Chris JOSLIN</div>
-<div class="competitor CAN">🇨🇦 Cordano RUSSELL</div>
-<div class="competitor BRA">🇧🇷 Felipe GUSTAVO</div>
-<div class="competitor BRA">🇧🇷 Giovanni VIANNA</div>
-<div class="competitor POR">🇵🇹 Gustavo RIBEIRO</div>
-<div class="competitor JPN">🇯🇵 HORIGOME Yuto</div>
-<div class="competitor USA">🇺🇸 Jagger EATON</div>
-<div class="competitor COL">🇨🇴 Jhancarlos GONZALEZ</div>
-<div class="competitor FRA">🇫🇷 Joseph GARBACCIO</div>
-<div class="competitor BRA">🇧🇷 Kelvin HOEFLER</div>
-<div class="competitor ARG">🇦🇷 Matias DELL OLIO</div>
-<div class="competitor CAN">🇨🇦 Matt BERGER</div>
-<div class="competitor ARG">🇦🇷 Mauro IGLESIAS</div>
-<div class="competitor USA">🇺🇸 Nyjah HUSTON</div>
-<div class="competitor JPN">🇯🇵 ONODERA Ginwoo</div>
-<div class="competitor SVK">🇸🇰 Richard TURY</div>
-<div class="competitor CAN">🇨🇦 Ryan DECENZO</div>
-<div class="competitor JPN">🇯🇵 SHIRAI Sora</div>
-<div class="competitor AUS">🇦🇺 Shane O'NEILL</div>
-<div class="competitor FRA">🇫🇷 Vincent MILOU</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T100000Z" data-end="20240727T160000Z" data-noc="BEL,FRA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -2938,14 +2908,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T150000Z" data-end="20240727T163000Z" data-noc="">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">SKATEBOARDING</div>
-   <div class="">Men's Street Final
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240727T150000Z" data-end="20240727T171500Z" data-noc="POL,EGY">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -5224,15 +5186,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="HUN">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">FENCING</div>
-   <div class="">Men's Épée Individual Table of 32
-<div class="competitor HUN">🇭🇺 Mate Tamas KOCH</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="FRA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -5242,6 +5195,15 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="HUN">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">FENCING</div>
+   <div class="">Men's Épée Individual Table of 32
+<div class="competitor HUN">🇭🇺 Mate Tamas KOCH</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240728T102500Z" data-end="20240728T105000Z" data-noc="CZE,FRA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -7649,7 +7611,7 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
    <div class="">Women's Sabre Individual Table of 32
-<div class="competitor FRA">🇫🇷 Sara BALZER</div>
+<div class="competitor FRA">🇫🇷 Manon APITHY-BRUNET</div>
    </div>
  </div>
 </div>
@@ -7658,7 +7620,7 @@
  <div class="w-3/5 align-top inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
    <div class="">Women's Sabre Individual Table of 32
-<div class="competitor FRA">🇫🇷 Manon APITHY-BRUNET</div>
+<div class="competitor FRA">🇫🇷 Sara BALZER</div>
    </div>
  </div>
 </div>
@@ -8149,15 +8111,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="JPN">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">FENCING</div>
-   <div class="">Women's Sabre Individual Table of 32
-<div class="competitor JPN">🇯🇵 EMURA Misaki</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="ESP">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8167,6 +8120,15 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="JPN">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">FENCING</div>
+   <div class="">Women's Sabre Individual Table of 32
+<div class="competitor JPN">🇯🇵 EMURA Misaki</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="BUL,JPN">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8290,6 +8252,36 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T100000Z" data-end="20240729T135000Z" data-noc="AUS,CAN,ARG,BRA,COL,ARG,USA,FRA,USA,JPN,RSA,FRA,JPN,BRA,POR,CAN,BRA,JPN,SVK,CAN,USA,FRA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">SKATEBOARDING</div>
+   <div class="">Men's Street Prelims
+<div class="competitor FRA">🇫🇷 Aurelien GIRAUD</div>
+<div class="competitor RSA">🇿🇦 Brandon VALJALO</div>
+<div class="competitor USA">🇺🇸 Chris JOSLIN</div>
+<div class="competitor CAN">🇨🇦 Cordano RUSSELL</div>
+<div class="competitor BRA">🇧🇷 Felipe GUSTAVO</div>
+<div class="competitor BRA">🇧🇷 Giovanni VIANNA</div>
+<div class="competitor POR">🇵🇹 Gustavo RIBEIRO</div>
+<div class="competitor JPN">🇯🇵 HORIGOME Yuto</div>
+<div class="competitor USA">🇺🇸 Jagger EATON</div>
+<div class="competitor COL">🇨🇴 Jhancarlos GONZALEZ</div>
+<div class="competitor FRA">🇫🇷 Joseph GARBACCIO</div>
+<div class="competitor BRA">🇧🇷 Kelvin HOEFLER</div>
+<div class="competitor ARG">🇦🇷 Matias DELL OLIO</div>
+<div class="competitor CAN">🇨🇦 Matt BERGER</div>
+<div class="competitor ARG">🇦🇷 Mauro IGLESIAS</div>
+<div class="competitor USA">🇺🇸 Nyjah HUSTON</div>
+<div class="competitor JPN">🇯🇵 ONODERA Ginwoo</div>
+<div class="competitor SVK">🇸🇰 Richard TURY</div>
+<div class="competitor CAN">🇨🇦 Ryan DECENZO</div>
+<div class="competitor JPN">🇯🇵 SHIRAI Sora</div>
+<div class="competitor AUS">🇦🇺 Shane O'NEILL</div>
+<div class="competitor FRA">🇫🇷 Vincent MILOU</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T100000Z" data-end="20240729T110000Z" data-noc="AUS,BRA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8371,6 +8363,15 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="EGY">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">FENCING</div>
+   <div class="">Men's Foil Individual Table of 32
+<div class="competitor EGY">🇪🇬 Mohamed HAMZA</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="ITA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8389,15 +8390,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="EGY">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">FENCING</div>
-   <div class="">Men's Foil Individual Table of 32
-<div class="competitor EGY">🇪🇬 Mohamed HAMZA</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="POL,CZE">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8678,15 +8670,6 @@
    </div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="USA">
- <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 align-top inline-block text-black pl-2">
-   <div class="text-2xl">FENCING</div>
-   <div class="">Men's Foil Individual Table of 32
-<div class="competitor USA">🇺🇸 Nick ITKIN</div>
-   </div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="HKG">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -8696,6 +8679,15 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="USA">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">FENCING</div>
+   <div class="">Men's Foil Individual Table of 32
+<div class="competitor USA">🇺🇸 Nick ITKIN</div>
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="CIV,USA">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">
@@ -9596,6 +9588,14 @@
    </div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T150000Z" data-end="20240729T163000Z" data-noc="">
+ <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 align-top inline-block text-black pl-2">
+   <div class="text-2xl">SKATEBOARDING</div>
+   <div class="">Men's Street Final
+   </div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T150000Z" data-end="20240729T160000Z" data-noc="">
  <div class="time w-1/4 align-top text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 align-top inline-block text-black pl-2">