diff --git a/rose-py/rose/genre_hierarchy.py b/rose-py/rose/genre_hierarchy.py
index 14bb1cd..d35da86 100644
--- a/rose-py/rose/genre_hierarchy.py
+++ b/rose-py/rose/genre_hierarchy.py
@@ -2,7 +2,7 @@
 
 TRANSIENT_PARENT_GENRES: dict[str, list[str]] = {
     "16-bit": ["Bit Music", "Electronic", "Sequencer & Tracker"],
-    "2 Tone": ["Ska"],
+    "2 Tone": ["Reggae / Ska / Dancehall", "Ska"],
     "2-Step": ["Dance", "Electronic", "Electronic Dance Music", "UK Garage"],
     "A cappella": [],
     "AOR": ["Rock"],
@@ -153,6 +153,7 @@
         "African Music",
         "Arabic Folk Music",
         "Arabic Music",
+        "Bedouin Music",
         "Folk",
         "Maghrebi Music",
         "North African Music",
@@ -283,6 +284,15 @@
         "Regional Music",
     ],
     "Americana": ["Country", "Northern American Music", "Regional Music"],
+    "Amigacore": [
+        "Bit Music",
+        "Dance",
+        "Electronic",
+        "Electronic Dance Music",
+        "Hardcore [EDM]",
+        "Sequencer & Tracker",
+        "Tracker Music",
+    ],
     "Anarcho-Punk": ["Punk", "Punk Rock", "Rock"],
     "Anatolian Rock": [
         "Asian Music",
@@ -319,8 +329,8 @@
         "Arabic Classical Music",
         "Arabic Music",
         "Classical Music",
-        "Islamic Modal Music",
         "Maghrebi Music",
+        "Maqāmic Music",
         "North African Music",
         "Regional Music",
     ],
@@ -368,7 +378,7 @@
     "Arabic Classical Music": [
         "Arabic Music",
         "Classical Music",
-        "Islamic Modal Music",
+        "Maqāmic Music",
         "Regional Music",
     ],
     "Arabic Folk Music": ["Arabic Music", "Folk", "Regional Music", "Traditional Folk Music"],
@@ -587,7 +597,7 @@
         "Asian Music",
         "Azerbaijani Music",
         "Classical Music",
-        "Islamic Modal Music",
+        "Maqāmic Music",
         "Regional Music",
         "West Asian Music",
     ],
@@ -697,6 +707,7 @@
     "Balkan Music": ["European Music", "Regional Music"],
     "Balkan Pop-Folk": ["Balkan Music", "European Music", "Pop", "Regional Music"],
     "Ballad Opera": [
+        "British Music",
         "Classical Music",
         "European Music",
         "Musical Theatre and Entertainment",
@@ -891,6 +902,9 @@
     "Beat bolha": ["Brazilian Music", "Funk brasileiro", "Regional Music", "South American Music"],
     "Beat bruxaria": [
         "Brazilian Music",
+        "Dance",
+        "Electronic",
+        "Electronic Dance Music",
         "Funk brasileiro",
         "Funk mandelão",
         "Regional Music",
@@ -1125,8 +1139,10 @@
     "Brazilian Music": ["Regional Music", "South American Music"],
     "Brazilian Phonk": [
         "Brazilian Music",
+        "Dance",
         "Drift Phonk",
         "Electronic",
+        "Electronic Dance Music",
         "Funk brasileiro",
         "Funk mandelão",
         "Regional Music",
@@ -1239,6 +1255,7 @@
         "Electronic",
         "Electronic Dance Music",
         "Jamaican Music",
+        "Reggae / Ska / Dancehall",
         "Regional Music",
     ],
     "Bubbling House": ["Dance", "Electronic", "Electronic Dance Music", "House"],
@@ -1751,7 +1768,7 @@
     "Chicago Hard House": ["Dance", "Electronic", "Electronic Dance Music", "House"],
     "Chicago House": ["Dance", "Electronic", "Electronic Dance Music", "House"],
     "Chicago Soul": ["R&B", "Soul"],
-    "Chicano Rap": ["Gangsta Rap", "Hardcore Hip Hop", "Hip Hop", "Latin Rap"],
+    "Chicano Rap": ["Hip Hop", "Latin Rap"],
     "Children's Music": [],
     "Chilean Music": [
         "Hispanic American Music",
@@ -1817,7 +1834,7 @@
     "Choral Symphony": [
         "Choral",
         "Classical Music",
-        "Orchestral",
+        "Orchestral Music",
         "Symphony",
         "Western Classical Music",
     ],
@@ -1958,15 +1975,20 @@
         "Regional Music",
         "Western Classical Music",
     ],
-    "Concert Band": ["Classical Music", "Orchestral", "Western Classical Music"],
-    "Concerto": ["Classical Music", "Orchestral", "Western Classical Music"],
+    "Concert Band": ["Classical Music", "Orchestral Music", "Western Classical Music"],
+    "Concerto": ["Classical Music", "Orchestral Music", "Western Classical Music"],
     "Concerto for Orchestra": [
         "Classical Music",
         "Concerto",
-        "Orchestral",
+        "Orchestral Music",
+        "Western Classical Music",
+    ],
+    "Concerto grosso": [
+        "Classical Music",
+        "Concerto",
+        "Orchestral Music",
         "Western Classical Music",
     ],
-    "Concerto grosso": ["Classical Music", "Concerto", "Orchestral", "Western Classical Music"],
     "Conducted Improvisation": ["Experimental"],
     "Conga": [
         "Caribbean Music",
@@ -2101,6 +2123,7 @@
         "Hardcore [Punk]",
         "Punk",
         "Punk Rock",
+        "Reggae / Ska / Dancehall",
         "Rock",
         "Ska",
         "Ska Punk",
@@ -2363,7 +2386,12 @@
     "Dance-Pop": ["Dance", "Pop"],
     "Dance-Punk": ["Post-Punk", "Punk", "Rock"],
     "Dancefloor Drum and Bass": ["Dance", "Drum and Bass", "Electronic", "Electronic Dance Music"],
-    "Dancehall": ["Caribbean Music", "Jamaican Music", "Regional Music"],
+    "Dancehall": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Dang-ak": [
         "Asian Music",
         "Classical Music",
@@ -2407,7 +2435,7 @@
         "Regional Music",
         "Sōkyoku",
     ],
-    "Dansbandsmusik": ["Pop"],
+    "Dansbandsmusik": ["European Music", "Nordic Music", "Pop", "Regional Music"],
     "Dansktop": ["European Music", "Nordic Music", "Pop", "Regional Music"],
     "Danzón": [
         "Caribbean Music",
@@ -2468,7 +2496,13 @@
         "Industrial & Noise",
         "Post-Industrial",
     ],
-    "Deejay": ["Caribbean Music", "Jamaican Music", "Reggae", "Regional Music"],
+    "Deejay": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Deep Funk": ["Funk", "R&B"],
     "Deep House": ["Dance", "Electronic", "Electronic Dance Music", "House"],
     "Deep Soul": ["R&B", "Soul"],
@@ -2483,6 +2517,7 @@
         "Traditional Folk Music",
     ],
     "Dembow": ["Caribbean Music", "Hispanic American Music", "Hispanic Music", "Regional Music"],
+    "Demostyle": ["Bit Music", "Electronic", "Sequencer & Tracker", "Tracker Music"],
     "Dennery Segment": ["Caribbean Music", "French Caribbean Music", "Regional Music", "Soca"],
     "Denpa": ["Pop"],
     "Depressive Black Metal": ["Black Metal", "Metal", "Rock"],
@@ -2498,6 +2533,7 @@
     "Deutschpunk": ["Punk", "Punk Rock", "Rock"],
     "Deutschrock": ["Rock"],
     "Dhaanto": ["African Music", "Northeastern African Music", "Regional Music", "Somali Music"],
+    "Dhol tasha": ["Asian Music", "Regional Music", "South Asian Music"],
     "Dhrupad": [
         "Asian Music",
         "Classical Music",
@@ -2522,6 +2558,7 @@
         "Dancehall",
         "Jamaican Music",
         "Reggae",
+        "Reggae / Ska / Dancehall",
         "Regional Music",
     ],
     "Digital Fusion": ["Electronic"],
@@ -2624,12 +2661,19 @@
         "Regional Music",
         "West Asian Music",
     ],
-    "Dub": ["Caribbean Music", "Jamaican Music", "Reggae", "Regional Music"],
+    "Dub": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Dub Poetry": [
         "Caribbean Music",
         "Jamaican Music",
         "Poetry",
         "Reggae",
+        "Reggae / Ska / Dancehall",
         "Regional Music",
         "Roots Reggae",
         "Spoken Word",
@@ -2841,7 +2885,12 @@
     "European Free Jazz": ["Avant-Garde Jazz", "Free Jazz", "Jazz"],
     "European Music": ["Regional Music"],
     "Europop": ["Pop"],
-    "Euskal kantagintza berria": ["European Music", "Regional Music", "Singer-Songwriter"],
+    "Euskal kantagintza berria": [
+        "European Music",
+        "Iberian Music",
+        "Regional Music",
+        "Singer-Songwriter",
+    ],
     "Ewe Music": ["African Music", "Regional Music", "West African Music"],
     "Exotica": ["Easy Listening"],
     "Experimental": [],
