diff --git a/src/assets/ta_servants/jalter.png b/src/assets/ta_servants/106.png
similarity index 100%
rename from src/assets/ta_servants/jalter.png
rename to src/assets/ta_servants/106.png
diff --git a/src/assets/ta_servants/sanzang.png b/src/assets/ta_servants/113.png
similarity index 100%
rename from src/assets/ta_servants/sanzang.png
rename to src/assets/ta_servants/113.png
diff --git a/src/assets/ta_servants/kintokirider.png b/src/assets/ta_servants/115.png
similarity index 100%
rename from src/assets/ta_servants/kintokirider.png
rename to src/assets/ta_servants/115.png
diff --git a/src/assets/ta_servants/ozymandias.png b/src/assets/ta_servants/118.png
similarity index 100%
rename from src/assets/ta_servants/ozymandias.png
rename to src/assets/ta_servants/118.png
diff --git a/src/assets/ta_servants/gilgamesh.png b/src/assets/ta_servants/12.png
similarity index 100%
rename from src/assets/ta_servants/gilgamesh.png
rename to src/assets/ta_servants/12.png
diff --git a/src/assets/ta_servants/bedivere.png b/src/assets/ta_servants/126.png
similarity index 100%
rename from src/assets/ta_servants/bedivere.png
rename to src/assets/ta_servants/126.png
diff --git a/src/assets/ta_servants/summertamamo.png b/src/assets/ta_servants/128.png
similarity index 100%
rename from src/assets/ta_servants/summertamamo.png
rename to src/assets/ta_servants/128.png
diff --git a/src/assets/ta_servants/summershishou.png b/src/assets/ta_servants/133.png
similarity index 100%
rename from src/assets/ta_servants/summershishou.png
rename to src/assets/ta_servants/133.png
diff --git a/src/assets/ta_servants/summerkiyohime.png b/src/assets/ta_servants/134.png
similarity index 100%
rename from src/assets/ta_servants/summerkiyohime.png
rename to src/assets/ta_servants/134.png
diff --git a/src/assets/ta_servants/illya.png b/src/assets/ta_servants/136.png
similarity index 100%
rename from src/assets/ta_servants/illya.png
rename to src/assets/ta_servants/136.png
diff --git a/src/assets/ta_servants/cleopatra.png b/src/assets/ta_servants/139.png
similarity index 100%
rename from src/assets/ta_servants/cleopatra.png
rename to src/assets/ta_servants/139.png
diff --git a/src/assets/ta_servants/janta.png b/src/assets/ta_servants/141.png
similarity index 100%
rename from src/assets/ta_servants/janta.png
rename to src/assets/ta_servants/141.png
diff --git a/src/assets/ta_servants/ishtar.png b/src/assets/ta_servants/142.png
similarity index 100%
rename from src/assets/ta_servants/ishtar.png
rename to src/assets/ta_servants/142.png
diff --git a/src/assets/ta_servants/enkidu.png b/src/assets/ta_servants/143.png
similarity index 100%
rename from src/assets/ta_servants/enkidu.png
rename to src/assets/ta_servants/143.png
diff --git a/src/assets/ta_servants/casgil.png b/src/assets/ta_servants/145.png
similarity index 100%
rename from src/assets/ta_servants/casgil.png
rename to src/assets/ta_servants/145.png
diff --git a/src/assets/ta_servants/taiga.png b/src/assets/ta_servants/148.png
similarity index 100%
rename from src/assets/ta_servants/taiga.png
rename to src/assets/ta_servants/148.png
diff --git a/src/assets/ta_servants/merlin.png b/src/assets/ta_servants/150.png
similarity index 100%
rename from src/assets/ta_servants/merlin.png
rename to src/assets/ta_servants/150.png
diff --git a/src/assets/ta_servants/musashi.png b/src/assets/ta_servants/153.png
similarity index 100%
rename from src/assets/ta_servants/musashi.png
rename to src/assets/ta_servants/153.png
diff --git a/src/assets/ta_servants/mhxa.png b/src/assets/ta_servants/155.png
similarity index 100%
rename from src/assets/ta_servants/mhxa.png
rename to src/assets/ta_servants/155.png
diff --git a/src/assets/ta_servants/arash.png b/src/assets/ta_servants/16.png
similarity index 100%
rename from src/assets/ta_servants/arash.png
rename to src/assets/ta_servants/16.png
diff --git a/src/assets/ta_servants/melt.png b/src/assets/ta_servants/163.png
similarity index 100%
rename from src/assets/ta_servants/melt.png
rename to src/assets/ta_servants/163.png
diff --git a/src/assets/ta_servants/suzuka.png b/src/assets/ta_servants/165.png
similarity index 100%
rename from src/assets/ta_servants/suzuka.png
rename to src/assets/ta_servants/165.png
diff --git a/src/assets/ta_servants/nerocaster.png b/src/assets/ta_servants/175.png
similarity index 100%
rename from src/assets/ta_servants/nerocaster.png
rename to src/assets/ta_servants/175.png
diff --git a/src/assets/ta_servants/riderishtar.png b/src/assets/ta_servants/182.png
similarity index 100%
rename from src/assets/ta_servants/riderishtar.png
rename to src/assets/ta_servants/182.png
diff --git a/src/assets/ta_servants/abby.png b/src/assets/ta_servants/195.png
similarity index 100%
rename from src/assets/ta_servants/abby.png
rename to src/assets/ta_servants/195.png
diff --git a/src/assets/ta_servants/ereshkigal.png b/src/assets/ta_servants/196.png
similarity index 100%
rename from src/assets/ta_servants/ereshkigal.png
rename to src/assets/ta_servants/196.png
diff --git a/src/assets/ta_servants/hokusai.png b/src/assets/ta_servants/198.png
similarity index 100%
rename from src/assets/ta_servants/hokusai.png
rename to src/assets/ta_servants/198.png
diff --git a/src/assets/ta_servants/artoria.png b/src/assets/ta_servants/2.png
similarity index 100%
rename from src/assets/ta_servants/artoria.png
rename to src/assets/ta_servants/2.png
diff --git a/src/assets/ta_servants/fujino.png b/src/assets/ta_servants/200.png
similarity index 100%
rename from src/assets/ta_servants/fujino.png
rename to src/assets/ta_servants/200.png
diff --git a/src/assets/ta_servants/anastasia.png b/src/assets/ta_servants/201.png
similarity index 100%
rename from src/assets/ta_servants/anastasia.png
rename to src/assets/ta_servants/201.png
diff --git a/src/assets/ta_servants/ivan.png b/src/assets/ta_servants/205.png
similarity index 100%
rename from src/assets/ta_servants/ivan.png
rename to src/assets/ta_servants/205.png
diff --git a/src/assets/ta_servants/okitaalter.png b/src/assets/ta_servants/209.png
similarity index 100%
rename from src/assets/ta_servants/okitaalter.png
rename to src/assets/ta_servants/209.png
diff --git a/src/assets/ta_servants/sigurd.png b/src/assets/ta_servants/213.png
similarity index 100%
rename from src/assets/ta_servants/sigurd.png
rename to src/assets/ta_servants/213.png
diff --git a/src/assets/ta_servants/skadi.png b/src/assets/ta_servants/215.png
similarity index 100%
rename from src/assets/ta_servants/skadi.png
rename to src/assets/ta_servants/215.png
diff --git a/src/assets/ta_servants/summerjeanne.png b/src/assets/ta_servants/216.png
similarity index 100%
rename from src/assets/ta_servants/summerjeanne.png
rename to src/assets/ta_servants/216.png
diff --git a/src/assets/ta_servants/jaltersummer.png b/src/assets/ta_servants/219.png
similarity index 100%
rename from src/assets/ta_servants/jaltersummer.png
rename to src/assets/ta_servants/219.png
diff --git a/src/assets/ta_servants/bbsummer.png b/src/assets/ta_servants/220.png
similarity index 100%
rename from src/assets/ta_servants/bbsummer.png
rename to src/assets/ta_servants/220.png
diff --git a/src/assets/ta_servants/sitonai.png b/src/assets/ta_servants/224.png
similarity index 100%
rename from src/assets/ta_servants/sitonai.png
rename to src/assets/ta_servants/224.png
diff --git a/src/assets/ta_servants/shutencaster.png b/src/assets/ta_servants/225.png
similarity index 100%
rename from src/assets/ta_servants/shutencaster.png
rename to src/assets/ta_servants/225.png
diff --git a/src/assets/ta_servants/xiangyu.png b/src/assets/ta_servants/226.png
similarity index 100%
rename from src/assets/ta_servants/xiangyu.png
rename to src/assets/ta_servants/226.png
diff --git a/src/assets/ta_servants/redhare.png b/src/assets/ta_servants/231.png
similarity index 100%
rename from src/assets/ta_servants/redhare.png
rename to src/assets/ta_servants/231.png
diff --git a/src/assets/ta_servants/bradamante.png b/src/assets/ta_servants/232.png
similarity index 100%
rename from src/assets/ta_servants/bradamante.png
rename to src/assets/ta_servants/232.png
diff --git a/src/assets/ta_servants/benienma.png b/src/assets/ta_servants/234.png
similarity index 100%
rename from src/assets/ta_servants/benienma.png
rename to src/assets/ta_servants/234.png
diff --git a/src/assets/ta_servants/oldli.png b/src/assets/ta_servants/235.png
similarity index 100%
rename from src/assets/ta_servants/oldli.png
rename to src/assets/ta_servants/235.png
diff --git a/src/assets/ta_servants/kingprotea.png b/src/assets/ta_servants/238.png
similarity index 100%
rename from src/assets/ta_servants/kingprotea.png
rename to src/assets/ta_servants/238.png
diff --git a/src/assets/ta_servants/kama.png b/src/assets/ta_servants/239.png
similarity index 100%
rename from src/assets/ta_servants/kama.png
rename to src/assets/ta_servants/239.png
diff --git a/src/assets/ta_servants/astrea.png b/src/assets/ta_servants/242.png
similarity index 100%
rename from src/assets/ta_servants/astrea.png
rename to src/assets/ta_servants/242.png
diff --git a/src/assets/ta_servants/arjunaalter.png b/src/assets/ta_servants/247.png
similarity index 100%
rename from src/assets/ta_servants/arjunaalter.png
rename to src/assets/ta_servants/247.png
diff --git a/src/assets/ta_servants/maounobu.png b/src/assets/ta_servants/250.png
similarity index 100%
rename from src/assets/ta_servants/maounobu.png
rename to src/assets/ta_servants/250.png
diff --git a/src/assets/ta_servants/kagetora.png b/src/assets/ta_servants/252.png
similarity index 100%
rename from src/assets/ta_servants/kagetora.png
rename to src/assets/ta_servants/252.png
diff --git a/src/assets/ta_servants/davincirider.png b/src/assets/ta_servants/253.png
similarity index 100%
rename from src/assets/ta_servants/davincirider.png
rename to src/assets/ta_servants/253.png
diff --git a/src/assets/ta_servants/gong.png b/src/assets/ta_servants/258.png
similarity index 100%
rename from src/assets/ta_servants/gong.png
rename to src/assets/ta_servants/258.png
diff --git a/src/assets/ta_servants/charlotte.png b/src/assets/ta_servants/259.png
similarity index 100%
rename from src/assets/ta_servants/charlotte.png
rename to src/assets/ta_servants/259.png
diff --git a/src/assets/ta_servants/summermusashi.png b/src/assets/ta_servants/261.png
similarity index 100%
rename from src/assets/ta_servants/summermusashi.png
rename to src/assets/ta_servants/261.png
diff --git a/src/assets/ta_servants/summerhokusai.png b/src/assets/ta_servants/264.png
similarity index 100%
rename from src/assets/ta_servants/summerhokusai.png
rename to src/assets/ta_servants/264.png
diff --git a/src/assets/ta_servants/meltlambda.png b/src/assets/ta_servants/266.png
similarity index 100%
rename from src/assets/ta_servants/meltlambda.png
rename to src/assets/ta_servants/266.png
diff --git a/src/assets/ta_servants/spaceishtar.png b/src/assets/ta_servants/268.png
similarity index 100%
rename from src/assets/ta_servants/spaceishtar.png
rename to src/assets/ta_servants/268.png
diff --git a/src/assets/ta_servants/yangguifei.png b/src/assets/ta_servants/275.png
similarity index 100%
rename from src/assets/ta_servants/yangguifei.png
rename to src/assets/ta_servants/275.png
diff --git a/src/assets/ta_servants/sei.png b/src/assets/ta_servants/276.png
similarity index 100%
rename from src/assets/ta_servants/sei.png
rename to src/assets/ta_servants/276.png
diff --git a/src/assets/ta_servants/odysseus.png b/src/assets/ta_servants/277.png
similarity index 100%
rename from src/assets/ta_servants/odysseus.png
rename to src/assets/ta_servants/277.png
diff --git a/src/assets/ta_servants/dioscuri.png b/src/assets/ta_servants/278.png
similarity index 100%
rename from src/assets/ta_servants/dioscuri.png
rename to src/assets/ta_servants/278.png
diff --git a/src/assets/ta_servants/romulus.png b/src/assets/ta_servants/280.png
similarity index 100%
rename from src/assets/ta_servants/romulus.png
rename to src/assets/ta_servants/280.png
diff --git a/src/assets/ta_servants/voyager.png b/src/assets/ta_servants/281.png
similarity index 100%
rename from src/assets/ta_servants/voyager.png
rename to src/assets/ta_servants/281.png
diff --git a/src/assets/ta_servants/koyo.png b/src/assets/ta_servants/282.png
similarity index 100%
rename from src/assets/ta_servants/koyo.png
rename to src/assets/ta_servants/282.png
diff --git a/src/assets/ta_servants/castoria.png b/src/assets/ta_servants/284.png
similarity index 100%
rename from src/assets/ta_servants/castoria.png
rename to src/assets/ta_servants/284.png
diff --git a/src/assets/ta_servants/kiarasummer.png b/src/assets/ta_servants/285.png
similarity index 100%
rename from src/assets/ta_servants/kiarasummer.png
rename to src/assets/ta_servants/285.png
diff --git a/src/assets/ta_servants/summerillya.png b/src/assets/ta_servants/286.png
similarity index 100%
rename from src/assets/ta_servants/summerillya.png
rename to src/assets/ta_servants/286.png
diff --git a/src/assets/ta_servants/summeryu.png b/src/assets/ta_servants/288.png
similarity index 100%
rename from src/assets/ta_servants/summeryu.png
rename to src/assets/ta_servants/288.png
diff --git a/src/assets/ta_servants/saitohajime.png b/src/assets/ta_servants/293.png
similarity index 100%
rename from src/assets/ta_servants/saitohajime.png
rename to src/assets/ta_servants/293.png
diff --git a/src/assets/ta_servants/vangogh.png b/src/assets/ta_servants/295.png
similarity index 100%
rename from src/assets/ta_servants/vangogh.png
rename to src/assets/ta_servants/295.png
diff --git a/src/assets/ta_servants/douman.png b/src/assets/ta_servants/297.png
similarity index 100%
rename from src/assets/ta_servants/douman.png
rename to src/assets/ta_servants/297.png
diff --git a/src/assets/ta_servants/ibuki.png b/src/assets/ta_servants/299.png
similarity index 100%
rename from src/assets/ta_servants/ibuki.png
rename to src/assets/ta_servants/299.png
diff --git a/src/assets/ta_servants/saberalter.png b/src/assets/ta_servants/3.png
similarity index 100%
rename from src/assets/ta_servants/saberalter.png
rename to src/assets/ta_servants/3.png
diff --git a/src/assets/ta_servants/vritra.png b/src/assets/ta_servants/300.png
similarity index 100%
rename from src/assets/ta_servants/vritra.png
rename to src/assets/ta_servants/300.png
diff --git a/src/assets/ta_servants/muramasa.png b/src/assets/ta_servants/302.png
similarity index 100%
rename from src/assets/ta_servants/muramasa.png
rename to src/assets/ta_servants/302.png
diff --git a/src/assets/ta_servants/taira.png b/src/assets/ta_servants/303.png
similarity index 100%
rename from src/assets/ta_servants/taira.png
rename to src/assets/ta_servants/303.png
diff --git a/src/assets/ta_servants/caren.png b/src/assets/ta_servants/305.png
similarity index 100%
rename from src/assets/ta_servants/caren.png
rename to src/assets/ta_servants/305.png
diff --git a/src/assets/ta_servants/galatea.png b/src/assets/ta_servants/306.png
similarity index 100%
rename from src/assets/ta_servants/galatea.png
rename to src/assets/ta_servants/306.png
diff --git a/src/assets/ta_servants/misscrane.png b/src/assets/ta_servants/307.png
similarity index 100%
rename from src/assets/ta_servants/misscrane.png
rename to src/assets/ta_servants/307.png
diff --git a/src/assets/ta_servants/mixa.png b/src/assets/ta_servants/308.png
similarity index 100%
rename from src/assets/ta_servants/mixa.png
rename to src/assets/ta_servants/308.png
diff --git a/src/assets/ta_servants/morgan.png b/src/assets/ta_servants/309.png
similarity index 100%
rename from src/assets/ta_servants/morgan.png
rename to src/assets/ta_servants/309.png
diff --git a/src/assets/ta_servants/barghest.png b/src/assets/ta_servants/310.png
similarity index 100%
rename from src/assets/ta_servants/barghest.png
rename to src/assets/ta_servants/310.png
diff --git a/src/assets/ta_servants/baobhansith.png b/src/assets/ta_servants/311.png
similarity index 100%
rename from src/assets/ta_servants/baobhansith.png
rename to src/assets/ta_servants/311.png
diff --git a/src/assets/ta_servants/melusine_aoe.png b/src/assets/ta_servants/312_aoe.png
similarity index 100%
rename from src/assets/ta_servants/melusine_aoe.png
rename to src/assets/ta_servants/312_aoe.png
diff --git a/src/assets/ta_servants/melusine_st.png b/src/assets/ta_servants/312_st.png
similarity index 100%
rename from src/assets/ta_servants/melusine_st.png
rename to src/assets/ta_servants/312_st.png
diff --git a/src/assets/ta_servants/percival.png b/src/assets/ta_servants/313.png
similarity index 100%
rename from src/assets/ta_servants/percival.png
rename to src/assets/ta_servants/313.png
diff --git a/src/assets/ta_servants/koyanlight.png b/src/assets/ta_servants/314.png
similarity index 100%
rename from src/assets/ta_servants/koyanlight.png
rename to src/assets/ta_servants/314.png
diff --git a/src/assets/ta_servants/summerokitaalter.png b/src/assets/ta_servants/317.png
similarity index 100%
rename from src/assets/ta_servants/summerokitaalter.png
rename to src/assets/ta_servants/317.png
diff --git a/src/assets/ta_servants/summercharlotte.png b/src/assets/ta_servants/319.png
similarity index 100%
rename from src/assets/ta_servants/summercharlotte.png
rename to src/assets/ta_servants/319.png
diff --git a/src/assets/ta_servants/summerdavinci.png b/src/assets/ta_servants/320.png
similarity index 100%
rename from src/assets/ta_servants/summerdavinci.png
rename to src/assets/ta_servants/320.png
diff --git a/src/assets/ta_servants/summerkama.png b/src/assets/ta_servants/321.png
similarity index 100%
rename from src/assets/ta_servants/summerkama.png
rename to src/assets/ta_servants/321.png
diff --git a/src/assets/ta_servants/summercaenis.png b/src/assets/ta_servants/322.png
similarity index 100%
rename from src/assets/ta_servants/summercaenis.png
rename to src/assets/ta_servants/322.png
diff --git a/src/assets/ta_servants/summersei.png b/src/assets/ta_servants/323.png
similarity index 100%
rename from src/assets/ta_servants/summersei.png
rename to src/assets/ta_servants/323.png
diff --git a/src/assets/ta_servants/zenobia.png b/src/assets/ta_servants/325.png
similarity index 100%
rename from src/assets/ta_servants/zenobia.png
rename to src/assets/ta_servants/325.png
diff --git a/src/assets/ta_servants/cindereli.png b/src/assets/ta_servants/326.png
similarity index 100%
rename from src/assets/ta_servants/cindereli.png
rename to src/assets/ta_servants/326.png
diff --git a/src/assets/ta_servants/okuni.png b/src/assets/ta_servants/327.png
similarity index 100%
rename from src/assets/ta_servants/okuni.png
rename to src/assets/ta_servants/327.png
diff --git a/src/assets/ta_servants/ryomalancer.png b/src/assets/ta_servants/329.png
similarity index 100%
rename from src/assets/ta_servants/ryomalancer.png
rename to src/assets/ta_servants/329.png
diff --git a/src/assets/ta_servants/hans.png b/src/assets/ta_servants/33.png
similarity index 100%
rename from src/assets/ta_servants/hans.png
rename to src/assets/ta_servants/33.png
diff --git a/src/assets/ta_servants/taigongwang.png b/src/assets/ta_servants/331.png
similarity index 100%
rename from src/assets/ta_servants/taigongwang.png
rename to src/assets/ta_servants/331.png
diff --git a/src/assets/ta_servants/koyandark.png b/src/assets/ta_servants/334.png
similarity index 100%
rename from src/assets/ta_servants/koyandark.png
rename to src/assets/ta_servants/334.png
diff --git a/src/assets/ta_servants/bazett.png b/src/assets/ta_servants/336.png
similarity index 100%
rename from src/assets/ta_servants/bazett.png
rename to src/assets/ta_servants/336.png
diff --git a/src/assets/ta_servants/taisuixingjun.png b/src/assets/ta_servants/338.png
similarity index 100%
rename from src/assets/ta_servants/taisuixingjun.png
rename to src/assets/ta_servants/338.png
diff --git a/src/assets/ta_servants/zhangjue.png b/src/assets/ta_servants/348.png
similarity index 100%
rename from src/assets/ta_servants/zhangjue.png
rename to src/assets/ta_servants/348.png
diff --git a/src/assets/ta_servants/minamotonotametomo.png b/src/assets/ta_servants/350.png
similarity index 100%
rename from src/assets/ta_servants/minamotonotametomo.png
rename to src/assets/ta_servants/350.png
diff --git a/src/assets/ta_servants/arcueid.png b/src/assets/ta_servants/351.png
similarity index 100%
rename from src/assets/ta_servants/arcueid.png
rename to src/assets/ta_servants/351.png
diff --git a/src/assets/ta_servants/summeribuki.png b/src/assets/ta_servants/355.png
similarity index 100%
rename from src/assets/ta_servants/summeribuki.png
rename to src/assets/ta_servants/355.png
diff --git a/src/assets/ta_servants/summerskadi.png b/src/assets/ta_servants/357.png
similarity index 100%
rename from src/assets/ta_servants/summerskadi.png
rename to src/assets/ta_servants/357.png
diff --git a/src/assets/ta_servants/kojirou.png b/src/assets/ta_servants/39.png
similarity index 100%
rename from src/assets/ta_servants/kojirou.png
rename to src/assets/ta_servants/39.png
diff --git a/src/assets/ta_servants/saberlily.png b/src/assets/ta_servants/4.png
similarity index 100%
rename from src/assets/ta_servants/saberlily.png
rename to src/assets/ta_servants/4.png
diff --git a/src/assets/ta_servants/stheno.png b/src/assets/ta_servants/41.png
similarity index 100%
rename from src/assets/ta_servants/stheno.png
rename to src/assets/ta_servants/41.png
diff --git a/src/assets/ta_servants/nero.png b/src/assets/ta_servants/5.png
similarity index 100%
rename from src/assets/ta_servants/nero.png
rename to src/assets/ta_servants/5.png
diff --git a/src/assets/ta_servants/kintoki.png b/src/assets/ta_servants/51.png
similarity index 100%
rename from src/assets/ta_servants/kintoki.png
rename to src/assets/ta_servants/51.png
diff --git a/src/assets/ta_servants/darius.png b/src/assets/ta_servants/55.png
similarity index 100%
rename from src/assets/ta_servants/darius.png
rename to src/assets/ta_servants/55.png
diff --git a/src/assets/ta_servants/tamamocat.png b/src/assets/ta_servants/58.png
similarity index 100%
rename from src/assets/ta_servants/tamamocat.png
rename to src/assets/ta_servants/58.png
diff --git a/src/assets/ta_servants/tamamo.png b/src/assets/ta_servants/62.png
similarity index 100%
rename from src/assets/ta_servants/tamamo.png
rename to src/assets/ta_servants/62.png
diff --git a/src/assets/ta_servants/drake.png b/src/assets/ta_servants/65.png
similarity index 100%
rename from src/assets/ta_servants/drake.png
rename to src/assets/ta_servants/65.png
diff --git a/src/assets/ta_servants/okita.png b/src/assets/ta_servants/68.png
similarity index 100%
rename from src/assets/ta_servants/okita.png
rename to src/assets/ta_servants/68.png
diff --git a/src/assets/ta_servants/shishou.png b/src/assets/ta_servants/70.png
similarity index 100%
rename from src/assets/ta_servants/shishou.png
rename to src/assets/ta_servants/70.png
diff --git a/src/assets/ta_servants/shishou_bunny.png b/src/assets/ta_servants/70_bunny.png
similarity index 100%
rename from src/assets/ta_servants/shishou_bunny.png
rename to src/assets/ta_servants/70_bunny.png
diff --git a/src/assets/ta_servants/altera.png b/src/assets/ta_servants/8.png
similarity index 100%
rename from src/assets/ta_servants/altera.png
rename to src/assets/ta_servants/8.png
diff --git a/src/assets/ta_servants/jekyllhyde.png b/src/assets/ta_servants/81.png
similarity index 100%
rename from src/assets/ta_servants/jekyllhyde.png
rename to src/assets/ta_servants/81.png
diff --git a/src/assets/ta_servants/karna.png b/src/assets/ta_servants/85.png
similarity index 100%
rename from src/assets/ta_servants/karna.png
rename to src/assets/ta_servants/85.png
diff --git a/src/assets/ta_servants/mhx.png b/src/assets/ta_servants/86.png
similarity index 100%
rename from src/assets/ta_servants/mhx.png
rename to src/assets/ta_servants/86.png
diff --git a/src/assets/ta_servants/brynhild.png b/src/assets/ta_servants/88.png
similarity index 100%
rename from src/assets/ta_servants/brynhild.png
rename to src/assets/ta_servants/88.png
diff --git a/src/assets/ta_servants/nerobride.png b/src/assets/ta_servants/90.png
similarity index 100%
rename from src/assets/ta_servants/nerobride.png
rename to src/assets/ta_servants/90.png
diff --git a/src/assets/ta_servants/amakusa.png b/src/assets/ta_servants/93.png
similarity index 100%
rename from src/assets/ta_servants/amakusa.png
rename to src/assets/ta_servants/93.png
diff --git a/src/assets/ta_servants/dantes.png b/src/assets/ta_servants/96.png
similarity index 100%
rename from src/assets/ta_servants/dantes.png
rename to src/assets/ta_servants/96.png
diff --git a/src/assets/ta_servants/cualter.png b/src/assets/ta_servants/98.png
similarity index 100%
rename from src/assets/ta_servants/cualter.png
rename to src/assets/ta_servants/98.png
diff --git a/src/assets/ta_servants/summerkiara.png b/src/assets/ta_servants/summerkiara.png
deleted file mode 100644
index 26a695b..0000000
Binary files a/src/assets/ta_servants/summerkiara.png and /dev/null differ
diff --git a/src/content/taInfoData/arctic-summer-world.json b/src/content/taInfoData/arctic-summer-world.json
index 125f6a0..66b1b6a 100644
--- a/src/content/taInfoData/arctic-summer-world.json
+++ b/src/content/taInfoData/arctic-summer-world.json
@@ -1,7 +1,7 @@
 {
   "info": {
     "title": "Arctic Summer World",
-    "releaseDate": "2024-07-18",
+    "releaseDate": "2024-07-24",
     "shortdescription": "An expedition to the endless summer festival at the North Pole, orchestrated by Skadi - what could possibly happen here?",
     "releaseNumber": 1,
     "type": "quest"
@@ -15,7 +15,7 @@
           "title": "Summer Skadi 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=VD2FOa9lymE",
           "date": "2024-07-28",
-          "servant": "summerskadi",
+          "servant": "357",
           "turns": "4T",
           "runner": "Firq"
         },
@@ -23,7 +23,7 @@
           "title": "Summer Skadi 4T (Lvl. 2)",
           "link": "https://www.youtube.com/watch?v=ozgDQF_vMPQ",
           "date": "2024-07-27",
-          "servant": "summerskadi",
+          "servant": "357",
           "turns": "4T",
           "runner": "Requiem"
         },
