diff --git a/genres.yaml b/genres.yaml
index 0a1a9ea..99c9f5a 100644
--- a/genres.yaml
+++ b/genres.yaml
@@ -1,133 +1,134 @@
 cities:
-- Rotterdam
 - Berlin
 - Detroit
 - Gothenburg
-- San Francisco
 - London
 - Rio
+- Rotterdam
+- San Francisco
 group:
+- aggrotech
+- ambient
+- beat
+- bluegrass
+- blues
+- chiptune
 - core
+- country
+- dance
+- dancehall
+- drum and bass
+- dub
+- dubstep
+- grunge
+- hip-hop
+- house
+- humppa
+- industrial
+- jazz
 - metal
+- oi!
 - pop
 - punk
-- country
 - rap
-- western
-- ambient
-- techno
-- house
-- trance
-- dance
-- beat
-- dubstep
+- rave
+- reggae
+- rockabilly
 - samba
-- chiptune
-- jazz
+- schranz
 - ska
 - soul
-- aggrotech
-- rave
-- oi!
-- bluegrass
-- hip-hop
-- grunge
-- rockabilly
-- industrial
-- blues
-- humppa
-- reggae
-- dancehall
-- dub
-- schranz
-- drum and bass
+- techno
+- trance
+- western
 subgroup:
-- medieval
-- death
-- black
-- hard
-- progressive
-- symphonic
-- viking
-- pagan
-- gangsta
-- experimental
-- alternative
-- minimal
-- dark
-- synth
-- future
-- body
-- christian
-- indian
-- chinese
-- euro
-- happy
-- power
-- fusion
-- free
-- speed
-- trash
-- extreme
-- surf
-- brit
-- emo
-- electronic
-- neo
-- noise
-- psychedelic
-- post
-- conscious
-- battle
-- east coast
-- west coast
-- glam
-- heavy
-- avantgarde
-- gothic
-- groove
-- funk
-- nu
-- melodic
-- celtic
-- industrial
-- latin
-- traditional
-- harmonica
-- dirty
-- gospel
-- balkan
-- lounge
-- sunshine
-- street
-- skate
-- garage
-- horror
-- ghetto
 - acid
-- pirate
-- folk
-- doom
-- flower
-- swing
-- freestyle
-- goa
-- vocal
-- new age
-- crust
-- drone
-- grind
-- nintendo
-- sludge
-- stoner
-- swedish
-- teutonic
-- australian
+- alternative
 - anatolian
-- art
 - arena
+- art
+- australian
+- australian
+- avantgarde
+- balkan
+- battle
+- black
+- body
+- brit
+- celtic
+- chinese
+- christian
 - comedy
+- conscious
+- crust
+- dark
+- death
+- dirty
+- doom
+- drone
+- east coast
+- electronic
+- emo
+- euro
+- experimental
+- extreme
+- flower
+- folk
+- free
+- freestyle
 - fun
+- funk
+- fusion
+- future
+- gangsta
+- garage
+- ghetto
+- glam
+- goa
+- gospel
+- gothic
+- grind
+- groove
+- happy
+- hard
+- harmonica
+- heavy
+- horror
+- indian
+- industrial
 - instrumental
+- latin
+- lounge
 - mainstream
+- medieval
+- melodic
+- minimal
+- neo
+- new age
+- nintendo
+- noise
+- nu
+- pagan
+- pirate
+- post
+- power
+- progressive
+- psychedelic
+- skate
+- sludge
 - southern
+- speed
+- stoner
+- street
+- sunshine
+- surf
+- swedish
+- swing
+- symphonic
+- synth
+- teutonic
+- traditional
+- trash
+- viking
+- vocal
+- west coast