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 ea83cad98..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
@@ -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,15 +1495,6 @@ 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🇫🇷 Enzo LEFORT
-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
@@ -1519,6 +1510,15 @@ 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🇫🇷 Enzo LEFORT
+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/FRA.ics b/docs/general/FRA.ics
index 2fa642787..65dc3c7f9 100644
--- a/docs/general/FRA.ics
+++ b/docs/general/FRA.ics
@@ -1147,8 +1147,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
@@ -1157,8 +1157,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/general/general.ics b/docs/general/general.ics
index cbbda6eb9..f6ef62ea2 100644
--- a/docs/general/general.ics
+++ b/docs/general/general.ics
@@ -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
@@ -7771,8 +7771,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
@@ -7781,8 +7781,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
@@ -8337,8 +8337,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
@@ -8347,8 +8347,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
@@ -8588,15 +8588,6 @@ 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🇫🇷 Enzo LEFORT
-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
@@ -8612,6 +8603,15 @@ 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🇫🇷 Enzo LEFORT
+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
@@ -8900,7 +8900,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
@@ -8909,8 +8910,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/today.html b/docs/today.html
index b5eaaee2b..39121ef6d 100644
--- a/docs/today.html
+++ b/docs/today.html
@@ -685,14 +685,14 @@
    <div class="">WONG Ka Lee 🇭🇰 - 🇦🇹 Katharina TANZER</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="HKG">
+<div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="CHN">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
    <div class="">Women's Épée Individual Table of 32</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="CHN">
+<div class="event py-4" data-start="20240727T085000Z" data-end="20240727T091500Z" data-noc="HKG">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
@@ -6243,14 +6243,14 @@
    <div class="">Women -57 kg Elimination Round of 16</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="JPN">
+<div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="ESP">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
    <div class="">Women's Sabre Individual Table of 32</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="ESP">
+<div class="event py-4" data-start="20240729T094000Z" data-end="20240729T100500Z" data-noc="JPN">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
@@ -6432,13 +6432,6 @@
    <div class="">Ruslan ABDULLAEV 🇺🇿 - 🇲🇽 Miguel Angel MARTINEZ RAMIREZ</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="FRA">
- <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
- <div class="w-3/5 inline-block text-black pl-2">
-   <div class="text-2xl">FENCING</div>
-   <div class="">Men's Foil Individual Table of 32</div>
- </div>
-</div>
 <div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="EGY">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
@@ -6453,6 +6446,13 @@
    <div class="">Men's Foil Individual Table of 32</div>
  </div>
 </div>
+<div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="FRA">
+ <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
+ <div class="w-3/5 inline-block text-black pl-2">
+   <div class="text-2xl">FENCING</div>
+   <div class="">Men's Foil Individual Table of 32</div>
+ </div>
+</div>
 <div class="event py-4" data-start="20240729T100500Z" data-end="20240729T103500Z" data-noc="POL,CZE">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
@@ -6663,14 +6663,14 @@
    <div class="">GER 🇩🇪 - 🇧🇪 BEL</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="USA">
+<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="HKG">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>
    <div class="">Men's Foil Individual Table of 32</div>
  </div>
 </div>
-<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="HKG">
+<div class="event py-4" data-start="20240729T113500Z" data-end="20240729T120500Z" data-noc="USA">
  <div class="time w-1/4 text-right inline-block text-5xl text-center pr-2 border-r border-slate-900/10">__:__</div>
  <div class="w-3/5 inline-block text-black pl-2">
    <div class="text-2xl">FENCING</div>