18 changed files with 135 additions and 123 deletions
--- a/metadata/_meta.yaml
+++ b/metadata/_meta.yaml
@ -1,5 +1,14 @@
 # This file contains all metagenres
 # Metagenres are extra genres used to group Spotify genres together for better organization
 buddhist:
  name: Buddhist
  description:
    Buddhist music is music created for or inspired by Buddhism and part of Buddhist
    art.
  parent: religious
  localized_name: true
  wikipedia_url: https://en.wikipedia.org/wiki/Buddhist_music
  metagenre: true
 chill:
  name: Chill
  description: Relaxed music to listen to from the background
--- a/metadata/a.yaml
+++ b/metadata/a.yaml
@ -364,7 +364,7 @@ adoracao:
    worship and praise. Adoracao music is typically performed in churches and other
    religious settings, and is known for its uplifting and inspiring message. Some
    notable Adoracao artists include Aline Barros, Diante do Trono, and Fernandinho.
-  parent: worship
+  parent: christian music
  language: por
  country: BR
  localized_name: true
@ -376,7 +376,7 @@ adoracion:
    Adoracion is a genre of Christian music that focuses on worship and praise. It is
    characterized by its use of biblical themes and imagery, as well as its emphasis on
    heartfelt expression of faith through song.
-  parent: worship
+  parent: christian music
  language: spa
  region: LA
  localized_name: true
@ -1267,7 +1267,7 @@ alternative ccm:
    explore faith and spirituality in a modern context. The sound is polished and
    radio-friendly, with catchy hooks and uplifting messages that appeal to a wide
    audience.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 2493
  playlist_id: 4o7TCoOT3h3CBBV8d4mc9s
--- a/metadata/b.yaml
+++ b/metadata/b.yaml
@ -200,7 +200,7 @@ baja indie:
    and its fusion of traditional Mexican music with rock and pop. Baja indie bands
    often sing in Spanish and their lyrics reflect on social and political issues in
    Mexico.
-  parent: indie rock mexicano
+  parent: mexican indie
  popularity: 4711
  playlist_id: 7brR2dtt87902qmMJAu08D
 bajan soca:
--- a/metadata/c.yaml
+++ b/metadata/c.yaml
@ -3368,7 +3368,7 @@ christian a cappella:
    setting. The lyrics of Christian a cappella music are often centered on faith, hope,
    and love. This genre of music is popular among Christians and is often performed in
    churches and religious gatherings.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 3304
  playlist_id: 0zfqVW6LOYYYPCwHNpbS4H
@ -3381,7 +3381,7 @@ christian afrobeat:
    and love and are often sung in various African languages. This genre of music is
    popular among Christians and is often played in churches, religious gatherings, and
    events.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 2172
  playlist_id: 2dVHwR9NRScJP0Ss4G7t0B
@ -3393,7 +3393,7 @@ christian alternative rock:
    distorted guitars, heavy basslines, and prominent drum beats. The lyrics often focus
    on themes of faith, hope, and redemption, and can be both uplifting and
    introspective.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 223
  playlist_id: 3P1RRrVtaVLBTOvvNm8k8N
@ -3405,7 +3405,7 @@ christian dance:
    drum machines, and other electronic instruments, and is often played in clubs and
    other dance venues. The lyrics often focus on themes of worship, praise, and
    celebration, and are designed to inspire listeners to dance and connect with God.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 4023
  playlist_id: 1gwP21GRuImodOMURpSXYs
@ -3418,7 +3418,7 @@ christian death metal:
    lyrics often deal with topics such as sin, redemption, and the struggle between good
    and evil. Despite its controversial subject matter, Christian death metal has gained
    a dedicated following among fans of both metal and Christian music.
-  parent: christian metal
+  parent: christian music
  localized_name: true
  popularity: 5426
  playlist_id: 1hZEnZ5B3e9W5btI9zC4Fk
@ -3431,7 +3431,7 @@ christian deathcore:
    lyrics often focus on themes of sin, redemption, and spiritual warfare, and are
    designed to challenge listeners to think deeply about their faith and their
    relationship with God.
-  parent: christian hardcore
+  parent: christian music
  localized_name: true
  popularity: 5010
  playlist_id: 59bdZN6IStGCb7z18SiCmD
@ -3443,7 +3443,7 @@ christian doom metal:
    characterized by slow and heavy riffs, deep growling vocals, and haunting melodies.
    Christian doom metal bands often explore themes of sin, redemption, and salvation
    through their music.
-  parent: christian metal
+  parent: christian music
  localized_name: true
  popularity: 5799
  playlist_id: 742lGGmiVn8lktCViYzcbc
@ -3454,7 +3454,7 @@ christian hard rock:
    messages into its lyrics. The music is characterized by its heavy use of distorted
    guitars, powerful vocals, and driving rhythms. Christian hard rock bands often use
    their music as a means of spreading their faith and promoting positive values.
-  parent: christian rock
+  parent: christian music
  localized_name: true
  popularity: 3340
  playlist_id: 7l2qOZAyDLC2YH99jiBnT0
@ -3466,7 +3466,7 @@ christian hardcore:
    with heavy use of distorted guitars and shouted vocals. Christian hardcore bands
    often use their music as a platform to express their faith and promote positive
    messages.
