diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml
index c8ae42478..d7acfbc1f 100644
--- a/beetsplug/lastgenre/genres-tree.yaml
+++ b/beetsplug/lastgenre/genres-tree.yaml
@@ -9,6 +9,7 @@
     - cape jazz
     - chimurenga
     - coupé-décalé
+    - egyptian
     - fuji music
     - genge
     - highlife
@@ -35,6 +36,7 @@
     - sega
     - seggae
     - semba
+    - shangaan electro
     - soukous
     - taarab
     - zouglou
@@ -133,6 +135,7 @@
     - chutney
     - chutney soca
     - compas
+    - folklore argentino
     - mambo
     - merengue
     - méringue
@@ -185,6 +188,7 @@
     - humor
     - parody music
     - stand-up
+    - kabarett
 - country:
     - alternative country:
         - cowpunk
@@ -250,7 +254,6 @@
         - acid breaks
         - baltimore club
         - big beat
-        - breakbeat hardcore
         - broken beat
         - florida breaks
         - nu skool breaks
@@ -287,12 +290,15 @@
         - jump-up
         - liquid funk
         - neurofunk
-        - oldschool jungle:
+        - jungle:
             - darkside jungle
             - ragga jungle
+            - oldschool jungle
         - raggacore
         - sambass
         - techstep
+        - leftfield
+        - halftime
     - electro:
         - crunk
         - electro backbeat
@@ -343,6 +349,7 @@
     - hardcore:
         - bouncy house
         - bouncy techno
+        - breakbeat hardcore
         - breakcore
         - digital hardcore
         - doomcore
@@ -400,6 +407,8 @@
             - power electronics
             - power noise
         - witch house
+    - juke:
+        - footwork
     - post-disco:
         - boogie
         - dance-pop
@@ -414,6 +423,7 @@
     - techno:
         - acid techno
         - detroit techno
+        - dub techno
         - free tekno
         - ghettotech
         - minimal
@@ -469,7 +479,6 @@
     - chap hop
     - christian hip hop
     - conscious hip hop
-    - country-rap
     - crunkcore
     - cumbia rap
     - east coast hip hop:
@@ -481,6 +490,7 @@
     - freestyle rap
     - g-funk
     - gangsta rap
+    - glitch hop
     - golden age hip hop
     - hip hop soul
     - hip pop
@@ -521,11 +531,14 @@
     - west coast hip hop:
         - chicano rap
         - jerkin'
+    - austrian hip hop
+    - german hip hop
 - jazz:
     - asian american jazz
     - avant-garde jazz
     - bebop
     - boogie-woogie
+    - brass band
     - british dance band
     - chamber jazz
     - continental jazz
@@ -568,14 +581,13 @@
     - vocal jazz
     - west coast gypsy jazz
     - west coast jazz
-- other:
-    - worldbeat
+- kids music:
+    - kinderlieder
 - pop:
     - adult contemporary
     - arab pop
     - baroque pop
     - bubblegum pop
-    - chanson
     - christian pop
     - classical crossover
     - europop:
@@ -640,6 +652,7 @@
     - beat music
     - chinese rock
     - christian rock
+    - classic rock
     - dark cabaret
     - desert rock
     - experimental rock
@@ -720,6 +733,7 @@
         - art punk
         - christian punk
         - deathrock
+        - deutschpunk
         - folk punk:
             - celtic punk
             - gypsy punk
@@ -762,5 +776,18 @@
     - dancehall
     - ska:
         - 2 tone
-        - dub
         - rocksteady
+    - dub
+- soundtrack:
+- singer-songwriter:
+    - cantautorato
+    - cantautor
+    - cantautora
+    - chanson
+    - canción de autor
+    - nueva canción
+- world:
+    - world dub
+    - world fusion
+    - worldbeat
+
diff --git a/beetsplug/lastgenre/genres.txt b/beetsplug/lastgenre/genres.txt
index 28b1225c3..571b6f350 100644
--- a/beetsplug/lastgenre/genres.txt
+++ b/beetsplug/lastgenre/genres.txt
@@ -160,10 +160,14 @@ calypso jazz
 calypso-style baila
 campursari
 canatronic
+canción de autor
 candombe
 canon
 canrock
 cantata
+cantautorato
+cantautor
+cantautora
 cante chico
 cante jondo
 canterbury scene
@@ -371,6 +375,7 @@ desert rock
 desi
 detroit blues
 detroit techno
+dub techno
 dhamar
 dhimotiká
 dhrupad
@@ -684,7 +689,7 @@ indo rock
 indonesian pop
 indoyíftika
 industrial death metal
-industrial hip-hop
+industrial hip hop
 industrial metal
 industrial music
 industrial musical
@@ -1069,10 +1074,10 @@ nortec
 norteño
 northern soul
 nota
-nu breaks
 nu jazz
 nu metal
 nu soul
+nu skool breaks
 nueva canción
 nyatiti
 néo kýma
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6532c5beb..794013806 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -133,6 +133,8 @@ Other changes:
 - :doc:`/guides/main`: Add instructions to install beets on Void Linux.
 - :doc:`plugins/lastgenre`: Refactor loading whitelist and canonicalization
   file. :bug:`5979`
+- :doc:`plugins/lastgenre`: Updated and streamlined the genre whitelist and
+  canonicalization tree :bug:`5977`
 
 2.3.1 (May 14, 2025)
 --------------------