@@ -31,7 +31,7 @@
           "title": "Summer Jeanne 4T",
           "link": "https://www.youtube.com/watch?v=9inDbuA-mDo",
           "date": "2024-07-25",
-          "servant": "summerjeanne",
+          "servant": "216",
           "turns": "4T",
           "runner": "im poketar"
         },
@@ -39,7 +39,7 @@
           "title": "Summer Ibuki 4T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=Yp1aN6d_Daw",
           "date": "2024-07-25",
-          "servant": "summeribuki",
+          "servant": "355",
           "turns": "4T",
           "runner": "ahelpfulhamster"
         },
@@ -47,7 +47,7 @@
           "title": "Gilgamesh Caster 4T",
           "link": "https://www.youtube.com/watch?v=ut-VcCeB_1o",
           "date": "2024-07-25",
-          "servant": "casgil",
+          "servant": "145",
           "turns": "4T",
           "runner": "Gorgeous P."
         },
@@ -55,7 +55,7 @@
           "title": "Dantes 4T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=tH7BUI5C3oA",
           "date": "2024-07-25",
-          "servant": "dantes",
+          "servant": "96",
           "turns": "4T",
           "runner": "Akise"
         },
@@ -63,7 +63,7 @@
           "title": "Cu Alter 4T (NDCE)",
           "link": "https://www.youtube.com/watch?v=DII1lPGAGR4",
           "date": "2024-07-25",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "4T",
           "runner": "Volcanicz"
         },
@@ -71,7 +71,7 @@
           "title": "Arcueid 4T (NDCE)",
           "link": "https://www.youtube.com/watch?v=avMiU2rU7Y4",
           "date": "2024-07-25",
-          "servant": "arcueid",
+          "servant": "351",
           "turns": "4T",
           "runner": "QyTheQTπ"
         },
@@ -79,7 +79,7 @@
           "title": "Morgan 4T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=zT1cm4jxEtY",
           "date": "2024-07-25",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "4T",
           "runner": "Felt"
         },
@@ -87,7 +87,7 @@
           "title": "Morgan 4T (4man NDCE)",
           "link": "https://www.youtube.com/watch?v=UJP79G_yge4",
           "date": "2024-07-25",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "4T",
           "runner": "Loki"
         },
@@ -95,7 +95,7 @@
           "title": "Taigong Wang 4T",
           "link": "https://www.youtube.com/watch?v=B1tNm-LRlOs",
           "date": "2024-07-25",
-          "servant": "taigongwang",
+          "servant": "331",
           "turns": "4T",
           "runner": "Ise(Kai)"
         },
@@ -103,7 +103,7 @@
           "title": "Melt Summer 4T",
           "link": "https://www.youtube.com/watch?v=Upqg_OTScNs",
           "date": "2024-07-26",
-          "servant": "meltlambda",
+          "servant": "266",
           "turns": "4T",
           "runner": "CarmFGO"
         },
@@ -111,7 +111,7 @@
           "title": "Shishou Summer 4T",
           "link": "https://www.youtube.com/watch?v=Gd46UzjslPs",
           "date": "2024-07-26",
-          "servant": "summershishou",
+          "servant": "133",
           "turns": "4T",
           "runner": "Lyud"
         },
@@ -119,7 +119,7 @@
           "title": "Minamoto-no-Tametomo 4T (No CE)",
           "link": "https://www.youtube.com/watch?v=iaVGp-HuoDg",
           "date": "2024-07-26",
-          "servant": "minamotonotametomo",
+          "servant": "350",
           "turns": "4T",
           "runner": "ProbablyAParrot"
         },
@@ -127,7 +127,7 @@
           "title": "Bazett 4T (4man)",
           "link": "https://www.youtube.com/watch?v=5q7x738BzkQ",
           "date": "2024-07-26",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "4T",
           "runner": "TokuHer0"
         },
@@ -135,7 +135,7 @@
           "title": "Voyager 4T",
           "link": "https://www.youtube.com/watch?v=ciPBOisUtYg",
           "date": "2024-07-26",
-          "servant": "voyager",
+          "servant": "281",
           "turns": "4T",
           "runner": "Ise(Kai)"
         },
@@ -143,7 +143,7 @@
           "title": "Arjuna Alter 4T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=ARXYYGCT8A8",
           "date": "2024-07-26",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "4T",
           "runner": "Akise"
         },
@@ -151,7 +151,7 @@
           "title": "Summer Ibuki 4T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=D2oi0OskXKU",
           "date": "2024-07-26",
-          "servant": "summeribuki",
+          "servant": "355",
           "turns": "4T",
           "runner": "Tinesh"
         },
@@ -159,7 +159,7 @@
           "title": "Melusine 4T (No RNG)",
           "link": "https://www.youtube.com/watch?v=D2oi0OskXKU",
           "date": "2024-07-26",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "4T",
           "runner": "Felt"
         },
@@ -167,7 +167,7 @@
           "title": "Taira 4T (NoCE)",
           "link": "https://www.youtube.com/watch?v=Y-EhbiRbeCc",
           "date": "2024-07-27",
-          "servant": "taira",
+          "servant": "303",
           "turns": "4T",
           "runner": "Felt"
         },
@@ -175,7 +175,7 @@
           "title": "Voyager 4T (4man)",
           "link": "https://www.youtube.com/watch?v=L0jSQWOeN6s",
           "date": "2024-07-27",
-          "servant": "voyager",
+          "servant": "281",
           "turns": "4T",
           "runner": "Kamager III"
         },
@@ -183,7 +183,7 @@
           "title": "BB Summer 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=Lz3YltEipd0",
           "date": "2024-07-27",
-          "servant": "bbsummer",
+          "servant": "220",
           "turns": "4T",
           "runner": "Zoropp"
         },
@@ -191,7 +191,7 @@
           "title": "Jalter 4T (NoCE)",
           "link": "https://www.youtube.com/watch?v=0AJ4w09VlT4",
           "date": "2024-07-28",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "4T",
           "runner": "Ray"
         },
@@ -199,7 +199,7 @@
           "title": "Gilgamesh 4T",
           "link": "https://www.youtube.com/watch?v=ZwH32UR-CIU",
           "date": "2024-07-28",
-          "servant": "gilgamesh",
+          "servant": "12",
           "turns": "4T",
           "runner": "Mikazuki"
         },
@@ -207,7 +207,7 @@
           "title": "Artoria 4T",
           "link": "https://www.youtube.com/watch?v=pfRJBE5JupA",
           "date": "2024-07-28",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "4T",
           "runner": "HardChibi"
         },
@@ -215,7 +215,7 @@
           "title": "Melusine 4T (NoCEs)",
           "link": "https://www.youtube.com/watch?v=9-S91YIDqug",
           "date": "2024-07-28",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "4T",
           "runner": "TokuHer0"
         },
@@ -223,7 +223,7 @@
           "title": "Taisui Xingjun 4T",
           "link": "https://www.youtube.com/watch?v=95HdMeysR1A",
           "date": "2024-07-28",
-          "servant": "taisuixingjun",
+          "servant": "338",
           "turns": "4T",
           "runner": "Kamager III"
         },
@@ -231,7 +231,7 @@
           "title": "Nero (Caster) 4T (NoCE)",
           "link": "https://www.youtube.com/watch?v=f1UvMBeE7-I",
           "date": "2024-07-28",
-          "servant": "nerocaster",
+          "servant": "175",
           "turns": "4T",
           "runner": "Lutrec"
         },
@@ -239,7 +239,7 @@
           "title": "Zhang Jue 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=T3BEI-04dmI",
           "date": "2024-07-29",
-          "servant": "zhangjue",
+          "servant": "348",
           "turns": "4T",
           "runner": "L11"
         },
@@ -247,7 +247,7 @@
           "title": "Galatea 4T",
           "link": "https://www.youtube.com/watch?v=mL1und2p5Wc",
           "date": "2024-07-29",
-          "servant": "galatea",
+          "servant": "306",
           "turns": "4T",
           "runner": "Hentai Daddy"
         },
@@ -255,7 +255,7 @@
           "title": "Summer Okitan 4T",
           "link": "https://www.youtube.com/watch?v=o1Ai-YCvo08",
           "date": "2024-07-29",
-          "servant": "summerokitaalter",
+          "servant": "317",
           "turns": "4T",
           "runner": "TokuHer0"
         },
@@ -263,7 +263,7 @@
           "title": "Summer Jalter 4T (NDCE)",
           "link": "https://x.com/santoryuiai3/status/1817969764972847614",
           "date": "2024-07-29",
-          "servant": "jaltersummer",
+          "servant": "219",
           "turns": "4T",
           "runner": "Ray"
         }
diff --git a/src/content/taInfoData/beast4l.json b/src/content/taInfoData/beast4l.json
index eaa34df..509d524 100644
--- a/src/content/taInfoData/beast4l.json
+++ b/src/content/taInfoData/beast4l.json
@@ -14,7 +14,7 @@
           "title": "Shishou 4T (No MLB DMG CE)",
           "link": "https://www.youtube.com/watch?v=brz21NKMMsY",
           "date": "2023-12-31",
-          "servant": "shishou_bunny",
+          "servant": "70_bunny",
           "turns": "4T",
           "runner": "Firq"
         },
@@ -22,7 +22,7 @@
           "title": "Shishou 4T (No DMG CE)",
           "link": "https://www.youtube.com/watch?v=J0l-psWpokQ",
           "date": "2023-12-28",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "4T",
           "runner": "Requiem"
         },
@@ -30,7 +30,7 @@
           "title": "Amakusa 4T",
           "link": "https://www.youtube.com/watch?v=ud5JZ__Hk4I",
           "date": "2023-12-31",
-          "servant": "amakusa",
+          "servant": "93",
           "turns": "4T",
           "runner": "Yier"
         },
@@ -38,7 +38,7 @@
           "title": "Romulus 4T (NoMash NoCE)",
           "link": "https://www.youtube.com/watch?v=e0DJEXpysSQ",
           "date": "2023-12-28",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "4T",
           "runner": "Sakazuki"
         },
@@ -46,7 +46,7 @@
           "title": "Melt 4T",
           "link": "https://www.youtube.com/watch?v=c7K5ra2CAxs",
           "date": "2023-12-31",
-          "servant": "melt",
+          "servant": "163",
           "turns": "4T",
           "runner": "Zectry"
         },
@@ -54,7 +54,7 @@
           "title": "Okuni 4T",
           "link": "https://www.youtube.com/watch?v=eg5OeQrhQMk",
           "date": "2023-12-29",
-          "servant": "okuni",
+          "servant": "327",
           "turns": "4T",
           "runner": "QP Dangerous"
         },
@@ -62,7 +62,7 @@
           "title": "Kama 4T",
           "link": "https://www.youtube.com/watch?v=9sm8XBglEgo",
           "date": "2023-12-29",
-          "servant": "kama",
+          "servant": "239",
           "turns": "4T",
           "runner": "Requiem"
         },
@@ -70,7 +70,7 @@
           "title": "Melusine 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=XHjExMEg3vQ",
           "date": "2024-01-01",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "4T",
           "runner": "Zectry"
         },
@@ -78,7 +78,7 @@
           "title": "Gilgamesh 4T",
           "link": "https://www.youtube.com/watch?v=SrDvEaFx3ko",
           "date": "2023-12-31",
-          "servant": "gilgamesh",
+          "servant": "12",
           "turns": "4T",
           "runner": "Yier"
         },
@@ -86,7 +86,7 @@
           "title": "Astrea 4T",
           "link": "https://www.youtube.com/watch?v=kw4E_mCxkKc",
           "date": "2023-12-30",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "4T",
           "runner": "Alastair Hale"
         },
@@ -94,7 +94,7 @@
           "title": "Kijyo Koyo 4T (Solo)",
           "link": "https://www.youtube.com/watch?v=tAUA7Fn_HYo",
           "date": "2023-12-29",
-          "servant": "koyo",
+          "servant": "282",
           "turns": "4T",
           "runner": "MCR"
         },
@@ -102,7 +102,7 @@
           "title": "Tamamo Solo 30T",
           "link": "https://www.youtube.com/watch?v=2wUcojRXTlw",
           "date": "2023-12-27",
-          "servant": "tamamo",
+          "servant": "62",
           "turns": "30T",
           "runner": "Mitsunee"
         },
@@ -110,7 +110,7 @@
           "title": "Dual Taigong Wang 4T",
           "link": "https://www.youtube.com/watch?v=3jU3Az7iM7E",
           "date": "2023-12-27",
-          "servant": "taigongwang",
+          "servant": "331",
           "turns": "4T",
           "runner": "Ryougi Bobby"
         },
@@ -118,7 +118,7 @@
           "title": "Ibuki 4T",
           "link": "https://www.youtube.com/watch?v=dgJfgMHAOpI",
           "date": "2023-12-29",
-          "servant": "ibuki",
+          "servant": "299",
           "turns": "4T",
           "runner": "Martyr Kuga"
         },
@@ -126,7 +126,7 @@
           "title": "Ozymandias 4T",
           "link": "https://www.youtube.com/watch?v=Y8qYY875M_I",
           "date": "2023-12-28",
-          "servant": "ozymandias",
+          "servant": "118",
           "turns": "4T",
           "runner": "Kusanagi"
         },
@@ -134,7 +134,7 @@
           "title": "Arjuna Alter 4T",
           "link": "https://www.youtube.com/watch?v=OTfM7WQl5uI",
           "date": "2023-12-28",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "4T",
           "runner": "Akise"
         },
@@ -142,7 +142,7 @@
           "title": "Galatea 4T",
           "link": "https://www.youtube.com/watch?v=GKCZtn815wA",
           "date": "2023-12-30",
-          "servant": "galatea",
+          "servant": "306",
           "turns": "4T",
           "runner": "Hentai Daddi"
         },
@@ -150,7 +150,7 @@
           "title": "Summer Kiara 4T",
           "link": "https://www.youtube.com/watch?v=b46JRNUIdrM",
           "date": "2023-12-28",
-          "servant": "kiarasummer",
+          "servant": "285",
           "turns": "4T",
           "runner": "Felt"
         }
diff --git a/src/content/taInfoData/case-files-rerun.json b/src/content/taInfoData/case-files-rerun.json
index 6e54788..ac89873 100644
--- a/src/content/taInfoData/case-files-rerun.json
+++ b/src/content/taInfoData/case-files-rerun.json
@@ -15,7 +15,7 @@
           "title": "Shishou 3T",
           "link": "https://www.youtube.com/watch?v=j1fFbkfYtvo",
           "date": "2024-01-22",
-          "servant": "shishou_bunny",
+          "servant": "70_bunny",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -23,7 +23,7 @@
           "title": "Shishou 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=Sszw_x7IqVU",
           "date": "2024-01-23",
-          "servant": "shishou_bunny",
+          "servant": "70_bunny",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -31,7 +31,7 @@
           "title": "Muramasa 3T",
           "link": "https://www.youtube.com/watch?v=IyOXmmY9wy8",
           "date": "2024-01-21",