-  parent: christian punk
+  parent: christian music
  localized_name: true
  popularity: 3127
  playlist_id: 7m7jhomQZY5LM4GrWyMiut
@ -3478,7 +3478,7 @@ christian hip hop:
    electronic beats, and samples from gospel and other Christian music. Christian hip
    hop artists often use their music as a means of expressing their faith and promoting
    positive messages to their listeners.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 821
  playlist_id: 19MzV9T4UTnjZdQEWL3xFe
@ -3489,7 +3489,7 @@ christian indie:
    and values into its lyrics. It is characterized by its use of unconventional
    instrumentation, unique song structures, and introspective lyrics that explore
    faith, doubt, and spirituality.
-  parent: christian rock
+  parent: christian music
  localized_name: true
  popularity: 786
  playlist_id: 3l8CtYFuLlRkrh6zCBODwp
@ -3501,7 +3501,7 @@ christian lo-fi:
    techniques, vintage equipment, and raw, unpolished production. The music often
    features hushed vocals, acoustic guitars, and atmospheric textures that create a
    contemplative and meditative mood.
-  parent: christian rock
+  parent: christian music
  localized_name: true
  popularity: 2088
  playlist_id: 7ks7U4OenxbeU7G4PU4cO4
@ -3514,7 +3514,7 @@ christian metal:
    redemption, and spiritual warfare. The music often features elements of thrash,
    death, and power metal, and is popular among Christian youth groups and metal fans
    alike.
-  parent: christian metal
+  parent: christian music
  localized_name: true
  wikipedia_url: https://en.wikipedia.org/wiki/Christian_metal
  popularity: 1399
@ -3526,7 +3526,7 @@ christian metalcore:
    and lyrics. It typically features aggressive guitar riffs, breakdowns, and screaming
    vocals, but also includes melodic and clean singing. The lyrics often focus on
    faith, redemption, and spiritual warfare.
-  parent: christian metal
+  parent: christian music
  localized_name: true
  popularity: 1600
  playlist_id: 432O6ZucUUusfi3KpPf7VP
@ -3551,7 +3551,7 @@ christian pop:
    references to biblical stories and teachings. Christian pop has gained popularity in
    recent years, with many Christian artists crossing over into the mainstream music
    industry.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 1146
  playlist_id: 4LR7zJ6HkhAJFhQm4eTfqS
@ -3562,7 +3562,7 @@ christian power metal:
    aggressive sound of traditional metal with Christian themes and lyrics. The music is
    characterized by its high energy, powerful vocals, and intricate guitar solos, often
    featuring religious imagery and messages of hope and redemption.
-  parent: christian metal
+  parent: christian music
  localized_name: true
  popularity: 3556
  playlist_id: 1QARasWas7RvvcCyiXEjlV
@ -3574,7 +3574,7 @@ christian punk:
    music is characterized by its fast, distorted guitar riffs, driving bass lines, and
    aggressive vocals, often featuring lyrics that address social and political issues
    from a Christian perspective.
-  parent: christian rock
+  parent: christian music
  localized_name: true
  popularity: 2379
  playlist_id: 39xz0DseGu9cHjy8C6Oy9T
@ -3585,7 +3585,7 @@ christian rock:
    values into its lyrics. The music is often characterized by its uplifting melodies
    and positive messages, which aim to inspire listeners to live a life of faith and
    hope.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 553
  playlist_id: 0l4beRwx17QIjP7kTciYUk
@ -3596,7 +3596,7 @@ christian symphonic metal:
    aggressive sound of metal with the grandeur and complexity of orchestral music. The
    lyrics often deal with Christian themes and values, and the music is characterized
    by its powerful vocals, intricate guitar solos, and epic symphonic arrangements.
-  parent: christian metal
+  parent: christian music
  localized_name: true
  popularity: 5646
  playlist_id: 7qaB6v3tN8aZIrEk3bkA1i
@ -3607,7 +3607,7 @@ christian thrash metal:
    and intensity of thrash metal with Christian themes and values. The music is
    characterized by its fast-paced rhythms, aggressive vocals, and heavy guitar riffs,
    which aim to inspire listeners to live a life of faith and righteousness.
-  parent: christian metal
+  parent: christian music
  localized_name: true
  popularity: 5521
  playlist_id: 06SnywJrDVSDAyzCIBGYnq
@ -3619,7 +3619,7 @@ christian trap:
    with lyrics that focus on faith, hope, and redemption. Christian trap artists aim to
    reach a younger generation with their music, using the popular sound of trap to
    spread positive messages.
-  parent: christian hip hop
+  parent: christian music
  localized_name: true
  popularity: 1371
  playlist_id: 7dAAKYBOlPiG4pZxtrF3hx
@ -3631,7 +3631,7 @@ christian uplift:
    including pop, rock, gospel, and R&B. Christian uplift artists use their music to
    spread messages of hope, love, and faith, encouraging listeners to persevere through
    difficult times and find strength in their beliefs.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 1938
  playlist_id: 1MfuuCRndwqJIGz1yW8aHH
@ -3645,7 +3645,7 @@ christlicher rap:
    encourage listeners to live a life of righteousness and devotion. They aim to reach
    a younger generation with their music, using the popular sound of rap to spread
    positive messages.
-  parent: christian hip hop
+  parent: christian music
  language: deu
  region: DH
  localized_name: true