@@ -3021,6 +3070,7 @@
         "Electronic",
         "Electronic Dance Music",
         "Jamaican Music",
+        "Reggae / Ska / Dancehall",
         "Regional Music",
     ],
     "Florida Breaks": ["Breakbeat", "Dance", "Electronic", "Electronic Dance Music"],
@@ -3170,6 +3220,9 @@
     "Funk de BH": ["Brazilian Music", "Funk brasileiro", "Regional Music", "South American Music"],
     "Funk mandelão": [
         "Brazilian Music",
+        "Dance",
+        "Electronic",
+        "Electronic Dance Music",
         "Funk brasileiro",
         "Regional Music",
         "South American Music",
@@ -3477,7 +3530,13 @@
     "Go-Go": ["Funk", "R&B"],
     "Goa Trance": ["Dance", "Electronic", "Electronic Dance Music", "Psytrance", "Trance"],
     "Gogo Music": ["African Music", "East African Music", "Regional Music"],
-    "Gommance": ["Caribbean Music", "Dancehall", "Jamaican Music", "Regional Music"],
+    "Gommance": [
+        "Caribbean Music",
+        "Dancehall",
+        "Jamaican Music",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Gondang": [
         "Asian Music",
         "Austronesian Traditional Music",
@@ -3530,6 +3589,7 @@
         "Romanticism",
         "Western Classical Music",
     ],
+    "Graphical Sound": ["Electronic", "Experimental"],
     "Grebo": ["Alternative Dance", "Alternative Rock", "Dance", "Rock"],
     "Greek Folk Music": [
         "Balkan Folk Music",
@@ -4024,7 +4084,7 @@
         "Arabic Music",
         "Asian Music",
         "Classical Music",
-        "Islamic Modal Music",
+        "Maqāmic Music",
         "Regional Music",
         "West Asian Music",
     ],
@@ -4038,7 +4098,6 @@
     ],
     "Irish Showband": ["European Music", "Pop", "Regional Music"],
     "Isicathamiya": ["A cappella", "African Music", "Regional Music", "Southern African Music"],
-    "Islamic Modal Music": ["Regional Music"],
     "Islamic Religious Music & Recitation": ["Regional Music"],
     "Israeli Folk Music": [
         "Asian Music",
@@ -4094,7 +4153,13 @@
     ],
     "Jam Band": ["Rock"],
     "Jamaican Music": ["Caribbean Music", "Regional Music"],