-          "servant": "muramasa",
+          "servant": "302",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -39,7 +39,7 @@
           "title": "Artoria 3T",
           "link": "https://www.youtube.com/watch?v=UnFsH4t0A4Y",
           "date": "2024-01-22",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "3T",
           "runner": "HardChibi"
         },
@@ -47,7 +47,7 @@
           "title": "Salter 3T",
           "link": "https://www.youtube.com/watch?v=K_8iF_EHP1g",
           "date": "2024-01-21",
-          "servant": "saberalter",
+          "servant": "3",
           "turns": "3T",
           "runner": "im poketar"
         },
@@ -55,7 +55,7 @@
           "title": "Sei 3T",
           "link": "https://www.youtube.com/watch?v=kCajUN2Lz2Q",
           "date": "2024-01-24",
-          "servant": "sei",
+          "servant": "276",
           "turns": "3T",
           "runner": "crimsonmage"
         },
@@ -63,7 +63,7 @@
           "title": "Cindereli 3T",
           "link": "https://www.youtube.com/watch?v=BPc7RTY_c7M",
           "date": "2024-01-21",
-          "servant": "cindereli",
+          "servant": "326",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -71,7 +71,7 @@
           "title": "Kama 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=-4dDZV7ijeM",
           "date": "2024-01-22",
-          "servant": "kama",
+          "servant": "239",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -79,7 +79,7 @@
           "title": "MHXA 3T",
           "link": "https://www.youtube.com/watch?v=TfWsR-hVULo",
           "date": "2024-01-20",
-          "servant": "mhxa",
+          "servant": "155",
           "turns": "3T",
           "runner": "Ayumi"
         },
@@ -87,7 +87,7 @@
           "title": "Morgan 3T (6 Cost)",
           "link": "https://www.youtube.com/watch?v=zXQ_FrnBh0k",
           "date": "2024-01-20",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Ray"
         },
@@ -95,7 +95,7 @@
           "title": "Astrea 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=kwqjMhYrQHY",
           "date": "2024-01-20",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -103,7 +103,7 @@
           "title": "Van Gogh 3T",
           "link": "https://www.youtube.com/watch?v=VbSXl8GthwM",
           "date": "2024-01-20",
-          "servant": "vangogh",
+          "servant": "295",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -111,7 +111,7 @@
           "title": "Hokusai 3T",
           "link": "https://www.youtube.com/watch?v=CIzUCIN-ft4",
           "date": "2024-01-24",
-          "servant": "hokusai",
+          "servant": "198",
           "turns": "3T",
           "runner": "inv4der"
         },
@@ -119,7 +119,7 @@
           "title": "Okita Alter 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=qkah__8XWJk",
           "date": "2024-01-20",
-          "servant": "okitaalter",
+          "servant": "209",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -127,7 +127,7 @@
           "title": "Summer BB 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=VAEjvL34hsc",
           "date": "2024-01-21",
-          "servant": "bbsummer",
+          "servant": "220",
           "turns": "3T",
           "runner": "Felt"
         },
@@ -135,7 +135,7 @@
           "title": "Kijyo Koyo 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=A5-VRkAx__o",
           "date": "2024-01-19",
-          "servant": "koyo",
+          "servant": "282",
           "turns": "3T",
           "runner": "MCR"
         }
@@ -149,7 +149,7 @@
           "title": "Artoria 3T",
           "link": "https://www.youtube.com/watch?v=FQ6Zb_kzrWs",
           "date": "2024-01-21",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "3T",
           "runner": "HardChibi"
         },
@@ -157,7 +157,7 @@
           "title": "Artoria 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=uKercpWUnGs&t=216s",
           "date": "2024-01-19",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "3T",
           "runner": "Fu Windsword"
         },
@@ -165,7 +165,7 @@
           "title": "Altera 3T",
           "link": "https://www.youtube.com/watch?v=WcHpHfFnVrY",
           "date": "2024-01-24",
-          "servant": "altera",
+          "servant": "8",
           "turns": "3T",
           "runner": "Lyud"
         },
@@ -173,7 +173,7 @@
           "title": "Saber Lily 3T",
           "link": "https://www.youtube.com/watch?v=jCwTbmLsGcA",
           "date": "2024-01-18",
-          "servant": "saberlily",
+          "servant": "4",
           "turns": "3T",
           "runner": "Ayumi"
         },
@@ -181,7 +181,7 @@
           "title": "Gilgamesh 3T (NoCE)",
           "link": "https://www.youtube.com/watch?v=nWeZ9lo2iYI",
           "date": "2024-01-18",
-          "servant": "gilgamesh",
+          "servant": "12",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -189,7 +189,7 @@
           "title": "Sei 3T",
           "link": "https://www.youtube.com/watch?v=BEGortNzIsQ",
           "date": "2024-01-23",
-          "servant": "sei",
+          "servant": "276",
           "turns": "3T",
           "runner": "inv4der"
         },
@@ -197,7 +197,7 @@
           "title": "Melusine 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=OgoteFJL85A",
           "date": "2024-01-21",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -205,7 +205,7 @@
           "title": "Melusine 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=PTtm_c7F5Ro",
           "date": "2024-01-18",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "Felt"
         },
@@ -213,7 +213,7 @@
           "title": "Ivan 3T",
           "link": "https://www.youtube.com/watch?v=shsogSLclv4",
           "date": "2024-01-24",
-          "servant": "ivan",
+          "servant": "205",
           "turns": "3T",
           "runner": "ProbablyAParrot"
         },
@@ -221,7 +221,7 @@
           "title": "Gong 3T",
           "link": "https://www.youtube.com/watch?v=bc5LvCQO56I&t=244s",
           "date": "2024-01-23",
-          "servant": "gong",
+          "servant": "258",
           "turns": "3T",
           "runner": "BadLuck"
         },
@@ -229,7 +229,7 @@
           "title": "Morgan 3T (NoCEs)",
           "link": "https://www.youtube.com/watch?v=y4XnMyqVGK8",
           "date": "2024-01-18",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -237,7 +237,7 @@
           "title": "Morgan 3T (Lvl 50)",
           "link": "https://www.youtube.com/watch?v=MQ2b6FFPMf8",
           "date": "2024-01-18",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Ray"
         },
@@ -245,7 +245,7 @@
           "title": "Okita Alter 3T (FLO NoCEs)",
           "link": "https://www.youtube.com/watch?v=7Htl-Ld6f-Q",
           "date": "2024-01-21",
-          "servant": "okitaalter",
+          "servant": "209",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -253,7 +253,7 @@
           "title": "Kingprotea 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=iarswRjrKAI",
           "date": "2024-01-21",
-          "servant": "kingprotea",
+          "servant": "238",
           "turns": "3T",
           "runner": "Akise"
         },
@@ -261,7 +261,7 @@
           "title": "Koyan of Dark 3T",
           "link": "https://www.youtube.com/watch?v=h_jsUQeOXi8",
           "date": "2024-01-21",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -269,7 +269,7 @@
           "title": "Voyager 3T",
           "link": "https://www.youtube.com/watch?v=kQ2pRFR3ZmM",
           "date": "2024-01-20",
-          "servant": "voyager",
+          "servant": "281",
           "turns": "3T",
           "runner": "Ise(Kai)"
         },
@@ -277,7 +277,7 @@
           "title": "Scathach 5T (4Man)",
           "link": "https://www.youtube.com/watch?v=IIk5ypPq9dM",
           "date": "2024-01-23",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "5T",
           "runner": "Requiem"
         },
@@ -285,7 +285,7 @@
           "title": "Li Shuwen 5T (NoCE)",
           "link": "https://www.youtube.com/watch?v=BHNTmj56Adk",
           "date": "2024-01-24",
-          "servant": "oldli",
+          "servant": "235",
           "turns": "5T",
           "runner": "Alastair Hale"
         },
@@ -293,7 +293,7 @@
           "title": "Charlotte 5T",
           "link": "https://www.youtube.com/watch?v=aOuK9RhZSFk",
           "date": "2024-01-20",
-          "servant": "charlotte",
+          "servant": "259",
           "turns": "5T",
           "runner": "xy sunder"
         },
@@ -301,7 +301,7 @@
           "title": "Taira 5T (FLO BCE)",
           "link": "https://www.youtube.com/watch?v=A5F8Rb26tNY",
           "date": "2024-01-22",
-          "servant": "taira",
+          "servant": "303",
           "turns": "5T",
           "runner": "Felt"
         },
@@ -309,7 +309,7 @@
           "title": "Melt 5T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=-WRocbYbzpE",
           "date": "2024-01-23",
-          "servant": "melt",
+          "servant": "163",
           "turns": "5T",
           "runner": "xy sunder"
         },
@@ -317,7 +317,7 @@
           "title": "MHXA 5T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=qFESCN59RFA",
           "date": "2024-01-22",
-          "servant": "mhxa",
+          "servant": "155",
           "turns": "5T",
           "runner": "Ayumi"
         }
@@ -331,7 +331,7 @@
           "title": "Skadi 1T",
           "link": "https://www.youtube.com/watch?v=ic-wva9H0Ic",
           "date": "2024-01-16",
-          "servant": "skadi",
+          "servant": "215",
           "turns": "1T",
           "runner": "Firq"
         }
diff --git a/src/content/taInfoData/devilish-bodhisattva.json b/src/content/taInfoData/devilish-bodhisattva.json
index c4bbbae..958ea99 100644
--- a/src/content/taInfoData/devilish-bodhisattva.json
+++ b/src/content/taInfoData/devilish-bodhisattva.json
@@ -15,7 +15,7 @@
           "title": "Shishou 7T (NoDupes)",
           "link": "https://www.youtube.com/watch?v=d1ftVeitR6c",
           "date": "2022-07-09",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "7T",
           "runner": "Firq"
         },
@@ -23,7 +23,7 @@
           "title": "Summer Skadi 7T",
           "link": "https://www.youtube.com/watch?v=7HPLGs_LPzs",
           "date": "2024-07-25",
-          "servant": "summerskadi",
+          "servant": "357",
           "turns": "7T",
           "runner": "Firq"
         },
@@ -31,7 +31,7 @@
           "title": "Shishou 7T",
           "link": "https://www.youtube.com/watch?v=nYV4jwgpuR0",
           "date": "2022-07-14",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "7T",
           "runner": "KOG"
         },
@@ -39,7 +39,7 @@
           "title": "Shishou 7T",
           "link": "https://www.youtube.com/watch?v=jKoSw1XM6-c",
           "date": "2022-07-07",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "7T",
           "runner": "Requiem"
         },
@@ -47,7 +47,7 @@
           "title": "Jalter 7T",
           "link": "https://www.youtube.com/watch?v=U5wsl09_VVQ",
           "date": "2023-03-21",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "7T",
           "runner": "Ray"
         },
@@ -55,7 +55,7 @@
           "title": "Jalter 7T (NoCE)",
           "link": "https://www.youtube.com/watch?v=RPtMHOxQfjs",
           "date": "2023-11-29",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "7T",
           "runner": "Ray"
         },
@@ -63,7 +63,7 @@
           "title": "Taira 7T (NoCE)",
           "link": "https://www.youtube.com/watch?v=mg8f8TD5AEQ",
           "date": "2023-08-20",
-          "servant": "taira",
+          "servant": "303",
           "turns": "7T",
           "runner": "Felt"
         },
@@ -71,7 +71,7 @@
           "title": "Astrea 7T",
           "link": "https://www.youtube.com/watch?v=aWg9LCcZxro",
           "date": "2023-08-22",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "7T",
           "runner": "Alastair Hale"
         },
@@ -79,7 +79,7 @@
           "title": "Astrea 7T (No Castoria)",
           "link": "https://www.youtube.com/watch?v=fEJTDScu238",
           "date": "2023-01-01",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "7T",
           "runner": "Alastair Hale"
         },
@@ -87,7 +87,7 @@
           "title": "Dioscuri 7T",
           "link": "https://www.youtube.com/watch?v=El9D-LskMHU",
           "date": "2022-06-25",
-          "servant": "dioscuri",
+          "servant": "278",
           "turns": "7T",
           "runner": "Sou"
         },
@@ -95,7 +95,7 @@
           "title": "Maou Nobu 7T",
           "link": "https://www.youtube.com/watch?v=CGGJ7WA6Gqg",
           "date": "2022-12-30",
-          "servant": "maounobu",
+          "servant": "250",
           "turns": "7T",
           "runner": "Haru"
         },
@@ -103,7 +103,7 @@
           "title": "Sitonai 7T",
           "link": "https://www.youtube.com/watch?v=RJSedKUyKn0",
           "date": "2022-10-26",
-          "servant": "sitonai",
+          "servant": "224",
           "turns": "7T",
           "runner": "Alastair Hale"
         },
@@ -111,7 +111,7 @@
           "title": "Charlotte 7T",
           "link": "https://www.youtube.com/watch?v=2DhDcxAcUTo",
           "date": "2022-07-07",
-          "servant": "charlotte",
+          "servant": "259",
           "turns": "7T",
           "runner": "Dante09"
         },
@@ -119,7 +119,7 @@
           "title": "MHXA 7T",
           "link": "https://www.youtube.com/watch?v=xGHiUL4HR08",
           "date": "2023-06-13",
-          "servant": "mhxa",
+          "servant": "155",
           "turns": "7T",
           "runner": "Ayumi"
         }
diff --git a/src/content/taInfoData/lostbelt-6-5/zhang-jue.json b/src/content/taInfoData/lostbelt-6-5/zhang-jue.json
index 33ba363..c9415f1 100644
--- a/src/content/taInfoData/lostbelt-6-5/zhang-jue.json
+++ b/src/content/taInfoData/lostbelt-6-5/zhang-jue.json
@@ -14,7 +14,7 @@
           "title": "Skadi 2T",
           "link": "https://youtu.be/OtNYsaM13G4",
           "date": "2024-05-14",
-          "servant": "skadi",
+          "servant": "215",
           "turns": "2T",
           "runner": "Firq"
         },
@@ -22,7 +22,7 @@
           "title": "Baobhan 2T",
           "link": "https://www.youtube.com/watch?v=GmUUF0aiXik",
           "date": "2024-05-18",
-          "servant": "baobhansith",
+          "servant": "311",
           "turns": "2T",
           "runner": "Mikazuki"
         },
@@ -30,7 +30,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=9X5Znfw6dWk",
           "date": "2024-05-20",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -38,7 +38,7 @@
           "title": "Nero (Caster) 2T",
           "link": "https://www.youtube.com/watch?v=-rK9rpJIFDA",
           "date": "2024-05-20",
-          "servant": "nerocaster",
+          "servant": "175",
           "turns": "2T",
           "runner": "Lutrec"
         },
@@ -46,7 +46,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=8mg123LnifQ",
           "date": "2024-05-14",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -54,7 +54,7 @@
           "title": "Bazett 1T",
           "link": "https://www.youtube.com/watch?v=Zgn8tlXStiI",
           "date": "2024-05-22",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "1T",
           "runner": "Mikazuki"
         }
diff --git a/src/content/taInfoData/lostbelt-6/albion.json b/src/content/taInfoData/lostbelt-6/albion.json
index 6b0e8cd..874b811 100644
--- a/src/content/taInfoData/lostbelt-6/albion.json
+++ b/src/content/taInfoData/lostbelt-6/albion.json
@@ -15,7 +15,7 @@
           "title": "Musashi 3T",
           "link": "https://www.youtube.com/watch?v=iVdQPoouI_Y",
           "date": "2023-07-10",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "3T",
           "runner": "Ray"
         },
@@ -23,7 +23,7 @@
           "title": "Altera 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=7pyPtTVbd2A",
           "date": "2023-07-13",
-          "servant": "altera",
+          "servant": "8",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -31,7 +31,7 @@
           "title": "Suzuka 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=6ExpIoUJ3aU",
           "date": "2023-07-12",
-          "servant": "suzuka",
+          "servant": "165",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -39,7 +39,7 @@
           "title": "Saber Alter 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=5U42nu-vPnk",
           "date": "2023-07-12",
-          "servant": "saberalter",
+          "servant": "3",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -47,7 +47,7 @@
           "title": "Baobhan Sith 3T",
           "link": "https://www.youtube.com/watch?v=526KYBolySY",
           "date": "2023-07-13",
-          "servant": "baobhansith",
+          "servant": "311",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -55,7 +55,7 @@
           "title": "Shishou 3T",
           "link": "https://www.youtube.com/watch?v=E8fjEYFqrWI",
           "date": "2023-07-12",
-          "servant": "shishou_bunny",
+          "servant": "70_bunny",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -63,7 +63,7 @@
           "title": "Shishou 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=ciIkgHr-QPk",
           "date": "2023-07-12",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -71,7 +71,7 @@
           "title": "Ereshkigal 3T",
           "link": "https://www.youtube.com/watch?v=wQBe74XTy4Q",
           "date": "2023-07-13",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "3T",
           "runner": "Conry"
         },
@@ -79,7 +79,7 @@
           "title": "Skadi 3T",
           "link": "https://www.youtube.com/watch?v=tejeiYpzfqo",
           "date": "2023-07-11",
-          "servant": "skadi",
+          "servant": "215",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -87,7 +87,7 @@
           "title": "Kama 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=SmnwfrXp1sg",
           "date": "2023-07-13",
-          "servant": "kama",
+          "servant": "239",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -95,7 +95,7 @@
           "title": "Summer Jalter 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=-3uDduYI2Cw",
           "date": "2023-07-10",
-          "servant": "jaltersummer",
+          "servant": "219",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -103,7 +103,7 @@
           "title": "Tamamo Cat 3T",
           "link": "https://www.youtube.com/watch?v=Vn6L6Ywin44",
           "date": "2023-07-13",
-          "servant": "tamamocat",
+          "servant": "58",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -111,7 +111,7 @@
           "title": "Cu Alter 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=iaR6PdFmmeQ",
           "date": "2023-07-13",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "3T",
           "runner": "Volcanicz"
         },
@@ -119,7 +119,7 @@
           "title": "Suzuka 3T",
           "link": "https://www.youtube.com/watch?v=2dj-55-9Oe8",
           "date": "2023-07-12",
-          "servant": "suzuka",
+          "servant": "165",
           "turns": "3T",
           "runner": "Mitsunee"
         },
@@ -127,7 +127,7 @@
           "title": "Shishou 3T",
           "link": "https://www.youtube.com/watch?v=QB8xf7IeLO4",
           "date": "2023-07-13",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "3T",
           "runner": "KOG"
         }
diff --git a/src/content/taInfoData/lostbelt-6/cernunnos.json b/src/content/taInfoData/lostbelt-6/cernunnos.json
index 61113f8..d4998d6 100644
--- a/src/content/taInfoData/lostbelt-6/cernunnos.json
+++ b/src/content/taInfoData/lostbelt-6/cernunnos.json
@@ -15,7 +15,7 @@
           "title": "Shishou 4T (No Castoria)",
           "link": "https://www.youtube.com/watch?v=WrHudtdfivA",
           "date": "2023-07-19",
-          "servant": "shishou_bunny",
+          "servant": "70_bunny",
           "turns": "4T",
           "runner": "Firq"
         },
@@ -23,7 +23,7 @@
           "title": "Shishou 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=O1f-go7uJQM",
           "date": "2023-07-19",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "4T",
           "runner": "Requiem"
         },
@@ -31,7 +31,7 @@
           "title": "Jalter 4T",
           "link": "https://www.youtube.com/watch?v=VGuXstsJa6k",
           "date": "2023-07-10",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "4T",
           "runner": "Ray"
         },
@@ -39,7 +39,7 @@
           "title": "Altera 4T",
           "link": "https://www.youtube.com/watch?v=BrgJT3gC6sg",
           "date": "2023-07-13",
-          "servant": "altera",
+          "servant": "8",
           "turns": "4T",
           "runner": "Requiem"
         },
@@ -47,7 +47,7 @@
           "title": "Astrea 4T (4 Slot)",
           "link": "https://www.youtube.com/watch?v=0pwUn_bickU",
           "date": "2023-07-17",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "4T",
           "runner": "Alastair Hale"
         },
@@ -55,7 +55,7 @@
           "title": "Meltryllis 4T (4 Slot)",
           "link": "https://www.youtube.com/watch?v=B5uZkC40SQc",
           "date": "2023-07-21",
-          "servant": "melt",
+          "servant": "163",
           "turns": "4T",
           "runner": "Zectry"
         },
@@ -63,7 +63,7 @@
           "title": "Kijyo Koyo 4T",
           "link": "https://www.youtube.com/watch?v=hea0QSvTbkY",
           "date": "2023-07-14",
-          "servant": "koyo",
+          "servant": "282",
           "turns": "4T",
           "runner": "MCR"
         },
@@ -71,7 +71,7 @@
           "title": "Charlotte 4T",
           "link": "https://www.youtube.com/watch?v=HMD2WLNGxAk",
           "date": "2023-07-12",
-          "servant": "charlotte",
+          "servant": "259",
           "turns": "4T",
           "runner": "Dante09"
         },
@@ -79,7 +79,7 @@
           "title": "Gong 4T (4 NPs)",
           "link": "https://www.youtube.com/watch?v=qQ82YA4BeGE",
           "date": "2023-07-11",
-          "servant": "gong",
+          "servant": "258",
           "turns": "4T",
           "runner": "BadLuck"
         },
@@ -87,7 +87,7 @@
           "title": "Shishou 4T",
           "link": "https://www.youtube.com/watch?v=dArTitWkttA",
           "date": "2023-07-13",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "4T",
           "runner": "KOG"
         },
@@ -95,7 +95,7 @@
           "title": "Amakusa 4T",
           "link": "https://www.youtube.com/watch?v=hRu3EskLExE",
           "date": "2023-07-27",
-          "servant": "amakusa",
+          "servant": "93",
           "turns": "4T",
           "runner": "Yier"
         }