--- a/metadata/f.yaml
+++ b/metadata/f.yaml
@ -2678,7 +2678,7 @@ funk evangelico:
    1990s. It combines the upbeat rhythms of funk with religious lyrics, often sung in
    Portuguese. This music is popular among evangelical Christians in Brazil and has
    been criticized by some for its commercialization of religion.
-  parent: ccm
+  parent: christian music
  localized_name: true
  popularity: 3060
  playlist_id: 7a1oABbPxSKFGu9UHx4oD9
--- a/metadata/h.yaml
+++ b/metadata/h.yaml
@ -1112,7 +1112,7 @@ hinos ccb:
    Hinos CCB is a genre of Christian hymns sung by members of the Congregação Cristã no
    Brasil. These hymns are characterized by their four-part harmony and simple
    melodies, and are typically sung a cappella in church services.
-  parent: latin christian
+  parent: christian music
  language: por
  country: BR
  localized_name: true
--- a/metadata/i.yaml
+++ b/metadata/i.yaml
@ -801,7 +801,7 @@ indie cristao:
    are often uplifting and inspirational. Musically, the genre draws from a variety of
    styles, including folk, rock, and electronic, and is characterized by its catchy
    melodies and sing-along choruses.
-  parent: christian indie rock
+  parent: christian music
  language: por
  localized_name: true
  popularity: 3402
--- a/metadata/j.yaml
+++ b/metadata/j.yaml
@ -432,7 +432,7 @@ japanese buddhist chant:
    sounds of traditional Japanese instruments such as the shakuhachi, koto, and taiko
    drums. The music is deeply spiritual and is often used in religious ceremonies and
    rituals.
-  parent: world devotional
+  parent: buddhist
  language: jpn
  country: JP
  localized_name: true
--- a/metadata/k.yaml
+++ b/metadata/k.yaml
@ -780,7 +780,9 @@ kerkkoor:
    themes. It is typically performed by a choir in a church setting and is often
    accompanied by organ music. The music is solemn and reverent, with an emphasis on
    harmony and melody.
-  parent: christelijk
+  parent: christian music
  language: nld
  country: NL
  localized_name: true
  popularity: 4996
  playlist_id: 6f8oAWcmpEcXrbnbOpnfqT
@ -1333,7 +1335,7 @@ kompa chretien:
    messages into the music. This genre is popular among Haitian Christians and is often
    played in churches and religious gatherings. It is characterized by its uplifting
    lyrics and use of traditional Kompa instruments, such as the guitar and accordion.
-  parent: christian music
+  parent: kompa
  localized_name: true
  popularity: 5363
  playlist_id: 3y2utCl5HkIG1gegMzoJGp
@ -1385,7 +1387,7 @@ korean bl ost:
    the struggles and conflicts faced by the characters. The OSTs are known for their
    beautiful melodies and powerful vocals, and have become a significant part of the
    Korean BL culture.
-  parent: korean ost
+  parent: korean soundtrack
  localized_name: true
  popularity: 4678
  playlist_id: 2M3L8vM7lYRSzDtDu8zv3z
--- a/metadata/l.yaml
+++ b/metadata/l.yaml
@ -583,7 +583,7 @@ latin classical:
    indigenous instruments such as the maracas and panpipes. The genre is known for its
    rich harmonies and complex rhythms, and its composers have created a unique and
    vibrant musical tradition that celebrates the cultural diversity of Latin America.
-  parent: classical
+  parent: christian music
  language: spa
  region: LA
  localized_name: true
@ -1524,7 +1524,7 @@ lldm:
    trumpets, and lyrics that focus on faith, love, and devotion. Lldm music is often
    performed during religious services and celebrations, and is an important part of
    the cultural heritage of the Lldm community.
-  parent: latin christian
+  parent: christian music
  language: spa
  country: MX
  localized_name: true
--- a/metadata/m.yaml
+++ b/metadata/m.yaml
@ -2163,7 +2163,7 @@ metal cristao:
    Christian themes and lyrics. The music often features intense guitar riffs,
    thunderous drums, and powerful vocals that deliver messages of faith and
    spirituality.
-  parent: christian metal
+  parent: ccm
  language: por
  localized_name: true
  popularity: 5979
@ -4378,7 +4378,7 @@ musica alagoana:
    as its use of traditional instruments such as the zabumba and the pandeiro. Musica
    alagoana often features upbeat rhythms and lyrics that celebrate the culture and
    traditions of the region.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 2153
  playlist_id: 3xfMKzKtq7xNODln9zdPtO
@ -4390,7 +4390,7 @@ musica amapaense:
    influences, as well as its use of traditional instruments such as the maracá and the
    cuíca. Musica amapaense often features slow, melodic rhythms and lyrics that reflect
    the natural beauty and cultural diversity of the region.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5948
  playlist_id: 29mSwTOUCx0qir7FngxNJV
@ -4498,7 +4498,7 @@ musica baiana:
    genre that blends African rhythms with Brazilian samba and reggae. It is
    characterized by its use of percussion instruments such as the berimbau, atabaque,
    and pandeiro, and its lyrics often focus on social and political issues.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 3232
  playlist_id: 66EO2XTAsVGNHIWDfwQx31