-    "Jamaican Ska": ["Caribbean Music", "Jamaican Music", "Regional Music", "Ska"],
+    "Jamaican Ska": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+        "Ska",
+    ],
     "James Bay Fiddling": [
         "Folk",
         "Indigenous American Music",
@@ -4836,7 +4901,13 @@
     "Lolicore": ["Breakcore", "Dance", "Electronic", "Electronic Dance Music", "Hardcore [EDM]"],
     "Louisiana Music": ["Northern American Music", "Regional Music"],
     "Lounge": ["Easy Listening"],
-    "Lovers Rock": ["Caribbean Music", "Jamaican Music", "Reggae", "Regional Music"],
+    "Lovers Rock": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Lowend": ["Hip Hop"],
     "Lowercase": ["Experimental", "Reductionism"],
     "Luk krung": ["Asian Music", "Regional Music", "Southeast Asian Music", "Thai Music"],
@@ -4990,6 +5061,7 @@
     "Mande Music": ["African Music", "Regional Music", "West African Music"],
     "Mandopop": ["C-Pop", "Pop"],
     "Manele": ["Balkan Music", "Balkan Pop-Folk", "European Music", "Pop", "Regional Music"],
+    "Mangambeu": ["African Music", "Central African Music", "Regional Music"],
     "Manguebeat": [
         "Brazilian Music",
         "Northeastern Brazilian Music",
@@ -5023,6 +5095,7 @@
         "South American Music",
         "Traditional Folk Music",
     ],
+    "Maqāmic Music": ["Classical Music", "Regional Music"],
     "Marabi": ["African Music", "Jazz", "Regional Music", "Southern African Music"],
     "Maracatu": [
         "Brazilian Folk Music",
@@ -5683,6 +5756,20 @@
         "Southern African Music",
         "Traditional Folk Music",
     ],
+    "Ngâm thơ": [
+        "Asian Music",
+        "East Asian Music",
+        "Regional Music",
+        "Southeast Asian Music",
+        "Vietnamese Music",
+    ],
+    "Nhạc tiền chiến": [
+        "Asian Music",
+        "East Asian Music",
+        "Regional Music",
+        "Southeast Asian Music",
+        "Vietnamese Music",
+    ],
     "Nhạc vàng": [
         "Asian Music",
         "East Asian Music",
@@ -5783,7 +5870,14 @@
     "Nova cançó": ["European Music", "Iberian Music", "Regional Music", "Singer-Songwriter"],
     "Novelty": [],
     "Novelty Piano": ["Northern American Music", "Ragtime", "Regional Music"],
-    "Novo Dub": ["Caribbean Music", "Dub", "Jamaican Music", "Reggae", "Regional Music"],
+    "Novo Dub": [
+        "Caribbean Music",
+        "Dub",
+        "Jamaican Music",
+        "Reggae",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Nu Jazz": ["Electronic"],
     "Nu Metal": ["Alternative Metal", "Metal", "Rock"],
     "Nu Skool Breaks": ["Breakbeat", "Dance", "Electronic", "Electronic Dance Music"],
@@ -5995,8 +6089,13 @@
         "Western Classical Music",
     ],
     "Oratorio": ["Classical Music", "Western Classical Music"],
-    "Orchestral": ["Classical Music", "Western Classical Music"],
-    "Orchestral Song": ["Art Song", "Classical Music", "Orchestral", "Western Classical Music"],
+    "Orchestral Music": ["Classical Music", "Western Classical Music"],
+    "Orchestral Song": [
+        "Art Song",
+        "Classical Music",
+        "Orchestral Music",
+        "Western Classical Music",
+    ],
     "Organic House": ["Dance", "Electronic", "Electronic Dance Music", "House"],
     "Ori deck": ["Dance", "Electronic", "Electronic Dance Music"],
     "Oriental Ballad": [
@@ -6054,6 +6153,7 @@
         "Jamaican Music",
         "Oceanian Music",
         "Reggae",
+        "Reggae / Ska / Dancehall",
         "Regional Music",
     ],
     "Pagan Black Metal": ["Black Metal", "Metal", "Rock"],
@@ -6158,7 +6258,7 @@
     "Persian Classical Music": [
         "Asian Music",
         "Classical Music",
-        "Islamic Modal Music",
+        "Maqāmic Music",
         "Persian Music",
         "Regional Music",
         "West Asian Music",
@@ -6182,6 +6282,7 @@
     ],
     "Philippine Music": ["Asian Music", "Regional Music", "Southeast Asian Music"],
     "Philly Club": ["Dance", "East Coast Club", "Electronic", "Electronic Dance Music"],
+    "Philly Club Rap": ["Hip Hop"],
     "Philly Soul": ["R&B", "Soul"],
     "Phleng phuea chiwit": [
         "Asian Music",
@@ -6398,7 +6499,14 @@
         "Raï",
         "Regional Music",
     ],
-    "Pop Reggae": ["Caribbean Music", "Jamaican Music", "Pop", "Reggae", "Regional Music"],
+    "Pop Reggae": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Pop",
+        "Reggae",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Pop Rock": ["Pop", "Rock"],
     "Pop Soul": ["Pop", "R&B", "Soul"],
     "Pop Sunda": [
@@ -6605,7 +6713,13 @@
     "Radio Drama": ["Spoken Word"],
     "Raga Rock": ["Psychedelia", "Psychedelic Rock", "Rock"],
     "Rage": ["Hip Hop", "Trap"],
-    "Ragga": ["Caribbean Music", "Dancehall", "Jamaican Music", "Regional Music"],
+    "Ragga": [
+        "Caribbean Music",
+        "Dancehall",
+        "Jamaican Music",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Ragga Jungle": ["Dance", "Drum and Bass", "Electronic", "Electronic Dance Music", "Jungle"],
     "Raggacore": ["Breakcore", "Dance", "Electronic", "Electronic Dance Music", "Hardcore [EDM]"],
     "Raggatek": [
@@ -6672,7 +6786,8 @@
     "Red Dirt": ["Americana", "Country", "Northern American Music", "Regional Music"],
     "Reductionism": ["Experimental"],
     "Regalia": ["Hip Hop", "Trap"],
-    "Reggae": ["Caribbean Music", "Jamaican Music", "Regional Music"],
+    "Reggae": ["Caribbean Music", "Jamaican Music", "Reggae / Ska / Dancehall", "Regional Music"],
+    "Reggae / Ska / Dancehall": [],
     "Reggae Rock": ["Rock"],
     "Reggaetón": ["Hispanic American Music", "Hispanic Music", "Regional Music"],
     "Regional Music": [],
@@ -6791,7 +6906,12 @@
     ],
     "Rock urbano español": ["Rock"],
     "Rockabilly": ["Rock", "Rock & Roll"],
-    "Rocksteady": ["Caribbean Music", "Jamaican Music", "Regional Music"],
+    "Rocksteady": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Rom kbach": [
         "Asian Music",
         "Cambodian Pop",
@@ -6838,7 +6958,13 @@
         "Traditional Pop",
     ],
     "Rominimal": ["Dance", "Electronic", "Electronic Dance Music", "House", "Tech House"],
-    "Roots Reggae": ["Caribbean Music", "Jamaican Music", "Reggae", "Regional Music"],
+    "Roots Reggae": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Roots Rock": ["Northern American Music", "Regional Music", "Rock"],
     "Rumba catalana": [
         "European Music",
@@ -7063,8 +7189,8 @@
         "Arabic Music",
         "Asian Music",
         "Classical Music",
-        "Islamic Modal Music",
         "Khaliji Music",
+        "Maqāmic Music",
         "Regional Music",
         "West Asian Music",
     ],
@@ -7134,6 +7260,7 @@
         "Caribbean Music",
         "Jamaican Music",
         "Reggae",
+        "Reggae / Ska / Dancehall",
         "Regional Music",
         "Seychelles & Mascarene Islands Music",
         "Séga",
@@ -7287,10 +7414,16 @@
         "Asian Music",
         "Central Asian Music",
         "Classical Music",
-        "Islamic Modal Music",
+        "Maqāmic Music",
+        "Regional Music",
+    ],
+    "Shatta": [
+        "Caribbean Music",
+        "Dancehall",
+        "Jamaican Music",
+        "Reggae / Ska / Dancehall",
         "Regional Music",
     ],
-    "Shatta": ["Caribbean Music", "Dancehall", "Jamaican Music", "Regional Music"],
     "Shehhi Music": [
         "Arabic Music",
         "Asian Music",
@@ -7370,7 +7503,7 @@
     "Sinfonia concertante": [
         "Classical Music",
         "Concerto",
-        "Orchestral",
+        "Orchestral Music",
         "Symphony",
         "Western Classical Music",
     ],
@@ -7399,13 +7532,14 @@
         "South Asian Music",
         "Traditional Folk Music",
     ],
-    "Ska": [],
-    "Ska Punk": ["Punk", "Punk Rock", "Rock", "Ska", "Third Wave Ska"],
+    "Ska": ["Reggae / Ska / Dancehall"],
+    "Ska Punk": ["Punk", "Punk Rock", "Reggae / Ska / Dancehall", "Rock", "Ska", "Third Wave Ska"],
     "Skacore": [
         "Hardcore Punk",
         "Hardcore [Punk]",
         "Punk",
         "Punk Rock",
+        "Reggae / Ska / Dancehall",
         "Rock",
         "Ska",
         "Ska Punk",
@@ -7423,7 +7557,13 @@
         "Pop",
         "Regional Music",
     ],
-    "Skinhead Reggae": ["Caribbean Music", "Jamaican Music", "Reggae", "Regional Music"],
+    "Skinhead Reggae": [
+        "Caribbean Music",
+        "Jamaican Music",
+        "Reggae",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Skullstep": ["Dance", "Darkstep", "Drum and Bass", "Electronic", "Electronic Dance Music"],
     "Skweee": ["Dance", "Electro", "Electronic", "Electronic Dance Music"],
     "Slack-Key Guitar": ["Hawaiian Music", "Oceanian Music", "Polynesian Music", "Regional Music"],
@@ -7663,7 +7803,7 @@
         "Speedcore",
     ],
     "Spoken Word": [],
-    "Spouge": ["Calypso", "Caribbean Music", "Regional Music", "Ska"],
+    "Spouge": ["Calypso", "Caribbean Music", "Reggae / Ska / Dancehall", "Regional Music", "Ska"],
     "Spy Music": ["Jazz"],
     "Stand-Up Comedy": ["Comedy", "Spoken Word"],
     "Standards": ["Pop", "Traditional Pop"],
@@ -7709,7 +7849,7 @@
         "Asian Music",
         "Central Asian Music",
         "Classical Music",
-        "Islamic Modal Music",
+        "Maqāmic Music",
         "Regional Music",
         "South Asian Music",
         "Sufi Music",
@@ -7776,7 +7916,7 @@
     "Symphonic Metal": ["Metal", "Rock"],
     "Symphonic Prog": ["Progressive Rock", "Rock"],
     "Symphonic Rock": ["Rock"],
-    "Symphony": ["Classical Music", "Orchestral", "Western Classical Music"],
+    "Symphony": ["Classical Music", "Orchestral Music", "Western Classical Music"],
     "Synth Funk": ["Funk", "R&B"],
     "Synth Punk": ["Electronic", "Punk"],
     "Synthpop": ["Electronic", "Pop"],
@@ -7901,6 +8041,14 @@
         "South American Music",
         "Traditional Folk Music",
     ],
+    "Tarana": [
+        "Asian Music",
+        "Classical Music",
+        "Hindustani Classical Music",
+        "Regional Music",
+        "South Asian Classical Music",
+        "South Asian Music",
+    ],
     "Tarantella": [
         "European Folk Music",
         "European Music",
@@ -8025,7 +8173,7 @@
     ],
     "Thai Music": ["Asian Music", "Regional Music", "Southeast Asian Music"],
     "Third Stream": ["Jazz"],
-    "Third Wave Ska": ["Ska"],
+    "Third Wave Ska": ["Reggae / Ska / Dancehall", "Ska"],
     "Thrash Metal": ["Metal", "Rock"],
     "Thrashcore": ["Hardcore Punk", "Hardcore [Punk]", "Punk", "Punk Rock", "Rock"],
     "Thumri": [
@@ -8122,7 +8270,7 @@
         "South American Music",
         "Traditional Folk Music",
     ],
-    "Tone Poem": ["Classical Music", "Orchestral", "Western Classical Music"],
+    "Tone Poem": ["Classical Music", "Orchestral Music", "Western Classical Music"],
     "Tontipop": ["Indie Pop", "Pop"],
     "Tosk Polyphony": [
         "Albanian Folk Music",
@@ -8151,7 +8299,8 @@
     ],
     "Township Jive": ["African Music", "Regional Music", "Southern African Music"],
     "Tracker Music": ["Bit Music", "Electronic", "Sequencer & Tracker"],
-    "Tradi-Modern": ["African Music", "Central African Music", "Regional Music"],
+    "Tradi-moderne congolais": ["African Music", "Central African Music", "Regional Music"],
+    "Tradi-moderne ivoirien": ["African Music", "Regional Music", "West African Music"],
     "Traditional Arabic Pop": ["Arabic Music", "Regional Music"],
     "Traditional Black Gospel": [
         "American Folk Music",
@@ -8351,7 +8500,7 @@
     "Turkish Classical Music": [
         "Asian Music",
         "Classical Music",
-        "Islamic Modal Music",
+        "Maqāmic Music",
         "Regional Music",
         "Turkish Music",
         "West Asian Music",
@@ -8368,8 +8517,8 @@
     "Turkish Mevlevi Music": [
         "Asian Music",
         "Classical Music",
-        "Islamic Modal Music",
         "Islamic Religious Music & Recitation",
+        "Maqāmic Music",
         "Regional Music",
         "Sufi Music",
         "Turkish Classical Music",
@@ -8391,6 +8540,14 @@
     ],
     "Twa Music": ["African Music", "Central African Music", "East African Music", "Regional Music"],
     "Twee Pop": ["Indie Pop", "Pop", "Pop Rock", "Rock"],
+    "Twelve Muqam": [
+        "Asian Music",
+        "Central Asian Music",
+        "Classical Music",
+        "Maqāmic Music",
+        "Regional Music",
+        "Uyghur Music",
+    ],
     "Twerk": ["Dance", "Electronic", "Electronic Dance Music", "Trap [EDM]"],
     "Twist": ["R&B", "Rhythm & Blues", "Rock", "Rock & Roll"],
     "UK Bass": ["Dance", "Electronic", "Electronic Dance Music"],
@@ -8476,13 +8633,6 @@
         "Traditional Folk Music",
     ],
     "Utopian Virtual": ["Electronic", "Vapor"],
-    "Uyghur Muqam": [
-        "Asian Music",
-        "Central Asian Music",
-        "Islamic Modal Music",
-        "Regional Music",
-        "Uyghur Music",
-    ],
     "Uyghur Music": ["Asian Music", "Central Asian Music", "Regional Music"],
     "Uzbek Music": ["Asian Music", "Central Asian Music", "Regional Music"],
     "Uzun Hava": [
@@ -8601,6 +8751,7 @@
     ],
     "Viking Metal": ["Metal", "Rock"],
     "Vikingarock": ["Punk", "Punk Rock", "Rock"],
+    "Villancico": ["European Music", "Iberian Music", "Regional Music"],
     "Vinahouse": ["Dance", "Electronic", "Electronic Dance Music", "House"],
     "Vira": [
         "European Folk Music",
@@ -8881,7 +9032,13 @@
         "Psytrance",
         "Trance",
     ],
-    "Zess": ["Caribbean Music", "Dancehall", "Jamaican Music", "Regional Music"],
+    "Zess": [
+        "Caribbean Music",
+        "Dancehall",
+        "Jamaican Music",
+        "Reggae / Ska / Dancehall",
+        "Regional Music",
+    ],
     "Zeuhl": ["Avant-Prog", "Experimental Rock", "Progressive Rock", "Rock"],
     "Zeybek": [
         "Asian Music",
@@ -9130,6 +9287,7 @@
         "Maloya",
         "Maloya élektrik",
         "Mande Music",
+        "Mangambeu",
         "Manzuma",
         "Marabi",
         "Marrabenta",
@@ -9194,7 +9352,8 @@
         "Tizita",
         "Township Bubblegum",
         "Township Jive",
-        "Tradi-Modern",
+        "Tradi-moderne congolais",
+        "Tradi-moderne ivoirien",
         "Traditional Maloya",
         "Traditional Raï",
         "Traditional Séga",
@@ -9337,6 +9496,7 @@
     ],
     "American Primitivism": [],
     "Americana": ["Red Dirt"],
+    "Amigacore": [],
     "Anarcho-Punk": [],
     "Anatolian Rock": [],
     "Ancient Chinese Music": [],
@@ -9499,6 +9659,7 @@
         "Dangdut",
         "Dangdut koplo",
         "Danmono",
+        "Dhol tasha",
         "Dhrupad",
         "Dongjing",
         "Druze Music",
@@ -9625,6 +9786,8 @@
         "Muzika mizrahit",
         "Nagauta",
         "Newa Folk Music",
+        "Ngâm thơ",
+        "Nhạc tiền chiến",
         "Nhạc vàng",
         "Nhạc đỏ",
         "Nivkh Music",
@@ -9706,6 +9869,7 @@
         "Talempong goyang",
         "Tamil Folk Music",
         "Tanjidor",
+        "Tarana",
         "Telugu Folk Music",
         "Tembang Sunda Cianjuran",
         "Thai Classical Music",
@@ -9724,9 +9888,9 @@
         "Turkish Pop",
         "Turkmen Music",
         "Tuvan Throat Singing",
+        "Twelve Muqam",
         "Upopo",
         "Urumi melam",
-        "Uyghur Muqam",
         "Uyghur Music",
         "Uzbek Music",
         "Uzun Hava",
@@ -9945,7 +10109,7 @@
     "Beatboxing": [],
     "Beatdown Hardcore": [],
     "Bebop": [],
-    "Bedouin Music": ["Ayyalah", "Shilla"],
+    "Bedouin Music": ["Aita", "Ayyalah", "Shilla"],
     "Bedroom Pop": [],
     "Beja Music": [],
     "Belarusian Folk Music": [],
@@ -9973,8 +10137,10 @@
     "Birmingham Sound": [],
     "Bit Music": [
         "16-bit",
+        "Amigacore",
         "Black MIDI",
         "Chiptune",
+        "Demostyle",
         "Doskpop",
         "FM Synthesis",
         "MIDI Music",
@@ -10224,6 +10390,7 @@
     "British Dance Band": [],
     "British Folk Rock": [],
     "British Music": [
+        "Ballad Opera",
         "British Brass Band",
         "British Dance Band",
         "British Folk Rock",
@@ -10526,12 +10693,13 @@
         "Kuduro",
         "Kwassa kwassa",
         "Makossa",
+        "Mangambeu",
         "Mbenga-Mbuti Music",
         "Puxa",
         "Semba",
         "Soukous",
         "Tarraxinha",
-        "Tradi-Modern",
+        "Tradi-moderne congolais",
         "Twa Music",
         "Zamrock",
     ],
@@ -10558,7 +10726,7 @@
         "Tibetan Music",
         "Turkmen Music",
         "Tuvan Throat Singing",
-        "Uyghur Muqam",
+        "Twelve Muqam",
         "Uyghur Music",
         "Uzbek Music",
         "Zhabdro gorgom",
@@ -10834,6 +11002,7 @@
         "Mahori",
         "Malay Classical Music",
         "Malay Gamelan",
+        "Maqāmic Music",
         "Mass",
         "Medieval Classical Music",
         "Medieval Lyric Poetry",
@@ -10861,7 +11030,7 @@
         "Opéra-ballet",
         "Opéra-comique",
         "Oratorio",
-        "Orchestral",
+        "Orchestral Music",
         "Orchestral Song",
         "Overture",
         "Peking Opera",
@@ -10902,6 +11071,7 @@
         "Symphony",
         "Sōkyoku",
         "Talempong",
+        "Tarana",
         "Tembang Sunda Cianjuran",
         "Thai Classical Music",
         "Thumri",
@@ -10912,6 +11082,7 @@
         "Tragédie en musique",
         "Turkish Classical Music",
         "Turkish Mevlevi Music",
+        "Twelve Muqam",
         "Valsa brasileira",
         "Verismo",
         "Vietnamese Classical Music",
@@ -11144,6 +11315,7 @@
         "Amapiano",
         "Ambient House",
         "Ambient Techno",
+        "Amigacore",
         "Aquacrunk",
         "Artcore",
         "Atlanta Bass",
@@ -11155,6 +11327,7 @@
         "Bass House",
         "Bassline",
         "Batida",
+        "Beat bruxaria",
         "Belgian Techno",
         "Big Beat",
         "Big Room House",
@@ -11164,6 +11337,7 @@
         "Boogie",
         "Bouncy Techno",
         "Brazilian Bass",
+        "Brazilian Phonk",
         "Breakbeat",
         "Breakbeat Hardcore",
         "Breakbeat Kota",
@@ -11251,6 +11425,7 @@
         "Frenchcore",
         "Full-On Psytrance",
         "Funk Melody",
+        "Funk mandelão",
         "Funkot",
         "Funky House",
         "Future Bass",
@@ -11495,6 +11670,7 @@
     "Deep Tech": [],
     "Delta Blues": [],
     "Dembow": [],
+    "Demostyle": [],
     "Dennery Segment": [],
     "Denpa": [],
     "Depressive Black Metal": [],
@@ -11504,6 +11680,7 @@
     "Deutschpunk": [],
     "Deutschrock": [],
     "Dhaanto": [],
+    "Dhol tasha": [],
     "Dhrupad": [],
     "Digicore": [],
     "Digital Cumbia": [],
@@ -11762,6 +11939,8 @@
         "Min'yō",
         "Minyue",
         "Nagauta",
+        "Ngâm thơ",
+        "Nhạc tiền chiến",
         "Nhạc vàng",
         "Nhạc đỏ",
         "Noh",
@@ -11857,6 +12036,7 @@
         "Ambient House",
         "Ambient Techno",
         "Ambient Trance",
+        "Amigacore",
         "Aquacrunk",
         "Artcore",
         "Atmospheric Drum and Bass",
@@ -11869,6 +12049,7 @@
         "Bassline",
         "Batida",
         "Batidão romântico",
+        "Beat bruxaria",
         "Belgian Techno",
         "Berlin School",
         "Big Beat",
@@ -11928,6 +12109,7 @@
         "Deconstructed Club",
         "Deep House",
         "Deep Tech",
+        "Demostyle",
         "Detroit Techno",
         "Digital Cumbia",
         "Digital Fusion",
@@ -11991,6 +12173,7 @@
         "French House",
         "Frenchcore",
         "Full-On Psytrance",
+        "Funk mandelão",
         "Funkot",
         "Funktronica",
         "Funky House",
@@ -12015,6 +12198,7 @@
         "Goa Trance",
         "Gospel House",
         "Gqom",
+        "Graphical Sound",
         "Grime",
         "Guaracha [EDM]",
         "Halftime",
@@ -12221,6 +12405,7 @@
         "Amapiano",
         "Ambient House",
         "Ambient Techno",
+        "Amigacore",
         "Aquacrunk",
         "Artcore",
         "Atmospheric Drum and Bass",
@@ -12231,6 +12416,7 @@
         "Bass House",
         "Bassline",
         "Batida",
+        "Beat bruxaria",
         "Belgian Techno",
         "Big Beat",
         "Big Room House",
@@ -12239,6 +12425,7 @@
         "Bleep Techno",
         "Bouncy Techno",
         "Brazilian Bass",
+        "Brazilian Phonk",
         "Breakbeat",
         "Breakbeat Hardcore",
         "Breakbeat Kota",
@@ -12320,6 +12507,7 @@
         "French House",
         "Frenchcore",
         "Full-On Psytrance",
+        "Funk mandelão",
         "Funkot",
         "Funky House",
         "Future Bass",
@@ -12793,6 +12981,7 @@
         "Czech Folk Music",
         "Dagestani Folk Music",
         "Danish Folk Music",
+        "Dansbandsmusik",
         "Dansktop",
         "Dimotika",
         "Disco polo",
@@ -13001,6 +13190,7 @@
         "Vaigat Music",
         "Valsa brasileira",
         "Verismo",
+        "Villancico",
         "Vira",
         "Visa",
         "Volga Tatar Folk Music",
@@ -13041,6 +13231,7 @@
         "Futurism",
         "Glitch",
         "Gorenoise",
+        "Graphical Sound",
         "Harsh Noise",
         "Harsh Noise Wall",
         "Indeterminacy",
@@ -13711,7 +13902,7 @@
     "Gamelan selonding": [],
     "Gamelan semar pegulingan": [],
     "Ganga": [],
-    "Gangsta Rap": ["Chicano Rap"],
+    "Gangsta Rap": [],
     "Garage House": ["Gospel House", "Jersey Sound"],
     "Garage Punk": [],
     "Garage Rock": ["Freakbeat", "Garage Punk", "Garage Rock Revival"],
@@ -13770,6 +13961,7 @@
     "Gothic Rock": ["Deathrock"],
     "Gqom": [],
     "Grand opéra": [],
+    "Graphical Sound": [],
     "Grebo": [],
     "Greek Folk Music": [
         "Aegean Islands Folk Music",
@@ -13880,7 +14072,6 @@
     "Hardcore Breaks": [],
     "Hardcore Hip Hop": [
         "Britcore",
-        "Chicano Rap",
         "Dungeon Rap",
         "Gangsta Rap",
         "Horrorcore",
@@ -13909,6 +14100,7 @@
     ],
     "Hardcore [EDM]": [
         "Acidcore",
+        "Amigacore",
         "Belgian Techno",
         "Bouncy Techno",
         "Breakbeat Hardcore",
@@ -14014,6 +14206,7 @@
         "Khyal",
         "Qawwali",
         "Shabad kirtan",
+        "Tarana",
         "Thumri",
     ],
     "Hip Hop": [
@@ -14083,6 +14276,7 @@
         "Nervous Music",
         "New Jazz",
         "No Melody",
+        "Philly Club Rap",
         "Plugg",
         "PluggnB",
         "Political Hip Hop",
@@ -14635,6 +14829,7 @@
         "Chotis madrileño",
         "Copla",
         "Cuplé",
+        "Euskal kantagintza berria",
         "Fado",
         "Fado de Coimbra",
         "Flamenco",
@@ -14661,6 +14856,7 @@
         "Spanish Music",
         "Tecnorumba",
         "Trás-os-Montes Folk Music",
+        "Villancico",
         "Vira",
         "Zarzuela",
         "Zarzuela barocca",
@@ -14848,19 +15044,6 @@
     "Irish Folk Music": ["Sean-nós"],
     "Irish Showband": [],
     "Isicathamiya": [],
-    "Islamic Modal Music": [
-        "Andalusian Classical Music",
-        "Arabic Classical Music",
-        "Azerbaijani Mugham",
-        "Iraqi Maqam",
-        "Persian Classical Music",
-        "Sawt",
-        "Shashmaqam",
-        "Sufiana kalam",
-        "Turkish Classical Music",
-        "Turkish Mevlevi Music",
-        "Uyghur Muqam",
-    ],
     "Islamic Religious Music & Recitation": [
         "Ginan",
         "Maddahi",
@@ -15320,6 +15503,7 @@
     "Mande Music": [],
     "Mandopop": [],
     "Manele": [],
+    "Mangambeu": [],
     "Manguebeat": [],
     "Manila Sound": [],
     "Mantra": ["Tibetan Bhuddist Chant", "Vedic Chant"],
@@ -15327,6 +15511,19 @@
     "Manyao": [],
     "Manzuma": [],
     "Mapuche Folk Music": [],
+    "Maqāmic Music": [
+        "Andalusian Classical Music",
+        "Arabic Classical Music",
+        "Azerbaijani Mugham",
+        "Iraqi Maqam",
+        "Persian Classical Music",
+        "Sawt",
+        "Shashmaqam",
+        "Sufiana kalam",
+        "Turkish Classical Music",
+        "Turkish Mevlevi Music",
+        "Twelve Muqam",
+    ],
     "Marabi": ["Kwela", "Mbaqanga"],
     "Maracatu": [],
     "Marathi Folk Music": [],
@@ -15696,6 +15893,8 @@
     "Newfoundland Folk Music": [],
     "Ngoma": ["Unyago"],
     "Nguni Folk Music": [],
+    "Ngâm thơ": [],
+    "Nhạc tiền chiến": [],
     "Nhạc vàng": [],
     "Nhạc đỏ": [],
     "Nightcore": [],
@@ -15736,6 +15935,7 @@
     "Nordic Folk Rock": [],
     "Nordic Music": [
         "Danish Folk Music",
+        "Dansbandsmusik",
         "Dansktop",
         "Faroese Folk Music",
         "Finnish Folk Music",
@@ -16058,7 +16258,7 @@
     "Opéra-ballet": [],
     "Opéra-comique": [],
     "Oratorio": [],
-    "Orchestral": [
+    "Orchestral Music": [
         "Choral Symphony",
         "Concert Band",
         "Concerto",
@@ -16126,6 +16326,7 @@
     ],
     "Philippine Music": ["Balitaw", "Filipino Rondalla", "Kundiman", "Pinoy Folk Rock"],
     "Philly Club": [],
+    "Philly Club Rap": [],
     "Philly Soul": [],
     "Phleng phuea chiwit": [],
     "Phonk House": [],
@@ -16785,6 +16986,36 @@
         "Seggae",
         "Skinhead Reggae",
     ],
+    "Reggae / Ska / Dancehall": [
+        "2 Tone",
+        "Bubbling",
+        "Crack Rock Steady",
+        "Dancehall",
+        "Deejay",
+        "Digital Dancehall",
+        "Dub",
+        "Dub Poetry",
+        "Flex Dance Music",
+        "Gommance",
+        "Jamaican Ska",
+        "Lovers Rock",
+        "Novo Dub",
+        "Pacific Reggae",
+        "Pop Reggae",
+        "Ragga",
+        "Reggae",
+        "Rocksteady",
+        "Roots Reggae",
+        "Seggae",
+        "Shatta",
+        "Ska",
+        "Ska Punk",
+        "Skacore",
+        "Skinhead Reggae",
+        "Spouge",
+        "Third Wave Ska",
+        "Zess",
+    ],
     "Reggae Rock": [],
     "Reggaetón": ["Bachatón", "Cubaton", "Cumbiatón", "Neoperreo", "RKT"],
     "Regional Music": [
@@ -17154,6 +17385,7 @@
         "Dangdut koplo",
         "Danish Folk Music",
         "Danmono",
+        "Dansbandsmusik",
         "Dansktop",
         "Danzón",
         "Deejay",
@@ -17162,6 +17394,7 @@
         "Dennery Segment",
         "Descarga",
         "Dhaanto",
+        "Dhol tasha",
         "Dhrupad",
         "Digital Cumbia",
         "Digital Dancehall",
@@ -17361,7 +17594,6 @@
         "Irish Folk Music",
         "Irish Showband",
         "Isicathamiya",
-        "Islamic Modal Music",
         "Islamic Religious Music & Recitation",
         "Israeli Folk Music",
         "Istrian Folk Music",
@@ -17524,10 +17756,12 @@
         "Mambo urbano",
         "Mande Music",
         "Manele",
+        "Mangambeu",
         "Manguebeat",
         "Manx Folk Music",
         "Manzuma",
         "Mapuche Folk Music",
+        "Maqāmic Music",
         "Marabi",
         "Maracatu",
         "Marathi Folk Music",
@@ -17630,6 +17864,8 @@
         "Newfoundland Folk Music",
         "Ngoma",
         "Nguni Folk Music",
+        "Ngâm thơ",
+        "Nhạc tiền chiến",
         "Nhạc vàng",
         "Nhạc đỏ",
         "Nigun",
@@ -17967,6 +18203,7 @@
         "Tango Nuevo",
         "Tanjidor",
         "Taquirari",
+        "Tarana",
         "Tarantella",
         "Tarraxinha",
         "Tassu",
@@ -18002,7 +18239,8 @@
         "Tosk Polyphony",
         "Township Bubblegum",
         "Township Jive",
-        "Tradi-Modern",
+        "Tradi-moderne congolais",
+        "Tradi-moderne ivoirien",
         "Traditional Arabic Pop",
         "Traditional Black Gospel",
         "Traditional Cajun Music",
@@ -18043,6 +18281,7 @@
         "Turkmen Music",
         "Tuvan Throat Singing",
         "Twa Music",
+        "Twelve Muqam",
         "Udigrudi",
         "Udmurt Folk Music",
         "Ukrainian Folk Music",
@@ -18051,7 +18290,6 @@
         "Upopo",
         "Urban Cowboy",
         "Urumi melam",
-        "Uyghur Muqam",
         "Uyghur Music",
         "Uzbek Music",
         "Uzun Hava",
@@ -18069,6 +18307,7 @@
         "Vietnamese Folk Music",
         "Vietnamese Music",
         "Vietnamese Opera",
+        "Villancico",
         "Vira",
         "Virgin Islander Cariso",
         "Visa",
@@ -18558,7 +18797,7 @@
     "Semba": [],
     "Semi-Trot": [],
     "Sephardic Music": ["Ladino Folksong", "Maftirim"],
-    "Sequencer & Tracker": ["16-bit", "Doskpop", "Tracker Music"],
+    "Sequencer & Tracker": ["16-bit", "Amigacore", "Demostyle", "Doskpop", "Tracker Music"],
     "Serbian Folk Music": [],
     "Serenade": [],
     "Serialism": ["Integral Serialism"],
@@ -18949,6 +19188,7 @@
         "Odissi Classical Music",
         "Qawwali",
         "Shabad kirtan",
+        "Tarana",
         "Thumri",
     ],
     "South Asian Folk Music": [
@@ -18989,6 +19229,7 @@
         "Boduberu",
         "Burushaski Folk Music",
         "Carnatic Classical Music",
+        "Dhol tasha",
         "Dhrupad",
         "Filmi",
         "Folkhop",
@@ -19022,6 +19263,7 @@
         "Sufi Rock",
         "Sufiana kalam",
         "Tamil Folk Music",
+        "Tarana",
         "Telugu Folk Music",
         "Thumri",
         "Urumi melam",
@@ -19136,6 +19378,8 @@
         "Molam",
         "Molam sing",
         "Mono",
+        "Ngâm thơ",
+        "Nhạc tiền chiến",
         "Nhạc vàng",
         "Nhạc đỏ",
         "Orkes gambus",
@@ -19386,6 +19630,7 @@
     "Tanjidor": [],
     "Tape Music": [],
     "Taquirari": [],
+    "Tarana": [],
     "Tarantella": ["Pizzica", "Tammurriata"],
     "Tarraxinha": [],
     "Tassu": [],
@@ -19472,8 +19717,9 @@
     "Totalism": [],
     "Township Bubblegum": [],
     "Township Jive": [],
-    "Tracker Music": ["Doskpop"],
-    "Tradi-Modern": [],
+    "Tracker Music": ["Amigacore", "Demostyle", "Doskpop"],
+    "Tradi-moderne congolais": [],
+    "Tradi-moderne ivoirien": [],
     "Traditional Arabic Pop": [],
     "Traditional Black Gospel": [],
     "Traditional Cajun Music": [],
@@ -20011,6 +20257,7 @@
     "Tuvan Throat Singing": [],
     "Twa Music": [],
     "Twee Pop": [],
+    "Twelve Muqam": [],
     "Twerk": [],
     "Twist": [],
     "UK Bass": [],
@@ -20035,8 +20282,7 @@
     "Urban Cowboy": [],
     "Urumi melam": [],
     "Utopian Virtual": [],
-    "Uyghur Muqam": [],
-    "Uyghur Music": ["Bayawan", "Uyghur Muqam"],
+    "Uyghur Music": ["Bayawan", "Twelve Muqam"],
     "Uzbek Music": [],
     "Uzun Hava": [],
     "V-Pop": [],
@@ -20075,6 +20321,8 @@
         "Ca trù",
         "Chèo",
         "Cải lương",
+        "Ngâm thơ",
+        "Nhạc tiền chiến",
         "Nhạc vàng",
         "Nhạc đỏ",
         "Quan họ",
@@ -20086,6 +20334,7 @@
     "Vietnamese Opera": [],
     "Viking Metal": [],
     "Vikingarock": [],
+    "Villancico": [],
     "Vinahouse": [],
     "Vira": [],
     "Virgin Islander Cariso": [],
@@ -20154,6 +20403,7 @@
         "Tassu",
         "Tchink System",
         "Tchinkoumé",
+        "Tradi-moderne ivoirien",
         "Waka",
         "Wassoulou",
         "Wolof Music",
@@ -20321,7 +20571,7 @@
         "Opéra-ballet",
         "Opéra-comique",
         "Oratorio",
-        "Orchestral",
+        "Orchestral Music",
         "Orchestral Song",
         "Overture",
         "Plainsong",
@@ -20573,6 +20823,7 @@
     ],
     "American Primitivism": [],
     "Americana": ["Red Dirt"],
+    "Amigacore": [],
     "Anarcho-Punk": [],
     "Anatolian Rock": [],
     "Ancient Chinese Music": [],
@@ -20786,7 +21037,7 @@
     "Beatboxing": [],
     "Beatdown Hardcore": [],
     "Bebop": [],
-    "Bedouin Music": ["Ayyalah", "Shilla"],
+    "Bedouin Music": ["Aita", "Ayyalah", "Shilla"],
     "Bedroom Pop": [],
     "Beja Music": [],
     "Belarusian Folk Music": [],
@@ -20942,6 +21193,7 @@
     "British Dance Band": [],
     "British Folk Rock": [],
     "British Music": [
+        "Ballad Opera",
         "British Brass Band",
         "British Dance Band",
         "British Folk Rock",
@@ -21117,11 +21369,12 @@
         "Kizomba",
         "Kuduro",
         "Makossa",
+        "Mangambeu",
         "Mbenga-Mbuti Music",
         "Puxa",
         "Semba",
         "Soukous",
-        "Tradi-Modern",
+        "Tradi-moderne congolais",
         "Twa Music",
         "Zamrock",
     ],
@@ -21265,21 +21518,16 @@
     "Classical Crossover": [],
     "Classical March": ["Circus March", "Dobrado", "Funeral March"],
     "Classical Music": [
-        "Arabic Classical Music",
-        "Azerbaijani Mugham",
         "Buganda Royal Court Music",
         "East Asian Classical Music",
         "Inkiranya",
         "Kete",
+        "Maqāmic Music",
         "Minyue",
-        "Persian Classical Music",
         "Pìobaireachd",
-        "Shashmaqam",
         "South Asian Classical Music",
         "Southeast Asian Classical Music",
-        "Sufiana kalam",
         "Tibetan Bhuddist Chant",
-        "Turkish Classical Music",
         "Western Classical Music",
     ],
     "Classical Period": [],
@@ -21522,6 +21770,7 @@
     "Deep Tech": [],
     "Delta Blues": [],
     "Dembow": [],
+    "Demostyle": [],
     "Dennery Segment": [],
     "Denpa": [],
     "Depressive Black Metal": [],
@@ -21531,6 +21780,7 @@
     "Deutschpunk": [],
     "Deutschrock": [],
     "Dhaanto": [],
+    "Dhol tasha": [],
     "Dhrupad": [],
     "Digicore": [],
     "Digital Cumbia": [],
@@ -21717,6 +21967,7 @@
         "Funktronica",
         "Glitch",
         "Glitch Hop",
+        "Graphical Sound",
         "HexD",
         "Horror Synth",
         "Hyperpop",
@@ -21772,6 +22023,7 @@
         "Flex Dance Music",
         "Footwork",
         "Freestyle",
+        "Funk mandelão",
         "Funkot",
         "Future Bass",
         "Future Rave",
@@ -21883,7 +22135,6 @@
         "Anglican Chant",
         "Ashkenazi Music",
         "Balkan Music",
-        "Ballad Opera",
         "Baroque Music",
         "Baroque Suite",
         "British Music",
@@ -21899,7 +22150,6 @@
         "Crimean Tatar Music",
         "Dutch Cabaret",
         "European Folk Music",
-        "Euskal kantagintza berria",
         "Fanfare",
         "Finnish Tango",
         "German Music",
@@ -21944,6 +22194,7 @@
         "Free Improvisation",
         "Futurism",
         "Glitch",
+        "Graphical Sound",
         "Indeterminacy",
         "Industrial",
         "Modern Creative",
@@ -22148,7 +22399,7 @@
     "Gamelan selonding": [],
     "Gamelan semar pegulingan": [],
     "Ganga": [],
-    "Gangsta Rap": ["Chicano Rap"],
+    "Gangsta Rap": [],
     "Garage House": ["Gospel House", "Jersey Sound"],
     "Garage Punk": [],
     "Garage Rock": ["Freakbeat", "Garage Punk", "Garage Rock Revival"],
@@ -22206,6 +22457,7 @@
     "Gothic Rock": ["Deathrock"],
     "Gqom": [],
     "Grand opéra": [],
+    "Graphical Sound": [],
     "Grebo": [],
     "Greek Folk Music": [
         "Aegean Islands Folk Music",
@@ -22308,6 +22560,7 @@
     ],
     "Hardcore [EDM]": [
         "Acidcore",
+        "Amigacore",
         "Belgian Techno",
         "Breakbeat Hardcore",
         "Breakcore",
@@ -22370,6 +22623,7 @@
         "Khyal",
         "Qawwali",
         "Shabad kirtan",
+        "Tarana",
         "Thumri",
     ],
     "Hip Hop": [
@@ -22416,6 +22670,7 @@
         "Mobb Music",
         "Nerdcore Hip Hop",
         "Nervous Music",
+        "Philly Club Rap",
         "Political Hip Hop",
         "Pop Rap",
         "Ratchet Music",
@@ -22588,9 +22843,11 @@
     "Iberian Music": [
         "Basque Folk Music",
         "Catalan Folk Music",
+        "Euskal kantagintza berria",
         "Nova cançó",
         "Portuguese Music",
         "Spanish Music",
+        "Villancico",
     ],
     "Ibiza Trance": [],
     "Icelandic Folk Music": [],
@@ -22686,15 +22943,6 @@
     "Irish Folk Music": ["Sean-nós"],
     "Irish Showband": [],
     "Isicathamiya": [],
-    "Islamic Modal Music": [
-        "Arabic Classical Music",
-        "Azerbaijani Mugham",
-        "Persian Classical Music",
-        "Shashmaqam",
-        "Sufiana kalam",
-        "Turkish Classical Music",
-        "Uyghur Muqam",
-    ],
     "Islamic Religious Music & Recitation": [
         "Ginan",
         "Maddahi",
@@ -23045,6 +23293,7 @@
     "Mande Music": [],
     "Mandopop": [],
     "Manele": [],
+    "Mangambeu": [],
     "Manguebeat": [],
     "Manila Sound": [],
     "Mantra": ["Tibetan Bhuddist Chant", "Vedic Chant"],
@@ -23052,6 +23301,15 @@
     "Manyao": [],
     "Manzuma": [],
     "Mapuche Folk Music": [],
+    "Maqāmic Music": [
+        "Arabic Classical Music",
+        "Azerbaijani Mugham",
+        "Persian Classical Music",
+        "Shashmaqam",
+        "Sufiana kalam",
+        "Turkish Classical Music",
+        "Twelve Muqam",
+    ],
     "Marabi": ["Kwela", "Mbaqanga"],
     "Maracatu": [],
     "Marathi Folk Music": [],
@@ -23346,6 +23604,8 @@
     "Newfoundland Folk Music": [],
     "Ngoma": ["Unyago"],
     "Nguni Folk Music": [],
+    "Ngâm thơ": [],
+    "Nhạc tiền chiến": [],
     "Nhạc vàng": [],
     "Nhạc đỏ": [],
     "Nightcore": [],
@@ -23381,6 +23641,7 @@
     ],
     "Nordic Folk Rock": [],
     "Nordic Music": [
+        "Dansbandsmusik",
         "Dansktop",
         "Greenlandic Music",
         "Nordic Folk Music",
@@ -23534,7 +23795,7 @@
     "Opéra-ballet": [],
     "Opéra-comique": [],
     "Oratorio": [],
-    "Orchestral": ["Concert Band", "Concerto", "Orchestral Song", "Symphony", "Tone Poem"],
+    "Orchestral Music": ["Concert Band", "Concerto", "Orchestral Song", "Symphony", "Tone Poem"],
     "Orchestral Song": [],
     "Organic House": [],
     "Ori deck": [],
@@ -23586,6 +23847,7 @@
     "Peruvian Music": ["Cumbia peruana", "Música criolla peruana"],
     "Philippine Music": ["Balitaw", "Filipino Rondalla", "Kundiman", "Pinoy Folk Rock"],
     "Philly Club": [],
+    "Philly Club Rap": [],
     "Philly Soul": [],
     "Phleng phuea chiwit": [],
     "Phonk House": [],
@@ -23971,6 +24233,7 @@
         "Seggae",
         "Skinhead Reggae",
     ],
+    "Reggae / Ska / Dancehall": ["Dancehall", "Reggae", "Rocksteady", "Ska"],
     "Reggae Rock": [],
     "Reggaetón": ["Bachatón", "Cubaton", "Cumbiatón", "Neoperreo", "RKT"],
     "Regional Music": [
@@ -23984,9 +24247,9 @@
         "Gospel",
         "Hispanic Music",
         "Indigenous American Music",
-        "Islamic Modal Music",
         "Islamic Religious Music & Recitation",
         "Jewish Music",
+        "Maqāmic Music",
         "Northern American Music",
         "Oceanian Music",
         "Polyphonic Chant",
@@ -24422,6 +24685,7 @@
         "Baila",
         "Balochi Music",
         "Bhangra",
+        "Dhol tasha",
         "Filmi",
         "Garba",
         "Ginan",
@@ -24641,6 +24905,7 @@
     "Tanjidor": [],
     "Tape Music": [],
     "Taquirari": [],
+    "Tarana": [],
     "Tarantella": ["Pizzica", "Tammurriata"],
     "Tarraxinha": [],
     "Tassu": [],
@@ -24720,8 +24985,9 @@
     "Totalism": [],
     "Township Bubblegum": [],
     "Township Jive": [],
-    "Tracker Music": ["Doskpop"],
-    "Tradi-Modern": [],
+    "Tracker Music": ["Amigacore", "Demostyle", "Doskpop"],
+    "Tradi-moderne congolais": [],
+    "Tradi-moderne ivoirien": [],
     "Traditional Arabic Pop": [],
     "Traditional Black Gospel": [],
     "Traditional Cajun Music": [],
@@ -24855,6 +25121,7 @@
     "Tuvan Throat Singing": [],
     "Twa Music": [],
     "Twee Pop": [],
+    "Twelve Muqam": [],
     "Twerk": [],
     "Twist": [],
     "UK Bass": [],
@@ -24879,8 +25146,7 @@
     "Urban Cowboy": [],
     "Urumi melam": [],
     "Utopian Virtual": [],
-    "Uyghur Muqam": [],
-    "Uyghur Music": ["Bayawan", "Uyghur Muqam"],
+    "Uyghur Music": ["Bayawan", "Twelve Muqam"],
     "Uzbek Music": [],
     "Uzun Hava": [],
     "V-Pop": [],
@@ -24913,6 +25179,8 @@
     "Vietnamese Music": [
         "Bolero Việt Nam",
         "Cải lương",
+        "Ngâm thơ",
+        "Nhạc tiền chiến",
         "Nhạc vàng",
         "Nhạc đỏ",
         "Vietnamese Classical Music",
@@ -24921,6 +25189,7 @@
     "Vietnamese Opera": [],
     "Viking Metal": [],
     "Vikingarock": [],
+    "Villancico": [],
     "Vinahouse": [],
     "Vira": [],
     "Virgin Islander Cariso": [],
@@ -24974,6 +25243,7 @@
         "Mande Music",
         "Mossi Music",
         "Songhai Music",
+        "Tradi-moderne ivoirien",
         "Wassoulou",
         "Wolof Music",
         "Yoruba Music",
@@ -25036,7 +25306,7 @@
         "Nocturne",
         "Opera",
         "Oratorio",
-        "Orchestral",
+        "Orchestral Music",
         "Overture",
         "Prelude",
         "Renaissance Music",
diff --git a/scripts/rym-genres/rym.txt b/scripts/rym-genres/rym.txt
index e6567ee..62088bd 100644
--- a/scripts/rym-genres/rym.txt
+++ b/scripts/rym-genres/rym.txt
@@ -37,12 +37,6 @@ Blues
     Vaudeville Blues::genre
 Classical Music
     Classical Music::genre
-    Arabic Classical Music
-        Arabic Classical Music::genre
-        Andalusian Classical Music::genre
-        Iraqi Maqam::genre
-        Sawt::genre
-    Azerbaijani Mugham::genre
     Buganda Royal Court Music::genre
     East Asian Classical Music
         East Asian Classical Music::genre
@@ -90,10 +84,23 @@ Classical Music
             Vietnamese Opera::genre
     Inkiranya::genre
     Kete::genre
+    Maqāmic Music
+        Maqāmic Music::genre
+        Arabic Classical Music
+            Arabic Classical Music::genre
+            Andalusian Classical Music::genre
+            Iraqi Maqam::genre
+            Sawt::genre
+        Azerbaijani Mugham::genre
+        Persian Classical Music::genre
+        Shashmaqam::genre
+        Sufiana kalam::genre
+        Turkish Classical Music
+            Turkish Classical Music::genre
+            Turkish Mevlevi Music::genre
+        Twelve Muqam::genre
     Minyue::genre
-    Persian Classical Music::genre
     Pìobaireachd::genre
-    Shashmaqam::genre
     South Asian Classical Music
         South Asian Classical Music::genre
         Carnatic Classical Music
@@ -106,6 +113,7 @@ Classical Music
             Khyal::genre
             Qawwali::genre
             Shabad kirtan::genre
+            Tarana::genre
             Thumri::genre
         Odissi Classical Music::genre
     Southeast Asian Classical Music
@@ -143,11 +151,7 @@ Classical Music
             Fon leb::genre
             Khrueang sai::genre
             Piphat::genre
-    Sufiana kalam::genre
     Tibetan Bhuddist Chant::genre
-    Turkish Classical Music
-        Turkish Classical Music::genre
-        Turkish Mevlevi Music::genre
     Western Classical Music
         Western Classical Music::genre
         Art Song
@@ -266,8 +270,8 @@ Classical Music
                 Zarzuela grande::genre
             Zeitoper::genre
         Oratorio::genre
-        Orchestral
-            Orchestral::genre
+        Orchestral Music
+            Orchestral Music::genre
             Concert Band::genre
             Concerto
                 Concerto::genre
@@ -494,6 +498,10 @@ Dance
         Freestyle
             Freestyle::genre
             Latin Freestyle::genre
+        Funk mandelão
+            Funk mandelão::genre
+            Beat bruxaria::genre
+            Brazilian Phonk::genre
         Funkot
             Funkot::genre
             Breakbeat Kota
@@ -542,6 +550,7 @@ Dance
         Hardcore [EDM]
             Hardcore [EDM]::genre
             Acidcore::genre
+            Amigacore::genre
             Belgian Techno::genre
             Breakbeat Hardcore
                 Breakbeat Hardcore::genre
@@ -781,6 +790,8 @@ Electronic
             16-bit::genre
             Tracker Music
                 Tracker Music::genre
+                Amigacore::genre
+                Demostyle::genre
                 Doskpop::genre
     Bitpop::genre
     Celtic Electronica::genre
@@ -928,6 +939,10 @@ Electronic
         Freestyle
             Freestyle::genre
             Latin Freestyle::genre
+        Funk mandelão
+            Funk mandelão::genre
+            Beat bruxaria::genre
+            Brazilian Phonk::genre
         Funkot
             Funkot::genre
             Breakbeat Kota
@@ -976,6 +991,7 @@ Electronic
         Hardcore [EDM]
             Hardcore [EDM]::genre
             Acidcore::genre
+            Amigacore::genre
             Belgian Techno::genre
             Breakbeat Hardcore
                 Breakbeat Hardcore::genre
@@ -1200,6 +1216,7 @@ Electronic
     Funktronica::genre
     Glitch::genre
     Glitch Hop::genre
+    Graphical Sound::genre
     HexD::genre
     Horror Synth::genre
     Hyperpop::genre
@@ -1290,6 +1307,7 @@ Experimental
         EAI::genre
     Futurism::genre
     Glitch::genre
+    Graphical Sound::genre
     Indeterminacy::genre
     Industrial
         Industrial::genre
@@ -1935,9 +1953,7 @@ Hip Hop
     Hardcore Hip Hop
         Hardcore Hip Hop::genre
         Britcore::genre
-        Gangsta Rap
-            Gangsta Rap::genre
-            Chicano Rap::genre
+        Gangsta Rap::genre
         Horrorcore::genre
         Memphis Rap
             Memphis Rap::genre
@@ -1973,6 +1989,7 @@ Hip Hop
     Mobb Music::genre
     Nerdcore Hip Hop::genre
     Nervous Music::genre
+    Philly Club Rap::genre
     Political Hip Hop::genre
     Pop Rap
         Pop Rap::genre
@@ -2656,6 +2673,45 @@ R&B
         Psychedelic Soul::genre
         Smooth Soul::genre
         Southern Soul::genre
+Reggae / Ska / Dancehall
+    Reggae / Ska / Dancehall::genre
+    Dancehall
+        Dancehall::genre
+        Bubbling::genre
+        Digital Dancehall::genre
+        Flex Dance Music::genre
+        Gommance::genre
+        Ragga::genre
+        Shatta::genre
+        Zess::genre
+    Reggae
+        Reggae::genre
+        Deejay::genre
+        Digital Dancehall::genre
+        Dub
+            Dub::genre
+            Novo Dub::genre
+        Lovers Rock::genre
+        Pacific Reggae::genre
+        Pop Reggae::genre
+        Roots Reggae
+            Roots Reggae::genre
+            Dub Poetry::genre
+        Seggae::genre
+        Skinhead Reggae::genre
+    Rocksteady::genre
+    Ska
+        Ska::genre
+        2 Tone::genre
+        Jamaican Ska::genre
+        Spouge::genre
+        Third Wave Ska
+            Third Wave Ska::genre
+            Ska Punk
+                Ska Punk::genre
+                Skacore
+                    Skacore::genre
+                    Crack Rock Steady::genre
 Regional Music
     Regional Music::genre
     African Music
@@ -2710,13 +2766,14 @@ Regional Music
                 Kuduro::genre
                 Batida::genre
             Makossa::genre
+            Mangambeu::genre
             Mbenga-Mbuti Music::genre
             Puxa::genre
             Semba::genre
             Soukous
                 Soukous::genre
                 Kwassa kwassa::genre
-            Tradi-Modern::genre
+            Tradi-moderne congolais::genre
             Twa Music::genre
             Zamrock::genre
         East African Music
@@ -2902,6 +2959,7 @@ Regional Music
             Mande Music::genre
             Mossi Music::genre
             Songhai Music::genre
+            Tradi-moderne ivoirien::genre
             Wassoulou::genre
             Wolof Music
                 Wolof Music::genre
@@ -2949,6 +3007,7 @@ Regional Music
             Al jeel::genre
         Bedouin Music
             Bedouin Music::genre
+            Aita::genre
             Ayyalah::genre
             Shilla::genre
         Dabke::genre
@@ -3011,7 +3070,7 @@ Regional Music
             Uyghur Music
                 Uyghur Music::genre
                 Bayawan::genre
-                Uyghur Muqam::genre
+                Twelve Muqam::genre
             Uzbek Music::genre
         East Asian Music
             East Asian Music::genre
@@ -3183,7 +3242,9 @@ Regional Music
                 Vietnamese Music::genre
                 Bolero Việt Nam::genre
                 Cải lương::genre
+                Ngâm thơ::genre
                 Nhạc đỏ::genre
+                Nhạc tiền chiến::genre
                 Nhạc vàng::genre
                 Vietnamese Classical Music
                     Vietnamese Classical Music::genre
@@ -3217,6 +3278,7 @@ Regional Music
             Bhangra
                 Bhangra::genre
                 Folkhop::genre
+            Dhol tasha::genre
             Filmi::genre
             Garba::genre
             Ginan::genre
@@ -3236,6 +3298,7 @@ Regional Music
                     Khyal::genre
                     Qawwali::genre
                     Shabad kirtan::genre
+                    Tarana::genre
                     Thumri::genre
                 Odissi Classical Music::genre
             South Asian Folk Music
@@ -3426,7 +3489,9 @@ Regional Music
                 Vietnamese Music::genre
                 Bolero Việt Nam::genre
                 Cải lương::genre
+                Ngâm thơ::genre
                 Nhạc đỏ::genre
+                Nhạc tiền chiến::genre
                 Nhạc vàng::genre
                 Vietnamese Classical Music
                     Vietnamese Classical Music::genre
@@ -3766,7 +3831,6 @@ Regional Music
                 Skiladika::genre
             Romanţe::genre
             Yu-Mex::genre
-        Ballad Opera::genre
         Baroque Music
             Baroque Music::genre
             Ballet de cour::genre
@@ -3776,6 +3840,7 @@ Regional Music
         Baroque Suite::genre
         British Music
             British Music::genre
+            Ballad Opera::genre
             British Brass Band::genre
             British Dance Band::genre
             British Folk Rock::genre
@@ -4070,7 +4135,6 @@ Regional Music
             Walloon Folk Music::genre
             White Voice::genre
             Yiddish Folksong::genre
-        Euskal kantagintza berria::genre
         Fanfare::genre
         Finnish Tango::genre
         German Music
@@ -4113,6 +4177,7 @@ Regional Music
             Catalan Folk Music
                 Catalan Folk Music::genre
                 Sardana::genre
+            Euskal kantagintza berria::genre
             Nova cançó::genre
             Portuguese Music
                 Portuguese Music::genre
@@ -4164,6 +4229,7 @@ Regional Music
                     Galician Folk Music::genre
                     Pasodoble::genre
                 Tecnorumba::genre
+            Villancico::genre
         Irish Showband::genre
         Italian Music
             Italian Music::genre
@@ -4213,6 +4279,7 @@ Regional Music
         Mulatós::genre
         Nordic Music
             Nordic Music::genre
+            Dansbandsmusik::genre
             Dansktop::genre
             Greenlandic Music
                 Greenlandic Music::genre
@@ -4643,21 +4710,6 @@ Regional Music
         Mesoamerican Music
             Mesoamerican Music::genre
             Pirekua::genre
-    Islamic Modal Music
-        Islamic Modal Music::genre
-        Arabic Classical Music
-            Arabic Classical Music::genre
-            Andalusian Classical Music::genre
-            Iraqi Maqam::genre
-            Sawt::genre
-        Azerbaijani Mugham::genre
-        Persian Classical Music::genre
-        Shashmaqam::genre
-        Sufiana kalam::genre
-        Turkish Classical Music
-            Turkish Classical Music::genre
-            Turkish Mevlevi Music::genre
-        Uyghur Muqam::genre
     Islamic Religious Music & Recitation
         Islamic Religious Music & Recitation::genre
         Ginan::genre
@@ -4692,6 +4744,21 @@ Regional Music
             Sephardic Music::genre
             Ladino Folksong::genre
             Maftirim::genre
+    Maqāmic Music
+        Maqāmic Music::genre
+        Arabic Classical Music
+            Arabic Classical Music::genre
+            Andalusian Classical Music::genre
+            Iraqi Maqam::genre
+            Sawt::genre
+        Azerbaijani Mugham::genre
+        Persian Classical Music::genre
+        Shashmaqam::genre
+        Sufiana kalam::genre
+        Turkish Classical Music
+            Turkish Classical Music::genre
+            Turkish Mevlevi Music::genre
+        Twelve Muqam::genre
     Northern American Music
         Northern American Music::genre
         Ambient Americana::genre
@@ -6242,8 +6309,8 @@ Uncategorised
             Lauda::genre
         Musical Parody::genre
         Novelty::genre
-        Orchestral
-            Orchestral::genre
+        Orchestral Music
+            Orchestral Music::genre
             Concert Band::genre
             Concerto
                 Concerto::genre
@@ -6324,18 +6391,6 @@ Uncategorised
         Shibuya-kei::genre
         Akishibu-kei::genre
         Picopop::genre
-    Ska
-        Ska::genre
-        2 Tone::genre
-        Jamaican Ska::genre
-        Spouge::genre
-        Third Wave Ska
-            Third Wave Ska::genre
-            Ska Punk
-                Ska Punk::genre
-                Skacore
-                    Skacore::genre
-                    Crack Rock Steady::genre
     Sound Effects
         Sound Effects::genre
         Battle Record::genre