diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ccc0bfe18d8..e29cacda7b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     name: 'Build & Unit Test: node-${{ matrix.node_version }}, ${{ matrix.os }}'
     steps:
       - name: Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           # Required for docs/versions tests
           fetch-depth: 0
@@ -70,7 +70,7 @@ jobs:
         run: date
 
       - name: Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           # Required for docs/versions tests
           fetch-depth: 0
@@ -104,7 +104,7 @@ jobs:
     name: 'E2E Doc Test: node-20, ubuntu-latest'
     steps:
       - name: Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
       - name: Install pnpm
         uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # v3.0.0
@@ -125,7 +125,7 @@ jobs:
     name: 'Lint: node-20, ubuntu-latest'
     steps:
       - name: Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           fetch-depth: 0
 
@@ -155,7 +155,7 @@ jobs:
     name: 'TS-Check: node-20, ubuntu-latest'
     steps:
       - name: Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           fetch-depth: 0
 
@@ -185,7 +185,7 @@ jobs:
     name: 'Codecov: node-20, ubuntu-latest'
     steps:
       - name: Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 961386f258f..f84d36fcd14 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/semantic-pull-request.yml b/.github/workflows/semantic-pull-request.yml
index da58a945f85..edd8f891386 100644
--- a/.github/workflows/semantic-pull-request.yml
+++ b/.github/workflows/semantic-pull-request.yml
@@ -20,7 +20,7 @@ jobs:
     name: Semantic Pull Request
     steps:
       - name: Validate PR title
-        uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5.4.0
+        uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e # v5.5.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index e92efc8e073..3bb9c9355ba 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -14,25 +14,44 @@ const description =
   'Generate massive amounts of fake (but reasonable) data for testing and development.';
 const image = 'https://fakerjs.dev/social-image.png';
 