@ -4522,7 +4522,7 @@ musica bautista:
    personal testimony, often set to simple melodies and accompanied by guitar or piano.
    The genre has grown in popularity over the years, with many musicians and groups
    incorporating elements of rock, pop, and other styles into their music.
-  parent: latin christian
+  parent: christian music
  region: LA
  localized_name: true
  popularity: 3567
@ -4535,7 +4535,7 @@ musica blumenauense:
    instrumentation, resulting in a unique and lively sound. The accordion is a
    prominent instrument in this genre, and the lyrics often celebrate Blumenau's
    culture and traditions.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5751
  playlist_id: 5Q21EJ3ftlQiKoof6SX42Q
@ -4546,8 +4546,11 @@ musica brasiliense:
    Brazilian music that emerged in the 1960s. It blends elements of samba, bossa nova,
    and jazz, and often features socially conscious lyrics. Some of the most famous MPB
    artists include Caetano Veloso, Gilberto Gil, and Chico Buarque.
-  parent: mpb
+  parent: folk
  language: por
  country: BR
  localized_name: true
  wikipedia_url: https://en.wikipedia.org/wiki/Music_of_Brazil
  popularity: 4939
  playlist_id: 1cAFBWUGxXphtu1uhf0WDT
 musica cabo-verdiana:
@ -4594,7 +4597,7 @@ musica campineira:
    incorporates elements of traditional Brazilian music, such as samba and forró, with
    country and folk influences. The lyrics often focus on rural life and the struggles
    of the working class.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5916
  playlist_id: 2hmUr9SATE6SeyVgRe1Bfq
@ -4606,7 +4609,7 @@ musica campista:
    type of guitar) and the pandeiro (a type of tambourine). The lyrics often deal with
    themes of love, nature, and rural life, and are sung in a distinctive accent that is
    unique to the region.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5460
  playlist_id: 3JVMCNDPkh4UfEBnj8obiI
@ -4629,7 +4632,7 @@ musica capixaba:
    Brazil. It is characterized by its fusion of African, European, and indigenous
    musical styles. The music often features the use of percussion instruments such as
    the tambu and the conga and is known for its lively and energetic rhythms.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 3104
  playlist_id: 0RS2azUaADBZ6gCOvSx8qs
@ -4640,7 +4643,7 @@ musica caririense:
    of Ceará, Brazil. It is characterized by its use of traditional instruments such as
    the rabeca, a type of fiddle, and the pífano, a type of flute. The music often tells
    stories of rural life and is known for its melancholic and nostalgic sound.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5882
  playlist_id: 5OXdeWcY5kynPjDIsAcwvJ
@ -4666,7 +4669,7 @@ musica catarinense:
    indigenous rhythms. The music often features accordion, guitar, and percussion, and
    its lyrics often focus on themes of love, nature, and regional identity. Musica
    catarinense is known for its catchy melodies and lively rhythms.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 3495
  playlist_id: 3Yzyns9XiroQy5zuD8ZDbb
@ -4678,7 +4681,7 @@ musica cearense:
    music. The music often features accordion, guitar, and percussion, and its lyrics
    often focus on themes of love, nature, and regional identity. Musica cearense is
    known for its upbeat tempo and lively dance rhythms.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5147
  playlist_id: 1JuNWLFhawInDMeE6ZNsEG
@ -4915,7 +4918,7 @@ musica feirense:
    influences. Musica feirense is often played at festivals and celebrations and
    features a variety of instruments, including drums, guitars, and horns. The music is
    lively and energetic, with a strong emphasis on rhythm and dance.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 3239
  playlist_id: 71AA3D5B7W4Lm8uGG5GSO9
@ -4964,7 +4967,7 @@ musica goiana:
    viola caipira and the accordion, as well as its incorporation of folk and country
    music elements. Musica goiana often tells stories of rural life and the struggles of
    the working class.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 4375
  playlist_id: 0JJUuA4qSz5vhiKSWzkIW8
@ -5119,7 +5122,7 @@ musica juiz-forana:
    Fora. It has a mix of influences from rock, pop, and MPB (Brazilian Popular Music)
    and is characterized by its upbeat rhythms and catchy melodies. The lyrics often
    touch on themes of love, relationships, and social issues.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 2486
  playlist_id: 7L2TjFMaVJPczHZuf09iDG
@ -5152,7 +5155,7 @@ musica londrinense:
    blends elements of sertanejo, rock, and pop. The lyrics often reflect the daily life
    of the region, including themes of love, work, and family. The music is
    characterized by its upbeat rhythms and catchy melodies.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5936
  playlist_id: 05SeBe6b4cU4jUSmdZScc3
@ -5201,7 +5204,7 @@ musica maranhense:
    such as tambor de crioula and bumba-meu-boi. The music often tells stories of local
    folklore and traditions, and is performed with a variety of instruments including
    drums, flutes, and stringed instruments.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 2518
  playlist_id: 1zZ74gVRdo7Irvd0UEt7uf
@ -5213,7 +5216,7 @@ musica maringaense:
    sertanejo, rock, and pop. The lyrics often focus on love and relationships, and the
    music is typically upbeat and danceable. Popular artists in this genre include João
    Neto & Frederico and Fernando & Sorocaba.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 6211
  playlist_id: 6N3Txa5NqvAjRsZIolwaXo