diff --git a/src/content/taInfoData/lostbelt-6/morgan.json b/src/content/taInfoData/lostbelt-6/morgan.json
index 8d30d3f..a1d7554 100644
--- a/src/content/taInfoData/lostbelt-6/morgan.json
+++ b/src/content/taInfoData/lostbelt-6/morgan.json
@@ -15,7 +15,7 @@
           "title": "Skadi 3T",
           "link": "https://www.youtube.com/watch?v=sQ7HHl1Pb3c",
           "date": "2023-06-25",
-          "servant": "skadi",
+          "servant": "215",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -23,7 +23,7 @@
           "title": "Shishou 3T",
           "link": "https://www.youtube.com/watch?v=7wQ6iabqgEc",
           "date": "2023-06-26",
-          "servant": "shishou_bunny",
+          "servant": "70_bunny",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -31,7 +31,7 @@
           "title": "Shishou 3T",
           "link": "https://www.youtube.com/watch?v=peKFxJZzoQ8",
           "date": "2023-06-24",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "3T",
           "runner": "KOG"
         },
@@ -39,7 +39,7 @@
           "title": "MHXA 3T",
           "link": "https://www.youtube.com/watch?v=ezKPe41MP3w",
           "date": "2023-06-28",
-          "servant": "mhxa",
+          "servant": "155",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -47,7 +47,7 @@
           "title": "NPC Castoria 3T",
           "link": "https://www.youtube.com/watch?v=80u9nMp1k3o",
           "date": "2023-06-28",
-          "servant": "castoria",
+          "servant": "284",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -55,7 +55,7 @@
           "title": "Shishou 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=nDLV_TrnEts",
           "date": "2023-06-28",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -63,7 +63,7 @@
           "title": "Kama 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=3hEmzqo84XU",
           "date": "2023-06-28",
-          "servant": "kama",
+          "servant": "239",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -71,7 +71,7 @@
           "title": "Baobhan Sith 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=RR0u-_oooJ8",
           "date": "2023-06-28",
-          "servant": "baobhansith",
+          "servant": "311",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -79,7 +79,7 @@
           "title": "Jalter 3T (NoCE)",
           "link": "https://www.youtube.com/watch?v=Vjai9Qg8TyU",
           "date": "2023-06-24",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "3T",
           "runner": "Ray"
         },
@@ -87,7 +87,7 @@
           "title": "MIXA 3T (NoCE)",
           "link": "https://www.youtube.com/watch?v=pV6ktirIuPE",
           "date": "2023-06-26",
-          "servant": "mixa",
+          "servant": "308",
           "turns": "3T",
           "runner": "Ayumi"
         },
@@ -95,7 +95,7 @@
           "title": "BB (Summer) 3T (NoCE NoNP FLO)",
           "link": "https://www.youtube.com/watch?v=lgyteVK7cNA",
           "date": "2023-07-06",
-          "servant": "bbsummer",
+          "servant": "220",
           "turns": "3T",
           "runner": "BadLuck"
         },
@@ -103,7 +103,7 @@
           "title": "Cu Alter 3T",
           "link": "https://www.youtube.com/watch?v=7QY_9rYmbwA",
           "date": "2023-06-30",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -111,7 +111,7 @@
           "title": "Saber Lily 3T",
           "link": "https://www.youtube.com/watch?v=v4j8YkJfZJ4",
           "date": "2023-06-26",
-          "servant": "saberlily",
+          "servant": "4",
           "turns": "3T",
           "runner": "Ayumi"
         },
@@ -119,7 +119,7 @@
           "title": "Arjuna Alter 3T (FLO NoCEs)",
           "link": "https://www.youtube.com/watch?v=zqGoTDhNfXM",
           "date": "2023-07-07",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Akise"
         },
@@ -127,7 +127,7 @@
           "title": "Arjuna Alter 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=SWK8oevHYmk",
           "date": "2023-07-20",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Sakazuki"
         },
@@ -135,7 +135,7 @@
           "title": "Astrea 3T",
           "link": "https://www.youtube.com/watch?v=FsCfhat10yw",
           "date": "2023-06-24",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "3T",
           "runner": "Duplexubiquitary"
         },
@@ -143,7 +143,7 @@
           "title": "Kijyo Koyo 3T",
           "link": "https://www.youtube.com/watch?v=gL4PqwliXr4",
           "date": "2023-06-28",
-          "servant": "koyo",
+          "servant": "282",
           "turns": "3T",
           "runner": "MCR"
         },
@@ -151,7 +151,7 @@
           "title": "Melt 3T (FLO NoCEs)",
           "link": "https://www.youtube.com/watch?v=2eh_Hitk7uQ",
           "date": "2023-07-14",
-          "servant": "melt",
+          "servant": "163",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -159,7 +159,7 @@
           "title": "Taira 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=iM7KBuvtUH0",
           "date": "2023-07-17",
-          "servant": "taira",
+          "servant": "303",
           "turns": "3T",
           "runner": "Felt"
         }
diff --git a/src/content/teslafest/cq-teslafest.json b/src/content/teslafest/cq-teslafest.json
index 5191828..b524fee 100644
--- a/src/content/teslafest/cq-teslafest.json
+++ b/src/content/teslafest/cq-teslafest.json
@@ -14,7 +14,7 @@
           "title": "Scathach 5T (Solo)",
           "link": "https://www.youtube.com/watch?v=z00-lmhHSz8",
           "date": "2024-04-08",
-          "servant": "shishou_bunny",
+          "servant": "70_bunny",
           "turns": "5T",
           "runner": "Firq"
         },
@@ -22,7 +22,7 @@
           "title": "Scathach 5T (Solo)",
           "link": "https://www.youtube.com/watch?v=OgZo-anT5uQ",
           "date": "2024-03-26",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "5T",
           "runner": "Requiem"
         },
@@ -30,7 +30,7 @@
           "title": "Summer Sei 5T",
           "link": "https://www.youtube.com/watch?v=7fPkwG--6Is",
           "date": "2024-03-27",
-          "servant": "summersei",
+          "servant": "323",
           "turns": "5T",
           "runner": "Ise(Kai)"
         },
@@ -38,7 +38,7 @@
           "title": "Artoria 3T",
           "link": "https://www.youtube.com/watch?v=NbQE0SzQH6M",
           "date": "2024-03-28",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "3T",
           "runner": "Fu Windsword"
         },
@@ -46,7 +46,7 @@
           "title": "Nero 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=9u2JdC2cxYU",
           "date": "2024-03-25",
-          "servant": "nero",
+          "servant": "5",
           "turns": "3T",
           "runner": "Lutrec"
         },
@@ -54,7 +54,7 @@
           "title": "Ibuki 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=bUIYd9JI5zE",
           "date": "2024-03-24",
-          "servant": "ibuki",
+          "servant": "299",
           "turns": "3T",
           "runner": "inv4der"
         },
@@ -62,7 +62,7 @@
           "title": "Sei 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=_EOrWKda0Mo",
           "date": "2024-03-24",
-          "servant": "sei",
+          "servant": "276",
           "turns": "3T",
           "runner": "Ise(Kai)"
         },
@@ -70,7 +70,7 @@
           "title": "Summer Illya 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=_EOrWKda0Mo",
           "date": "2024-03-30",
-          "servant": "summerillya",
+          "servant": "286",
           "turns": "3T",
           "runner": "Zoropp"
         },
@@ -78,7 +78,7 @@
           "title": "Gong 3T",
           "link": "https://www.youtube.com/watch?v=-hZpsrD-8oA",
           "date": "2024-03-24",
-          "servant": "gong",
+          "servant": "258",
           "turns": "3T",
           "runner": "Liz Happy Club"
         },
@@ -86,7 +86,7 @@
           "title": "Summer Kama 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=F5DTWtzSz-w",
           "date": "2024-03-24",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "3T",
           "runner": "Kamager III"
         },
@@ -94,7 +94,7 @@
           "title": "Voyager 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=cNvJDcKvjzY",
           "date": "2024-03-26",
-          "servant": "voyager",
+          "servant": "281",
           "turns": "3T",
           "runner": "Kamager III"
         },
@@ -102,7 +102,7 @@
           "title": "Bazett 2T (w. Morgan)",
           "link": "https://www.youtube.com/watch?v=nZjTgPkemxM",
           "date": "2024-03-24",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -110,7 +110,7 @@
           "title": "Bazett 2T (w. Gong)",
           "link": "https://www.youtube.com/watch?v=MxYdAf5L0rQ",
           "date": "2024-03-26",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "2T",
           "runner": "Paradise"
         },
@@ -118,7 +118,7 @@
           "title": "Da Vinci Rider 3T",
           "link": "https://www.youtube.com/watch?v=HnkTrc1HC60",
           "date": "2024-03-27",
-          "servant": "davincirider",
+          "servant": "253",
           "turns": "3T",
           "runner": "Gartendrache"
         },
@@ -126,7 +126,7 @@
           "title": "Ivan 3T",
           "link": "https://www.youtube.com/watch?v=fkRfkKwOGg4",
           "date": "2024-03-24",
-          "servant": "ivan",
+          "servant": "205",
           "turns": "3T",
           "runner": "rotankhero"
         },
@@ -134,7 +134,7 @@
           "title": "Ivan 3T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=X6JMhUjizvY",
           "date": "2024-03-27",
-          "servant": "ivan",
+          "servant": "205",
           "turns": "3T",
           "runner": "ProbablyAParrot"
         },
@@ -142,7 +142,7 @@
           "title": "Red Hare 3T",
           "link": "https://www.youtube.com/watch?v=QkeY-m2EPVM",
           "date": "2024-03-27",
-          "servant": "redhare",
+          "servant": "231",
           "turns": "3T",
           "runner": "L11"
         },
@@ -150,7 +150,7 @@
           "title": "Morgan 3T",
           "link": "https://www.youtube.com/watch?v=qXqsBAgdjEc",
           "date": "2024-03-24",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Sonicanimefan1"
         },
@@ -158,7 +158,7 @@
           "title": "Morgan 3T",
           "link": "https://www.youtube.com/watch?v=mkF973oq5JU",
           "date": "2024-03-29",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "SilverChaos"
         },
@@ -166,7 +166,7 @@
           "title": "Arjuna Alter 3T",
           "link": "https://www.youtube.com/watch?v=2ALsnvTHErw",
           "date": "2024-03-30",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "geens"
         },
@@ -174,7 +174,7 @@
           "title": "Arjuna Alter 3T (FLO NoDupes)",
           "link": "https://www.youtube.com/watch?v=M9uMA8zYZ3w",
           "date": "2024-03-24",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -182,7 +182,7 @@
           "title": "Arjuna Alter 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=1Eu1qwknSBY",
           "date": "2024-04-06",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Sakazuki"
         },
@@ -190,7 +190,7 @@
           "title": "Romulus 3T",
           "link": "https://www.youtube.com/watch?v=QwXakPCGTQY",
           "date": "2024-03-24",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "3T",
           "runner": "First_TLN"
         },
@@ -198,7 +198,7 @@
           "title": "Romulus 3T (F2P Support)",
           "link": "https://www.youtube.com/watch?v=pJIUG1k9AZk",
           "date": "2024-03-29",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "3T",
           "runner": "Infernia Rosarum"
         },
@@ -206,7 +206,7 @@
           "title": "Melusine 3T (w. Abby)",
           "link": "https://www.youtube.com/watch?v=BpVSenM9bHY",
           "date": "2024-03-24",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "TopKirby8305"
         },
@@ -214,7 +214,7 @@
           "title": "Melusine 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=H-vQOgCZ6sM",
           "date": "2024-03-24",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "Hentai Daddi"
         },
@@ -222,7 +222,7 @@
           "title": "Melusine 3T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=13dXuoO9oaE",
           "date": "2024-03-24",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -230,7 +230,7 @@
           "title": "Vritra 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=PEqr6jTGEbM",
           "date": "2024-03-25",
-          "servant": "vritra",
+          "servant": "300",
           "turns": "3T",
           "runner": "Tinesh"
         },
@@ -238,7 +238,7 @@
           "title": "Ereshkigal 3T (FLO)",
           "link": "https://twitter.com/yang_766/status/1774051778234839122",
           "date": "2024-03-30",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "3T",
           "runner": "yang_766"
         }
diff --git a/src/content/teslafest/eq-2020-finale-ii.json b/src/content/teslafest/eq-2020-finale-ii.json
index 7411f80..b9f91a4 100644
--- a/src/content/teslafest/eq-2020-finale-ii.json
+++ b/src/content/teslafest/eq-2020-finale-ii.json
@@ -14,7 +14,7 @@
           "title": "Melusine 3T",
           "link": "https://www.youtube.com/watch?v=jdzfh2L7C30",
           "date": "2024-03-18",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -22,7 +22,7 @@
           "title": "Ereshkigal 3T",
           "link": "https://www.youtube.com/watch?v=xXppPoi6z7E",
           "date": "2024-03-22",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -30,7 +30,7 @@
           "title": "Romulus 3T (4man)",
           "link": "https://www.youtube.com/watch?v=3H65DgMm2CQ",
           "date": "2024-03-26",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "3T",
           "runner": "Sakazuki"
         },
@@ -38,7 +38,7 @@
           "title": "Morgan 3T",
           "link": "https://www.youtube.com/watch?v=8cVyOWVxkKk",
           "date": "2024-03-18",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -46,7 +46,7 @@
           "title": "Morgan 3T (No 5* Support)",
           "link": "https://twitter.com/santoryuiai3/status/1770102234711273812",
           "date": "2024-03-19",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Ray"
         },
@@ -54,7 +54,7 @@
           "title": "Arjuna Alter 3T",
           "link": "https://www.youtube.com/watch?v=Ts9kNHgVQCc",
           "date": "2024-03-18",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Akise"
         },
@@ -62,7 +62,7 @@
           "title": "Arjuna Alter 3T (5man)",
           "link": "https://www.youtube.com/watch?v=fyAEETeNf8Q",
           "date": "2024-03-24",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Sakazuki"
         }
diff --git a/src/content/teslafest/eq-2020-flame-gate.json b/src/content/teslafest/eq-2020-flame-gate.json
index e15e598..0299a67 100644
--- a/src/content/teslafest/eq-2020-flame-gate.json
+++ b/src/content/teslafest/eq-2020-flame-gate.json
@@ -14,7 +14,7 @@
           "title": "Artoria 2T",
           "link": "https://www.youtube.com/watch?v=GIk9UhjgO8w",
           "date": "2024-03-15",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "2T",
           "runner": "First_TLN"
         },
@@ -22,7 +22,7 @@
           "title": "Altera 2T",
           "link": "https://www.youtube.com/watch?v=dMOj81oyQi4",
           "date": "2024-03-17",
-          "servant": "altera",
+          "servant": "8",
           "turns": "2T",
           "runner": "Requiem"
         },
@@ -30,7 +30,7 @@
           "title": "Okita 2T (w. Helena & Arash)",
           "link": "https://www.youtube.com/watch?v=mJq61IjuaR4",
           "date": "2024-03-18",
-          "servant": "okita",
+          "servant": "68",
           "turns": "2T",
           "runner": "Nyxi"
         },
@@ -38,7 +38,7 @@
           "title": "Okita 2T (w. Nitocris & Taigong Wang)",
           "link": "https://www.youtube.com/watch?v=tuJrX2gxiTE",
           "date": "2024-03-17",
-          "servant": "okita",
+          "servant": "68",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -46,7 +46,7 @@
           "title": "Musashi 2T (w. Morgan)",
           "link": "https://twitter.com/santoryuiai3/status/1769165469427118302",
           "date": "2024-03-17",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "2T",
           "runner": "Ray"
         },
@@ -54,7 +54,7 @@
           "title": "Muramasa 2T",
           "link": "https://www.youtube.com/watch?v=R2spWJxXSfY",
           "date": "2024-03-16",
-          "servant": "muramasa",
+          "servant": "302",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -62,7 +62,7 @@
           "title": "Ibuki 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=SRNv98fujUQ",
           "date": "2024-03-15",
-          "servant": "ibuki",
+          "servant": "299",
           "turns": "2T",
           "runner": "inv4der"
         },
@@ -70,7 +70,7 @@
           "title": "Barghest 2T",
           "link": "https://www.youtube.com/watch?v=5WMt8kf_loE",
           "date": "2024-03-15",
-          "servant": "barghest",
+          "servant": "310",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -78,7 +78,7 @@
           "title": "Okita Alter (Summer) 2T",
           "link": "https://www.youtube.com/watch?v=CiLA1lHd_E4",
           "date": "2024-03-17",
-          "servant": "summerokitaalter",
+          "servant": "317",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -86,7 +86,7 @@
           "title": "Nero 2T",
           "link": "https://www.youtube.com/watch?v=Yfop1b4o1Us",
           "date": "2024-03-20",
-          "servant": "nero",
+          "servant": "5",
           "turns": "2T",
           "runner": "Lutrec"
         },
@@ -94,7 +94,7 @@
           "title": "Romulus 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=EhOEeDYidrM",
           "date": "2024-03-18",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -102,7 +102,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=bRfdcSstPLE",
           "date": "2024-03-17",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Hentai Daddi"
         },
@@ -110,7 +110,7 @@
           "title": "Ereshkigal 2T",
           "link": "https://www.youtube.com/watch?v=NriopMKja-w",
           "date": "2024-03-15",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "2T",
           "runner": "Swarmlord2"
         },
@@ -118,7 +118,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=rREch6zsjGI",
           "date": "2024-03-16",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Gorgeous P."
         },
@@ -126,7 +126,7 @@
           "title": "Morgan 2T (NDCE)",
           "link": "https://twitter.com/santoryuiai3/status/1768687213921874128",
           "date": "2024-03-15",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Ray"
         },
@@ -134,7 +134,7 @@
           "title": "Arjuna Alter 2T (NDCE 4man)",
           "link": "https://www.youtube.com/watch?v=3ev0cmERbtA",
           "date": "2024-03-17",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -142,7 +142,7 @@
           "title": "Jalter 2T (w. Morgan & Oberon)",
           "link": "https://twitter.com/santoryuiai3/status/1768813813468373494",
           "date": "2024-03-16",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "2T",
           "runner": "Ray"
         }
diff --git a/src/content/teslafest/eq-2020-jaguar-forest.json b/src/content/teslafest/eq-2020-jaguar-forest.json
index d46e55f..f755ee0 100644
--- a/src/content/teslafest/eq-2020-jaguar-forest.json
+++ b/src/content/teslafest/eq-2020-jaguar-forest.json
@@ -14,7 +14,7 @@
           "title": "Artoria 2T",
           "link": "https://www.youtube.com/watch?v=gpX3D4iQcVo",
           "date": "2024-03-16",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "2T",
           "runner": "Tinesh"
         },
@@ -22,7 +22,7 @@
           "title": "Saber Alter 2T",
           "link": "https://www.youtube.com/watch?v=0fco4_aaahw",
           "date": "2024-03-18",
-          "servant": "saberalter",
+          "servant": "3",
           "turns": "2T",
           "runner": "Lyud"
         },
@@ -30,7 +30,7 @@
           "title": "Barghest 2T",
           "link": "https://www.youtube.com/watch?v=lkgA_qV9IrA",
           "date": "2024-03-16",
-          "servant": "barghest",
+          "servant": "310",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -38,7 +38,7 @@
           "title": "Nero 2T",
           "link": "https://www.youtube.com/watch?v=Rn25x0ZonVs",
           "date": "2024-03-24",
-          "servant": "nero",
+          "servant": "5",
           "turns": "2T",
           "runner": "Lutrec"
         },
@@ -46,7 +46,7 @@
           "title": "Romulus 2T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=pd-uY8F4iVM",
           "date": "2024-03-20",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -54,7 +54,7 @@
           "title": "Ereshkigal 2T",
           "link": "https://www.youtube.com/watch?v=_GbNnxxpS0M",
           "date": "2024-03-19",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "2T",
           "runner": "Anthony J"
         },
@@ -62,7 +62,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=zIo0O92S7Us",
           "date": "2024-03-16",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Hentai Daddi"
         },
@@ -70,7 +70,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=9nDmoHc-eig",
           "date": "2024-03-17",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Sesshou01"
         },
@@ -78,7 +78,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=yookE0tGeZA",
           "date": "2024-03-17",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -86,7 +86,7 @@
           "title": "Melt Lambda 2T",
           "link": "https://www.youtube.com/watch?v=5ykZzT3qTN4",
           "date": "2024-03-16",
-          "servant": "meltlambda",
+          "servant": "266",
           "turns": "2T",
           "runner": "inv4der"
         },
@@ -94,7 +94,7 @@
           "title": "Karna 2T",
           "link": "https://www.youtube.com/watch?v=o4gZZtTxszs",
           "date": "2024-03-24",
-          "servant": "karna",
+          "servant": "85",
           "turns": "2T",
           "runner": "Blocklv55"
         },
@@ -102,7 +102,7 @@
           "title": "Janta 2T",
           "link": "https://www.youtube.com/watch?v=PtiKVcoMRNs",
           "date": "2024-03-20",
-          "servant": "janta",
+          "servant": "141",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -110,7 +110,7 @@
           "title": "Arjuna Alter 2T",
           "link": "https://www.youtube.com/watch?v=3CSggM4lARY",
           "date": "2024-03-16",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "First_TLN"
         },
@@ -118,7 +118,7 @@
           "title": "Arjuna Alter 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=JYM7ZnZNo2U",
           "date": "2024-03-16",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Ray the II"
         },
@@ -126,7 +126,7 @@
           "title": "Arjuna Alter 2T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=Pyh4X2SQwGo",
           "date": "2024-03-16",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Akise"
         },
@@ -134,7 +134,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=wD34eiRINXg&t=190s",
           "date": "2024-03-16",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Liz Happy Club"
         },
@@ -142,7 +142,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=NlJmc2-6rs8",
           "date": "2024-03-21",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Nyxi"
         },
@@ -150,7 +150,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=sNvNP5N-RUU",
           "date": "2024-03-17",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Duplexubiquitary"
         },