-function extendSideNav(current: SidebarItem): SidebarItem[] {
+function getSideBarWithExpandedEntry(entryToExpand: string): SidebarItem[] {
   const links: SidebarItem[] = [
     {
       text: 'Guide',
       items: [
         {
-          text: 'Usage Guide',
+          text: 'Getting Started',
           link: '/guide/',
         },
+        {
+          text: 'Usage',
+          link: '/guide/usage',
+        },
+        {
+          text: 'Localization',
+          link: '/guide/localization',
+        },
+        {
+          text: 'Frameworks',
+          link: '/guide/frameworks',
+        },
+        {
+          text: 'Randomizer',
+          link: '/guide/randomizer',
+        },
+        {
+          text: 'Unique Values',
+          link: '/guide/unique',
+        },
+        {
+          text: 'Upgrading to v9',
+          link: '/guide/upgrading',
+        },
       ],
     },
     {
       text: 'API',
-      items: [
-        {
-          text: 'API Reference',
-          link: '/api/',
-        },
-      ],
+      items: apiPages,
     },
     {
       text: 'About',
@@ -40,10 +59,26 @@ function extendSideNav(current: SidebarItem): SidebarItem[] {
         {
           text: 'Announcements',
           link: '/about/announcements',
+          items: [
+            { text: '2022-09-08', link: '/about/announcements/2022-09-08' },
+            { text: '2022-01-14', link: '/about/announcements/2022-01-14' },
+          ],
         },
         {
           text: 'Roadmap',
           link: '/about/roadmap/',
+          items: [
+            {
+              text: 'v9 - Tree-Shakeable Module-Functions',
+              link: '/about/roadmap/v9',
+            },
+            { text: 'v8 - Make Faker Handier', link: '/about/roadmap/v8' },
+            {
+              text: 'v7 - Cleanup & Improvements',
+              link: '/about/roadmap/v7',
+            },
+            { text: 'v6 - Continue Faker', link: '/about/roadmap/v6' },
+          ],
         },
         {
           text: 'Team',
@@ -56,7 +91,9 @@ function extendSideNav(current: SidebarItem): SidebarItem[] {
       ],
     },
   ];
-  links[links.findIndex((group) => group.text === current.text)] = current;
+  for (const entry of links) {
+    entry.collapsed = entry.text !== entryToExpand;
+  }
   return links;
 }
 
@@ -197,81 +234,9 @@ const config: UserConfig<DefaultTheme.Config> = {
     ],
 
     sidebar: {
-      '/guide/': extendSideNav({
-        text: 'Guide',
-        items: [
-          {
-            text: 'Getting Started',
-            link: '/guide/',
-          },
-          {
-            text: 'Usage',
-            link: '/guide/usage',
-          },
-          {
-            text: 'Localization',
-            link: '/guide/localization',
-          },
-          {
-            text: 'Frameworks',
-            link: '/guide/frameworks',
-          },
-          {
-            text: 'Randomizer',
-            link: '/guide/randomizer',
-          },
-          {
-            text: 'Unique Values',
-            link: '/guide/unique',
-          },
-          {
-            text: 'Upgrading to v9',
-            link: '/guide/upgrading',
-          },
-        ],
-      }),
-      '/api/': extendSideNav({
-        text: 'API',
-        items: apiPages,
-      }),
-
-      '/about/': extendSideNav({
-        text: 'About',
-        items: [
-          {
-            text: 'Announcements',
-            link: '/about/announcements',
-            items: [
-              { text: '2022-09-08', link: '/about/announcements/2022-09-08' },
-              { text: '2022-01-14', link: '/about/announcements/2022-01-14' },
-            ],
-          },
-          {
-            text: 'Roadmap',
-            link: '/about/roadmap/',
-            items: [
-              {
-                text: 'v9 - Tree-Shakeable Module-Functions',
-                link: '/about/roadmap/v9',
-              },
-              { text: 'v8 - Make Faker Handier', link: '/about/roadmap/v8' },
-              {
-                text: 'v7 - Cleanup & Improvements',
-                link: '/about/roadmap/v7',
-              },
-              { text: 'v6 - Continue Faker', link: '/about/roadmap/v6' },
-            ],
-          },
-          {
-            text: 'Team',
-            link: '/about/team',
-          },
-          {
-            text: 'Contributing',
-            link: '/about/contributing',
-          },
-        ],
-      }),
+      '/guide/': getSideBarWithExpandedEntry('Guide'),
+      '/api/': getSideBarWithExpandedEntry('API'),
+      '/about/': getSideBarWithExpandedEntry('About'),
     },
   },
 
diff --git a/package.json b/package.json
index 8a4a40576fc..b33e43e4006 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@vitest/ui": "1.5.0",
     "@vueuse/core": "10.9.0",
     "conventional-changelog-cli": "4.1.0",
-    "cypress": "13.8.0",
+    "cypress": "13.8.1",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-define-config": "2.1.0",
@@ -127,15 +127,15 @@
     "standard-version": "9.5.0",
     "ts-morph": "22.0.0",
     "tsup": "8.0.2",
-    "tsx": "4.7.2",
+    "tsx": "4.7.3",
     "typescript": "5.4.5",
     "validator": "13.11.0",
     "vite": "5.2.10",
     "vitepress": "1.1.3",
     "vitest": "1.5.0",
-    "vue": "3.4.24"
+    "vue": "3.4.25"
   },
-  "packageManager": "pnpm@9.0.5",
+  "packageManager": "pnpm@9.0.6",
   "engines": {
     "node": ">=18.0.0",
     "npm": ">=9.0.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b9a6a68f3e6..bd98c9c50a1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -55,13 +55,13 @@ importers:
         version: 1.5.0(vitest@1.5.0)
       '@vueuse/core':
         specifier: 10.9.0
-        version: 10.9.0(vue@3.4.24(typescript@5.4.5))
+        version: 10.9.0(vue@3.4.25(typescript@5.4.5))
       conventional-changelog-cli:
         specifier: 4.1.0
         version: 4.1.0
       cypress:
-        specifier: 13.8.0
-        version: 13.8.0
+        specifier: 13.8.1
+        version: 13.8.1
       eslint:
         specifier: 8.57.0
         version: 8.57.0
@@ -120,8 +120,8 @@ importers:
         specifier: 8.0.2
         version: 8.0.2(postcss@8.4.38)(typescript@5.4.5)
       tsx:
-        specifier: 4.7.2
-        version: 4.7.2
+        specifier: 4.7.3
+        version: 4.7.3
       typescript:
         specifier: 5.4.5
         version: 5.4.5
@@ -138,8 +138,8 @@ importers:
         specifier: 1.5.0
         version: 1.5.0(@types/node@20.12.7)(@vitest/ui@1.5.0)
       vue:
-        specifier: 3.4.24
-        version: 3.4.24(typescript@5.4.5)
+        specifier: 3.4.25
+        version: 3.4.25(typescript@5.4.5)
 
 packages:
 
@@ -1005,17 +1005,17 @@ packages:
   '@vitest/utils@1.5.0':
     resolution: {integrity: sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==}
 
-  '@vue/compiler-core@3.4.24':
-    resolution: {integrity: sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==}
+  '@vue/compiler-core@3.4.25':
+    resolution: {integrity: sha512-Y2pLLopaElgWnMNolgG8w3C5nNUVev80L7hdQ5iIKPtMJvhVpG0zhnBG/g3UajJmZdvW0fktyZTotEHD1Srhbg==}
 
-  '@vue/compiler-dom@3.4.24':
-    resolution: {integrity: sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==}
+  '@vue/compiler-dom@3.4.25':
+    resolution: {integrity: sha512-Ugz5DusW57+HjllAugLci19NsDK+VyjGvmbB2TXaTcSlQxwL++2PETHx/+Qv6qFwNLzSt7HKepPe4DcTE3pBWg==}
 
-  '@vue/compiler-sfc@3.4.24':
-    resolution: {integrity: sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==}
+  '@vue/compiler-sfc@3.4.25':
+    resolution: {integrity: sha512-m7rryuqzIoQpOBZ18wKyq05IwL6qEpZxFZfRxlNYuIPDqywrXQxgUwLXIvoU72gs6cRdY6wHD0WVZIFE4OEaAQ==}
 
-  '@vue/compiler-ssr@3.4.24':
-    resolution: {integrity: sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==}
+  '@vue/compiler-ssr@3.4.25':
+    resolution: {integrity: sha512-H2ohvM/Pf6LelGxDBnfbbXFPyM4NE3hrw0e/EpwuSiYu8c819wx+SVGdJ65p/sFrYDd6OnSDxN1MB2mN07hRSQ==}
 
   '@vue/devtools-api@7.0.27':
     resolution: {integrity: sha512-BFCFCusSDcw2UcOFD/QeK7OxD1x2C/m+uAN30Q7jLKECSW53hmz0urzJmX834GuWDZX/hIxkyUKnLLfEIP1c/w==}
@@ -1028,22 +1028,22 @@ packages:
   '@vue/devtools-shared@7.0.27':
     resolution: {integrity: sha512-4VxtmZ6yjhiSloqZZq2UYU0TBGxOJ8GxWvp5OlAH70zYqi0FIAyWGPkOhvfoZ7DKQyv2UU0mmKzFHjsEkelGyQ==}
 
-  '@vue/reactivity@3.4.24':
-    resolution: {integrity: sha512-nup3fSYg4i4LtNvu9slF/HF/0dkMQYfepUdORBcMSsankzRPzE7ypAFurpwyRBfU1i7Dn1kcwpYsE1wETSh91g==}
+  '@vue/reactivity@3.4.25':
+    resolution: {integrity: sha512-mKbEtKr1iTxZkAG3vm3BtKHAOhuI4zzsVcN0epDldU/THsrvfXRKzq+lZnjczZGnTdh3ojd86/WrP+u9M51pWQ==}
 
-  '@vue/runtime-core@3.4.24':
-    resolution: {integrity: sha512-c7iMfj6cJMeAG3s5yOn9Rc5D9e2/wIuaozmGf/ICGCY3KV5H7mbTVdvEkd4ZshTq7RUZqj2k7LMJWVx+EBiY1g==}
+  '@vue/runtime-core@3.4.25':
+    resolution: {integrity: sha512-3qhsTqbEh8BMH3pXf009epCI5E7bKu28fJLi9O6W+ZGt/6xgSfMuGPqa5HRbUxLoehTNp5uWvzCr60KuiRIL0Q==}
 
-  '@vue/runtime-dom@3.4.24':
-    resolution: {integrity: sha512-uXKzuh/Emfad2Y7Qm0ABsLZZV6H3mAJ5ZVqmAOlrNQRf+T5mxpPGZBfec1hkP41t6h6FwF6RSGCs/gd8WbuySQ==}
+  '@vue/runtime-dom@3.4.25':
+    resolution: {integrity: sha512-ode0sj77kuwXwSc+2Yhk8JMHZh1sZp9F/51wdBiz3KGaWltbKtdihlJFhQG4H6AY+A06zzeMLkq6qu8uDSsaoA==}
 
-  '@vue/server-renderer@3.4.24':
-    resolution: {integrity: sha512-H+DLK4sQF6sRgzKyofmlEVBIV/9KrQU6HIV7nt6yIwSGGKvSwlV8pqJlebUKLpbXaNHugdSfAbP6YmXF69lxow==}
+  '@vue/server-renderer@3.4.25':
+    resolution: {integrity: sha512-8VTwq0Zcu3K4dWV0jOwIVINESE/gha3ifYCOKEhxOj6MEl5K5y8J8clQncTcDhKF+9U765nRw4UdUEXvrGhyVQ==}
     peerDependencies:
-      vue: 3.4.24
+      vue: 3.4.25
 
-  '@vue/shared@3.4.24':
-    resolution: {integrity: sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==}
+  '@vue/shared@3.4.25':
+    resolution: {integrity: sha512-k0yappJ77g2+KNrIaF0FFnzwLvUBLUYr8VOwz+/6vLsmItFp51AcxLL7Ey3iPd7BIRyWPOcqUjMnm7OkahXllA==}
 
   '@vueuse/core@10.9.0':
     resolution: {integrity: sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==}
@@ -1577,8 +1577,8 @@ packages:
   csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
-  cypress@13.8.0:
-    resolution: {integrity: sha512-Qau//mtrwEGOU9cn2YjavECKyDUwBh8J2tit+y9s1wsv6C3BX+rlv6I9afmQnL8PmEEzJ6be7nppMHacFzZkTw==}
+  cypress@13.8.1:
+    resolution: {integrity: sha512-Uk6ovhRbTg6FmXjeZW/TkbRM07KPtvM5gah1BIMp4Y2s+i/NMxgaLw0+PbYTOdw1+egE0FP3mWRiGcRkjjmhzA==}
     engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
 
@@ -3490,8 +3490,8 @@ packages:
     peerDependencies:
       typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
 
-  tsx@4.7.2:
-    resolution: {integrity: sha512-BCNd4kz6fz12fyrgCTEdZHGJ9fWTGeUzXmQysh0RVocDY3h4frk05ZNCXSy4kIenF7y/QnrdiVpTsyNRn6vlAw==}
+  tsx@4.7.3:
+    resolution: {integrity: sha512-+fQnMqIp/jxZEXLcj6WzYy9FhcS5/Dfk8y4AtzJ6ejKcKqmfTF8Gso/jtrzDggCF2zTU20gJa6n8XqPYwDAUYQ==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -3709,8 +3709,8 @@ packages:
       '@vue/composition-api':
         optional: true
 
-  vue@3.4.24:
-    resolution: {integrity: sha512-NPdx7dLGyHmKHGRRU5bMRYVE+rechR+KDU5R2tSTNG36PuMwbfAJ+amEvOAw7BPfZp5sQulNELSLm5YUkau+Sg==}
+  vue@3.4.25:
+    resolution: {integrity: sha512-HWyDqoBHMgav/OKiYA2ZQg+kjfMgLt/T0vg4cbIF7JbXAjDexRf5JRg+PWAfrAkSmTd2I8aPSXtooBFWHB98cg==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -4578,10 +4578,10 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vitejs/plugin-vue@5.0.4(vite@5.2.10(@types/node@20.12.7))(vue@3.4.24(typescript@5.4.5))':
+  '@vitejs/plugin-vue@5.0.4(vite@5.2.10(@types/node@20.12.7))(vue@3.4.25(typescript@5.4.5))':
     dependencies:
       vite: 5.2.10(@types/node@20.12.7)
-      vue: 3.4.24(typescript@5.4.5)
+      vue: 3.4.25(typescript@5.4.5)
 
   '@vitest/coverage-v8@1.5.0(vitest@1.5.0(@types/node@20.12.7)(@vitest/ui@1.5.0))':
     dependencies:
@@ -4642,93 +4642,93 @@ snapshots:
       loupe: 2.3.7
       pretty-format: 29.7.0
 
-  '@vue/compiler-core@3.4.24':
+  '@vue/compiler-core@3.4.25':
     dependencies:
       '@babel/parser': 7.24.4
-      '@vue/shared': 3.4.24
+      '@vue/shared': 3.4.25
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.0
 
-  '@vue/compiler-dom@3.4.24':
+  '@vue/compiler-dom@3.4.25':
     dependencies:
-      '@vue/compiler-core': 3.4.24
-      '@vue/shared': 3.4.24
+      '@vue/compiler-core': 3.4.25
+      '@vue/shared': 3.4.25
 
-  '@vue/compiler-sfc@3.4.24':
+  '@vue/compiler-sfc@3.4.25':
     dependencies:
       '@babel/parser': 7.24.4
-      '@vue/compiler-core': 3.4.24
-      '@vue/compiler-dom': 3.4.24
-      '@vue/compiler-ssr': 3.4.24
-      '@vue/shared': 3.4.24
+      '@vue/compiler-core': 3.4.25
+      '@vue/compiler-dom': 3.4.25
+      '@vue/compiler-ssr': 3.4.25
+      '@vue/shared': 3.4.25
       estree-walker: 2.0.2
       magic-string: 0.30.10
       postcss: 8.4.38
       source-map-js: 1.2.0
 
-  '@vue/compiler-ssr@3.4.24':
+  '@vue/compiler-ssr@3.4.25':
     dependencies:
-      '@vue/compiler-dom': 3.4.24
-      '@vue/shared': 3.4.24
+      '@vue/compiler-dom': 3.4.25
+      '@vue/shared': 3.4.25
 
-  '@vue/devtools-api@7.0.27(vue@3.4.24(typescript@5.4.5))':
+  '@vue/devtools-api@7.0.27(vue@3.4.25(typescript@5.4.5))':
     dependencies:
-      '@vue/devtools-kit': 7.0.27(vue@3.4.24(typescript@5.4.5))
+      '@vue/devtools-kit': 7.0.27(vue@3.4.25(typescript@5.4.5))
     transitivePeerDependencies:
       - vue
 
-  '@vue/devtools-kit@7.0.27(vue@3.4.24(typescript@5.4.5))':
+  '@vue/devtools-kit@7.0.27(vue@3.4.25(typescript@5.4.5))':
     dependencies:
       '@vue/devtools-shared': 7.0.27
       hookable: 5.5.3
       mitt: 3.0.1
       perfect-debounce: 1.0.0
       speakingurl: 14.0.1
-      vue: 3.4.24(typescript@5.4.5)
+      vue: 3.4.25(typescript@5.4.5)
 
   '@vue/devtools-shared@7.0.27':
     dependencies:
       rfdc: 1.3.1
 
-  '@vue/reactivity@3.4.24':
+  '@vue/reactivity@3.4.25':
     dependencies:
-      '@vue/shared': 3.4.24
+      '@vue/shared': 3.4.25
 
-  '@vue/runtime-core@3.4.24':
+  '@vue/runtime-core@3.4.25':
     dependencies:
-      '@vue/reactivity': 3.4.24
-      '@vue/shared': 3.4.24
+      '@vue/reactivity': 3.4.25
+      '@vue/shared': 3.4.25
 
-  '@vue/runtime-dom@3.4.24':
+  '@vue/runtime-dom@3.4.25':
     dependencies:
-      '@vue/runtime-core': 3.4.24
-      '@vue/shared': 3.4.24
+      '@vue/runtime-core': 3.4.25
+      '@vue/shared': 3.4.25
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.4.24(vue@3.4.24(typescript@5.4.5))':
+  '@vue/server-renderer@3.4.25(vue@3.4.25(typescript@5.4.5))':
     dependencies:
-      '@vue/compiler-ssr': 3.4.24
-      '@vue/shared': 3.4.24
-      vue: 3.4.24(typescript@5.4.5)
+      '@vue/compiler-ssr': 3.4.25
+      '@vue/shared': 3.4.25
+      vue: 3.4.25(typescript@5.4.5)
 
-  '@vue/shared@3.4.24': {}
+  '@vue/shared@3.4.25': {}
 
-  '@vueuse/core@10.9.0(vue@3.4.24(typescript@5.4.5))':
+  '@vueuse/core@10.9.0(vue@3.4.25(typescript@5.4.5))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.9.0
-      '@vueuse/shared': 10.9.0(vue@3.4.24(typescript@5.4.5))
-      vue-demi: 0.14.7(vue@3.4.24(typescript@5.4.5))
+      '@vueuse/shared': 10.9.0(vue@3.4.25(typescript@5.4.5))
+      vue-demi: 0.14.7(vue@3.4.25(typescript@5.4.5))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/integrations@10.9.0(focus-trap@7.5.4)(vue@3.4.24(typescript@5.4.5))':
+  '@vueuse/integrations@10.9.0(focus-trap@7.5.4)(vue@3.4.25(typescript@5.4.5))':
     dependencies:
-      '@vueuse/core': 10.9.0(vue@3.4.24(typescript@5.4.5))
-      '@vueuse/shared': 10.9.0(vue@3.4.24(typescript@5.4.5))
-      vue-demi: 0.14.7(vue@3.4.24(typescript@5.4.5))
+      '@vueuse/core': 10.9.0(vue@3.4.25(typescript@5.4.5))
+      '@vueuse/shared': 10.9.0(vue@3.4.25(typescript@5.4.5))
+      vue-demi: 0.14.7(vue@3.4.25(typescript@5.4.5))
     optionalDependencies:
       focus-trap: 7.5.4
     transitivePeerDependencies:
@@ -4737,9 +4737,9 @@ snapshots:
 
   '@vueuse/metadata@10.9.0': {}
 
-  '@vueuse/shared@10.9.0(vue@3.4.24(typescript@5.4.5))':
+  '@vueuse/shared@10.9.0(vue@3.4.25(typescript@5.4.5))':
     dependencies:
-      vue-demi: 0.14.7(vue@3.4.24(typescript@5.4.5))
+      vue-demi: 0.14.7(vue@3.4.25(typescript@5.4.5))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -5275,7 +5275,7 @@ snapshots:
 
   csstype@3.1.3: {}
 
-  cypress@13.8.0:
+  cypress@13.8.1:
     dependencies:
       '@cypress/request': 3.0.1
       '@cypress/xvfb': 1.2.4(supports-color@8.1.1)
@@ -7364,7 +7364,7 @@ snapshots:
       tslib: 1.14.1
       typescript: 5.4.5
 
-  tsx@4.7.2:
+  tsx@4.7.3:
     dependencies:
       esbuild: 0.19.12
       get-tsconfig: 4.7.3
@@ -7526,16 +7526,16 @@ snapshots:
       '@shikijs/core': 1.3.0
       '@shikijs/transformers': 1.3.0
       '@types/markdown-it': 14.0.1
-      '@vitejs/plugin-vue': 5.0.4(vite@5.2.10(@types/node@20.12.7))(vue@3.4.24(typescript@5.4.5))
-      '@vue/devtools-api': 7.0.27(vue@3.4.24(typescript@5.4.5))
-      '@vueuse/core': 10.9.0(vue@3.4.24(typescript@5.4.5))
-      '@vueuse/integrations': 10.9.0(focus-trap@7.5.4)(vue@3.4.24(typescript@5.4.5))
+      '@vitejs/plugin-vue': 5.0.4(vite@5.2.10(@types/node@20.12.7))(vue@3.4.25(typescript@5.4.5))
+      '@vue/devtools-api': 7.0.27(vue@3.4.25(typescript@5.4.5))
+      '@vueuse/core': 10.9.0(vue@3.4.25(typescript@5.4.5))
+      '@vueuse/integrations': 10.9.0(focus-trap@7.5.4)(vue@3.4.25(typescript@5.4.5))
       focus-trap: 7.5.4
       mark.js: 8.11.1
       minisearch: 6.3.0
       shiki: 1.3.0
       vite: 5.2.10(@types/node@20.12.7)
-      vue: 3.4.24(typescript@5.4.5)
+      vue: 3.4.25(typescript@5.4.5)
     optionalDependencies:
       postcss: 8.4.38
     transitivePeerDependencies:
@@ -7599,17 +7599,17 @@ snapshots:
       - supports-color
       - terser
 
-  vue-demi@0.14.7(vue@3.4.24(typescript@5.4.5)):
+  vue-demi@0.14.7(vue@3.4.25(typescript@5.4.5)):
     dependencies:
-      vue: 3.4.24(typescript@5.4.5)
+      vue: 3.4.25(typescript@5.4.5)
 
-  vue@3.4.24(typescript@5.4.5):
+  vue@3.4.25(typescript@5.4.5):
     dependencies:
-      '@vue/compiler-dom': 3.4.24
-      '@vue/compiler-sfc': 3.4.24
-      '@vue/runtime-dom': 3.4.24
-      '@vue/server-renderer': 3.4.24(vue@3.4.24(typescript@5.4.5))
-      '@vue/shared': 3.4.24
+      '@vue/compiler-dom': 3.4.25
+      '@vue/compiler-sfc': 3.4.25
+      '@vue/runtime-dom': 3.4.25
+      '@vue/server-renderer': 3.4.25(vue@3.4.25(typescript@5.4.5))
+      '@vue/shared': 3.4.25
     optionalDependencies:
       typescript: 5.4.5
 
diff --git a/scripts/generate-locales.ts b/scripts/generate-locales.ts
index ac50f6d11fc..4326ecc8891 100644
--- a/scripts/generate-locales.ts
+++ b/scripts/generate-locales.ts
@@ -322,7 +322,6 @@ async function normalizeLocaleFile(filePath: string, definitionKey: string) {
     'location',
     'lorem',
     'metadata',
-    'music',
     'person',
     'phone_number',
     'science',
diff --git a/src/locales/en/music/genre.ts b/src/locales/en/music/genre.ts
index 59d4c452109..bfd4dfadf99 100644
--- a/src/locales/en/music/genre.ts
+++ b/src/locales/en/music/genre.ts
@@ -2,8 +2,8 @@ export default [
   'Acid House',
   'Acid Jazz',
   'Acid Rock',
-  'Acoustic Blues',
   'Acoustic',
+  'Acoustic Blues',
   'Afro-Pop',
   'Afrobeat',
   'Alt-Rock',
@@ -32,11 +32,11 @@ export default [
   'Brazilian Funk',
   'Breakbeat',
   'Britpop',
+  'CCM',
   'Cajun',
   'Cantopop',
-  'CCM',
-  'Celtic Folk',
   'Celtic',
+  'Celtic Folk',
   'Chamber Music',
   'Chant',
   'Chanukah',
@@ -74,12 +74,12 @@ export default [
   "Drum'n'bass",
   'Dub',
   'Dubstep',
+  'EDM',
   'Early Music',
   'East Coast Rap',
   'Easter',
   'Easy Listening',
   'Eclectic',
-  'EDM',
   'Electric Blues',
   'Electro',
   'Electronic',
@@ -88,8 +88,8 @@ export default [
   'Enka',
   'Environmental',
   'Ethio-jazz',
-  'Experimental Rock',
   'Experimental',
+  'Experimental Rock',
   'Flamenco',
   'Folk',
   'Folk-Rock',
@@ -114,9 +114,9 @@ export default [
   'Hard Bop',
   'Hard Dance',
   'Hard Rock',
+  'Hardcore',
   'Hardcore Punk',
   'Hardcore Rap',
-  'Hardcore',
   'Hardstyle',
   'Healing',
   'Heavy Metal',
@@ -149,12 +149,13 @@ export default [
   'Kitsch',
   'Klezmer',
   'Krautrock',
+  'Latin',
   'Latin Jazz',
   'Latin Rap',
-  'Latin',
   'Local',
   'Lounge',
   'Lullabies',
+  'MPB',
   'Mainstream Jazz',
   'Malay',
   'Mandopop',
@@ -169,7 +170,6 @@ export default [
   'Minimalism',
   'Modern',
   'Motown',
-  'MPB',
   'Mugham',
   'Musicals',
   'Musique Concrète',
@@ -184,10 +184,10 @@ export default [
   'Noise',
   'Nordic',
   'Novelty',
+  'OPM',
   'Oi!',
   'Old School Rap',
   'Opera',
-  'OPM',
   'Orchestral',
   'Original Score',
   'Outlaw Country',
@@ -195,9 +195,9 @@ export default [
   'Party',
   'Piano',
   'Polka',
+  'Pop',
   'Pop Film',
   'Pop Latino',
-  'Pop',
   'Post Dubstep',
   'Power Pop',
   'Praise & Worship',
@@ -206,8 +206,8 @@ export default [
   'Proto-punk',
   'Psych Rock',
   'Psychedelic',
-  'Punk Rock',
   'Punk',
+  'Punk Rock',
   'Qawwali',
   'Quiet Storm',
   'R&B',
@@ -227,6 +227,7 @@ export default [
   'Romantic',
   'Roots Reggae',
   'Roots Rock',
+  'SKA',
   'Sad',
   'Salsa',
   'Samba',
@@ -234,7 +235,6 @@ export default [
   'Sertanejo',
   'Shaabi',
   'Shoegaze',
-  'SKA',
   'Sleep',
   'Smooth Jazz',
   'Soft Rock',
@@ -261,8 +261,8 @@ export default [
   'Trip Hop',
   'Tropical',
   'Underground Rap',
-  'Urban Cowboy',
   'Urban',
+  'Urban Cowboy',
   'West Coast Rap',
   'Western Swing',
   'World',
diff --git a/src/locales/en/music/song_name.ts b/src/locales/en/music/song_name.ts
index 04d060c5fb4..ae161d925d8 100644
--- a/src/locales/en/music/song_name.ts
+++ b/src/locales/en/music/song_name.ts
@@ -1,985 +1,985 @@
 export default [
-  'White Christmas',
-  'Hey Jude',
-  'Every Breath You Take',
-  'Mack the Knife',
-  'Rock Around the Clock',
-  'I Want to Hold Your Hand',
-  "(I Can't Get No) Satisfaction",
-  'The Twist',
   '(Everything I Do) I Do it For You',
-  'Bridge Over Troubled Water',
-  'When Doves Cry',
-  'Call Me',
-  'Bette Davis Eyes',
-  'I Will Always Love You',
-  'Over the Rainbow',
-  'American Pie',
-  'Flashdance. What a Feeling',
-  'The Way We Were',
-  'I Heard it Through the Grapevine',
-  "You've Lost That Lovin' Feelin'",
-  'Nothing Compares 2 U',
-  'Endless Love',
-  'Yeah!',
-  "Let's Get it On",
-  "That's What Friends Are For",
-  'You Light Up My Life',
-  "(Sittin' On) the Dock of the Bay",
-  'Joy to the World',
-  'Heartbreak Hotel',
-  "Theme From 'A Summer Place'",
-  'Aquarius/Let The Sunshine In',
-  'I Will Survive',
-  "It's Too Late",
-  'Respect',
-  'Sugar Sugar',
-  "Stayin' Alive",
-  'Maggie May',
-  'My Heart Will Go On',
-  'Eye of the Tiger',
-  'End of the Road',
-  'Another One Bites the Dust',
-  'Billie Jean',
-  "Let's Stay Together",
-  'Battle of New Orleans',
-  'Oh',
-  'Hound Dog',
-  "I Love Rock 'n' Roll",
-  'Smooth',
-  'Good Vibrations',
-  'Physical',
-  'Light My Fire',
-  'Low',
-  'Hey Ya!',
-  'Let it Be',
-  "Don't Be Cruel",
-  'Hotel California',
-  'We Belong Together',
-  'Le Freak',
-  'Raindrops Keep Falling On My Head',
-  'How High the Moon',
-  'My Girl',
-  "I Can't Stop Loving You",
-  'Killing Me Softly With His Song',
-  'Mona Lisa',
-  'In the Mood',
-  'She Loves You',
-  'The Letter',
-  'Mister Sandman',
-  'Careless Whisper',
-  "What's Love Got to Do With It?",
-  "I'm a Believer",
-  'Wooly Bully',
-  "Theme From 'Shaft'",
-  'Hot Stuff',
-  'Centerfold',
-  'Honky Tonk Woman',
-  "I'll Be There",
-  "Gangsta's Paradise",
-  'Yesterday',
-  'My Sharona',
-  'Tennessee Waltz',
-  "Reach Out (I'll Be There)",
-  "California Dreamin'",
-  'Jailhouse Rock',
-  'Irreplaceable',
-  'Dancing in the Street',
-  'Rolling In The Deep',
-  "Tie a Yellow Ribbon 'round the Old Oak Tree",
-  'Stand By Me',
-  'Sentimental Journey',
-  'The First Time Ever I Saw Your Face',
-  'Louie Louie',
-  'Another Brick in the Wall (part 2)',
+  '(Ghost) Riders in the Sky',
+  "(I Can't Get No) Satisfaction",
+  "(I've Got a Gal In) Kalamazoo",
+  "(I've Had) the Time of My Life",
+  "(It's No) Sin",
   '(Just Like) Starting Over',
-  'Night Fever',
-  'To Sir',
-  "You're So Vain",
-  'Be My Baby',
-  'Celebration',
+  '(Let Me Be Your) Teddy Bear',
+  '(Put Another Nickel In) Music! Music! Music!',
+  '(Sexual) Healing',
+  "(Sittin' On) the Dock of the Bay",
   '(They Long to Be) Close to You',
-  'Begin the Beguine',
-  "I Still Haven't Found What I'm Looking For",
-  'I Want You Back',
-  "Arthur's Theme (Best That You Can Do)",
-  'Boulevard of Broken Dreams',
-  'With Or Without You',
-  "Tonight's the Night (Gonna Be Alright)",
-  'Are You Lonesome Tonight?',
-  'Upside Down',
-  'Dancing Queen',
-  "Sweet Child O' Mine",
-  'Where Did Our Love Go',
-  'Unchained Melody',
-  'Rudolph',
-  'Take My Breath Away',
-  "I'll Make Love to You",
-  'Love Will Keep Us Together',
-  'When a Man Loves a Woman',
-  'Walk Like an Egyptian',
-  'Crazy in Love',
-  'Strangers in the Night',
-  'You Belong to Me',
-  'In Da Club',
-  'Say You',
-  'We Are the World',
-  'Johnny B Goode',
-  "Love Theme From 'A Star is Born' (Evergreen)",
-  'Shadow Dancing',
-  'Superstition',
-  'Beat It',
-  'Night & Day',
-  'Waterfalls',
-  'House of the Rising Sun',
-  'Paper Doll',
-  'Downtown',
-  "I Can't Help Myself (Sugar Pie",
-  'Kiss From a Rose',
-  'Believe',
-  'Ballad of the Green Berets',
-  'Proud Mary',
-  'Too Young',
-  'Umbrella',
-  'Swanee',
-  'Need You Tonight',
-  'Like a Rolling Stone',
-  'Lady',
-  'One Sweet Day',
-  'Lean On Me',
-  'Tik-Toc',
-  'Monday Monday',
-  "What'd I Say",
-  'How You Remind Me',
-  'Silly Love Songs',
-  'My Guy',
-  'Macarena',
-  'Goodnight',
-  'Just My Imagination (Running Away With Me)',
-  'The Sounds of Silence',
-  'Imagine',
-  'Me & Bobby McGee',
-  'Near You',
-  "What's Going On?",
-  'Suspicious Minds',
-  'Ode To Billie Joe',
-  'Wind Beneath My Wings',
-  'The Boy is Mine',
-  'Mr Tambourine Man',
-  'Faith',
-  'Green Onions',
-  'Mrs Robinson',
-  'How Deep is Your Love?',
-  'Hey There',
-  'Heart of Glass',
-  'Pennies From Heaven',
-  'Like a Virgin',
-  'Midnight Train to Georgia',
-  'Help!',
-  'Tossing & Turning',
-  'The Sign',
-  'Born to Be Wild',
-  'Layla',
-  'I Just Wanna Be Your Everything',
-  'War',
-  '96 Tears',
-  'I Get Around',
-  'Because You Loved Me',
-  'Summer in the City',
-  'Get Back',
-  'Secret Love',
+  "(You Keep Me) Hangin' On",
+  "(You're My) Soul & Inspiration",
+  '(Your Love Keeps Lifting Me) Higher & Higher',
+  '12th Street Rag',
+  '1999',
+  '19th Nervous Breakdown',
+  '50 Ways to Leave Your Lover',
   '9 to 5',
-  '(Ghost) Riders in the Sky',
-  'The Loco-Motion',
-  'Play That Funky Music',
-  'Bohemian Rhapsody',
-  'Little Things Mean a Lot',
-  'Cry',
-  'All Shook Up',
-  'Up Where We Belong',
-  'Sledgehammer',
-  'Fire & Rain',
-  'Stop! in the Name of Love',
-  'Sweet Home Alabama',
-  'Another Day in Paradise',
-  'Bleeding Love',
-  'Lady Marmalade (Voulez-Vous Coucher Aver Moi Ce Soir?)',
-  'Whispering',
-  'Vogue',
-  'Under the Bridge',
-  'Sixteen Tons',
-  'Sugar Shack',
-  'Baby Love',
-  'What a Fool Believes',
-  'Lose Yourself',
-  'Hello Dolly',
-  'Brown Eyed Girl',
-  'Without You',
-  'Build Me Up Buttercup',
-  'We Found Love',
-  'Tears in Heaven',
-  'Family Affair',
-  'All I Wanna Do',
-  'Soul Man',
-  'Tequila',
-  'Rock With You',
-  "Livin' La Vida Loca",
-  'Best of My Love',
-  'Runaway',
-  'Alone Again (Naturally)',
-  "Can't Help Falling in Love",
-  'My Sweet Lord',
-  'Runaround Sue',
-  'Swinging On a Star',
-  'Gold Digger',
-  'Happy Together',
-  'Losing My Religion',
-  'Heart of Gold',
-  'Stardust',
-  'Will You Love Me Tomorrow',
-  'You Are the Sunshine of My Life',
-  'You Were Meant for Me',
-  'Take On Me',
-  'Hollaback Girl',
-  'God Bless America',
-  'I Swear',
-  'Sunshine of Your Love',
-  'Firework',
-  "Groovin'",
-  'Smells Like Teen Spirit',
-  "Big Girls Don't Cry",
-  'Jack & Diane',
-  'Addicted to Love',
-  'The Last Dance',
-  'Georgia On My Mind',
-  'Money For Nothing',
-  'Jump',
-  'Vaya Con Dios (may God Be With You)',
-  "You'll Never Know",
-  "That'll Be the Day",
-  'Girls Just Wanna Have Fun',
-  'Wheel of Fortune',
-  'When You Wish Upon a Star',
-  "Don't Fence Me In",
-  'Turn! Turn! Turn! (To Everything There is a Season)',
-  'Volare',
-  'Sweet Dreams (Are Made of This)',
-  'Whole Lotta Love',
-  "You've Got a Friend",
-  'Penny Lane',
-  'People Got to Be Free',
-  'Nature Boy',
-  'Sexyback',
-  'Crying',
-  'Single Ladies (Put A Ring On It)',
-  'Bad Girls',
-  'Too Close',
-  'I Got You Babe',
-  "We've Only Just Begun",
-  'Sh-Boom (Life Could Be a Dream)',
-  'Shining Star',
-  'Kansas City',
-  'Like a Prayer',
-  'Cheek to Cheek',
-  'Papa Was a Rolling Stone',
-  'Promiscuous',
-  'Love Shack',
-  'Funkytown',
-  'Crazy',
-  'Philadelphia Freedom',
-  'Temperature',
-  'Somebody That I Used to Know',
-  'All I Have to Do is Dream',
-  "Jessie's Girl",
-  'Rhinestone Cowboy',
-  'Blue Suede Shoes',
-  'Ebony & Ivory',
-  "I'll Never Smile Again",
-  'Keep On Loving You',
-  'Since U Been Gone',
-  'The Way You Look Tonight',
-  'Crazy Little Thing Called Love',
-  'The Great Pretender',
-  'Brown Sugar',
-  'Que sera sera (Whatever will be will be)',
-  'No One',
-  'Bad Day',
-  'Boom Boom Pow',
-  'Party Rock Anthem',
-  'Because of You',
-  'Chattanooga Choo Choo',
+  '96 Tears',
+  'A Boy Named Sue',
+  "A Hard Day's Night",
+  'A String of Pearls',
+  'A Thousand Miles',
+  'A Tree in the Meadow',
   'A Whiter Shade of Pale',
-  'Love Me Tender',
-  'Higher Love',
-  'Footloose',
-  'Blurred Lines',
-  'I Just Called to Say I Love You',
-  'Come Together',
-  "It's Now Or Never",
-  'Under the Boardwalk',
-  "Don't You Want Me",
-  "You Can't Hurry Love",
-  'Fame',
-  "Fallin'",
-  'Poker Face',
-  'Bad Romance',
-  'Ruby Tuesday',
+  "A Whole New World (Aladdin's Theme)",
+  'A Woman in Love',
+  'A-Tisket A-Tasket',
+  'ABC',
+  'Abracadabra',
+  'Ac-cent-tchu-ate the Positive',
+  'Addicted to Love',
+  "After You've Gone",
+  'Afternoon Delight',
+  'Again',
+  'Against All Odds (Take a Look At Me Now)',
+  "Ain't Misbehavin'",
+  "Ain't No Mountain High Enough",
+  "Ain't No Sunshine",
+  "Ain't That a Shame",
+  'Airplanes',
+  'All Along the Watchtower',
+  'All I Have to Do is Dream',
+  'All I Wanna Do',
+  "All My Lovin' (You're Never Gonna Get It)",
   'All Night Long (All Night)',
+  'All Out of Love',
+  'All Shook Up',
+  'All You Need is Love',
+  'Alone',
+  'Alone Again (Naturally)',
+  'Always On My Mind',
+  'American Pie',
+  'American Woman',
+  'Angie',
+  'Another Brick in the Wall (part 2)',
+  'Another Day in Paradise',
+  'Another Night',
+  'Another One Bites the Dust',
+  'Apologize',
+  'April Showers',
+  'Aquarius/Let The Sunshine In',
+  'Are You Lonesome Tonight?',
+  "Arthur's Theme (Best That You Can Do)",
+  'As Time Goes By',
+  'At Last',
+  'At the Hop',
+  "Auf Wiederseh'n Sweetheart",
+  'Baby Baby',
+  'Baby Come Back',
   'Baby Got Back',
-  "Whole Lotta Shakin' Goin' On",
-  'Frenesi',
-  'December 1963 (Oh What a Night)',
+  'Baby Love',
+  'Baby One More Time',
+  'Bad',
+  'Bad Day',
+  'Bad Girls',
   'Bad Moon Rising',
-  'Abracadabra',
-  'I Gotta Feeling',
-  'The Song From Moulin Rouge (Where Is Your Heart)',
-  'Waiting For a Girl Like You',
-  'Everybody Loves Somebody',
-  "I Can't Go For That (No Can Do)",
-  'Buttons & Bows',
-  "It's All in the Game",
-  'Love Train',
-  'Dance to the Music',
-  "Candle in the Wind '97",
-  'Honey',
-  'Kiss',
-  "I'll Take You There",
-  'Paint it Black',
+  'Bad Romance',
+  'Baker Street',
+  "Ball of Confusion (That's What the World is Today)",
+  'Ballad of the Green Berets',
+  'Ballerina',
+  'Band On the Run',
   'Band of Gold',
-  'Just the Way You Are',
-  'Spirit in the Sky',
-  'Vision of Love',
-  "Hips don't lie",
-  'Till The End of Time',
-  'Duke of Earl',
-  'YMCA',
-  'Oh My Papa (O Mein Papa)',
-  "Pistol Packin' Mama",
-  'Gonna Make You Sweat (Everybody Dance Now)',
-  'Dilemma',
-  'I Need You Now',
-  'Wanted',
-  "Jumpin' Jack Flash",
-  'Against All Odds (Take a Look At Me Now)',
-  'Tom Dooley',
-  'Goodbye Yellow Brick Road',
-  'Rhapsody in Blue',
+  'Battle of New Orleans',
+  'Be Bop a Lula',
+  'Be My Baby',
+  'Be My Love',
+  'Beat It',
+  'Beautiful Day',
+  'Beauty & the Beast',
+  'Because I Love You (The Postman Song)',
+  'Because You Loved Me',
+  'Because of You',
+  'Before The Next Teardrop Falls',
+  'Begin the Beguine',
+  'Behind Closed Doors',
+  'Being With You',
+  'Believe',
+  'Ben',
   'Bennie & the Jets',
-  'Call Me Maybe',
-  'You Really Got Me',
-  'God Bless the Child',
-  "I'm Sorry",
-  'Bad',
-  "I Can't Get Next to You",
-  'The Power of Love',
-  'Dreamlover',
-  'Only The Lonely (Know The Way I Feel)',
-  'We Are Family',
-  'At Last',
-  'Brand New Key',
-  "I've Heard That Song Before",
-  'Stay (I Missed You)',
-  "Do Ya Think I'm Sexy?",
-  'Tutti Frutti',
-  'This Ole House',
-  'Please Mr Postman',
-  'Good Times',
-  'Something',
-  "(I've Had) the Time of My Life",
-  "I Don't Want to Miss a Thing",
-  'Down Hearted Blues',
-  'Rag Doll',
-  'Blueberry Hill',
-  "Ain't No Sunshine",
-  'Wild Thing',
+  'Besame Mucho',
+  'Best of My Love',
+  'Bette Davis Eyes',
+  'Big Bad John',
+  "Big Girls Don't Cry",
+  'Billie Jean',
+  'Bitter Sweet Symphony',
+  'Black Or White',
+  'Black Velvet',
   'Blaze of Glory',
-  'Ray of Light',
-  'The Hustle',
-  'Grenade',
-  "Cathy's Clown",
-  'Minnie the Moocher',
-  "Love Is Blue (L'Amour Est Bleu)",
-  'Iris',
-  'The Boys of Summer',
-  'The Tide is High',
-  'She Drives Me Crazy',
-  'Save the Best For Last',
-  'These Boots Are Made For Walking',
-  'I Feel Love',
-  'A Woman in Love',
-  'We Can Work it Out',
-  'The Reason',
-  'Locked Out Of Heaven',
-  'Do That to Me One More Time',
-  "That's the Way Love Goes",
-  "A Hard Day's Night",
-  'I Believe I Can Fly',
-  'Karma Chameleon',
-  "One O'Clock Jump",
-  'Mule Train',
-  'Car Wash',
-  'Rapture',
-  'Creep',
-  'Streets of Philadelphia',
-  'West End Girls',
-  'Leader of the Pack',
-  'T For Texas (Blue Yodel No 1)',
-  'Mama Told Me Not to Come',
-  'Just Dance',
-  'Mercy Mercy Me (The Ecology)',
-  "Livin' On a Prayer",
-  "Good Lovin'",
-  '50 Ways to Leave Your Lover',
-  'Stronger',
-  'I Can See Clearly Now',
-  'We Are the Champions',
-  "(I've Got a Gal In) Kalamazoo",
-  'No Scrubs',
-  'How Do You Mend a Broken Heart',
-  'I Got You (I Feel Good)',
-  "Don't Let the Stars Get in Your Eyes",
-  'The Girl From Ipanema',
-  '(Sexual) Healing',
-  'Tears of a Clown',
-  'We Will Rock You',
-  'Hold On',
+  'Bleeding Love',
+  'Blue Suede Shoes',
+  'Blue Tango',
+  'Blueberry Hill',
+  'Blurred Lines',
+  'Body & Soul',
+  'Bohemian Rhapsody',
+  'Boogie Oogie Oogie',
+  'Boogie Woogie Bugle Boy',
+  'Boom Boom Pow',
+  'Born in the USA',
+  'Born to Be Wild',
+  'Born to Run',
+  'Boulevard of Broken Dreams',
+  'Brand New Key',
+  "Brandy (You're A Fine Girl)",
+  'Breaking Up is Hard to Do',
+  'Breathe',
+  'Bridge Over Troubled Water',
+  'Brother',
+  'Brother Louie',
+  'Brown Eyed Girl',
+  'Brown Sugar',
+  'Build Me Up Buttercup',
+  'Burn',
+  'Buttons & Bows',
+  'Bye',
+  'Bye Bye',
   'Bye Bye Love',
+  'Caldonia Boogie (What Makes Your Big Head So Hard)',
+  "California Dreamin'",
+  'California Girls',
+  'Call Me',
+  'Call Me Maybe',
+  'Can You Feel the Love Tonight',
+  "Can't Buy Me Love",
+  "Can't Get Enough of Your Love",
+  "Can't Help Falling in Love",
+  "Candle in the Wind '97",
+  'Candy Man',
+  'Car Wash',
+  'Careless Whisper',
+  'Cars',
+  "Cat's in the Cradle",
+  "Cathy's Clown",
+  'Celebration',
+  'Centerfold',
+  'Chain of Fools',
+  'Chances Are',
+  'Change the World',
   'Chapel of Love',
-  'White Rabbit',
-  'Rock the Boat',
-  'The Gypsy',
-  "Take The 'A' Train",
+  'Chattanooga Choo Choo',
+  'Chattanoogie Shoe-Shine Boy',
+  'Check On It',
+  'Cheek to Cheek',
+  'Cherish',
+  'Cherry Pink & Apple Blossom White',
+  'Cold',
+  'Colors of the Wind',
+  'Come On Eileen',
+  'Come On-a My House',
+  'Come Together',
+  'Coming Up',
+  "Cracklin' Rosie",
+  'Crazy',
+  'Crazy For You',
+  'Crazy Little Thing Called Love',
+  'Crazy in Love',
+  'Creep',
   'Crimson & Clover',
   'Crocodile Rock',
-  'Make Love to Me',
-  "Nothing's Gonna Stop Us Now",
-  'Say Say Say',
-  'The Christmas Song (Chestnuts Roasting On An Open Fire)',
-  'Un-Break My Heart',
-  'Cherish',
-  "I'll Be Missing You",
-  'Drops of Jupiter (Tell Me)',
-  'There goes my baby',
-  'You Send Me',
-  'If (They Made Me a King)',
-  "The Prisoner's Song",
-  'ABC',
+  'Cry',
+  'Cry Like a Baby',
+  'Crying',
+  'Da Doo Ron Ron (When He Walked Me Home)',
+  'Dance to the Music',
+  'Dancing Queen',
+  'Dancing in the Dark',
+  'Dancing in the Street',
+  'Dardanella',
+  'Daydream Believer',
+  'December 1963 (Oh What a Night)',
+  'Delicado',
+  'Dilemma',
+  'Disco Duck',
+  'Disco Lady',
+  'Disturbia',
+  'Dizzy',
+  'Do That to Me One More Time',
   'Do Wah Diddy Diddy',
-  "He's So Fine",
-  'A Boy Named Sue',
-  'Roll Over Beethoven',
-  'Sweet Georgia Brown',
-  'Earth Angel',
-  'Rehab',
-  "(You Keep Me) Hangin' On",
-  'This Diamond Ring',
-  'Be My Love',
-  'Rush Rush',
-  "You're Beautiful",
-  'Roll With It',
-  'Moonlight Serenade',
-  'Unbelievable',
-  "Peg o' My Heart",
-  'This Land is Your Land',
-  'Stranger On the Shore',
-  'Rum & Coca-Cola',
-  'Hit the Road',
-  'Without Me',
-  'Crazy For You',
-  'I Want to Know What Love Is',
-  'Bye Bye',
-  'Down Under',
-  'At the Hop',
-  'One Bad Apple',
-  'Kiss & Say Goodbye',
-  "For What It's Worth (Stop",
-  'The Long & Winding Road',
-  'Baby One More Time',
-  'Stairway to Heaven',
-  'How Do I Live?',
-  'Hello',
-  'Truly Madly Deeply',
-  'Great Balls of Fire',
-  'King of the Road',
-  'I Wanna Dance With Somebody (Who Loves Me)',
-  'Reunited',
-  'Help Me',
-  'Rags to Riches',
-  "(It's No) Sin",
-  'Say My Name',
-  'Nobody Does it Better',
-  'Paperback Writer',
-  "Don't Worry Be Happy",
-  'I Fall to Pieces',
-  'Body & Soul',
-  "You're Still the One",
-  "Stormy Weather (Keeps Rainin' All the Time)",
-  'Horse With No Name',
-  'American Woman',
-  'Chattanoogie Shoe-Shine Boy',
-  'Pick Up the Pieces',
-  'Everybody Wants to Rule the World',
-  'Blue Tango',
-  'Hurt So Good',
-  'Apologize',
-  "Let's Dance",
-  "(You're My) Soul & Inspiration",
-  'I Only Have Eyes For You',
-  'Wichita Lineman',
-  'Hanging by a Moment',
-  'Spinning Wheel',
-  'Look Away',
-  'Ironic',
-  "Don't Stop 'Til You Get Enough",
-  'Empire State Of Mind',
+  "Do Ya Think I'm Sexy?",
   'Do You Love Me?',
-  "Jive Talkin'",
-  "You're the One That I Want",
-  'Sweet Soul Music',
-  'Hey There Delilah',
-  "A Whole New World (Aladdin's Theme)",
-  "Somethin' Stupid",
-  'Knock Three Times',
-  'Mickey',
-  'The Wanderer',
-  'Dancing in the Dark',
-  "It's Still Rock 'n' Roll to Me",
-  'Boogie Oogie Oogie',
-  'Can You Feel the Love Tonight',
-  'Harper Valley PTA',
-  'Seasons in the Sun',
-  'Come On-a My House',
-  'Viva La Vida',
-  'Walk On By',
-  "Drop it Like It's Hot",
-  'Private Eyes',
-  'Maniac',
-  "All My Lovin' (You're Never Gonna Get It)",
-  'Take a Bow',
-  'Ring of Fire',
-  'Save the Last Dance For Me',
-  'Make it With You',
+  "Don't Be Cruel",
+  "Don't Fence Me In",
+  "Don't Go Breaking My Heart",
+  "Don't Leave Me This Way",
+  "Don't Let the Stars Get in Your Eyes",
+  "Don't Let the Sun Go Down On Me",
   "Don't Speak",
-  'I Shot the Sheriff',
-  'Say It Right',
-  'Sing',
-  'Twist & Shout',
-  'Walk This Way',
-  'A-Tisket A-Tasket',
-  'Let Me Love You',
-  'I Can Dream',
-  'Toxic',
-  'The Joker',
-  'Hero',
-  'In the Year 2525 (Exordium & Terminus)',
-  'Your Song',
-  'Oh Happy Day',
-  'Grease',
-  'Love In This Club',
-  'Angie',
-  'How Much is That Doggy in the Window?',
-  'Daydream Believer',
-  'Whip It',
-  'Boogie Woogie Bugle Boy',
+  "Don't Stop 'Til You Get Enough",
+  "Don't Worry Be Happy",
+  "Don't You (Forget About Me)",
+  "Don't You Want Me",
+  'Doo Wop (That Thing)',
   'Down',
-  'Hanky Panky',
-  'Total Eclipse of the Heart',
-  "Cat's in the Cradle",
-  'Strange Fruit',
-  'Breathe',
-  'On My Own',
-  'Dizzy',
-  'Ticket to Ride',
-  'We Got The Beat',
-  'On the Atchison',
-  'Always On My Mind',
-  'Unforgettable',
-  'In the End',
-  'Music',
-  "Can't Buy Me Love",
-  'Chain of Fools',
-  "Won't Get Fooled Again",
-  'Happy Days Are Here Again',
-  'Third Man Theme',
-  "Your Cheatin' Heart",
-  'Thriller',
-  'Venus',
-  'Time After Time',
-  'That Lucky Old Sun (Just Rolls Around Heaven All Day)',
+  'Down Hearted Blues',
+  'Down Under',
+  'Downtown',
+  'Dreamlover',
+  'Dreams',
+  "Drop it Like It's Hot",
+  'Drops of Jupiter (Tell Me)',
+  'Duke of Earl',
   'E.T.',
-  'Three Coins in the Fountain',
-  'Touch Me',
-  "You Ain't Seen Nothin' Yet",
-  'Gives You Hell',
-  'Knock On Wood',
-  'One of These Nights',
-  'Again',
-  'Doo Wop (That Thing)',
-  'Whoomp! (There it Is)',
-  'Magic',
-  "I'm Walking Behind You",
-  "We Didn't Start the Fire",
-  'Lola',
+  'Earth Angel',
+  'Ebony & Ivory',
+  'Eight Days a Week',
+  'Empire State Of Mind',
+  'End of the Road',
+  'Endless Love',
+  'Escape (The Pina Colada Song)',
+  'Eve of Destruction',
+  'Every Breath You Take',
+  'Every Little Thing She Does is Magic',
+  'Everybody Loves Somebody',
+  'Everybody Wants to Rule the World',
+  'Everyday People',
+  'Eye of the Tiger',
+  'Faith',
+  "Fallin'",
+  'Fame',
+  'Family Affair',
+  'Fantasy',
+  'Fast Car',
+  'Feel Good Inc',
+  'Feel Like Making Love',
+  'Fire & Rain',
+  'Firework',
+  'Flashdance. What a Feeling',
+  'Fly Robin Fly',
+  'Foolish Games',
+  'Footloose',
+  "For What It's Worth (Stop",
+  'Fortunate Son',
+  'Frankenstein',
+  'Freak Me',
+  'Freebird',
+  'Frenesi',
+  'Funkytown',
+  "Gangsta's Paradise",
+  'Georgia On My Mind',
+  'Georgy Girl',
+  'Get Back',
+  'Get Down Tonight',
+  'Get Off of My Cloud',
   'Ghostbusters',
-  'Winchester Cathedral',
+  "Gimme Some Lovin'",
+  'Girls Just Wanna Have Fun',
+  'Give Me Everything',
+  'Gives You Hell',
+  'Glamorous',
+  'Glory of Love',
+  'Go Your Own Way',
+  'God Bless America',
+  'God Bless the Child',
+  'Gold Digger',
+  'Gonna Make You Sweat (Everybody Dance Now)',
+  "Good Lovin'",
+  'Good Times',
+  'Good Vibrations',
+  'Goodbye Yellow Brick Road',
+  'Goodnight',
+  'Got to Give it Up',
+  'Grease',
+  'Great Balls of Fire',
   'Greatest Love of All',
-  'My Love',
-  'Wannabe',
-  'Miss You',
+  'Green Onions',
+  'Green River',
+  'Green Tambourine',
+  'Grenade',
+  'Groove is in the Heart',
+  "Groovin'",
+  'Gypsies',
+  'Hair',
+  'Hang On Sloopy',
+  'Hanging by a Moment',
+  'Hanky Panky',
+  'Happy Days Are Here Again',
+  'Happy Together',
+  'Harbour Lights',
+  "Hard to Say I'm Sorry",
+  'Harper Valley PTA',
+  'Have You Ever Really Loved a Woman?',
+  "He'll Have to Go",
+  "He's So Fine",
+  "He's a Rebel",
+  'Heart of Glass',
+  'Heart of Gold',
+  'Heartbreak Hotel',
+  'Hello',
+  'Hello Dolly',
+  'Help Me',
+  'Help!',
+  'Here Without You',
+  'Here in My Heart',
+  'Hero',
+  'Hey Baby',
+  'Hey Jude',
+  'Hey Paula',
+  'Hey There',
+  'Hey There Delilah',
+  'Hey Ya!',
+  'Higher Love',
+  "Hips don't lie",
+  'Hit the Road',
+  'Hold On',
+  'Hollaback Girl',
+  'Honey',
+  'Honky Tonk',
+  'Honky Tonk Woman',
+  'Horse With No Name',
+  'Hot Child In The City',
+  'Hot Stuff',
+  'Hotel California',
+  'Hound Dog',
+  'House of the Rising Sun',
+  'How Deep is Your Love?',
+  'How Do I Live?',
+  'How Do You Mend a Broken Heart',
+  'How High the Moon',
+  'How Much is That Doggy in the Window?',
+  'How Will I Know',
+  'How You Remind Me',
+  'How to Save a Life',
+  'Hungry Heart',
+  'Hurt So Good',
+  'I Believe I Can Fly',
+  'I Can Dream',
+  'I Can Help',
+  'I Can See Clearly Now',
+  "I Can't Get Next to You",
+  "I Can't Get Started",
+  "I Can't Go For That (No Can Do)",
+  "I Can't Help Myself (Sugar Pie",
+  "I Can't Stop Loving You",
+  "I Don't Want to Miss a Thing",
+  'I Fall to Pieces',
   'I Feel Fine',
-  'Baby Baby',
-  'TSOP (The Sound of Philadelphia)',
-  'Loving You',
-  "This Guy's in Love With You",
-  'Till I Waltz Again With You',
-  'Why Do Fools Fall in Love?',
-  'Nights in White Satin',
-  "That's the Way (I Like It)",
-  'My Prayer',
-  '(Put Another Nickel In) Music! Music! Music!',
-  'Colors of the Wind',
-  'Morning Train (Nine to Five)',
+  'I Feel For You',
+  'I Feel Love',
+  'I Get Around',
+  'I Got You (I Feel Good)',
+  'I Got You Babe',
+  'I Gotta Feeling',
+  'I Heard it Through the Grapevine',
+  'I Honestly Love You',
+  'I Just Called to Say I Love You',
+  'I Just Wanna Be Your Everything',
+  'I Kissed A Girl',
+  "I Love Rock 'n' Roll",
+  'I Need You Now',
+  'I Only Have Eyes For You',
+  'I Shot the Sheriff',
+  "I Still Haven't Found What I'm Looking For",
+  'I Swear',
+  'I Think I Love You',
+  'I Walk the Line',
+  'I Wanna Dance With Somebody (Who Loves Me)',
+  'I Wanna Love You',
+  'I Want You Back',
+  'I Want to Hold Your Hand',
+  'I Want to Know What Love Is',
   'I Went to Your Wedding',
+  'I Will Always Love You',
+  'I Will Follow Him',
+  'I Will Survive',
+  'I Write the Songs',
+  "I'll Be Missing You",
+  "I'll Be There",
+  "I'll Make Love to You",
+  "I'll Never Smile Again",
+  "I'll Take You There",
+  "I'll Walk Alone",
+  "I'll be seeing you",
+  "I'm Looking Over a Four Leaf Clover",
+  "I'm So Lonesome I Could Cry",
+  "I'm Sorry",
+  "I'm Walking Behind You",
+  "I'm Your Boogie Man",
+  "I'm Yours",
+  "I'm a Believer",
+  "I've Heard That Song Before",
+  'If (They Made Me a King)',
+  "If I Didn't Care",
+  "If You Don't Know Me By Now",
+  'If You Leave Me Now',
+  'Imagine',
+  'In Da Club',
+  'In the End',
+  'In the Ghetto',
+  'In the Mood',
+  'In the Summertime',
+  'In the Year 2525 (Exordium & Terminus)',
+  'Incense & Peppermints',
+  'Indian Reservation (The Lament Of The Cherokee Reservation Indian)',
+  'Instant Karma',
+  'Iris',
+  'Ironic',
+  'Irreplaceable',
+  'It Had to Be You',
+  "It's All in the Game",
+  "It's My Party",
+  "It's Now Or Never",
+  "It's Still Rock 'n' Roll to Me",
+  "It's Too Late",
+  'Jack & Diane',
+  'Jailhouse Rock',
+  "Jessie's Girl",
+  "Jive Talkin'",
+  'Johnny B Goode',
+  'Joy to the World',
+  'Judy in Disguise (With Glasses)',
+  'Jump',
+  "Jumpin' Jack Flash",
+  'Just Dance',
+  'Just My Imagination (Running Away With Me)',
+  'Just the Way You Are',
+  'Kansas City',
+  'Karma Chameleon',
+  'Keep On Loving You',
+  'Killing Me Softly With His Song',
+  'King of the Road',
+  'Kiss',
+  'Kiss & Say Goodbye',
+  'Kiss From a Rose',
   'Kiss Me',
-  'Gypsies',
-  "Cracklin' Rosie",
-  'Maybellene',
-  'Born in the USA',
-  'Here Without You',
-  'Mony Mony',
-  'Mmmbop',
-  'You Always Hurt the One You Love',
-  'Eight Days a Week',
-  'What Goes Around Comes Around',
+  'Kiss On My List',
+  'Kiss You All Over',
+  'Knock On Wood',
+  'Knock Three Times',
+  'Kokomo',
+  'Kryptonite',
   'Kung Fu Fighting',
-  'Fantasy',
-  'Sir Duke',
-  "Ain't Misbehavin'",
-  'Need You Now',
+  'La Bamba',
+  'Lady',
+  'Lady Marmalade (Voulez-Vous Coucher Aver Moi Ce Soir?)',
   'Last Train to Clarksville',
-  'Yakety Yak',
-  "I'll be seeing you",
-  "Hard to Say I'm Sorry",
-  "It's My Party",
+  'Layla',
+  'Le Freak',
+  'Leader of the Pack',
+  'Lean On Me',
+  'Leaving',
+  'Let Me Call You Sweetheart',
+  'Let Me Love You',
+  'Let it Be',
+  'Let it Snow! Let it Snow! Let it Snow!',
+  "Let's Dance",
+  "Let's Get it On",
+  "Let's Groove",
+  "Let's Hear it For the Boy",
+  "Let's Stay Together",
+  'Light My Fire',
+  'Lights',
+  'Like a Prayer',
+  'Like a Rolling Stone',
+  'Like a Virgin',
+  "Little Darlin'",
+  'Little Things Mean a Lot',
+  'Live & Let Die',
+  "Livin' La Vida Loca",
+  "Livin' On a Prayer",
+  'Living For the City',
+  'Locked Out Of Heaven',
+  'Lola',
+  'Lonely Boy',
+  'Long Cool Woman in a Black Dress',
+  'Long Tall Sally',
+  'Look Away',
+  "Lookin' Out My Back Door",
+  'Lose Yourself',
+  'Losing My Religion',
+  'Louie Louie',
+  'Love Child',
+  'Love Hangover',
+  'Love In This Club',
+  "Love Is Blue (L'Amour Est Bleu)",
+  'Love Letters in the Sand',
+  'Love Me Do',
+  'Love Me Tender',
+  'Love Shack',
+  "Love Theme From 'A Star is Born' (Evergreen)",
+  'Love Train',
+  'Love Will Keep Us Together',
+  'Love is a Many Splendoured Thing',
   'Love to Love You Baby',
-  'Miss You Much',
-  'Born to Run',
-  'Instant Karma',
-  'The Rose',
-  'Purple Rain',
-  'One',
-  'Groove is in the Heart',
-  "Gimme Some Lovin'",
-  'Beautiful Day',
-  'Escape (The Pina Colada Song)',
-  'Use Somebody',
-  'Fortunate Son',
-  'Afternoon Delight',
   "Love's Theme",
-  'Sailing',
-  'Cherry Pink & Apple Blossom White',
-  'Georgy Girl',
-  'How to Save a Life',
-  'I Walk the Line',
-  'All You Need is Love',
-  "U Can't Touch This",
-  'All Out of Love',
-  'Where is the Love?',
-  'Revolution',
-  'The Love You Save',
-  'Black Or White',
-  'This Used to Be My Playground',
-  'Living For the City',
-  "School's Out",
-  'Disturbia',
-  'Riders On the Storm',
-  'Some Enchanted Evening',
-  'Weak',
+  'Loving You',
+  'Low',
+  'Macarena',
+  'Mack the Knife',
+  'Maggie May',
+  'Magic',
+  'Magic Carpet Ride',
+  'Make Love to Me',
+  'Make it With You',
+  "Makin' Whoopee",
+  'Mama Told Me Not to Come',
+  'Man in the Mirror',
+  'Manana (Is Soon Enough For Me)',
   'Maneater',
+  'Maniac',
+  'Maybellene',
+  'Me & Bobby McGee',
+  'Me & Mrs Jones',
+  'Memories Are Made of This',
+  'Mercy Mercy Me (The Ecology)',
+  'Mickey',
+  'Midnight Train to Georgia',
+  'Minnie the Moocher',
+  'Miss You',
+  'Miss You Much',
+  'Mister Sandman',
+  'Mmmbop',
+  'Mona Lisa',
+  'Monday Monday',
+  'Money For Nothing',
+  'Mony Mony',
+  'Mood Indigo',
+  'Moonlight Cocktail',
+  'Moonlight Serenade',
   'More Than Words',
-  'Time of the Season',
-  "Mrs Brown You've Got a Lovely Daughter",
-  'If You Leave Me Now',
-  "Can't Get Enough of Your Love",
-  'Na Na Hey Hey (Kiss Him Goodbye)',
+  'More Than a Feeling',
+  'Morning Train (Nine to Five)',
+  'Mr Big Stuff',
   'Mr Brightside',
-  'Black Velvet',
-  "I'm Yours",
+  'Mr Tambourine Man',
+  "Mrs Brown You've Got a Lovely Daughter",
+  'Mrs Robinson',
+  'Mule Train',
+  'Music',
   'My Blue Heaven',
-  'It Had to Be You',
-  'Tha Crossroads',
-  'Ac-cent-tchu-ate the Positive',
-  'Everyday People',
-  'We Are Young',
-  'Take Me Home',
-  'Smoke! Smoke! Smoke! (That Cigarette)',
-  'In the Summertime',
-  'The Tracks of My Tears',
-  'Fly Robin Fly',
-  'Love is a Many Splendoured Thing',
-  'Another Night',
-  'Long Tall Sally',
-  'You Sexy Thing',
-  'The Morning After',
-  'Get Off of My Cloud',
-  'Roses Are Red',
-  'Thank You (Falettinme be Mice Elf Again)',
-  'Slow Poke',
-  'You Belong With Me',
-  "Ain't No Mountain High Enough",
-  "Auf Wiederseh'n Sweetheart",
-  'Beauty & the Beast',
-  'St Louis Blues',
-  'Peggy Sue',
-  'U Got it Bad',
-  'Sweet Caroline (Good Times Never Seemed So Good)',
-  'Wedding Bell Blues',
-  'Freebird',
-  'Wipe Out',
-  'California Girls',
-  'Being With You',
-  "Makin' Whoopee",
-  'Shop Around',
-  'Smoke On the Water',
-  'Hungry Heart',
-  "That's Amore",
+  "My Boyfriend's Back",
+  'My Eyes Adored You',
+  'My Girl',
+  'My Guy',
+  'My Heart Will Go On',
   'My Life',
-  "Brandy (You're A Fine Girl)",
-  "Walk Don't Run",
-  "Surfin' USA",
-  "Ball of Confusion (That's What the World is Today)",
-  'Sunshine Superman',
-  'Frankenstein',
-  'Kiss You All Over',
-  'Wishing Well',
+  'My Love',
+  'My Man',
+  'My Prayer',
+  'My Sharona',
+  'My Sweet Lord',
+  'Na Na Hey Hey (Kiss Him Goodbye)',
+  'Nature Boy',
+  'Near You',
+  'Need You Now',
+  'Need You Tonight',
+  'Never Gonna Give You Up',
+  'Night & Day',
+  'Night Fever',
+  'Nights in White Satin',
+  'No One',
+  'No Scrubs',
+  'Nobody Does it Better',
+  "Nothin' on You",
+  'Nothing Compares 2 U',
+  "Nothing's Gonna Stop Us Now",
+  'Ode To Billie Joe',
+  'Oh',
+  'Oh Happy Day',
+  'Oh My Papa (O Mein Papa)',
+  "Ol' Man River",
+  'Ole Buttermilk Sky',
+  'On Bended Knee',
+  'On My Own',
+  'On the Atchison',
+  'One',
+  'One Bad Apple',
+  'One More Try',
+  "One O'Clock Jump",
+  'One Sweet Day',
+  'One of These Nights',
+  'One of Us',
+  'Only The Lonely (Know The Way I Feel)',
+  'Only You (And You Alone)',
+  'Open Arms',
+  'Over There',
+  'Over the Rainbow',
+  'Paint it Black',
+  "Papa Don't Preach",
+  'Papa Was a Rolling Stone',
+  "Papa's Got a Brand New Bag",
+  'Paper Doll',
+  'Paper Planes',
+  'Paperback Writer',
+  'Party Rock Anthem',
+  "Peg o' My Heart",
+  'Peggy Sue',
+  'Pennies From Heaven',
+  'Penny Lane',
+  'People',
+  'People Got to Be Free',
+  'Personality',
+  'Philadelphia Freedom',
+  'Physical',
   'Piano Man',
-  'Ben',
-  'In the Ghetto',
-  'Hang On Sloopy',
-  'Singing The Blues',
-  'Cry Like a Baby',
-  'I Honestly Love You',
-  'Brother',
-  "Lookin' Out My Back Door",
-  'Candy Man',
-  'Burn',
-  'Stagger Lee',
-  'Moonlight Cocktail',
-  'Coming Up',
+  'Pick Up the Pieces',
+  "Pistol Packin' Mama",
+  'Play That Funky Music',
+  'Please Mr Postman',
+  'Poker Face',
+  'Pon De Replay',
+  'Pony Time',
   'Pop Muzik',
-  'As Time Goes By',
-  'My Eyes Adored You',
-  'Strawberry Fields Forever',
-  'Some of These Days',
-  'I Think I Love You',
-  'Judy in Disguise (With Glasses)',
-  'All Along the Watchtower',
-  'A Thousand Miles',
-  'Fast Car',
+  'Prisoner of Love',
+  'Private Eyes',
+  'Promiscuous',
+  'Proud Mary',
+  'Purple Haze',
+  'Purple Rain',
+  "Puttin' on the Ritz",
+  'Que sera sera (Whatever will be will be)',
+  'Queen of Hearts',
+  'Rag Doll',
+  'Rag Mop',
+  'Rags to Riches',
+  'Raindrops Keep Falling On My Head',
+  'Rapture',
+  'Ray of Light',
+  "Reach Out (I'll Be There)",
   'Red Red Wine',
-  'Live & Let Die',
-  'Come On Eileen',
-  'Right Back Where We Started From',
-  'Brother Louie',
-  "Ol' Man River",
-  'Band On the Run',
+  'Rehab',
+  'Respect',
+  'Return to Sender',
+  'Reunited',
+  'Revolution',
+  'Rhapsody in Blue',
+  'Rhinestone Cowboy',
   'Rich Girl',
-  'Green River',
-  'Got to Give it Up',
-  'Behind Closed Doors',
-  "Don't Go Breaking My Heart",
-  "I'm Looking Over a Four Leaf Clover",
-  'Mr Big Stuff',
-  'Tiger Rag',
-  'Kryptonite',
-  'Hey Paula',
-  'Go Your Own Way',
-  'Big Bad John',
-  'Wake Me Up Before You Go Go',
-  'Tangerine',
-  'Wayward Wind',
-  'Disco Lady',
-  'Spanish Harlem',
-  'Wicked Game',
+  'Riders On the Storm',
+  'Right Back Where We Started From',
+  'Ring My Bell',
+  'Ring of Fire',
+  'Rock Around the Clock',
+  'Rock With You',
+  'Rock Your Baby',
+  'Rock the Boat',
+  'Rock the Casbah',
+  'Roll Over Beethoven',
+  'Roll With It',
+  'Rolling In The Deep',
   'Rosanna',
-  "Papa Don't Preach",
-  'Somebody to Love',
-  'Kokomo',
-  'Manana (Is Soon Enough For Me)',
-  "Puttin' on the Ritz",
-  'One More Try',
-  "I'll Walk Alone",
+  'Roses Are Red',
+  'Royals',
+  'Ruby Tuesday',
+  'Rudolph',
+  'Rum & Coca-Cola',
+  'Runaround Sue',
+  'Runaway',
+  'Running Scared',
+  'Rush Rush',
+  'Sailing',
+  'Save the Best For Last',
+  'Save the Last Dance For Me',
+  'Say It Right',
+  'Say My Name',
+  'Say Say Say',
+  'Say You',
+  "School's Out",
+  'Seasons in the Sun',
+  'Secret Love',
+  'Sentimental Journey',
+  'Sexyback',
+  'Sh-Boom (Life Could Be a Dream)',
+  'Shadow Dancing',
+  'Shake Down',
+  'Shake You Down',
+  'She Drives Me Crazy',
+  'She Loves You',
+  "She's a Lady",
+  'Shining Star',
+  'Shop Around',
   'Shout',
-  'Woman',
-  'Ballerina',
-  'We Built This City',
-  '19th Nervous Breakdown',
-  'Working My Way Back to You',
-  'Superstar',
-  'Foolish Games',
-  'Get Down Tonight',
-  'On Bended Knee',
-  'Magic Carpet Ride',
-  'Only You (And You Alone)',
-  'A String of Pearls',
-  'A Tree in the Meadow',
+  'Silly Love Songs',
+  'Since U Been Gone',
+  'Sing',
+  'Singing The Blues',
+  'Single Ladies (Put A Ring On It)',
+  'Sir Duke',
+  'Sixteen Tons',
+  'Sledgehammer',
+  'Sleep Walk',
+  'Sleepy Lagoon',
+  'Slow Poke',
+  'Smells Like Teen Spirit',
+  'Smoke Gets in Your Eyes',
+  'Smoke On the Water',
+  'Smoke! Smoke! Smoke! (That Cigarette)',
+  'Smooth',
   'So Much in Love',
-  'Every Little Thing She Does is Magic',
-  'La Bamba',
-  'Tighten Up',
-  'Three Times a Lady',
-  'Airplanes',
-  "Don't Leave Me This Way",
-  'Rock the Casbah',
-  'Feel Good Inc',
-  'Love Me Do',
-  'Kiss On My List',
-  'Give Me Everything',
-  'Have You Ever Really Loved a Woman?',
-  'Love Letters in the Sand',
-  'Ring My Bell',
-  'Love Child',
-  'I Feel For You',
-  'Bye',
-  '(Let Me Be Your) Teddy Bear',
   'Soldier Boy',
-  "Papa's Got a Brand New Bag",
-  'Love Hangover',
+  'Some Enchanted Evening',
+  'Some of These Days',
+  'Somebody That I Used to Know',
+  'Somebody to Love',
+  'Someday',
+  "Somethin' Stupid",
+  'Something',
+  'Soul Man',
+  'Spanish Harlem',
   'Spill the Wine',
-  'Royals',
-  'April Showers',
-  "Don't You (Forget About Me)",
-  "Travellin' Man",
-  'The Thing',
-  'You Make Me Feel Brand New',
-  'The Glow-Worm',
-  "You Don't Bring Me Flowers",
-  'Summertime Blues',
-  'Straight Up',
-  'Sunday',
-  'Wake Up Little Susie',
-  "She's a Lady",
-  'Over There',
-  "Little Darlin'",
-  'Rag Mop',
-  'Shake Down',
-  'Up Around the Bend',
-  'Harbour Lights',
-  'Chances Are',
-  'Mood Indigo',
-  'Pony Time',
-  "After You've Gone",
-  'I Wanna Love You',
-  'Da Doo Ron Ron (When He Walked Me Home)',
-  "If You Don't Know Me By Now",
-  'Green Tambourine',
-  'My Man',
-  "If I Didn't Care",
+  'Spinning Wheel',
+  'Spirit in the Sky',
   'St George & the Dragonette',
-  "Why Don't You Believe Me?",
-  'How Will I Know',
-  'Disco Duck',
-  'Lonely Boy',
-  'Never Gonna Give You Up',
-  'Before The Next Teardrop Falls',
-  'Running Scared',
-  "Let's Hear it For the Boy",
-  'Sleep Walk',
-  'Walk On the Wild Side',
-  'Memories Are Made of This',
-  'Open Arms',
-  'Stuck On You',
-  'Personality',
-  'Feel Like Making Love',
+  'St Louis Blues',
+  'Stagger Lee',
+  'Stairway to Heaven',
+  'Stand By Me',
+  'Stardust',
   'Stars & Stripes Forever',
-  'Besame Mucho',
-  'Let Me Call You Sweetheart',
-  'Indian Reservation (The Lament Of The Cherokee Reservation Indian)',
-  'Cars',
-  'You Make Me Feel Like Dancing',
-  'Whatcha Say',
-  'Me & Mrs Jones',
-  'Bitter Sweet Symphony',
-  'Uncle Albert (Admiral Halsey)',
-  'More Than a Feeling',
-  "My Boyfriend's Back",
-  'People',
-  "He'll Have to Go",
-  'I Can Help',
-  'The Streak',
-  'Dreams',
-  'Hair',
-  'Cold',
-  "Nothin' on You",
+  'Stay (I Missed You)',
+  "Stayin' Alive",
+  'Stop! in the Name of Love',
+  "Stormy Weather (Keeps Rainin' All the Time)",
+  'Straight Up',
+  'Strange Fruit',
+  'Stranger On the Shore',
+  'Strangers in the Night',
+  'Strawberry Fields Forever',
+  'Streets of Philadelphia',
+  'Stronger',
+  'Stuck On You',
+  'Sugar Shack',
+  'Sugar Sugar',
+  'Summer in the City',
+  'Summertime Blues',
+  'Sunday',
+  'Sunshine Superman',
+  'Sunshine of Your Love',
+  'Superstar',
+  'Superstition',
+  "Surfin' USA",
+  'Suspicious Minds',
+  'Swanee',
+  'Sweet Caroline (Good Times Never Seemed So Good)',
+  "Sweet Child O' Mine",
+  'Sweet Dreams (Are Made of This)',
+  'Sweet Georgia Brown',
+  'Sweet Home Alabama',
+  'Sweet Soul Music',
+  'Swinging On a Star',
+  'T For Texas (Blue Yodel No 1)',
+  'TSOP (The Sound of Philadelphia)',
+  'Take Me Home',
+  'Take My Breath Away',
+  'Take On Me',
+  "Take The 'A' Train",
+  'Take a Bow',
+  'Tammy',
+  'Tangerine',
+  'Tears in Heaven',
+  'Tears of a Clown',
+  'Temperature',
+  'Tennessee Waltz',
+  'Tequila',
+  'Tha Crossroads',
+  'Thank You (Falettinme be Mice Elf Again)',
+  'That Lucky Old Sun (Just Rolls Around Heaven All Day)',
+  'That Old Black Magic',
+  "That'll Be the Day",
+  "That's Amore",
+  "That's What Friends Are For",
+  "That's the Way (I Like It)",
+  "That's the Way Love Goes",
+  'The Boy is Mine',
+  'The Boys of Summer',
+  'The Christmas Song (Chestnuts Roasting On An Open Fire)',
   'The End of the World',
-  'Caldonia Boogie (What Makes Your Big Head So Hard)',
-  'I Kissed A Girl',
-  'Incense & Peppermints',
-  '12th Street Rag',
-  'West End Blues',
+  'The First Time Ever I Saw Your Face',
+  'The Girl From Ipanema',
+  'The Glow-Worm',
+  'The Great Pretender',
+  'The Gypsy',
+  'The Hustle',
+  'The Joker',
+  'The Last Dance',
+  'The Letter',
+  'The Loco-Motion',
+  'The Long & Winding Road',
+  'The Love You Save',
+  'The Morning After',
+  'The Power of Love',
+  "The Prisoner's Song",
+  'The Reason',
+  'The Rose',
+  'The Sign',
+  'The Song From Moulin Rouge (Where Is Your Heart)',
+  'The Sounds of Silence',
+  'The Streak',
+  'The Sweet Escape',
+  'The Thing',
+  'The Tide is High',
+  'The Tracks of My Tears',
+  'The Twist',
+  'The Wanderer',
+  'The Way We Were',
+  'The Way You Look Tonight',
   'The Way You Move',
-  'Smoke Gets in Your Eyes',
-  'Want Ads',
-  'Long Cool Woman in a Black Dress',
-  'Hey Baby',
-  '(Your Love Keeps Lifting Me) Higher & Higher',
-  "He's a Rebel",
-  'Alone',
+  "Theme From 'A Summer Place'",
+  "Theme From 'Greatest American Hero' (Believe It Or Not)",
+  "Theme From 'Shaft'",
+  'There goes my baby',
+  'These Boots Are Made For Walking',
+  'Third Man Theme',
+  'This Diamond Ring',
+  "This Guy's in Love With You",
+  'This Land is Your Land',
+  'This Love',
+  'This Ole House',
+  'This Used to Be My Playground',
+  'Three Coins in the Fountain',
+  'Three Times a Lady',
   'Thrift Shop',
-  "Don't Let the Sun Go Down On Me",
-  'The Sweet Escape',
-  'Return to Sender',
-  'Here in My Heart',
-  'Wabash Cannonball',
-  "Ain't That a Shame",
+  'Thriller',
+  'Ticket to Ride',
+  "Tie a Yellow Ribbon 'round the Old Oak Tree",
+  'Tiger Rag',
+  'Tighten Up',
+  'Tik-Toc',
+  'Till I Waltz Again With You',
+  'Till The End of Time',
+  'Time After Time',
+  'Time of the Season',
+  'To Sir',
+  'Tom Dooley',
+  "Tonight's the Night (Gonna Be Alright)",
+  'Too Close',
+  'Too Young',
+  'Tossing & Turning',
+  'Total Eclipse of the Heart',
+  'Touch Me',
+  'Toxic',
   "Travellin' Band",
-  "I'm Your Boogie Man",
-  'I Write the Songs',
-  'This Love',
-  'Lights',
-  'Will It Go Round In Circles',
-  'Purple Haze',
-  'Rock Your Baby',
-  'Delicado',
-  'Tammy',
-  'Check On It',
-  'Breaking Up is Hard to Do',
-  '1999',
-  'Prisoner of Love',
-  'Wild Wild West',
+  "Travellin' Man",
+  'Truly Madly Deeply',
+  'Turn! Turn! Turn! (To Everything There is a Season)',
+  'Tutti Frutti',
+  'Twist & Shout',
+  'Two Hearts',
+  "U Can't Touch This",
+  'U Got it Bad',
+  'Umbrella',
+  'Un-Break My Heart',
+  'Unbelievable',
+  'Unchained Melody',
+  'Uncle Albert (Admiral Halsey)',
+  'Under the Boardwalk',
+  'Under the Bridge',
+  'Unforgettable',
+  'Up Around the Bend',
+  'Up Up & Away',
+  'Up Where We Belong',
+  'Upside Down',
+  'Use Somebody',
+  'Vaya Con Dios (may God Be With You)',
+  'Venus',
+  'Vision of Love',
+  'Viva La Vida',
+  'Vogue',
+  'Volare',
+  'Wabash Cannonball',
+  'Waiting For a Girl Like You',
+  'Wake Me Up Before You Go Go',
+  'Wake Up Little Susie',
+  "Walk Don't Run",
   'Walk Like a Man',
-  'I Will Follow Him',
-  'Glamorous',
+  'Walk Like an Egyptian',
+  'Walk On By',
+  'Walk On the Wild Side',
+  'Walk This Way',
+  'Wannabe',
+  'Want Ads',
+  'Wanted',
+  'War',
+  'Waterfalls',
+  'Wayward Wind',
+  'We Are Family',
+  'We Are Young',
+  'We Are the Champions',
+  'We Are the World',
+  'We Belong Together',
+  'We Built This City',
+  'We Can Work it Out',
+  "We Didn't Start the Fire",
+  'We Found Love',
+  'We Got The Beat',
+  'We Will Rock You',
+  "We've Only Just Begun",
+  'Weak',
+  'Wedding Bell Blues',
+  'West End Blues',
+  'West End Girls',
+  'What Goes Around Comes Around',
+  'What a Fool Believes',
+  "What'd I Say",
+  "What's Going On?",
+  "What's Love Got to Do With It?",
+  'Whatcha Say',
+  'Wheel of Fortune',
+  'When Doves Cry',
+  'When You Wish Upon a Star',
+  'When a Man Loves a Woman',
+  'Where Did Our Love Go',
+  'Where is the Love?',
+  'Whip It',
+  'Whispering',
+  'White Christmas',
+  'White Rabbit',
+  'Whole Lotta Love',
+  "Whole Lotta Shakin' Goin' On",
+  'Whoomp! (There it Is)',
+  'Why Do Fools Fall in Love?',
+  "Why Don't You Believe Me?",
+  'Wichita Lineman',
+  'Wicked Game',
+  'Wild Thing',
+  'Wild Wild West',
+  'Will It Go Round In Circles',
+  'Will You Love Me Tomorrow',
+  'Winchester Cathedral',
+  'Wind Beneath My Wings',
+  'Wipe Out',
+  'Wishing Well',
+  'With Or Without You',
+  'Without Me',
+  'Without You',
+  'Woman',
+  "Won't Get Fooled Again",
+  'Wooly Bully',
+  'Working My Way Back to You',
+  'YMCA',
+  'Yakety Yak',
+  'Yeah!',
   'Yellow Rose of Texas',
-  'That Old Black Magic',
-  "I'm So Lonesome I Could Cry",
-  'Up Up & Away',
-  'Baby Come Back',
-  'Let it Snow! Let it Snow! Let it Snow!',
-  'Pon De Replay',
-  'Because I Love You (The Postman Song)',
-  'Sleepy Lagoon',
-  'Baker Street',
-  'Dardanella',
+  'Yesterday',
+  "You Ain't Seen Nothin' Yet",
+  'You Always Hurt the One You Love',
+  'You Are the Sunshine of My Life',
+  'You Belong With Me',
+  'You Belong to Me',
+  "You Can't Hurry Love",
+  "You Don't Bring Me Flowers",
   "You Don't Have to Be a Star (To Be in My Show)",
-  'Leaving',
-  'Glory of Love',
-  "Theme From 'Greatest American Hero' (Believe It Or Not)",
-  'Shake You Down',
-  'Ole Buttermilk Sky',
-  "I Can't Get Started",
-  'Freak Me',
-  'Hot Child In The City',
-  'Man in the Mirror',
-  'Queen of Hearts',
-  "Let's Groove",
-  'Change the World',
+  'You Light Up My Life',
+  'You Make Me Feel Brand New',
+  'You Make Me Feel Like Dancing',
+  'You Really Got Me',
+  'You Send Me',
+  'You Sexy Thing',
+  'You Were Meant for Me',
   'You make Me Wanna',
-  'Someday',
-  'Eve of Destruction',
-  'One of Us',
-  'Honky Tonk',
-  'Be Bop a Lula',
-  'Two Hearts',
-  'Paper Planes',
+  "You'll Never Know",
+  "You're Beautiful",
+  "You're So Vain",
+  "You're Still the One",
+  "You're the One That I Want",
+  "You've Got a Friend",
+  "You've Lost That Lovin' Feelin'",
+  "Your Cheatin' Heart",
+  'Your Song',
 ];
diff --git a/src/locales/fa/music/genre.ts b/src/locales/fa/music/genre.ts
index 0d80c874feb..1738c9f5d1d 100644
--- a/src/locales/fa/music/genre.ts
+++ b/src/locales/fa/music/genre.ts
@@ -1,19 +1,19 @@
 export default [
-  'راک',
-  'متال',
-  'پاپ',
   'الکترونیک',
-  'محلی',
-  'جهانی',
-  'کانتری',
+  'بلوز',
   'جاز',
-  'فانک',
+  'جهانی',
+  'راک',
+  'رپ',
+  'رگه',
   'سول',
+  'غیرموسیقی',
+  'فانک',
+  'لاتین',
+  'متال',
+  'محلی',
   'هیپ هاپ',
+  'پاپ',
+  'کانتری',
   'کلاسیک',
-  'لاتین',
-  'رگه',
-  'بلوز',
-  'غیرموسیقی',
-  'رپ',
 ];
diff --git a/src/locales/fr/music/genre.ts b/src/locales/fr/music/genre.ts
index 21fac42b065..db156a61d58 100644
--- a/src/locales/fr/music/genre.ts
+++ b/src/locales/fr/music/genre.ts
@@ -1,20 +1,20 @@
 export default [
-  'Rock',
-  'Metal',
-  'Pop',
-  'Électronique',
-  'Folk',
-  'World',
+  'Blues',
+  'Classique',
   'Country',
-  'Jazz',
+  'Folk',
   'Funk',
-  'Soul',
   'Hip Hop',
-  'Classique',
+  'Jazz',
   'Latine',
-  'Reggae',
-  'Blues',
+  'Lofi',
+  'Metal',
+  'Pop',
   'Rap',
+  'Reggae',
+  'Rock',
+  'Soul',
   'Variété',
-  'Lofi',
+  'World',
+  'Électronique',
 ];
diff --git a/src/locales/he/music/genre.ts b/src/locales/he/music/genre.ts
index e9ee9076cf6..8c822af28c3 100644
--- a/src/locales/he/music/genre.ts
+++ b/src/locales/he/music/genre.ts
@@ -1,22 +1,22 @@
 export default [
-  'רוק',
-  'רוק מטאלי',
-  'פופ',
   'אלקטרוני',
-  'מוזיקת עם',
-  'מוזיקת עולם',
-  'קאנטרי',
+  'בלוז',
+  'במה ומסך',
   "ג'אז",
-  'פאנק',
-  'נשמה',
+  'האוס',
   'היפ הופ',
-  'קלאסית',
-  'לטינית',
-  'רגאיי',
-  'במה ומסך',
-  'בלוז',
+  'טראנס',
   'לא מוסיקה',
+  'לטינית',
+  'מוזיקת עולם',
+  'מוזיקת עם',
+  'נשמה',
+  'פאנק',
+  'פופ',
+  'קאנטרי',
+  'קלאסית',
   'ראפ',
-  'טראנס',
-  'האוס',
+  'רגאיי',
+  'רוק',
+  'רוק מטאלי',
 ];
diff --git a/src/locales/ur/music/genre.ts b/src/locales/ur/music/genre.ts
index 24565e3c68f..aa20745921a 100644
--- a/src/locales/ur/music/genre.ts
+++ b/src/locales/ur/music/genre.ts
@@ -1,11 +1,11 @@
 export default [
-  'پاپ',
-  'فلک',
-  'دنیایٰ',
   'جاز',
+  'دنیایٰ',
+  'ریپ',
+  'فلک',
   'فنک',
-  'کلاسکی',
   'لاطینی',
+  'پاپ',
   'پرانی',
-  'ریپ',
+  'کلاسکی',
 ];
diff --git a/src/locales/zh_CN/music/genre.ts b/src/locales/zh_CN/music/genre.ts
index 6977f65a123..4a2426c9097 100644
--- a/src/locales/zh_CN/music/genre.ts
+++ b/src/locales/zh_CN/music/genre.ts
@@ -1,20 +1,20 @@
 export default [
-  '摇滚',
-  '流行',
-  '重金属',
-  '电子',
-  '民谣',
   '世界',
   '乡村',
-  '爵士',
-  '放克',
-  '灵魂',
   '嘻哈',
-  '经典',
   '拉丁',
+  '摇滚',
+  '放克',
+  '民谣',
+  '流行',
+  '灵魂',
+  '爵士',
   '牙买加',
+  '电子',
+  '经典',
+  '舞台与银幕',
   '蓝调',
-  '非音乐',
   '说唱',
-  '舞台与银幕',
+  '重金属',
+  '非音乐',
 ];
diff --git a/src/locales/zh_CN/music/song_name.ts b/src/locales/zh_CN/music/song_name.ts
index 9a8e2283003..aa662bfe6ee 100644
--- a/src/locales/zh_CN/music/song_name.ts
+++ b/src/locales/zh_CN/music/song_name.ts
@@ -1,118 +1,118 @@
 export default [
-  '白月光与朱砂痣',
-  '孤勇者',
-  '稻香',
-  '起风了',
-  '纪念',
-  '晴天',
-  '兰亭序',
-  '我流泪情绪零碎',
-  '七里香',
-  '花海',
-  '反方向的钟',
-  '一路向北',
-  '蒲公英的约定',
-  '夜曲',
-  '搁浅',
-  '海底',
   '105度的你',
-  '明明就',
-  '爱在西元前',
-  '我如此相信',
-  '枫',
-  '青花瓷',
-  '半岛铁盒',
-  '说了再见',
-  '暗号',
-  '退后',
-  '最长的电影',
-  '等你下课',
-  '烟花易冷',
-  '不该',
-  '告白气球',
-  '说好不哭',
-  '轨迹',
-  '红尘客栈',
+  '一点点',
+  '一路向北',
+  '七里香',
+  '不爱我拉倒',
   '不能说的秘密',
-  '珊瑚海',
-  '给我一首歌的时间',
+  '不该',
+  '世界末日',
+  '东风破',
+  '义勇军进行曲',
+  '之战之殇',
+  '以父之名',
   '你听得到',
-  '简单的爱',
-  '龙卷风',
+  '倒影',
+  '兰亭序',
+  '刀马旦',
+  '分裂',
+  '千里之外',
+  '半岛铁盒',
+  '反方向的钟',
   '发如雪',
-  '园游会',
+  '可爱女人',
   '听妈妈的话',
+  '听悲伤的情话',
+  '听见下雨的声音',
+  '告白气球',
+  '周大侠',
+  '哪里都是你',
+  '回到过去',
+  '园游会',
+  '在你身边',
+  '堕',
+  '夏日妄想',
+  '夏至未至',
+  '外婆',
+  '夜曲',
   '夜的第七章',
-  '接口',
-  '手写从前',
+  '大本钟',
+  '大鱼',
+  '奢香夫人',
+  '她的睫毛',
+  '孤勇者',
   '安静',
-  '爱情废材',
-  '以父之名',
-  '我不配',
-  '最伟大的作品',
-  '可爱女人',
+  '小城夏天',
+  '少年',
+  '布拉格广场',
+  '开不了口',
   '彩虹',
-  '回到过去',
-  '听悲伤的情话',
+  '心雨',
+  '忍者',
+  '悬溺',
+  '我不配',
+  '我如此相信',
+  '我流泪情绪零碎',
+  '手写从前',
   '把回忆拼好给你',
-  '东风破',
-  '黑色毛衣',
+  '接口',
+  '搁浅',
+  '断了的弦',
+  '明明就',
+  '星晴',
+  '晴天',
+  '暖暖',
+  '暗号',
+  '最伟大的作品',
+  '最好的安排',
+  '最长的电影',
   '本草纲目',
-  '开不了口',
-  '霍元甲',
+  '枫',
+  '海底',
+  '灯火里的中国',
+  '烟花易冷',
+  '爱在西元前',
+  '爱情废材',
   '爱的飞行日记',
-  '大本钟',
-  '断了的弦',
   '爷爷泡的茶',
-  '星晴',
+  '牛仔很忙',
+  '玫瑰少年',
+  '珊瑚海',
   '甜甜的',
-  '红颜如霜',
-  '粉色海洋',
-  '她的睫毛',
-  '雨下一整晚',
+  '画沙',
+  '白月光与朱砂痣',
   '白色风车',
-  '还在流浪',
-  '阳光宅男',
+  '稻香',
+  '等你下课',
+  '简单的爱',
   '算什么男人',
+  '米兰的小铁匠',
+  '粉色海洋',
+  '红尘客栈',
+  '红颜如霜',
+  '纪念',
+  '给我一首歌的时间',
+  '美人鱼',
+  '花海',
   '菊花台',
-  '千里之外',
+  '蒲公英的约定',
+  '说了再见',
+  '说好不哭',
+  '调查中',
+  '起风了',
+  '超人不会飞',
+  '轨迹',
+  '还在流浪',
+  '退后',
+  '铃芽之旅',
   '错过的烟火',
-  '倒影',
-  '听见下雨的声音',
+  '阳光宅男',
+  '雨下一整晚',
+  '霍元甲',
+  '青花瓷',
+  '飘移',
   '黑色幽默',
+  '黑色毛衣',
   '默',
-  '不爱我拉倒',
-  '之战之殇',
-  '布拉格广场',
-  '美人鱼',
-  '分裂',
-  '心雨',
-  '米兰的小铁匠',
-  '世界末日',
-  '一点点',
-  '外婆',
-  '画沙',
-  '哪里都是你',
-  '刀马旦',
-  '超人不会飞',
-  '牛仔很忙',
-  '周大侠',
-  '飘移',
-  '忍者',
-  '夏日妄想',
-  '铃芽之旅',
-  '玫瑰少年',
-  '大鱼',
-  '灯火里的中国',
-  '义勇军进行曲',
-  '调查中',
-  '少年',
-  '堕',
-  '在你身边',
-  '悬溺',
-  '奢香夫人',
-  '最好的安排',
-  '夏至未至',
-  '小城夏天',
-  '暖暖',
+  '龙卷风',
 ];
diff --git a/test/modules/__snapshots__/music.spec.ts.snap b/test/modules/__snapshots__/music.spec.ts.snap
index c8517e378aa..1060a54e774 100644
--- a/test/modules/__snapshots__/music.spec.ts.snap
+++ b/test/modules/__snapshots__/music.spec.ts.snap
@@ -2,12 +2,12 @@
 
 exports[`music > 42 > genre 1`] = `"German Folk"`;
 
-exports[`music > 42 > songName 1`] = `"God Bless the Child"`;
+exports[`music > 42 > songName 1`] = `"I Honestly Love You"`;
 
 exports[`music > 1211 > genre 1`] = `"Swing"`;
 
-exports[`music > 1211 > songName 1`] = `"The End of the World"`;
+exports[`music > 1211 > songName 1`] = `"Wedding Bell Blues"`;
 
 exports[`music > 1337 > genre 1`] = `"Drinking Songs"`;
 
-exports[`music > 1337 > songName 1`] = `"That'll Be the Day"`;
+exports[`music > 1337 > songName 1`] = `"Frankenstein"`;