@ -5225,7 +5228,7 @@ musica mato-grossense:
    as the viola caipira and the accordion. The music often tells stories of rural life
    and the struggles of the working class. The genre has gained popularity in recent
    years with artists such as Almir Sater and Renato Teixeira.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5777
  playlist_id: 66nq68q3YG4Pp4N8CspccC
@ -5306,7 +5309,7 @@ musica mogiana:
    incorporates elements of folk, country, and classical music. The lyrics often tell
    stories of rural life and nature, and the music is often performed in a duet or trio
    format.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 6165
  playlist_id: 79MRsgrRBZM0beXu7KGgO3
@ -5452,7 +5455,7 @@ musica paraibana:
    Brazil. It is characterized by its lively and upbeat rhythms, often featuring
    traditional instruments such as the accordion and zabumba. The lyrics often depict
    the culture and daily life of the region, with themes of love, nature, and faith.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 3460
  playlist_id: 4RNt8R9JKHC2QpnbRoTzI3
@ -5464,7 +5467,7 @@ musica paranaense:
    melancholic and nostalgic melodies, often accompanied by the guitar and harmonica.
    The lyrics often tell stories of love and loss, as well as the struggles of rural
    life.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 4569
  playlist_id: 0IDNHZwGpqlZShbrtCiw2F
@ -5489,7 +5492,7 @@ musica pernambucana:
    by African rhythms and melodies. Musica pernambucana is often associated with the
    traditional carnival celebrations in Pernambuco and is characterized by its use of
    percussion instruments, call-and-response vocals, and syncopated rhythms.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 4585
  playlist_id: 7uu3HVwevNc15mSUJiwblO
@ -5502,7 +5505,7 @@ musica piauiense:
    by its use of traditional instruments such as the rabeca, a type of fiddle, and the
    tambor de crioula, a type of drum. The lyrics often tell stories of everyday life in
    Pia
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5437
  playlist_id: 5i7C215uzusGrLt4aopH3q
@ -5549,7 +5552,7 @@ musica ponta-grossense:
    traditional Brazilian rhythms, such as samba and forró, with elements of rock, pop,
    and jazz. The lyrics often focus on social and political issues, and the music is
    known for its energetic, danceable rhythms and catchy melodies.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 6181
  playlist_id: 5C7yvtFPo6zeLkS4jzfJWP
@ -5583,7 +5586,7 @@ musica popular mineira:
    unique blend of African rhythms, folk music, and classical music. It often features
    acoustic guitars, accordions, and percussion instruments, with lyrics that celebrate
    the region's culture, traditions, and landscapes.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 2441
  playlist_id: 7dpfRH16qt19sTqBflvXH7
@ -5595,7 +5598,7 @@ musica popular paraense:
    music. It features instruments such as the carimbó drum, maracas, and the saxophone,
    with lyrics that often address social and political issues, as well as themes
    related to love, nature, and spirituality.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 2598
  playlist_id: 7eF49eqkrZG5wFtihgZePd
@ -5632,7 +5635,7 @@ musica potiguar:
    percussion, guitar, and accordion, and often includes call-and-response vocals. The
    music is known for its energetic and infectious beats, which are perfect for
    dancing.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 4145
  playlist_id: 7LTsVsWICU2Z8i5DOTtzYm
@ -5726,7 +5729,7 @@ musica rondoniense:
    features lively percussion, accordion, and guitar, and the songs are usually upbeat
    and danceable. Musica rondoniense is a celebration of the rich cultural heritage of
    the region and is loved by people throughout Brazil.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5894
  playlist_id: 2OichSu1aZp6qBQ45C5BX3
@ -5737,7 +5740,7 @@ musica roraimense:
    Roraima. It is characterized by its fusion of indigenous rhythms and instruments
    with modern music styles such as rock and reggae. Musica Roraimense often features
    lyrics that speak to the struggles and triumphs of the indigenous people of Roraima.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5885
  playlist_id: 4YN86Zcl3BVaTEAxT6IfUl
@ -5790,7 +5793,7 @@ musica sergipana:
    Brazil. It is characterized by its lively rhythms and use of traditional instruments
    such as the accordion, triangle, and zabumba. The lyrics often reflect the daily
    life and culture of the region, including themes of love, nature, and folklore.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 5317
  playlist_id: 3aR3QARYr1vxrp9hQlfOEq
@ -5851,7 +5854,7 @@ musica sul-mato-grossense:
    percussion instruments, and harmonicas, and often features lyrics that reflect the
    region's rural lifestyle and culture. The genre has been popularized by artists such
    as Almir Sater and Renato Teixeira.
-  parent: mpb
+  parent: musica brasiliense
  localized_name: true
  popularity: 4827
  playlist_id: 6ZbHMh1injVPBZTXnDKnYp
--- a/metadata/p.yaml
+++ b/metadata/p.yaml
@ -392,7 +392,7 @@ paracana:
    Paracana is popular in both traditional and modern contexts and is often heard at
    carnivals and other festive occasions. Its joyful and celebratory nature makes it a
    favorite of audiences around the world.
-  parent: folk brasileiro
+  parent: musica brasiliense
  popularity: 5508
  playlist_id: 0Qduod6rNuqHldiz0DiixT
 paraguayan indie:
@ -1394,7 +1394,7 @@ piseiro:
    characterized by a fast-paced rhythm and lyrics that often talk about love,
    partying, and rural life. Piseiro has gained popularity in recent years and has
    become a staple in Brazilian music festivals.
-  parent: folk brasileiro
+  parent: musica brasiliense
  popularity: 885
  playlist_id: 3r6u8ciy6JcrdCDXMwtC0v
 pittsburgh indie:
@ -2409,7 +2409,7 @@ pop cristiano:
  name: Pop Cristiano
  description:
    Pop Cristiano is contemporary christian music sung in the Spanish language
-  parent: christian pop
+  parent: ccm
  language: spa
  localized_name: true
  popularity: 2835
@ -2758,7 +2758,7 @@ pop worship:
    uplifting, with a focus on faith and spirituality. Pop worship has become
    increasingly popular in recent years, with many Christian artists crossing over into
    the mainstream music industry.
-  parent: christian pop
+  parent: ccm
  localized_name: true
  popularity: 2232
  playlist_id: 5YNMLIKV98cHxuMUka6Mlo
@ -3512,8 +3512,7 @@ praise:
    take many forms, from traditional hymns to contemporary pop and rock styles. It is a
    powerful and meaningful way for Christians to express their faith and connect with
    God.
-  parent: worship
+  parent: ccm
  localized_name: true
  popularity: 2105
  playlist_id: 1VhcRgHXUhPHaAgCk2uB0U
 prank:
--- a/metadata/r.yaml
+++ b/metadata/r.yaml
@ -506,7 +506,7 @@ rap conciencia:
    brutality, and aim to raise awareness and promote change. The style is characterized
    by its socially conscious themes and use of storytelling to convey powerful
    messages.
-  parent: conscious hip hop
+  parent: political hip hop
  language: spa
  localized_name: true
  popularity: 374
@ -533,7 +533,7 @@ rap conscient:
    inequality, and encourage listeners to think critically about the world around them.
    Artists such as Kendrick Lamar, J. Cole, and Common are known for their socially
    conscious lyrics and thought-provoking messages.
-  parent: conscious hip hop
+  parent: political hip hop
  language: fra
  localized_name: true
  popularity: 250
@ -558,7 +558,7 @@ rap cristao:
    Also known as Christian rap, this genre combines the beats and rhythms of hip-hop
    with religious themes and messages. The lyrics often focus on faith, morality, and
    spirituality, and aim to inspire listeners to live a more righteous life.
-  parent: christian hip hop
+  parent: ccm
  language: por
  localized_name: true
  popularity: 1965
@ -570,7 +570,7 @@ rap cristiano:
    features Christian themes and messages. The music is characterized by fast-paced
    beats and powerful lyrics that encourage listeners to embrace their faith and live
    according to Christian values.
-  parent: christian hip hop
+  parent: ccm
  language: spa
  localized_name: true
  popularity: 968
@ -2359,7 +2359,7 @@ rock cristao fluminense:
    state of Rio de Janeiro. It combines rock music with Christian themes and lyrics,
    often addressing spirituality and faith. The genre has gained popularity in Brazil,
    with bands like Resgate and Oficina G3 leading the way.
-  parent: christian rock
+  parent: ccm
  language: por
  country: BR
  localized_name: true
@ -2373,7 +2373,7 @@ rock cristiano:
    spirituality and faith. The genre has expanded globally, with bands like Switchfoot
    and Skillet gaining international recognition. The lyrics often focus on personal
    experiences and struggles, as well as the search for meaning and purpose in life.
-  parent: christian rock
+  parent: ccm
  language: spa
  localized_name: true
  popularity: 691
--- a/metadata/s.yaml
+++ b/metadata/s.yaml
@ -495,7 +495,7 @@ sanfona:
    melodies, and the use of the sanfona accordion as the lead instrument. The music is
    often associated with traditional Brazilian folk culture and is commonly played at
    festivals and celebrations.
-  parent: folk brasileiro
+  parent: musica brasiliense
  popularity: 3839
  playlist_id: 29uSVHov0bnaDg60Q8fzM4
 santa fe indie:
@ -2197,7 +2197,6 @@ ska:
    is characterized by its fast-paced rhythm, which is typically played on the guitar,
    bass, and drums. Ska music often features brass instruments, such as trumpets and
    trombones, and is known for its energetic and danceable sound.
  parent: world
  wikipedia_url: https://en.wikipedia.org/wiki/Ska
  popularity: 603
  playlist_id: 2aKMOs9FxzuCX6kdylLX94
--- a/metadata/t.yaml
+++ b/metadata/t.yaml
@ -2387,7 +2387,7 @@ trap cristao:
    lyrics that focus on faith, redemption, and spirituality. The genre has gained
    popularity among young Christians who enjoy listening to trap music but also want to
    connect with their faith.
-  parent: christian trap
+  parent: ccm
  language: por
  localized_name: true
  popularity: 2234
@ -2401,7 +2401,7 @@ trap cristiano:
    want to connect with their faith. The genre often features auto-tuned vocals, catchy
    hooks, and trap beats, with lyrics that focus on faith, redemption, and
    spirituality.
-  parent: christian trap
+  parent: ccm
  language: spa
  localized_name: true
  popularity: 4362