@@ -158,7 +158,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=5bgJZs-ryCQ",
           "date": "2024-03-17",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Gorgeous P."
         },
@@ -166,7 +166,7 @@
           "title": "Morgan 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=SB8X13BhLJY",
           "date": "2024-03-17",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Volcanicz"
         },
@@ -174,7 +174,7 @@
           "title": "Morgan 2T (19 Cost)",
           "link": "https://www.youtube.com/watch?v=tRGrSlgq2Pc",
           "date": "2024-03-17",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -182,7 +182,7 @@
           "title": "Maou Nobu 2T",
           "link": "https://www.youtube.com/watch?v=V6wHrLHDQ50",
           "date": "2024-03-21",
-          "servant": "maounobu",
+          "servant": "250",
           "turns": "2T",
           "runner": "Sigrdrífa"
         },
@@ -190,7 +190,7 @@
           "title": "Summer Kama 2T",
           "link": "https://www.youtube.com/watch?v=CfJha9gPuOM",
           "date": "2024-03-19",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "2T",
           "runner": "Kamager III"
         },
@@ -198,7 +198,7 @@
           "title": "Koyanskaya of Darkness 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=XnLoGdfscT8",
           "date": "2024-03-20",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "2T",
           "runner": "Alastair Hale"
         },
@@ -206,7 +206,7 @@
           "title": "Summer BB 2T",
           "link": "https://www.youtube.com/watch?v=bE75VZ8Mh9w",
           "date": "2024-03-19",
-          "servant": "bbsummer",
+          "servant": "220",
           "turns": "2T",
           "runner": "Zoropp"
         },
@@ -214,7 +214,7 @@
           "title": "Scathach 4T",
           "link": "https://www.youtube.com/watch?v=9JR-gz5RcpI",
           "date": "2024-03-17",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "4T",
           "runner": "Requiem"
         }
diff --git a/src/content/teslafest/eq-2020-pawn-shop.json b/src/content/teslafest/eq-2020-pawn-shop.json
index 24b3859..8ba6bd6 100644
--- a/src/content/teslafest/eq-2020-pawn-shop.json
+++ b/src/content/teslafest/eq-2020-pawn-shop.json
@@ -14,7 +14,7 @@
           "title": "Ozymandias 5T",
           "link": "https://www.youtube.com/watch?v=5FotXqLi8eA",
           "date": "2024-03-21",
-          "servant": "ozymandias",
+          "servant": "118",
           "turns": "5T",
           "runner": "Zectry"
         },
@@ -22,7 +22,7 @@
           "title": "Cindereli 5T",
           "link": "https://www.youtube.com/watch?v=B8gWE4c8qM0",
           "date": "2024-03-21",
-          "servant": "cindereli",
+          "servant": "326",
           "turns": "5T",
           "runner": "Sakazuki"
         }
diff --git a/src/content/teslafest/eq-2020-rice-ball-shop.json b/src/content/teslafest/eq-2020-rice-ball-shop.json
index c55adca..1e7221a 100644
--- a/src/content/teslafest/eq-2020-rice-ball-shop.json
+++ b/src/content/teslafest/eq-2020-rice-ball-shop.json
@@ -14,7 +14,7 @@
           "title": "Tamamo (Summer) 2T",
           "link": "https://www.youtube.com/watch?v=wbV0VkxkgVo",
           "date": "2024-03-15",
-          "servant": "summertamamo",
+          "servant": "128",
           "turns": "2T",
           "runner": "Liz Happy Club"
         },
@@ -22,7 +22,7 @@
           "title": "Brynhild 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=Kme2sdkMvBo",
           "date": "2024-03-18",
-          "servant": "brynhild",
+          "servant": "88",
           "turns": "2T",
           "runner": "Sigrdrífa"
         },
@@ -30,7 +30,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=YXUwwY0e5Uw",
           "date": "2024-03-16",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "2T",
           "runner": "Sesshou01"
         },
@@ -38,7 +38,7 @@
           "title": "Melusine 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=YXUwwY0e5Uw",
           "date": "2024-03-15",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "2T",
           "runner": "Hentai Daddi"
         },
@@ -46,7 +46,7 @@
           "title": "Kagetora 2T",
           "link": "https://www.youtube.com/watch?v=aU8Y8lpc12s",
           "date": "2024-03-16",
-          "servant": "kagetora",
+          "servant": "252",
           "turns": "2T",
           "runner": "Tinesh"
         },
@@ -54,7 +54,7 @@
           "title": "Scathach 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=I4dGfI8K2Xo",
           "date": "2024-03-17",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "2T",
           "runner": "Requiem"
         },
@@ -62,7 +62,7 @@
           "title": "Enkidu 2T (4man)",
           "link": "https://www.youtube.com/watch?v=k68VDhh480Y",
           "date": "2024-03-16",
-          "servant": "enkidu",
+          "servant": "143",
           "turns": "2T",
           "runner": "Ise(Kai)"
         },
@@ -70,7 +70,7 @@
           "title": "Enkidu 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=NUBljJdeN4U",
           "date": "2024-03-22",
-          "servant": "enkidu",
+          "servant": "143",
           "turns": "2T",
           "runner": "Alastair Hale"
         },
@@ -78,7 +78,7 @@
           "title": "Kiyohime (Summer) 2T",
           "link": "https://www.youtube.com/watch?v=JUTlUlRV2Fs",
           "date": "2024-03-16",
-          "servant": "summerkiyohime",
+          "servant": "134",
           "turns": "2T",
           "runner": "Gorgeous P."
         },
@@ -86,7 +86,7 @@
           "title": "Taiga 2T",
           "link": "https://www.youtube.com/watch?v=JOvEqH81VbU",
           "date": "2024-03-18",
-          "servant": "taiga",
+          "servant": "148",
           "turns": "2T",
           "runner": "Taiga"
         },
@@ -94,7 +94,7 @@
           "title": "Taiga 2T",
           "link": "https://www.youtube.com/watch?v=HxLOn7QlRTA",
           "date": "2024-03-16",
-          "servant": "taiga",
+          "servant": "148",
           "turns": "2T",
           "runner": "Ray the II"
         },
@@ -102,7 +102,7 @@
           "title": "Romulus 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=AfggRidr_Uo",
           "date": "2024-03-17",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -110,7 +110,7 @@
           "title": "Ereshkigal 2T",
           "link": "https://www.youtube.com/watch?v=9FobAzm8ZHY",
           "date": "2024-03-17",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -118,7 +118,7 @@
           "title": "Ereshkigal 2T (NoCE)",
           "link": "https://www.youtube.com/watch?v=M_tf5DuvvTI",
           "date": "2024-03-17",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "2T",
           "runner": "Swarmlord2"
         },
@@ -126,7 +126,7 @@
           "title": "Karna 2T (4man)",
           "link": "https://www.youtube.com/watch?v=ZZdQE_el_SA",
           "date": "2024-04-07",
-          "servant": "karna",
+          "servant": "85",
           "turns": "2T",
           "runner": "Akise"
         },
@@ -134,7 +134,7 @@
           "title": "Summer Yu 2T",
           "link": "https://www.youtube.com/watch?v=62vkxTWUBIY",
           "date": "2024-03-18",
-          "servant": "summeryu",
+          "servant": "288",
           "turns": "2T",
           "runner": "Lyud"
         },
@@ -142,7 +142,7 @@
           "title": "Summer Yu 2T",
           "link": "https://www.youtube.com/watch?v=59BXpBG84OU",
           "date": "2024-03-16",
-          "servant": "summeryu",
+          "servant": "288",
           "turns": "2T",
           "runner": "Kamager III"
         },
@@ -150,7 +150,7 @@
           "title": "Summer Yu 2T",
           "link": "https://www.youtube.com/watch?v=aGQ3RuG_-RM",
           "date": "2024-03-23",
-          "servant": "summeryu",
+          "servant": "288",
           "turns": "2T",
           "runner": "Nyxi"
         },
@@ -158,7 +158,7 @@
           "title": "Melt Lambda 2T",
           "link": "https://www.youtube.com/watch?v=uFOcbGj5yzc",
           "date": "2024-03-16",
-          "servant": "meltlambda",
+          "servant": "266",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -166,7 +166,7 @@
           "title": "Ozymandias 2T",
           "link": "https://www.youtube.com/watch?v=l9TuRq4WD2o",
           "date": "2024-03-15",
-          "servant": "ozymandias",
+          "servant": "118",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -174,7 +174,7 @@
           "title": "Arjuna Alter 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=EBtlKA8Zebc",
           "date": "2024-03-16",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -182,7 +182,7 @@
           "title": "Morgan 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=qHPczHi65Ps",
           "date": "2024-03-15",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -190,7 +190,7 @@
           "title": "MHXA 2T",
           "link": "https://www.youtube.com/watch?v=HohUbwoU5DE",
           "date": "2024-03-18",
-          "servant": "mhxa",
+          "servant": "155",
           "turns": "2T",
           "runner": "Anthony J"
         },
@@ -198,7 +198,7 @@
           "title": "Cu Alter 2T (4man)",
           "link": "https://www.youtube.com/watch?v=IDkaXVUVMm4",
           "date": "2024-03-15",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "2T",
           "runner": "Volcanicz"
         },
@@ -206,7 +206,7 @@
           "title": "Da Vinci Ruler 2T",
           "link": "https://twitter.com/LutrecTA/status/1769450074822574261",
           "date": "2024-03-17",
-          "servant": "summerdavinci",
+          "servant": "320",
           "turns": "2T",
           "runner": "Lutrec"
         }
diff --git a/src/content/teslafest/eq-2020-skyscraper-monster.json b/src/content/teslafest/eq-2020-skyscraper-monster.json
index 213b01a..7fd9505 100644
--- a/src/content/teslafest/eq-2020-skyscraper-monster.json
+++ b/src/content/teslafest/eq-2020-skyscraper-monster.json
@@ -14,7 +14,7 @@
           "title": "Baobhan Sith 2T",
           "link": "https://www.youtube.com/watch?v=KgM20h_Y3d0",
           "date": "2024-03-17",
-          "servant": "baobhansith",
+          "servant": "311",
           "turns": "2T",
           "runner": "Requiem"
         },
@@ -22,7 +22,7 @@
           "title": "Sei 2T",
           "link": "https://www.youtube.com/watch?v=2XgPUSHqvck",
           "date": "2024-03-17",
-          "servant": "sei",
+          "servant": "276",
           "turns": "2T",
           "runner": "inv4der"
         },
@@ -30,7 +30,7 @@
           "title": "Melusine 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=RiBu3tNtimU",
           "date": "2024-03-17",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -38,7 +38,7 @@
           "title": "Romulus 2T (NoCE)",
           "link": "https://www.youtube.com/watch?v=0DAcqHq9xdU",
           "date": "2024-03-19",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -46,7 +46,7 @@
           "title": "Ereshkigal 2T",
           "link": "https://www.youtube.com/watch?v=tmVdPXf7LbU",
           "date": "2024-03-17",
-          "servant": "ereshkigal",
+          "servant": "196",
           "turns": "2T",
           "runner": "Conry"
         },
@@ -54,7 +54,7 @@
           "title": "Izumo no Okuni 2T",
           "link": "https://www.youtube.com/watch?v=YE5SNty6Ci8",
           "date": "2024-03-16",
-          "servant": "okuni",
+          "servant": "327",
           "turns": "2T",
           "runner": "Kamager III"
         },
@@ -62,7 +62,7 @@
           "title": "Izumo no Okuni 2T (10Cost)",
           "link": "https://www.youtube.com/watch?v=of5avLvMihw",
           "date": "2024-03-18",
-          "servant": "okuni",
+          "servant": "327",
           "turns": "2T",
           "runner": "inv4der"
         },
@@ -70,7 +70,7 @@
           "title": "Illya 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=hSzGgc1mP-U",
           "date": "2024-03-22",
-          "servant": "illya",
+          "servant": "136",
           "turns": "2T",
           "runner": "Zoropp"
         },
@@ -78,7 +78,7 @@
           "title": "Nero Caster 2T (FLO NoCE)",
           "link": "https://twitter.com/LutrecTA/status/1769746018113831158",
           "date": "2024-03-18",
-          "servant": "nerocaster",
+          "servant": "175",
           "turns": "2T",
           "runner": "Lutrec"
         },
@@ -86,7 +86,7 @@
           "title": "Shuten Caster 2T",
           "link": "https://www.youtube.com/watch?v=y0Cls8YiWeI",
           "date": "2024-03-17",
-          "servant": "shutencaster",
+          "servant": "225",
           "turns": "2T",
           "runner": "Tinesh"
         },
@@ -94,7 +94,7 @@
           "title": "Merlin 2T",
           "link": "https://www.youtube.com/watch?v=IXx86fVnbSk",
           "date": "2024-03-16",
-          "servant": "merlin",
+          "servant": "150",
           "turns": "2T",
           "runner": "Volcanicz"
         },
@@ -102,7 +102,7 @@
           "title": "Merlin 2T",
           "link": "https://www.youtube.com/watch?v=yHGt8CQ2Rs8",
           "date": "2024-03-18",
-          "servant": "merlin",
+          "servant": "150",
           "turns": "2T",
           "runner": "Ise(Kai)"
         },
@@ -110,7 +110,7 @@
           "title": "Skadi 2T",
           "link": "https://www.youtube.com/watch?v=aSTr2G7IW_M",
           "date": "2024-03-17",
-          "servant": "skadi",
+          "servant": "215",
           "turns": "2T",
           "runner": "Firq"
         },
@@ -118,7 +118,7 @@
           "title": "Castoria 2T",
           "link": "https://www.youtube.com/watch?v=NG7iI5febaQ",
           "date": "2024-03-21",
-          "servant": "castoria",
+          "servant": "284",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -126,7 +126,7 @@
           "title": "Miss Crane 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=ymjOgTgmnPQ",
           "date": "2024-03-18",
-          "servant": "misscrane",
+          "servant": "307",
           "turns": "2T",
           "runner": "QP Dangerous"
         },
@@ -134,7 +134,7 @@
           "title": "Hans 2T",
           "link": "https://www.youtube.com/watch?v=nZftQeoFBds",
           "date": "2024-03-18",
-          "servant": "hans",
+          "servant": "33",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -142,7 +142,7 @@
           "title": "Jekyll & Hyde 2T",
           "link": "https://www.youtube.com/watch?v=v_s7mKBWNyc",
           "date": "2024-03-18",
-          "servant": "jekyllhyde",
+          "servant": "81",
           "turns": "2T",
           "runner": "Rikohaiji"
         },
@@ -150,7 +150,7 @@
           "title": "Arjuna Alter 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=iWYMM6C3vbQ",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -158,7 +158,7 @@
           "title": "Arjuna Alter 2T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=0A1B2Yc_NVw",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -166,7 +166,7 @@
           "title": "Morgan 2T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=susehGkuxfQ",
           "date": "2024-03-16",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Volcanicz"
         },
@@ -174,7 +174,7 @@
           "title": "Morgan 2T (FLO NoCE NoNP)",
           "link": "https://www.youtube.com/watch?v=lA_t9fNV6Nk",
           "date": "2024-03-16",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -182,7 +182,7 @@
           "title": "Summer Jalter 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=PKrPJNndlW0",
           "date": "2024-03-16",
-          "servant": "jaltersummer",
+          "servant": "219",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -190,7 +190,7 @@
           "title": "Summer Sei 2T",
           "link": "https://www.youtube.com/watch?v=QZpVNKGouyg",
           "date": "2024-03-16",
-          "servant": "summersei",
+          "servant": "323",
           "turns": "2T",
           "runner": "Ise(Kai)"
         },
@@ -198,7 +198,7 @@
           "title": "Tamamo Cat 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=_VhJwYMiUB4",
           "date": "2024-03-19",
-          "servant": "tamamocat",
+          "servant": "58",
           "turns": "2T",
           "runner": "Rikohaiji"
         },
@@ -206,7 +206,7 @@
           "title": "Cu Alter 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=EcoE7REerfg",
           "date": "2024-03-16",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "2T",
           "runner": "Ryougi Bobby"
         },
@@ -214,7 +214,7 @@
           "title": "Taira 2T",
           "link": "https://www.youtube.com/watch?v=XuM9Eq2CZJY",
           "date": "2024-03-16",
-          "servant": "taira",
+          "servant": "303",
           "turns": "2T",
           "runner": "Anthony J"
         },
@@ -222,7 +222,7 @@
           "title": "Okita Alter 2T",
           "link": "https://www.youtube.com/watch?v=7j03DlcgHIE",
           "date": "2024-03-16",
-          "servant": "okitaalter",
+          "servant": "209",
           "turns": "2T",
           "runner": "Blocklv55"
         }
diff --git a/src/content/teslafest/eq-2020-sweet-universe.json b/src/content/teslafest/eq-2020-sweet-universe.json
index cfe2731..1805980 100644
--- a/src/content/teslafest/eq-2020-sweet-universe.json
+++ b/src/content/teslafest/eq-2020-sweet-universe.json
@@ -14,7 +14,7 @@
           "title": "Maou Nobu 3T",
           "link": "https://www.youtube.com/watch?v=bdimFAP0cXc",
           "date": "2024-03-17",
-          "servant": "maounobu",
+          "servant": "250",
           "turns": "3T",
           "runner": "Ray the II"
         },
@@ -22,7 +22,7 @@
           "title": "Musashi 2T",
           "link": "https://www.youtube.com/watch?v=S3omeS0AYgo",
           "date": "2024-03-24",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "2T",
           "runner": "Sunder"
         },
@@ -30,7 +30,7 @@
           "title": "Musashi 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=ybK4XV7v7e0",
           "date": "2024-03-27",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -38,7 +38,7 @@
           "title": "Ibuki 2T",
           "link": "https://www.youtube.com/watch?v=VLgnnmx4D7g",
           "date": "2024-03-17",
-          "servant": "ibuki",
+          "servant": "299",
           "turns": "2T",
           "runner": "inv4der"
         },
@@ -46,7 +46,7 @@
           "title": "Saber Alter 2T",
           "link": "https://www.youtube.com/watch?v=KNEK2fL-ptw",
           "date": "2024-03-24",
-          "servant": "saberalter",
+          "servant": "3",
           "turns": "2T",
           "runner": "Shawn Sun"
         },
@@ -54,7 +54,7 @@
           "title": "Nero Bride 2T (w. Casgil & Medb)",
           "link": "https://www.youtube.com/watch?v=1Blot2gjslw",
           "date": "2024-04-11",
-          "servant": "nerobride",
+          "servant": "90",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -62,7 +62,7 @@
           "title": "Romulus 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=ltv8Cr0GPPg",
           "date": "2024-03-22",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -70,7 +70,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=QtofiRzGGXw",
           "date": "2024-03-17",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Hentai Daddi"
         },
@@ -78,7 +78,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=v9TIfEXx_HU",
           "date": "2024-03-17",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Felt"
         },
@@ -86,7 +86,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=LKX3jLg57q4",
           "date": "2024-03-17",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -94,7 +94,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=TRwF6JU4BEQ",
           "date": "2024-03-17",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -102,7 +102,7 @@
           "title": "Karna 2T",
           "link": "https://www.youtube.com/watch?v=CqQcZFWZwCk",
           "date": "2024-03-17",
-          "servant": "karna",
+          "servant": "85",
           "turns": "2T",
           "runner": "Akise"
         },
@@ -110,7 +110,7 @@
           "title": "Scathach 2T",
           "link": "https://www.youtube.com/watch?v=_mKuvVL7KtU",
           "date": "2024-03-17",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "2T",
           "runner": "Requiem"
         },
@@ -118,7 +118,7 @@
           "title": "Ozymandias 2T",
           "link": "https://www.youtube.com/watch?v=3n-OPY99Qcw",
           "date": "2024-03-17",
-          "servant": "ozymandias",
+          "servant": "118",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -126,7 +126,7 @@
           "title": "Illya 2T",
           "link": "https://www.youtube.com/watch?v=S7VWJyJWRd8",
           "date": "2024-03-22",
-          "servant": "illya",
+          "servant": "136",
           "turns": "2T",
           "runner": "MCR"
         },
@@ -134,7 +134,7 @@
           "title": "Charlotte Summer 2T",
           "link": "https://www.youtube.com/watch?v=_Bok9VXgRmA",
           "date": "2024-03-17",
-          "servant": "summercharlotte",
+          "servant": "319",
           "turns": "2T",
           "runner": "Dante"
         },
@@ -142,7 +142,7 @@
           "title": "MHX 2T",
           "link": "https://www.youtube.com/watch?v=GGnzoHtHGbs",
           "date": "2024-03-17",
-          "servant": "mhx",
+          "servant": "86",
           "turns": "2T",
           "runner": "Ayumi"
         },
@@ -150,7 +150,7 @@
           "title": "Koyanskaya of Light 2T",
           "link": "https://www.youtube.com/watch?v=HfQte4l549A",
           "date": "2024-03-27",
-          "servant": "koyanlight",
+          "servant": "314",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -158,7 +158,7 @@
           "title": "Arjuna Alter 2T",
           "link": "https://www.youtube.com/watch?v=8xsxfCBv4FE",
           "date": "2024-03-22",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -166,7 +166,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=eDZr8a2BrZs",
           "date": "2024-03-22",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Ray"
         },
@@ -174,7 +174,7 @@
           "title": "Cu Alter 2T",
           "link": "https://www.youtube.com/watch?v=6cMEXtmgBTM",
           "date": "2024-03-22",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "2T",
           "runner": "Volcanicz"
         },
@@ -182,7 +182,7 @@
           "title": "Astrea 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=PAsyKNWPsfg",
           "date": "2024-03-28",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "2T",
           "runner": "Alastair Hale"
         },
@@ -190,7 +190,7 @@
           "title": "Da Vinci Ruler 2T",
           "link": "https://twitter.com/LutrecTA/status/1770049305702813787",
           "date": "2024-03-19",
-          "servant": "summerdavinci",
+          "servant": "320",
           "turns": "2T",
           "runner": "Lutrec"
         },
@@ -198,7 +198,7 @@
           "title": "Jalter 2T (w. Elizabeth)",
           "link": "https://www.youtube.com/watch?v=iwVJRGk-tO4",
           "date": "2024-03-18",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "2T",
           "runner": "Ray the II"
         },
@@ -206,7 +206,7 @@
           "title": "Jalter 2T",
           "link": "https://www.youtube.com/watch?v=m7OBOU7DBk4",
           "date": "2024-03-17",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "2T",
           "runner": "Ray"
         },
@@ -214,7 +214,7 @@
           "title": "Jalter 2T (NoCE)",
           "link": "https://twitter.com/santoryuiai3/status/1770250552619814933",
           "date": "2024-03-20",
-          "servant": "jalter",
+          "servant": "106",
           "turns": "2T",
           "runner": "Ray"
         },
@@ -222,7 +222,7 @@
           "title": "Taira 2T",
           "link": "https://www.youtube.com/watch?v=EgfPk-cSXus",
           "date": "2024-03-17",
-          "servant": "taira",
+          "servant": "303",
           "turns": "2T",
           "runner": "Felt"
         },
@@ -230,7 +230,7 @@
           "title": "Space Ishtar 2T",
           "link": "https://www.youtube.com/watch?v=lWlcu4W_4Go",
           "date": "2024-03-21",
-          "servant": "spaceishtar",
+          "servant": "268",
           "turns": "2T",
           "runner": "Nirrin"
         },
@@ -238,7 +238,7 @@
           "title": "Koyanskaya of Darkness 2T",
           "link": "https://www.youtube.com/watch?v=3zydh0QEmu0",
           "date": "2024-03-19",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "2T",
           "runner": "Alastair Hale"
         },
@@ -246,7 +246,7 @@
           "title": "Abby 2T",
           "link": "https://www.youtube.com/watch?v=FftWUVnah2I",
           "date": "2024-03-19",
-          "servant": "abby",
+          "servant": "195",
           "turns": "2T",
           "runner": "Sol Sovereign"
         }
diff --git a/src/content/teslafest/eq-2021-bewitched.json b/src/content/teslafest/eq-2021-bewitched.json
index d32648e..a0d4900 100644
--- a/src/content/teslafest/eq-2021-bewitched.json
+++ b/src/content/teslafest/eq-2021-bewitched.json
@@ -14,7 +14,7 @@
           "title": "Sigurd 3T (NoCE)",
           "link": "https://www.youtube.com/watch?v=rpeRrBzZ8y4",
           "date": "2024-03-22",
-          "servant": "sigurd",
+          "servant": "213",
           "turns": "3T",
           "runner": "ProbablyAParrot"
         },
@@ -22,7 +22,7 @@
           "title": "Nero Bride 3T (F2P Support)",
           "link": "https://www.youtube.com/watch?v=DpUiSyzOyXQ",
           "date": "2024-03-25",
-          "servant": "nerobride",
+          "servant": "90",
           "turns": "3T",
           "runner": "Infernia Rosarum"
         },
@@ -30,7 +30,7 @@
           "title": "Nero Bride 3T (Lvl. 2)",
           "link": "https://twitter.com/LutrecTA/status/1771177568747635118",
           "date": "2024-03-22",
-          "servant": "nerobride",
+          "servant": "90",
           "turns": "3T",
           "runner": "Lutrec"
         },
@@ -38,7 +38,7 @@
           "title": "Gilgamesh 3T",
           "link": "https://www.youtube.com/watch?v=q6yMWO2LFUM",
           "date": "2024-03-20",
-          "servant": "gilgamesh",
+          "servant": "12",
           "turns": "3T",
           "runner": "Gorgeous P."
         },
@@ -46,7 +46,7 @@
           "title": "Fujino 3T",
           "link": "https://www.youtube.com/watch?v=CFlUil7cXqE",
           "date": "2024-03-25",
-          "servant": "fujino",
+          "servant": "200",
           "turns": "3T",
           "runner": "Blocklv55"
         },
@@ -54,7 +54,7 @@
           "title": "Baobhan Sith 3T",
           "link": "https://www.youtube.com/watch?v=6whjNuNHnnI",
           "date": "2024-03-24",
-          "servant": "baobhansith",
+          "servant": "311",
           "turns": "3T",
           "runner": "Nyxi"
         },
@@ -62,7 +62,7 @@
           "title": "Summer Illya 3T",
           "link": "https://www.youtube.com/watch?v=wVloyS4HwSo",
           "date": "2024-03-21",
-          "servant": "summerillya",
+          "servant": "286",
           "turns": "3T",
           "runner": "zoropp"
         },
@@ -70,7 +70,7 @@
           "title": "Brynhild 3T (NoCE)",
           "link": "https://www.youtube.com/watch?v=gVusXCtt0g8",
           "date": "2024-03-21",
-          "servant": "brynhild",
+          "servant": "88",
           "turns": "3T",
           "runner": "Sigrdrífa"
         },
@@ -78,7 +78,7 @@
           "title": "Romulus 3T (3 Cost)",
           "link": "https://www.youtube.com/watch?v=O9COj4g60-M",
           "date": "2024-03-28",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "3T",
           "runner": "Sakazuki"
         },
@@ -86,7 +86,7 @@
           "title": "Melusine 3T (Lvl. 1)",
           "link": "https://www.youtube.com/watch?v=WH7G1uBtEHk",
           "date": "2024-03-22",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -94,7 +94,7 @@
           "title": "Taiga 3T",
           "link": "https://www.youtube.com/watch?v=V95BpzpFWoI",
           "date": "2024-03-25",
-          "servant": "taiga",
+          "servant": "148",
           "turns": "3T",
           "runner": "Taiga"
         },
@@ -102,7 +102,7 @@
           "title": "Ozymandias 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=H7zBBN7RUXo",
           "date": "2024-03-19",
-          "servant": "ozymandias",
+          "servant": "118",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -110,7 +110,7 @@
           "title": "Summer Caenis 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=dfOFE-vF-vI",
           "date": "2024-03-20",
-          "servant": "summercaenis",
+          "servant": "322",
           "turns": "3T",
           "runner": "Kamager III"
         },
@@ -118,7 +118,7 @@
           "title": "Rider Ishtar 3T",
           "link": "https://www.youtube.com/watch?v=_IpVYgtMOqI",
           "date": "2024-03-22",
-          "servant": "riderishtar",
+          "servant": "182",
           "turns": "3T",
           "runner": "Volcanicz"
         },
@@ -126,7 +126,7 @@
           "title": "Sanzang 3T",
           "link": "https://www.youtube.com/watch?v=BdpfqnGsCyA&t=224s",
           "date": "2024-03-19",
-          "servant": "sanzang",
+          "servant": "113",
           "turns": "3T",
           "runner": "Liz Happy Club"
         },
@@ -134,7 +134,7 @@
           "title": "Castoria 3T",
           "link": "https://www.youtube.com/watch?v=kYn5Ubz4g9o",
           "date": "2024-03-22",
-          "servant": "castoria",
+          "servant": "284",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -142,7 +142,7 @@
           "title": "Miss Crane 3T",
           "link": "https://www.youtube.com/watch?v=iikUbWWA-Xc",
           "date": "2024-03-22",
-          "servant": "misscrane",
+          "servant": "307",
           "turns": "3T",
           "runner": "QP Dangerous"
         },
@@ -150,7 +150,7 @@
           "title": "Kojirou 3T",
           "link": "https://www.youtube.com/watch?v=cITjpOzF7vg",
           "date": "2024-03-22",
-          "servant": "kojirou",
+          "servant": "39",
           "turns": "3T",
           "runner": "Conry"
         },
@@ -158,7 +158,7 @@
           "title": "Jekyll & Hyde 3T (4man)",
           "link": "https://www.youtube.com/watch?v=m6ZJIfeTtWU",
           "date": "2024-03-19",
-          "servant": "jekyllhyde",
+          "servant": "81",
           "turns": "3T",
           "runner": "Rikohaiji"
         },
@@ -166,7 +166,7 @@
           "title": "Stheno 3T",
           "link": "https://www.youtube.com/watch?v=eUWnXU7Xgjs",
           "date": "2024-03-25",
-          "servant": "stheno",
+          "servant": "41",
           "turns": "3T",
           "runner": "Volcanicz"
         },
@@ -174,7 +174,7 @@
           "title": "Morgan 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=Ok4ylQvEjwA",
           "date": "2024-03-23",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -182,7 +182,7 @@
           "title": "Morgan 3T (6 Cost)",
           "link": "https://www.youtube.com/watch?v=zrMN7DeyHIw",
           "date": "2024-03-19",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -190,7 +190,7 @@
           "title": "Arjuna Alter 3T (6 Cost)",
           "link": "https://www.youtube.com/watch?v=upGvLuoe2L4",
           "date": "2024-03-28",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Sakazuki"
         },
@@ -198,7 +198,7 @@
           "title": "Da Vinci Ruler 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=m7hsS5ppPaI",
           "date": "2024-03-20",
-          "servant": "summerdavinci",
+          "servant": "320",
           "turns": "3T",
           "runner": "Tinesh"
         },
@@ -206,7 +206,7 @@
           "title": "Taira 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=JOaUhugHI6U",
           "date": "2024-03-20",
-          "servant": "taira",
+          "servant": "303",
           "turns": "3T",
           "runner": "Anthony J"
         },
@@ -214,7 +214,7 @@
           "title": "Summer Kama 3T",
           "link": "https://www.youtube.com/watch?v=-v0-vGpG-gI",
           "date": "2024-03-19",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "3T",
           "runner": "Kamager III"
         },
@@ -222,7 +222,7 @@
           "title": "Bazett 2T",
           "link": "https://www.youtube.com/watch?v=kMQzJlKvMrs",
           "date": "2024-03-19",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "2T",
           "runner": "First_TLN"
         },
@@ -230,7 +230,7 @@
           "title": "Bazett 2T (3 Cost)",
           "link": "https://www.youtube.com/watch?v=nx50uGiCYNw",
           "date": "2024-03-24",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "2T",
           "runner": "TokuHer0"
         }
diff --git a/src/content/teslafest/eq-2021-bride-main-event.json b/src/content/teslafest/eq-2021-bride-main-event.json
index 1349833..09a9b28 100644
--- a/src/content/teslafest/eq-2021-bride-main-event.json
+++ b/src/content/teslafest/eq-2021-bride-main-event.json
@@ -14,7 +14,7 @@
           "title": "Artoria 2T",
           "link": "https://www.youtube.com/watch?v=xomwwyFIJAY",
           "date": "2024-03-22",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "2T",
           "runner": "Tinesh"
         },
@@ -22,7 +22,7 @@
           "title": "Ibuki 2T",
           "link": "https://www.youtube.com/watch?v=rKV3hiVP_jg",
           "date": "2024-03-19",
-          "servant": "ibuki",
+          "servant": "299",
           "turns": "2T",
           "runner": "inv4der"
         },
@@ -30,7 +30,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=N1nQev7Vxag",
           "date": "2024-03-19",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Hentai Daddi"
         },
@@ -38,7 +38,7 @@
           "title": "Melusine 2T",
           "link": "https://www.youtube.com/watch?v=TgeO9w_xkXI",
           "date": "2024-03-20",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -46,7 +46,7 @@
           "title": "Romulus 2T",
           "link": "https://www.youtube.com/watch?v=oaJCHQgFWGc",
           "date": "2024-03-27",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -54,7 +54,7 @@
           "title": "Ivan 2T",
           "link": "https://www.youtube.com/watch?v=7VVT3ibdx3w",
           "date": "2024-03-24",
-          "servant": "ivan",
+          "servant": "205",
           "turns": "2T",
           "runner": "ProbablyAParrot"
         },
@@ -62,7 +62,7 @@
           "title": "Nero Caster 2T",
           "link": "https://www.youtube.com/watch?v=PrR2elnsCD8",
           "date": "2024-03-22",
-          "servant": "nerocaster",
+          "servant": "175",
           "turns": "2T",
           "runner": "Lutrec"
         },
@@ -70,7 +70,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=eG1SIfC8FCU",
           "date": "2024-03-19",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Gorgeous P."
         },
@@ -78,7 +78,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=xqXIW6V-Xj0",
           "date": "2024-03-26",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Nyxi"
         },
@@ -86,7 +86,7 @@
           "title": "Morgan 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=vtzwVCVX1DY",
           "date": "2024-03-19",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -94,7 +94,7 @@
           "title": "Arjuna Alter 2T",
           "link": "https://www.youtube.com/watch?v=BdpfqnGsCyA",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Liz Happy Club"
         },
@@ -102,7 +102,7 @@
           "title": "Arjuna Alter 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=WhLmfJrZyTA",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Akise"
         },
@@ -110,7 +110,7 @@
           "title": "Arjuna Alter 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=AIVvSa8fOdk",
           "date": "2024-03-27",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -118,7 +118,7 @@
           "title": "Summer Musashi 2T",
           "link": "https://www.youtube.com/watch?v=4MSIbjrEA7M",
           "date": "2024-03-19",
-          "servant": "summermusashi",
+          "servant": "261",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -126,7 +126,7 @@
           "title": "Darius 2T",
           "link": "https://www.youtube.com/watch?v=kNYP36Pcfe8",
           "date": "2024-03-24",
-          "servant": "darius",
+          "servant": "55",
           "turns": "2T",
           "runner": "TR"
         },
@@ -134,7 +134,7 @@
           "title": "Darius 2T",
           "link": "https://www.youtube.com/watch?v=0gUC07HUbKk",
           "date": "2024-03-22",
-          "servant": "darius",
+          "servant": "55",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -142,7 +142,7 @@
           "title": "Space Ishtar 2T",
           "link": "https://www.youtube.com/watch?v=uKEdeu6DJTs",
           "date": "2024-03-25",
-          "servant": "spaceishtar",
+          "servant": "268",
           "turns": "2T",
           "runner": "Requiem"
         },
@@ -150,7 +150,7 @@
           "title": "Koyanskaya of Darkness 2T",
           "link": "https://www.youtube.com/watch?v=HlF9zmw5XbE",
           "date": "2024-03-23",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "2T",
           "runner": "Alastair Hale"
         }
diff --git a/src/content/teslafest/eq-2021-catch-the-clown.json b/src/content/teslafest/eq-2021-catch-the-clown.json
index 41a3ce4..b7b3be6 100644
--- a/src/content/teslafest/eq-2021-catch-the-clown.json
+++ b/src/content/teslafest/eq-2021-catch-the-clown.json
@@ -14,7 +14,7 @@
           "title": "Altera 3T",
           "link": "https://www.youtube.com/watch?v=foNiMNDPAuI",
           "date": "2024-03-25",
-          "servant": "altera",
+          "servant": "8",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -22,7 +22,7 @@
           "title": "Nero 3T",
           "link": "https://twitter.com/LutrecTA/status/1772959434513293518",
           "date": "2024-03-27",
-          "servant": "nero",
+          "servant": "5",
           "turns": "3T",
           "runner": "Lutrec"
         },
@@ -30,7 +30,7 @@
           "title": "Gilgamesh 3T (4man)",
           "link": "https://www.youtube.com/watch?v=fnO6buimUqg",
           "date": "2024-03-20",
-          "servant": "gilgamesh",
+          "servant": "12",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -38,7 +38,7 @@
           "title": "Melusine 3T",
           "link": "https://www.youtube.com/watch?v=YhLV3ARYBSw",
           "date": "2024-03-25",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -46,7 +46,7 @@
           "title": "Summer Caenis 3T",
           "link": "https://www.youtube.com/watch?v=3VPZnvqvev4",
           "date": "2024-03-20",
-          "servant": "summercaenis",
+          "servant": "322",
           "turns": "3T",
           "runner": "Kamager III"
         },
@@ -54,7 +54,7 @@
           "title": "Drake 3T",
           "link": "https://www.youtube.com/watch?v=JPS48CxAXIY",
           "date": "2024-03-28",
-          "servant": "drake",
+          "servant": "65",
           "turns": "3T",
           "runner": "Tinesh"
         },
@@ -62,7 +62,7 @@
           "title": "Drake 3T (4man)",
           "link": "https://www.youtube.com/watch?v=J2t-WEV6hJk",
           "date": "2024-03-24",
-          "servant": "drake",
+          "servant": "65",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -70,7 +70,7 @@
           "title": "Arjuna Alter 3T (NoCE)",
           "link": "https://www.youtube.com/watch?v=2N-JXjXBBU0",
           "date": "2024-03-27",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Volcanicz"
         },
@@ -78,7 +78,7 @@
           "title": "Arjuna Alter 3T (NDCE 5man)",
           "link": "https://www.youtube.com/watch?v=ItA5mW3SwGk",
           "date": "2024-03-23",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Akise"
         },
@@ -86,7 +86,7 @@
           "title": "Arjuna Alter 3T (NoCE 4man)",
           "link": "https://www.youtube.com/watch?v=NIiZsn-TBdg",
           "date": "2024-03-31",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Sakazuki"
         },
@@ -94,7 +94,7 @@
           "title": "Morgan 3T",
           "link": "https://www.youtube.com/watch?v=BKiMQwQPRjM",
           "date": "2024-03-20",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "im poketar"
         },
@@ -102,7 +102,7 @@
           "title": "Morgan 3T",
           "link": "https://www.youtube.com/watch?v=aVgm6kfjNNA",
           "date": "2024-03-22",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Gorgeous P."
         },
@@ -110,7 +110,7 @@
           "title": "Morgan 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=E8aWa7GdTqE",
           "date": "2024-03-20",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -118,7 +118,7 @@
           "title": "Bazett 2T",
           "link": "https://www.youtube.com/watch?v=pAeBIcdtAgg",
           "date": "2024-03-20",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "2T",
           "runner": "First_TLN"
         },
@@ -126,7 +126,7 @@
           "title": "Bazett 2T",
           "link": "https://www.youtube.com/watch?v=1xaPz3sVxqA",
           "date": "2024-03-21",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "2T",
           "runner": "GregoryZero"
         },
@@ -134,7 +134,7 @@
           "title": "Koyanskaya of Darkness 3T",
           "link": "https://www.youtube.com/watch?v=0Yx9jxEU0eU",
           "date": "2024-03-29",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "3T",
           "runner": "Alastair Hale"
         }
diff --git a/src/content/teslafest/eq-2021-finale-ii.json b/src/content/teslafest/eq-2021-finale-ii.json
index eab19aa..6514e6b 100644
--- a/src/content/teslafest/eq-2021-finale-ii.json
+++ b/src/content/teslafest/eq-2021-finale-ii.json
@@ -14,7 +14,7 @@
           "title": "Musashi 3T",
           "link": "https://www.youtube.com/watch?v=N1_fKU3N6eM",
           "date": "2024-03-22",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "3T",
           "runner": "Ryougi Bobby"
         },
@@ -22,7 +22,7 @@
           "title": "Musashi 3T",
           "link": "https://www.youtube.com/watch?v=-YiKOerg-JQ",
           "date": "2024-03-26",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "3T",
           "runner": "Sigrdrífa"
         },
@@ -30,7 +30,7 @@
           "title": "Musashi 3T",
           "link": "https://www.youtube.com/watch?v=ivlzuhjRmQs",
           "date": "2024-03-22",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "3T",
           "runner": "First_TLN"
         },
@@ -38,7 +38,7 @@
           "title": "Musashi 3T",
           "link": "https://twitter.com/LutrecTA/status/1771597714309927260",
           "date": "2024-03-23",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "3T",
           "runner": "Lutrec"
         },
@@ -46,7 +46,7 @@
           "title": "Musashi 3T",
           "link": "https://www.youtube.com/watch?v=Uh3qycGalF4",
           "date": "2024-03-23",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -54,7 +54,7 @@
           "title": "Musashi 3T (NoCE)",
           "link": "https://www.youtube.com/watch?v=dj8yoMdEwkY",
           "date": "2024-03-26",
-          "servant": "musashi",
+          "servant": "153",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -62,7 +62,7 @@
           "title": "Sigurd 3T (NCDE)",
           "link": "https://www.youtube.com/watch?v=FDFcW8usavE",
           "date": "2024-03-23",
-          "servant": "sigurd",
+          "servant": "213",
           "turns": "3T",
           "runner": "ProbablyAParrot"
         },
@@ -70,7 +70,7 @@
           "title": "Beni-Enma 3T",
           "link": "https://www.youtube.com/watch?v=8GRvuL3BLEk",
           "date": "2024-03-22",
-          "servant": "benienma",
+          "servant": "234",
           "turns": "3T",
           "runner": "Kamager III"
         },
@@ -78,7 +78,7 @@
           "title": "Beni-Enma 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=IvTK0Q0JfsY",
           "date": "2024-03-27",
-          "servant": "benienma",
+          "servant": "234",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -86,7 +86,7 @@
           "title": "Bedivere 3T",
           "link": "https://www.youtube.com/watch?v=6WKnji9jctc",
           "date": "2024-03-22",
-          "servant": "bedivere",
+          "servant": "126",
           "turns": "3T",
           "runner": "Ray the II"
         },
@@ -94,7 +94,7 @@
           "title": "Summer Hokusai 3T",
           "link": "https://www.youtube.com/watch?v=Ly3K6wUapSE",
           "date": "2024-03-22",
-          "servant": "summerhokusai",
+          "servant": "264",
           "turns": "3T",
           "runner": "Tinesh"
         },
@@ -102,7 +102,7 @@
           "title": "Summer Hokusai 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=4NuCMMovksg",
           "date": "2024-03-25",
-          "servant": "summerhokusai",
+          "servant": "264",
           "turns": "3T",
           "runner": "inv4der"
         },
@@ -110,7 +110,7 @@
           "title": "Muramasa 3T",
           "link": "https://www.youtube.com/watch?v=MsiloyQxDfs",
           "date": "2024-03-23",