--- a/metadata/u.yaml
+++ b/metadata/u.yaml
@ -1251,7 +1251,7 @@ uwielbienie:
    use of traditional instruments such as the organ and choir. Uwielbienie aims to
    create a sense of reverence and worship, and is often used in religious services and
    gatherings.
-  parent: worship
+  parent: christian music
  language: pol
  country: PL
  localized_name: true
--- a/metadata/w.yaml
+++ b/metadata/w.yaml
@ -699,7 +699,7 @@ worship:
    traditional hymns and contemporary Christian music. Worship music is meant to be a
    form of spiritual expression and can be found in various Christian churches and
    gatherings around the world.
-  parent: christian music
+  parent: ccm
  localized_name: true
  wikipedia_url: https://en.wikipedia.org/wiki/Contemporary_worship_music
  popularity: 226
--- a/translations/en.json
+++ b/translations/en.json
@ -2113,7 +2113,7 @@
  "funk carioca": "Carioca (Brazil) funk",
  "funk consciente": "Conscious funk",
  "funk das antigas": "Old school funk",
-  "funk evangelico": "Portuguese evangelical funk",
+  "funk evangelico": "Evangelical funk",
  "funk mandelao": "Funk Mandelão",
  "funk melody": "Melodic funk",
  "funk metal": "Funk metal",
@ -3756,8 +3756,8 @@
  "musica acoriana": "Açoriano (Portugal) folk",
  "musica afroperuana": "Afro-Peruvian music",
  "musica aguascalentense": "Hidrocálido (Mexico) folk",
-  "musica alagoana": "Alagoense (Brazil) pop",
+  "musica alagoana": "Alagoense (Brazil) folk",
-  "musica amapaense": "Amapaense (Brazil) pop",
+  "musica amapaense": "Amapaense (Brazil) folk",
  "musica andina": "Andean folk",
  "musica andina chilena": "Chilean Andean music",
  "musica andina colombiana": "Colombian Andean music",
@ -3765,22 +3765,22 @@
  "musica angolana": "Angolan folk",
  "musica aragonesa": "Aragonese (Spain) folk",
  "musica ayacuchana": "Ayacuchano (Peru) folk",
-  "musica baiana": "Baiano (Brazil) pop",
+  "musica baiana": "Baiano (Brazil) folk",
  "musica bajacaliforniana": "Bajacaliforniano (Mexico) folk",
  "musica bautista": "Latin American Baptist music",
-  "musica blumenauense": "Blumenauense (Brazil) pop",
+  "musica blumenauense": "Blumenauense (Brazil) folk",
-  "musica brasiliense": "Brasília (Brazil) pop",
+  "musica brasiliense": "Brasília (Brazil) music",
  "musica cabo-verdiana": "Cape Verdean music",
  "musica calabrese": "Calabrian (Spain) folk",
  "musica campechana": "Campechano (Mexico) folk",
-  "musica campineira": "Campinas (Brazil) pop",
+  "musica campineira": "Campinas (Brazil) folk",
-  "musica campista": "Campista (Brazil) pop",
+  "musica campista": "Campista (Brazil) folk",
  "musica canaria": "Canarian folk",
-  "musica capixaba": "Capixaba (Brazil) pop",
+  "musica capixaba": "Capixaba (Brazil) folk",
-  "musica caririense": "Caririense (Brazil) pop",
+  "musica caririense": "Caririense (Brazil) folk",
  "musica catalana": "Catalonian music",
-  "musica catarinense": "Catarinense (Brazil) pop",
+  "musica catarinense": "Catarinense (Brazil) folk",
-  "musica cearense": "Cearense (Brazil) pop",
+  "musica cearense": "Cearense (Brazil) folk",
  "musica chiapaneca": "Chiapaneca (Mexico) folk",
  "musica chihuahuense": "Chihuahuense (Mexico) folk",
  "musica coahuilense": "Coahuilense (Mexico) folk",
@ -3799,11 +3799,11 @@
  "musica eletronica gospel": "Brazilian electronic gospel",
  "musica etnica": "Italian ethnic music",
  "musica evangelica instrumental": "Portuguese instrumental worship",
-  "musica feirense": "Feirense (Brazil) pop",
+  "musica feirense": "Feirense (Brazil) folk",
  "musica folk asturiana": "Asturian (Spain) folk",
  "musica gaucha": "Gaúcho music",
  "musica gaucha tradicionalista": "Traditional Gaúcho music",
-  "musica goiana": "Goiano (Brazil) pop",
+  "musica goiana": "Goiano (Brazil) folk",
  "musica guerrerense": "Guerrerense (Mexico) folk",
  "musica guineense": "Guinean folk",
  "musica hondurena": "Honduran folk",
@ -3815,22 +3815,22 @@
  "musica istmena": "Music from the Isthmus of Panama",
  "musica jalisciense": "Jalisciense (Mexico) folk",
  "musica jibara": "Música jíbara",
-  "musica juiz-forana": "Juiz-Forana (Brazil) pop",
+  "musica juiz-forana": "Juiz-Forana (Brazil) folk",
  "musica llanera": "Música Llanera",
  "musica lombarda": "Lombard folk",
-  "musica londrinense": "Londrinense (Brazil) pop",
+  "musica londrinense": "Londrinense (Brazil) music",
  "musica madeirense": "Madeiran (Portugal) folk",
  "musica mallorquina": "Mallorcan folk",
  "musica mapuche": "Mapuche folk",