-          "servant": "muramasa",
+          "servant": "302",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -118,7 +118,7 @@
           "title": "Muramasa 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=ge_PU19eMWM",
           "date": "2024-03-25",
-          "servant": "muramasa",
+          "servant": "302",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -126,7 +126,7 @@
           "title": "Saber Alter 3T",
           "link": "https://www.youtube.com/watch?v=Moe1-i-NVX8",
           "date": "2024-03-29",
-          "servant": "saberalter",
+          "servant": "3",
           "turns": "3T",
           "runner": "Shawn Sun"
         },
@@ -134,7 +134,7 @@
           "title": "Melusine 3T",
           "link": "https://www.youtube.com/watch?v=ahGiqivoUqA",
           "date": "2024-03-22",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -142,7 +142,7 @@
           "title": "Li Shuwen 3T",
           "link": "https://www.youtube.com/watch?v=R5XkPmaImWE",
           "date": "2024-03-25",
-          "servant": "oldli",
+          "servant": "235",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -150,7 +150,7 @@
           "title": "MHXA 3T",
           "link": "https://www.youtube.com/watch?v=01WPieF-EAQ",
           "date": "2024-03-22",
-          "servant": "mhxa",
+          "servant": "155",
           "turns": "3T",
           "runner": "Ayumi"
         },
@@ -158,7 +158,7 @@
           "title": "Morgan 3T",
           "link": "https://twitter.com/santoryuiai3/status/1771260206090965013",
           "date": "2024-03-22",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Ray"
         },
@@ -166,7 +166,7 @@
           "title": "Arjuna Alter 3T",
           "link": "https://www.youtube.com/watch?v=VElGV2WdQQQ",
           "date": "2024-03-22",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Akise"
         },
@@ -174,7 +174,7 @@
           "title": "Yang Guifei 3T",
           "link": "https://www.youtube.com/watch?v=F0mVvLtx9uE",
           "date": "2024-03-24",
-          "servant": "yangguifei",
+          "servant": "275",
           "turns": "3T",
           "runner": "Requiem"
         }
diff --git a/src/content/teslafest/eq-2021-gorgon-sisters.json b/src/content/teslafest/eq-2021-gorgon-sisters.json
index aea87de..21b5d0a 100644
--- a/src/content/teslafest/eq-2021-gorgon-sisters.json
+++ b/src/content/teslafest/eq-2021-gorgon-sisters.json
@@ -14,7 +14,7 @@
           "title": "Ibuki 2T",
           "link": "https://www.youtube.com/watch?v=nXqrqBPpMik",
           "date": "2024-03-20",
-          "servant": "ibuki",
+          "servant": "299",
           "turns": "2T",
           "runner": "inv4der"
         },
@@ -22,7 +22,7 @@
           "title": "Summer Illya 2T",
           "link": "https://www.youtube.com/watch?v=n9r7K8762ck",
           "date": "2024-03-28",
-          "servant": "summerillya",
+          "servant": "286",
           "turns": "2T",
           "runner": "zoropp"
         },
@@ -30,7 +30,7 @@
           "title": "Romulus 2T",
           "link": "https://www.youtube.com/watch?v=gOID1sTtcVI",
           "date": "2024-03-28",
-          "servant": "romulus",
+          "servant": "280",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -38,7 +38,7 @@
           "title": "Melusine 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=_UThC-CN6do",
           "date": "2024-03-20",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "Hentai Daddi"
         },
@@ -46,7 +46,7 @@
           "title": "Melusine 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=sDuE9IZQ7Ok",
           "date": "2024-03-20",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -54,7 +54,7 @@
           "title": "Nero Caster 2T",
           "link": "https://twitter.com/LutrecTA/status/1772372664838963480",
           "date": "2024-03-25",
-          "servant": "nerocaster",
+          "servant": "175",
           "turns": "2T",
           "runner": "Lutrec"
         },
@@ -62,7 +62,7 @@
           "title": "Arjuna Alter 2T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=2GczluPBHcc",
           "date": "2024-03-20",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Akise"
         },
@@ -70,7 +70,7 @@
           "title": "Arjuna Alter 2T (16 Cost)",
           "link": "https://www.youtube.com/watch?v=ly6DVlDfcXY",
           "date": "2024-03-28",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -78,7 +78,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=z7AzI8SGTv8",
           "date": "2024-03-20",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "First_TLN"
         },
@@ -86,7 +86,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=Dm2oe-QbK04",
           "date": "2024-03-20",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Liz Happy Club"
         },
@@ -94,7 +94,7 @@
           "title": "Morgan 2T",
           "link": "https://www.youtube.com/watch?v=nBwl3M77GF8",
           "date": "2024-03-21",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Gorgeous P."
         },
@@ -102,7 +102,7 @@
           "title": "Morgan 2T (20 Cost)",
           "link": "https://www.youtube.com/watch?v=rwGo5R9DP3A",
           "date": "2024-03-21",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -110,7 +110,7 @@
           "title": "Morgan 2T (16 Cost)",
           "link": "https://www.youtube.com/watch?v=fQiE5xc2Dv8",
           "date": "2024-03-23",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "2T",
           "runner": "Volcanicz"
         },
@@ -118,7 +118,7 @@
           "title": "Tamamo Cat 2T",
           "link": "https://www.youtube.com/watch?v=nE3mNXVQC04",
           "date": "2024-03-29",
-          "servant": "tamamocat",
+          "servant": "58",
           "turns": "2T",
           "runner": "Requiem"
         },
@@ -126,7 +126,7 @@
           "title": "Maou Nobu 2T (NoCE)",
           "link": "https://www.youtube.com/watch?v=hzmKa2vrgAk",
           "date": "2024-03-25",
-          "servant": "maounobu",
+          "servant": "250",
           "turns": "2T",
           "runner": "Sigrdrífa"
         },
@@ -134,7 +134,7 @@
           "title": "Summer Kama 2T",
           "link": "https://www.youtube.com/watch?v=axPQJS41hos",
           "date": "2024-03-20",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "2T",
           "runner": "Kamager III"
         },
@@ -142,7 +142,7 @@
           "title": "Kingprotea 2T",
           "link": "https://www.youtube.com/watch?v=wH6ItkkT5wM",
           "date": "2024-03-20",
-          "servant": "kingprotea",
+          "servant": "238",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -150,7 +150,7 @@
           "title": "Summer BB 2T",
           "link": "https://www.youtube.com/watch?v=1xNZTeC-lzY",
           "date": "2024-03-29",
-          "servant": "bbsummer",
+          "servant": "220",
           "turns": "2T",
           "runner": "zoropp"
         },
@@ -158,7 +158,7 @@
           "title": "Koyanskaya of Darkness 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=02utpNgpwTI",
           "date": "2024-03-23",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -166,7 +166,7 @@
           "title": "Voyager 2T",
           "link": "https://www.youtube.com/watch?v=JHTWwb8L0J0",
           "date": "2024-03-21",
-          "servant": "voyager",
+          "servant": "281",
           "turns": "2T",
           "runner": "Kamager III"
         },
@@ -174,7 +174,7 @@
           "title": "Sigurd 3T",
           "link": "https://www.youtube.com/watch?v=2WV4nB45Mx0",
           "date": "2024-03-22",
-          "servant": "sigurd",
+          "servant": "213",
           "turns": "3T",
           "runner": "ProbablyAParrot"
         }
diff --git a/src/content/teslafest/eq-2021-green-comet.json b/src/content/teslafest/eq-2021-green-comet.json
index 4be58eb..8419bef 100644
--- a/src/content/teslafest/eq-2021-green-comet.json
+++ b/src/content/teslafest/eq-2021-green-comet.json
@@ -14,7 +14,7 @@
           "title": "Kama 2T",
           "link": "https://www.youtube.com/watch?v=re1Po7O_kxM",
           "date": "2024-03-23",
-          "servant": "kama",
+          "servant": "239",
           "turns": "2T",
           "runner": "Requiem"
         },
@@ -22,7 +22,7 @@
           "title": "Arjuna Alter 2T",
           "link": "https://www.youtube.com/watch?v=6IabkracLbs",
           "date": "2024-03-31",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Sakazuki"
         },
@@ -30,7 +30,7 @@
           "title": "Arjuna Alter 2T",
           "link": "https://www.youtube.com/watch?v=55bFPChv1bw",
           "date": "2024-03-21",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Akise"
         },
@@ -38,7 +38,7 @@
           "title": "Kintoki 2T",
           "link": "https://www.youtube.com/watch?v=l4xOU8GRATc",
           "date": "2024-03-24",
-          "servant": "kintoki",
+          "servant": "51",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -46,7 +46,7 @@
           "title": "Bazett 2T",
           "link": "https://www.youtube.com/watch?v=F-ueNp9AP8M",
           "date": "2024-03-25",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -54,7 +54,7 @@
           "title": "Summer Tamamo 3T",
           "link": "https://twitter.com/Certain_Bastard/status/1772404717722689709",
           "date": "2024-03-26",
-          "servant": "summertamamo",
+          "servant": "128",
           "turns": "3T",
           "runner": "Certain Bastard"
         },
@@ -62,7 +62,7 @@
           "title": "Ozymandias 3T",
           "link": "https://www.youtube.com/watch?v=3LY4IzdN3rQ",
           "date": "2024-03-21",
-          "servant": "ozymandias",
+          "servant": "118",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -70,7 +70,7 @@
           "title": "Jekyll & Hyde 3T",
           "link": "https://www.youtube.com/watch?v=odX-pAx4csU",
           "date": "2024-03-21",
-          "servant": "jekyllhyde",
+          "servant": "81",
           "turns": "3T",
           "runner": "Rikohaiji"
         },
@@ -78,7 +78,7 @@
           "title": "Arjuna Alter 3T",
           "link": "https://www.youtube.com/watch?v=2JWVOe7zu-Y&t=25s",
           "date": "2024-03-21",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Liz Happy Club"
         },
@@ -86,7 +86,7 @@
           "title": "Kintoki 3T",
           "link": "https://www.youtube.com/watch?v=D8ClWvbnEdM",
           "date": "2024-03-21",
-          "servant": "kintoki",
+          "servant": "51",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -94,7 +94,7 @@
           "title": "Kintoki 3T",
           "link": "https://www.youtube.com/watch?v=1D0dzlNDOfc",
           "date": "2024-03-24",
-          "servant": "kintoki",
+          "servant": "51",
           "turns": "3T",
           "runner": "Conry"
         },
@@ -102,7 +102,7 @@
           "title": "Cu Alter 3T",
           "link": "https://www.youtube.com/watch?v=VoTat-fDwlE",
           "date": "2024-03-23",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "3T",
           "runner": "Gorgeous P."
         },
@@ -110,7 +110,7 @@
           "title": "Sitonai 3T",
           "link": "https://www.youtube.com/watch?v=-WPUn_z8aq4",
           "date": "2024-03-26",
-          "servant": "sitonai",
+          "servant": "224",
           "turns": "3T",
           "runner": "zoropp"
         }
diff --git a/src/content/teslafest/gc-akihabara-explosion.json b/src/content/teslafest/gc-akihabara-explosion.json
index 3d0b711..867ccc3 100644
--- a/src/content/teslafest/gc-akihabara-explosion.json
+++ b/src/content/teslafest/gc-akihabara-explosion.json
@@ -14,7 +14,7 @@
           "title": "Juano 7T (Multicore FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=AznMkbg6UMM",
           "date": "2024-03-24",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "7T",
           "runner": "Akise"
         },
@@ -22,7 +22,7 @@
           "title": "Morgan 7T (Multicore)",
           "link": "https://www.youtube.com/watch?v=RFa_RlhksBs&t=166s",
           "date": "2024-04-11",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "7T",
           "runner": "Zectry"
         },
@@ -30,7 +30,7 @@
           "title": "Kintoki 8T (Multicore)",
           "link": "https://www.youtube.com/watch?v=QqZsNJwsdns",
           "date": "2024-04-05",
-          "servant": "kintoki",
+          "servant": "51",
           "turns": "8T",
           "runner": "Roz"
         },
@@ -38,7 +38,7 @@
           "title": "Bazett 4T (Multicore)",
           "link": "https://www.youtube.com/watch?v=pITWIii6JjM&t=110s",
           "date": "2024-03-29",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "4T",
           "runner": "TokuHer0"
         }
diff --git a/src/content/teslafest/gc-fate-requiem.json b/src/content/teslafest/gc-fate-requiem.json
index 5573cd8..81891ac 100644
--- a/src/content/teslafest/gc-fate-requiem.json
+++ b/src/content/teslafest/gc-fate-requiem.json
@@ -14,7 +14,7 @@
           "title": "Muramasa 3T",
           "link": "https://www.youtube.com/watch?v=gb249dDmfl0",
           "date": "2024-03-28",
-          "servant": "muramasa",
+          "servant": "302",
           "turns": "3T",
           "runner": "Alastair Hale"
         },
@@ -22,7 +22,7 @@
           "title": "Summer Okitan 3T",
           "link": "https://www.youtube.com/watch?v=pITWIii6JjM&t=566s",
           "date": "2024-03-29",
-          "servant": "summerokitaalter",
+          "servant": "317",
           "turns": "3T",
           "runner": "Tokuher0"
         },
@@ -30,7 +30,7 @@
           "title": "Saito Hajime 3T",
           "link": "https://www.youtube.com/watch?v=QmAmBxJKXWk&t=757s",
           "date": "2024-03-27",
-          "servant": "saitohajime",
+          "servant": "293",
           "turns": "3T",
           "runner": "Conry"
         },
@@ -38,7 +38,7 @@
           "title": "Morgan 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=ZLGXjXCW-bE",
           "date": "2024-03-27",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -46,7 +46,7 @@
           "title": "Arjuna Alter 3T",
           "link": "https://www.youtube.com/watch?v=RFa_RlhksBs&t=829s",
           "date": "2024-04-11",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -54,7 +54,7 @@
           "title": "Summer Musashi 3T",
           "link": "https://www.youtube.com/watch?v=yE6Mv6VTnCc&t=876s",
           "date": "2024-03-28",
-          "servant": "summermusashi",
+          "servant": "261",
           "turns": "3T",
           "runner": "Patrick Bandeira"
         },
@@ -62,7 +62,7 @@
           "title": "Cu Alter 3T (NoNP)",
           "link": "https://www.youtube.com/watch?v=2xMvkmtp-gk",
           "date": "2024-04-04",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "3T",
           "runner": "Volcanicz"
         }
diff --git a/src/content/teslafest/gc-gudaguda-2021.json b/src/content/teslafest/gc-gudaguda-2021.json
index 3c820e0..73320e1 100644
--- a/src/content/teslafest/gc-gudaguda-2021.json
+++ b/src/content/teslafest/gc-gudaguda-2021.json
@@ -14,7 +14,7 @@
           "title": "Sigurd 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=ow5KRkoFWYs",
           "date": "2024-03-29",
-          "servant": "sigurd",
+          "servant": "213",
           "turns": "3T",
           "runner": "ProbablyAParrot"
         },
@@ -22,7 +22,7 @@
           "title": "Barghest 3T",
           "link": "https://www.youtube.com/watch?v=tkSdcRKT-bg",
           "date": "2024-03-25",
-          "servant": "barghest",
+          "servant": "310",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -30,7 +30,7 @@
           "title": "Melusine 3T (Asc1/2)",
           "link": "https://www.youtube.com/watch?v=yE6Mv6VTnCc&t=1030s",
           "date": "2024-03-28",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "3T",
           "runner": "Patrick Bandeira"
         },
@@ -38,7 +38,7 @@
           "title": "Melusine 3T (Asc1/2)",
           "link": "https://www.youtube.com/watch?v=RFa_RlhksBs&t=1014s",
           "date": "2024-04-11",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "3T",
           "runner": "zectry"
         },
@@ -46,7 +46,7 @@
           "title": "Morgan 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=tnq0ACSoBZE",
           "date": "2024-03-28",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -54,7 +54,7 @@
           "title": "Morgan 3T (NDCE 5Man)",
           "link": "https://www.youtube.com/watch?v=PNLeiRqC9wM",
           "date": "2024-03-31",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Volcanicz"
         },
@@ -62,7 +62,7 @@
           "title": "Arjuna Alter 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=8d0ZBjI6Pd8",
           "date": "2024-03-28",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Akise"
         },
@@ -70,7 +70,7 @@
           "title": "Cu Alter 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=FjNoeuMgf2w",
           "date": "2024-03-29",
-          "servant": "cualter",
+          "servant": "98",
           "turns": "3T",
           "runner": "Volcanicz"
         },
@@ -78,7 +78,7 @@
           "title": "Bazett 3T",
           "link": "https://www.youtube.com/watch?v=SvQYbPxPGwc&t=1949s",
           "date": "2024-03-25",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "3T",
           "runner": "Paradise"
         },
@@ -86,7 +86,7 @@
           "title": "Van Gogh 3T",
           "link": "https://www.youtube.com/watch?v=pITWIii6JjM&t=691s",
           "date": "2024-03-29",
-          "servant": "vangogh",
+          "servant": "295",
           "turns": "3T",
           "runner": "TokuHer0"
         }
diff --git a/src/content/teslafest/gc-saber-wars-2.json b/src/content/teslafest/gc-saber-wars-2.json
index 501302b..a574f19 100644
--- a/src/content/teslafest/gc-saber-wars-2.json
+++ b/src/content/teslafest/gc-saber-wars-2.json
@@ -14,7 +14,7 @@
           "title": "Sitonai 2T",
           "link": "https://www.youtube.com/watch?v=pITWIii6JjM&t=297s",
           "date": "2024-03-29",
-          "servant": "sitonai",
+          "servant": "224",
           "turns": "2T",
           "runner": "TokuHer0"
         },
@@ -22,7 +22,7 @@
           "title": "Bazett 1T (FLO)",
           "link": "https://www.youtube.com/watch?v=RFa_RlhksBs&t=491s",
           "date": "2024-04-11",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "1T",
           "runner": "Zectry"
         },
@@ -30,7 +30,7 @@
           "title": "Yang Guifei 2T",
           "link": "https://www.youtube.com/watch?v=yE6Mv6VTnCc&t=492s",
           "date": "2024-03-28",
-          "servant": "yangguifei",
+          "servant": "275",
           "turns": "2T",
           "runner": "Patrick Bandeira"
         },
@@ -38,7 +38,7 @@
           "title": "Koyanskaya of Darkness 2T",
           "link": "https://www.youtube.com/watch?v=uZDNzw9tTWo",
           "date": "2024-03-24",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "2T",
           "runner": "Loki"
         },
@@ -46,7 +46,7 @@
           "title": "MIXA 2T (NoNP)",
           "link": "https://www.youtube.com/watch?v=6AbWuaLxfzM",
           "date": "2024-03-26",
-          "servant": "mixa",
+          "servant": "308",
           "turns": "2T",
           "runner": "Rikohaiji"
         }
diff --git a/src/content/teslafest/gc-summer-2021.json b/src/content/teslafest/gc-summer-2021.json
index 6fe620f..ba6cb88 100644
--- a/src/content/teslafest/gc-summer-2021.json
+++ b/src/content/teslafest/gc-summer-2021.json
@@ -14,7 +14,7 @@
           "title": "Skadi 3T",
           "link": "https://www.youtube.com/watch?v=VMVus__ZYXE",
           "date": "2024-03-30",
-          "servant": "skadi",
+          "servant": "215",
           "turns": "3T",
           "runner": "Firq"
         },
@@ -22,7 +22,7 @@
           "title": "Melusine 3T",
           "link": "https://www.youtube.com/watch?v=yE6Mv6VTnCc",
           "date": "2024-03-28",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "3T",
           "runner": "Patrick Bandeira"
         },
@@ -30,7 +30,7 @@
           "title": "Ozymandias 3T",
           "link": "https://www.youtube.com/watch?v=gv9YuMvfTYM",
           "date": "2024-03-24",
-          "servant": "ozymandias",
+          "servant": "118",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -38,7 +38,7 @@
           "title": "Sanzang 3T",
           "link": "https://www.youtube.com/watch?v=OJrs2Gbh_KI",
           "date": "2024-03-24",
-          "servant": "sanzang",
+          "servant": "113",
           "turns": "3T",
           "runner": "Liz Happy Club"
         },
@@ -46,7 +46,7 @@
           "title": "Okuni 3T",
           "link": "https://www.youtube.com/watch?v=RFa_RlhksBs",
           "date": "2024-04-11",
-          "servant": "okuni",
+          "servant": "327",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -54,7 +54,7 @@
           "title": "Kojirou 3T",
           "link": "https://www.youtube.com/watch?v=QmAmBxJKXWk",
           "date": "2024-03-27",
-          "servant": "kojirou",
+          "servant": "39",
           "turns": "3T",
           "runner": "Conry"
         },
@@ -62,7 +62,7 @@
           "title": "MHXA 3T (NDCE)",
           "link": "https://youtu.be/7-fPdCtGaks",
           "date": "2024-03-29",
-          "servant": "mhxa",
+          "servant": "155",
           "turns": "3T",
           "runner": "Requiem"
         },
@@ -70,7 +70,7 @@
           "title": "Morgan 3T (FLO NDCE NoBG)",
           "link": "https://youtu.be/ls0p-tsH_10",
           "date": "2024-03-24",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "3T",
           "runner": "Loki"
         },
@@ -78,7 +78,7 @@
           "title": "Junao 3T (FLO NDCE)",
           "link": "https://youtu.be/GX9gqQ0YfW0",
           "date": "2024-03-27",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Akise"
         },
@@ -86,7 +86,7 @@
           "title": "Kintoki 3T",
           "link": "https://youtu.be/pITWIii6JjM",
           "date": "2024-03-29",
-          "servant": "kintoki",
+          "servant": "51",
           "turns": "3T",
           "runner": "TokuHer0"
         }
diff --git a/src/content/teslafest/gc-valentines-2023.json b/src/content/teslafest/gc-valentines-2023.json
index 5556158..f9f9371 100644
--- a/src/content/teslafest/gc-valentines-2023.json
+++ b/src/content/teslafest/gc-valentines-2023.json
@@ -14,7 +14,7 @@
           "title": "Percival 4T",
           "link": "https://www.youtube.com/watch?v=MGcyhZMkMrs&t=1292s",
           "date": "2024-03-28",
-          "servant": "percival",
+          "servant": "313",
           "turns": "4T",
           "runner": "Nyxi"
         },
@@ -22,7 +22,7 @@
           "title": "Ryoma 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=RFa_RlhksBs&t=581s",
           "date": "2024-04-11",
-          "servant": "ryomalancer",
+          "servant": "329",
           "turns": "4T",
           "runner": "Zectry"
         },
@@ -30,7 +30,7 @@
           "title": "Space Ishtar 4T",
           "link": "https://www.youtube.com/watch?v=pITWIii6JjM&t=398s",
           "date": "2024-03-24",
-          "servant": "spaceishtar",
+          "servant": "268",
           "turns": "4T",
           "runner": "TokuHer0"
         }
diff --git a/src/content/teslafest/gc-white-day-2023.json b/src/content/teslafest/gc-white-day-2023.json
index cf06795..60b2c71 100644
--- a/src/content/teslafest/gc-white-day-2023.json
+++ b/src/content/teslafest/gc-white-day-2023.json
@@ -14,7 +14,7 @@
           "title": "Baobhan Sith 6T",
           "link": "https://www.youtube.com/watch?v=ZBfamgici20",
           "date": "2024-03-29",
-          "servant": "baobhansith",
+          "servant": "311",
           "turns": "6T",
           "runner": "Requiem"
         },
@@ -22,7 +22,7 @@
           "title": "Nero 4T",
           "link": "https://twitter.com/LutrecTA/status/1773370060603629855",
           "date": "2024-03-28",
-          "servant": "nero",
+          "servant": "5",
           "turns": "4T",
           "runner": "Lutrec"
         },
@@ -30,7 +30,7 @@
           "title": "Melusine 4T (2CS)",
           "link": "https://www.youtube.com/watch?v=8SLr2KAULIc",
           "date": "2024-03-31",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "4T",
           "runner": "TokuHer0"
         },
@@ -38,7 +38,7 @@
           "title": "Zenobia 4T",
           "link": "https://www.youtube.com/watch?v=RFa_RlhksBs&t=1192s",
           "date": "2024-04-11",
-          "servant": "zenobia",
+          "servant": "325",
           "turns": "4T",
           "runner": "Zectry"
         },
@@ -46,7 +46,7 @@
           "title": "Morgan 4T (BCE)",
           "link": "https://www.youtube.com/watch?v=81N4DhCQ7Io",
           "date": "2024-03-27",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "4T",
           "runner": "im poketar"
         },
@@ -54,7 +54,7 @@
           "title": "Summer Musashi 4T",
           "link": "https://www.youtube.com/watch?v=yE6Mv6VTnCc&t=1175s",
           "date": "2024-03-28",
-          "servant": "summermusashi",
+          "servant": "261",
           "turns": "4T",
           "runner": "Patrick Bandeira"
         },
@@ -62,7 +62,7 @@
           "title": "Summer Kama 4T",
           "link": "https://www.youtube.com/watch?v=pITWIii6JjM&t=802s",
           "date": "2024-03-29",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "4T",
           "runner": "TokuHer0"
         },
@@ -70,7 +70,7 @@
           "title": "Summer Kama 4T",
           "link": "https://www.youtube.com/watch?v=3MYS_V5Rqhw&t=2985s",
           "date": "2024-03-25",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "4T",
           "runner": "Kamager III"
         },
@@ -78,7 +78,7 @@
           "title": "Summer Kiara 4T",
           "link": "https://www.youtube.com/watch?v=SvQYbPxPGwc&t=2113s",
           "date": "2024-03-25",
-          "servant": "summerkiara",
+          "servant": "285",
           "turns": "4T",
           "runner": "Paradise"
         },
@@ -86,7 +86,7 @@
           "title": "Ishtar 4T (NDCE)",
           "link": "https://www.youtube.com/watch?v=QmAmBxJKXWk&t=1042s",
           "date": "2024-03-27",
-          "servant": "ishtar",
+          "servant": "142",
           "turns": "4T",
           "runner": "Conry"
         }
diff --git a/src/content/teslafest/mc-amazoness-crisis.json b/src/content/teslafest/mc-amazoness-crisis.json
index e1920a8..9eb35e0 100644
--- a/src/content/teslafest/mc-amazoness-crisis.json
+++ b/src/content/teslafest/mc-amazoness-crisis.json
@@ -14,7 +14,7 @@
           "title": "Brynhild 3T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=dkmrzD1X6CQ",
           "date": "2024-03-19",
-          "servant": "brynhild",
+          "servant": "88",
           "turns": "3T",
           "runner": "Sigrdrífa"
         },
@@ -22,7 +22,7 @@
           "title": "Jekyll & Hyde 3T (4Man)",
           "link": "https://www.youtube.com/watch?v=vxAn6PZf2bA",
           "date": "2024-04-05",
-          "servant": "jekyllhyde",
+          "servant": "81",
           "turns": "3T",
           "runner": "Rikohaiji"
         },
@@ -30,7 +30,7 @@
           "title": "Muramasa 2T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=DeQw_tUWTgo",
           "date": "2024-03-24",
-          "servant": "muramasa",
+          "servant": "302",
           "turns": "2T",
           "runner": "Alastair Hale"
         },
@@ -38,7 +38,7 @@
           "title": "Artoria 2T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=EJAhp9Vs_ls",
           "date": "2024-03-16",
-          "servant": "artoria",
+          "servant": "2",
           "turns": "2T",
           "runner": "Sesshou01"
         },
@@ -46,7 +46,7 @@
           "title": "Gilgamesh 2T",
           "link": "https://www.youtube.com/watch?v=p8QkHOC-CgE&t=234s",
           "date": "2024-03-25",
-          "servant": "gilgamesh",
+          "servant": "12",
           "turns": "2T",
           "runner": "Nyxi"
         },
@@ -54,7 +54,7 @@
           "title": "Arash 2T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=6QkpSKA2YNM",
           "date": "2024-03-18",
-          "servant": "arash",
+          "servant": "16",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -62,7 +62,7 @@
           "title": "Bradamante 2T (NDCE)",
           "link": "https://www.youtube.com/watch?v=k5hIGF3FW3o",
           "date": "2024-03-20",
-          "servant": "bradamante",
+          "servant": "232",
           "turns": "2T",
           "runner": "Alastair Hale"
         },
@@ -70,7 +70,7 @@
           "title": "Drake 2T",
           "link": "https://www.youtube.com/watch?v=k5vbEdc_BA4&t=299s",
           "date": "2024-03-27",
-          "servant": "drake",
+          "servant": "65",
           "turns": "2T",
           "runner": "Patrick Bandeira"
         },
@@ -78,7 +78,7 @@
           "title": "Taigong Wang 2T (NoCE FLO)",
           "link": "https://www.youtube.com/watch?v=HROrOxcVnKQ",
           "date": "2024-03-16",
-          "servant": "taigongwang",
+          "servant": "331",
           "turns": "2T",
           "runner": "Ryougi Bobby"
         },
@@ -86,7 +86,7 @@
           "title": "Anastasia 2T (NoCE FLO)",
           "link": "https://www.youtube.com/watch?v=3NebOHW5IC0&t=182s",
           "date": "2024-04-09",
-          "servant": "anastasia",
+          "servant": "201",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -94,7 +94,7 @@
           "title": "Arjuna Alter 2T (4Man)",
           "link": "https://www.youtube.com/watch?v=pLX_4PDIai8",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -102,7 +102,7 @@
           "title": "Caren 2T",
           "link": "https://www.youtube.com/watch?v=JdlpwZKanJA&t=161s",
           "date": "2024-03-26",
-          "servant": "caren",
+          "servant": "305",
           "turns": "2T",
           "runner": "TokuHer0"
         }
diff --git a/src/content/teslafest/mc-christmas-2018.json b/src/content/teslafest/mc-christmas-2018.json
index ad4aa61..ccabeb4 100644
--- a/src/content/teslafest/mc-christmas-2018.json
+++ b/src/content/teslafest/mc-christmas-2018.json
@@ -14,7 +14,7 @@
           "title": "Summer Okita Alter 4T",
           "link": "https://www.youtube.com/watch?v=JdlpwZKanJA&t=409s",
           "date": "2024-03-26",
-          "servant": "summerokitaalter",
+          "servant": "317",
           "turns": "4T",
           "runner": "TokuHer0"
         },
@@ -22,7 +22,7 @@
           "title": "Morgan 4T (Multicore)",
           "link": "https://www.youtube.com/watch?v=QYe-8ijdfnI&t=698s",
           "date": "2024-03-15",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "4T",
           "runner": "Liz Happy Club"
         },
@@ -30,7 +30,7 @@
           "title": "Cleopatra 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=3NebOHW5IC0&t=490s",
           "date": "2024-04-09",
-          "servant": "cleopatra",
+          "servant": "139",
           "turns": "4T",
           "runner": "Zectry"
         },
@@ -38,7 +38,7 @@
           "title": "Morgan 4T (w. Jack)",
           "link": "https://www.youtube.com/watch?v=EJAhp9Vs_ls&t=338s",
           "date": "2024-03-16",
-          "servant": "morgan",
+          "servant": "309",
           "turns": "4T",
           "runner": "Sesshou01"
         },
@@ -46,7 +46,7 @@
           "title": "Arjuna Alter 4T (FLO)",
           "link": "https://www.youtube.com/watch?v=pLX_4PDIai8&t=281s",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "4T",
           "runner": "Kusanagi"
         }
diff --git a/src/content/teslafest/mc-halloween-2019.json b/src/content/teslafest/mc-halloween-2019.json
index 0e7885f..8146507 100644
--- a/src/content/teslafest/mc-halloween-2019.json
+++ b/src/content/teslafest/mc-halloween-2019.json
@@ -14,7 +14,7 @@
           "title": "Melt Lambda 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=3NebOHW5IC0&t=323s",
           "date": "2024-04-09",
-          "servant": "meltlambda",
+          "servant": "266",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -22,7 +22,7 @@
           "title": "Scathach 3T",
           "link": "https://www.youtube.com/watch?v=EJAhp9Vs_ls&t=158s",
           "date": "2024-03-16",
-          "servant": "shishou",
+          "servant": "70",
           "turns": "3T",
           "runner": "Sesshou01"
         },
@@ -30,7 +30,7 @@
           "title": "Bryn 3T (Solo NDCE)",
           "link": "https://www.youtube.com/watch?v=2csi-flWJCU",
           "date": "2024-03-20",
-          "servant": "brynhild",
+          "servant": "88",
           "turns": "3T",
           "runner": "Sigrdrífa"
         },
@@ -38,7 +38,7 @@
           "title": "Percival 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=QYe-8ijdfnI&t=483s",
           "date": "2024-03-20",
-          "servant": "percival",
+          "servant": "313",
           "turns": "3T",
           "runner": "Liz Happy Club"
         },
@@ -46,7 +46,7 @@
           "title": "Melusine 3T",
           "link": "https://www.youtube.com/watch?v=HPNIxDrSFxc",
           "date": "2024-03-19",
-          "servant": "melusine_aoe",
+          "servant": "312_aoe",
           "turns": "3T",
           "runner": "Yamada II"
         },
@@ -54,7 +54,7 @@
           "title": "Melusine 3T (Lvl. 1)",
           "link": "https://www.youtube.com/watch?v=JdlpwZKanJA&t=284s",
           "date": "2024-03-26",
-          "servant": "melusine_st",
+          "servant": "312_st",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -62,7 +62,7 @@
           "title": "Jekyll & Hyde 3T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=v_WlwqTJYTc",
           "date": "2024-04-04",
-          "servant": "jekyllhyde",
+          "servant": "81",
           "turns": "3T",
           "runner": "Rikohaiji"
         },
@@ -70,7 +70,7 @@
           "title": "Arjuna Alter 3T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=pLX_4PDIai8&t=133s",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -78,7 +78,7 @@
           "title": "Astrea 3T (Lvl. 2 FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=9D6L_47msCw",
           "date": "2024-03-21",
-          "servant": "astrea",
+          "servant": "242",
           "turns": "3T",
           "runner": "Alastair Hale"
         }
diff --git a/src/content/teslafest/mc-summer-2018.json b/src/content/teslafest/mc-summer-2018.json
index 71f4ffe..bd0e7d2 100644
--- a/src/content/teslafest/mc-summer-2018.json
+++ b/src/content/teslafest/mc-summer-2018.json
@@ -14,7 +14,7 @@
           "title": "Multicore - Douman 3T",
           "link": "https://www.youtube.com/watch?v=JdlpwZKanJA",
           "date": "2024-03-26",
-          "servant": "douman",
+          "servant": "297",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -22,7 +22,7 @@
           "title": "Multicore - Koyanskaya of Dark 3T",
           "link": "https://www.youtube.com/watch?v=3NebOHW5IC0",
           "date": "2024-04-09",
-          "servant": "koyandark",
+          "servant": "334",
           "turns": "3T",
           "runner": "Zectry"
         }
diff --git a/src/content/teslafest/mc-summer-2019.json b/src/content/teslafest/mc-summer-2019.json
index 1d91240..0f9726a 100644
--- a/src/content/teslafest/mc-summer-2019.json
+++ b/src/content/teslafest/mc-summer-2019.json
@@ -14,7 +14,7 @@
           "title": "Nero 3T (FLO)",
           "link": "https://twitter.com/LutrecTA/status/1772766697864249523",
           "date": "2024-03-27",
-          "servant": "nero",
+          "servant": "5",
           "turns": "3T",
           "runner": "Lutrec"
         },
@@ -22,7 +22,7 @@
           "title": "Musashi (Summer) 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=agZb8zyHsfY&t=1373s",
           "date": "2024-03-16",
-          "servant": "summermusashi",
+          "servant": "261",
           "turns": "3T",
           "runner": "Paradise"
         },
@@ -30,7 +30,7 @@
           "title": "Musashi (Summer) 3T",
           "link": "https://www.youtube.com/watch?v=QYe-8ijdfnI&t=1312s",
           "date": "2024-03-15",
-          "servant": "summermusashi",
+          "servant": "261",
           "turns": "3T",
           "runner": "Liz Happy Club"
         },
@@ -38,7 +38,7 @@
           "title": "Arjuna Alter 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=pLX_4PDIai8&t=676s",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -46,7 +46,7 @@
           "title": "Space Ishtar 3T",
           "link": "https://www.youtube.com/watch?v=EJAhp9Vs_ls&t=821s",
           "date": "2024-03-16",
-          "servant": "spaceishtar",
+          "servant": "268",
           "turns": "3T",
           "runner": "Sesshou01"
         },
@@ -54,7 +54,7 @@
           "title": "Space Ishtar 3T",
           "link": "https://www.youtube.com/watch?v=p8QkHOC-CgE&t=1231s",
           "date": "2024-03-25",
-          "servant": "spaceishtar",
+          "servant": "268",
           "turns": "3T",
           "runner": "Nyxi"
         },
@@ -62,7 +62,7 @@
           "title": "Space Ishtar 3T (NDCE)",
           "link": "https://www.youtube.com/watch?v=JdlpwZKanJA&t=740s",
           "date": "2024-03-26",
-          "servant": "spaceishtar",
+          "servant": "268",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -70,7 +70,7 @@
           "title": "Summer Kama 3T",
           "link": "https://www.youtube.com/watch?v=B2Buu8F2PMI&t=1736s",
           "date": "2024-03-17",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "3T",
           "runner": "Kamager III"
         },
@@ -78,7 +78,7 @@
           "title": "Summer Kama 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=3NebOHW5IC0&t=989s",
           "date": "2024-04-09",
-          "servant": "summerkama",
+          "servant": "321",
           "turns": "3T",
           "runner": "Zectry"
         },
@@ -86,7 +86,7 @@
           "title": "BB (Summer) 3T",
           "link": "https://www.youtube.com/watch?v=qgaWv5dvMe0",
           "date": "2024-03-25",
-          "servant": "bbsummer",
+          "servant": "220",
           "turns": "3T",
           "runner": "Rikohaiji"
         }
diff --git a/src/content/teslafest/mc-valentines-2021.json b/src/content/teslafest/mc-valentines-2021.json
index c2ba263..b7d160f 100644
--- a/src/content/teslafest/mc-valentines-2021.json
+++ b/src/content/teslafest/mc-valentines-2021.json
@@ -14,7 +14,7 @@
           "title": "Sei 2T",
           "link": "https://www.youtube.com/watch?v=-Id8YIoJpN0",
           "date": "2024-03-17",
-          "servant": "sei",
+          "servant": "276",
           "turns": "2T",
           "runner": "Ise(Kai)"
         },
@@ -22,7 +22,7 @@
           "title": "Kintoki (Rider) 2T (w. Arash)",
           "link": "https://www.youtube.com/watch?v=EJAhp9Vs_ls&t=560s",
           "date": "2024-03-16",
-          "servant": "kintokirider",
+          "servant": "115",
           "turns": "2T",
           "runner": "Sesshou01"
         },
@@ -30,7 +30,7 @@
           "title": "Odysseus 2T (FLO)",
           "link": "https://www.youtube.com/watch?v=3NebOHW5IC0&t=707s",
           "date": "2024-04-09",
-          "servant": "odysseus",
+          "servant": "277",
           "turns": "2T",
           "runner": "Zectry"
         },
@@ -38,7 +38,7 @@
           "title": "Taigong Wang 2T (FLO NoCE)",
           "link": "https://www.youtube.com/watch?v=-3srNDj0opg",
           "date": "2024-03-16",
-          "servant": "taigongwang",
+          "servant": "331",
           "turns": "2T",
           "runner": "Ryougi Bobby"
         },
@@ -46,7 +46,7 @@
           "title": "Arjuna Alter 2T (FLO NoCEs)",
           "link": "https://www.youtube.com/watch?v=pLX_4PDIai8&t=413s",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "2T",
           "runner": "Kusanagi"
         },
@@ -54,7 +54,7 @@
           "title": "Maou Nobu 2T (FLO NoCEs)",
           "link": "https://www.youtube.com/watch?v=_Sb7j2XAT5U",
           "date": "2024-03-19",
-          "servant": "maounobu",
+          "servant": "250",
           "turns": "2T",
           "runner": "Sigrdrífa"
         },
@@ -62,7 +62,7 @@
           "title": "Bazett 1T (w. Ozy)",
           "link": "https://www.youtube.com/watch?v=agZb8zyHsfY&t=1014s",
           "date": "2024-03-16",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "1T",
           "runner": "Paradise"
         },
@@ -70,7 +70,7 @@
           "title": "Bazett 1T (w. Cindereli)",
           "link": "https://www.youtube.com/watch?v=tJLGb9xye6Y",
           "date": "2024-03-24",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "1T",
           "runner": "Alastair Hale"
         },
@@ -78,7 +78,7 @@
           "title": "Bazett 1T (w. Maid Alter)",
           "link": "https://www.youtube.com/watch?v=JdlpwZKanJA&t=558s",
           "date": "2024-03-26",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "1T",
           "runner": "TokuHer0"
         },
@@ -86,7 +86,7 @@
           "title": "Bazett 1T (w. Ozy)",
           "link": "https://www.youtube.com/watch?v=QYe-8ijdfnI&t=958s",
           "date": "2024-03-15",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "1T",
           "runner": "Liz Happy Club"
         },
@@ -94,7 +94,7 @@
           "title": "Bazett 1T (w. Arash)",
           "link": "https://www.youtube.com/watch?v=p8QkHOC-CgE&t=797s",
           "date": "2024-03-25",
-          "servant": "bazett",
+          "servant": "336",
           "turns": "1T",
           "runner": "Nyxi"
         }
diff --git a/src/content/teslafest/mc-white-day-2021.json b/src/content/teslafest/mc-white-day-2021.json
index c8d0d8a..7cdbdcd 100644
--- a/src/content/teslafest/mc-white-day-2021.json
+++ b/src/content/teslafest/mc-white-day-2021.json
@@ -14,7 +14,7 @@
           "title": "Jekyll & Hyde 3T",
           "link": "https://www.youtube.com/watch?v=v_WlwqTJYTc&t=155s",
           "date": "2024-04-04",
-          "servant": "jekyllhyde",
+          "servant": "81",
           "turns": "3T",
           "runner": "Rikohaiji"
         },
@@ -22,7 +22,7 @@
           "title": "Arjuna Alter 3T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=pLX_4PDIai8&t=526s",
           "date": "2024-03-19",
-          "servant": "arjunaalter",
+          "servant": "247",
           "turns": "3T",
           "runner": "Kusanagi"
         },
@@ -30,7 +30,7 @@
           "title": "Xiang Yu 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=JdlpwZKanJA&t=641s",
           "date": "2024-04-04",
-          "servant": "xiangyu",
+          "servant": "226",
           "turns": "3T",
           "runner": "TokuHer0"
         },
@@ -38,7 +38,7 @@
           "title": "Maou Nobu 3T (FLO NDCE)",
           "link": "https://www.youtube.com/watch?v=CvvXasgp-iY",
           "date": "2024-03-20",
-          "servant": "maounobu",
+          "servant": "250",
           "turns": "3T",
           "runner": "Sigrdrífa"
         },
@@ -46,7 +46,7 @@
           "title": "Taira 3T (FLO)",
           "link": "https://www.youtube.com/watch?v=3NebOHW5IC0&t=839s",
           "date": "2024-04-04",
-          "servant": "taira",
+          "servant": "303",
           "turns": "3T",
           "runner": "Zectry"
         }