-  "musica maranhense": "Maranhense (Brazil) pop",
+  "musica maranhense": "Maranhense (Brazil) folk",
-  "musica maringaense": "Maringaense (Brazil) pop",
+  "musica maringaense": "Maringaense (Brazil) folk",
-  "musica mato-grossense": "Mato-Grossense (Brazil) pop",
+  "musica mato-grossense": "Mato-Grossense (Brazil) folk",
  "musica menorquina": "Menorcan (Spain) folk",
  "musica mexicana": "Mexican music",
  "musica michoacana": "Michoacano (Brazil) folk",
  "musica mixteca": "Mixtecan (Mexico) folk",
  "musica mocambicana": "Mozambican folk",
-  "musica mogiana": "Mogiano (Brazil) pop",
+  "musica mogiana": "Mogiana music",
  "musica morelense": "Morelense (Mexico) folk",
  "musica nayarita": "Nayarita (Mexico) folk",
  "musica neoleonesa": "Neoleonés (Mexico) folk",
@ -3842,22 +3842,22 @@
  "musica otavalena": "Otavaleña (Equador) folk",
  "musica para criancas": "Portuguese children's music",
  "musica para ninos": "Spanish children's music",
-  "musica paraibana": "Paraíba (Brazil) pop",
+  "musica paraibana": "Paraíba (Brazil) folk",
-  "musica paranaense": "Paranaense (Brazil) pop",
+  "musica paranaense": "Paranaense (Brazil) folk",
  "musica per bambini": "Italian children's music",
-  "musica pernambucana": "Pernambucan (Brazil) pop",
+  "musica pernambucana": "Pernambucan (Brazil) folk",
-  "musica piauiense": "Piauí (Brazil) pop",
+  "musica piauiense": "Piauí (Brazil) folk",
  "musica piemonteisa": "Piedmontese folk",
  "musica pitiusa": "Pitiusa (Spain) folk",
  "musica poblana": "Poblano (Mexico) folk",
-  "musica ponta-grossense": "Ponta-Grossense (Brazil) pop",
+  "musica ponta-grossense": "Ponta-Grossense (Brazil) folk",
  "musica popular amazonense": "Amazonian popular music",
  "musica popular colombiana": "Colombian popular music",
-  "musica popular mineira": "Miniero (Brazil) pop",
+  "musica popular mineira": "Miniero (Brazil) popular music",
-  "musica popular paraense": "Paraense (Brazil) pop",
+  "musica popular paraense": "Paraense (Brazil) popular music",
  "musica popular uruguaya": "Uruguayan popular music",
  "musica portuguesa contemporanea": "Portuguese contemporary music",
-  "musica potiguar": "Potiguara (Brazil) pop",
+  "musica potiguar": "Potiguara (Brazil) folk",
  "musica potosina": "Potosina (Bolivia) folk",
  "musica prehispanica": "Prehispanic music",
  "musica puntana": "Puntano (Argentina) folk",
@ -3865,17 +3865,17 @@
  "musica queretana": "Queretaro (Mexico) folk",
  "musica quintanarroense": "Quintanarroense (Mexico) folk",
  "musica rapa nui": "Easter Island folk",
-  "musica rondoniense": "Rondôniano (Brazil) pop",
+  "musica rondoniense": "Rondôniano (Brazil) folk",
-  "musica roraimense": "Roraiman (Brazil) pop",
+  "musica roraimense": "Roraiman (Brazil) folk",
  "musica sammarinese": "San Marino folk",
  "musica santomense": "Santomean folk",
  "musica sarda": "Sardinian folk",
-  "musica sergipana": "Sergipano (Brazil) pop",
+  "musica sergipana": "Sergipano (Brazil) folk",
  "musica sinaloense": "Sinaloense (Mexico) folk",
  "musica sinfonica": "Portuguese symphony",
  "musica sonorense": "Sonoran (Mexico) folk",
  "musica sudcaliforniana": "Baja California Sur (Mexico) folk",
-  "musica sul-mato-grossense": "Sul-mato-grossense (Brazil) pop",
+  "musica sul-mato-grossense": "Sul-mato-grossense (Brazil) folk",
  "musica tabasquena": "Tabasqueño (Mexico) folk",
  "musica tamaulipeca": "Tamaulipeco (Mexico) folk",
  "musica timor-leste": "East Timorese folk",
@ -4162,10 +4162,10 @@
  "nova canco": "Nova Cançó",
  "nova mpb": "New MPB",
  "nova musica amazonense": "New Amazonian music",
-  "nova musica carioca": "New Carioca (Brazil) pop",
+  "nova musica carioca": "New Carioca (Brazil) music",
-  "nova musica maranhense": "New Maranhense (Brazil) pop",
+  "nova musica maranhense": "New Maranhense (Brazil) music",
-  "nova musica paulista": "New Paulistan (Brazil) pop",
+  "nova musica paulista": "New Paulistan (Brazil) music",
-  "nova musica pernambucana": "New Pernambucan (Brazil) pop",
+  "nova musica pernambucana": "New Pernambucan (Brazil) music",
  "novelty": "Novelty",
  "novo rock gaucho": "New gaúcho rock",
  "nu disco": "Nu disco",