diff --git a/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs b/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs
index 506c36e45..6ce5cde8a 100644
--- a/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs
+++ b/src/NzbDrone.Core/Indexers/Definitions/XSpeeds.cs
@@ -121,53 +121,49 @@ private IndexerCapabilities SetCapabilities()
         caps.Categories.AddCategoryMapping(112, NewznabStandardCategory.MoviesOther, "Anime Movies");
         caps.Categories.AddCategoryMapping(111, NewznabStandardCategory.MoviesOther, "Anime TV");
         caps.Categories.AddCategoryMapping(150, NewznabStandardCategory.PC, "Apps");
-        caps.Categories.AddCategoryMapping(156, NewznabStandardCategory.TV, "AV1");
-        caps.Categories.AddCategoryMapping(156, NewznabStandardCategory.Movies, "AV1");
-        caps.Categories.AddCategoryMapping(159, NewznabStandardCategory.Movies, "Movie Boxsets AV1");
-        caps.Categories.AddCategoryMapping(158, NewznabStandardCategory.Movies, "Movies AV1");
-        caps.Categories.AddCategoryMapping(157, NewznabStandardCategory.TV, "TV AV1");
-        caps.Categories.AddCategoryMapping(160, NewznabStandardCategory.TV, "TV Boxsets AV1");
         caps.Categories.AddCategoryMapping(153, NewznabStandardCategory.Books, "Books");
-        caps.Categories.AddCategoryMapping(154, NewznabStandardCategory.AudioAudiobook, "Audiobooks");
-        caps.Categories.AddCategoryMapping(155, NewznabStandardCategory.Books, "Books & Magazines");
+        caps.Categories.AddCategoryMapping(154, NewznabStandardCategory.AudioAudiobook, "Books Audiobooks");
+        caps.Categories.AddCategoryMapping(155, NewznabStandardCategory.Books, "Books eBooks & Magazines");
         caps.Categories.AddCategoryMapping(68, NewznabStandardCategory.MoviesOther, "Cams/TS");
         caps.Categories.AddCategoryMapping(140, NewznabStandardCategory.TVDocumentary, "Documentary");
         caps.Categories.AddCategoryMapping(10, NewznabStandardCategory.MoviesDVD, "DVDR");
-        caps.Categories.AddCategoryMapping(109, NewznabStandardCategory.MoviesBluRay, "Bluray Disc");
+        caps.Categories.AddCategoryMapping(109, NewznabStandardCategory.MoviesBluRay, "DVDR Bluray Disc");
         caps.Categories.AddCategoryMapping(131, NewznabStandardCategory.TVSport, "Fighting");
-        caps.Categories.AddCategoryMapping(134, NewznabStandardCategory.TVSport, "Fighting/Boxing");
-        caps.Categories.AddCategoryMapping(133, NewznabStandardCategory.TVSport, "Fighting/MMA");
-        caps.Categories.AddCategoryMapping(132, NewznabStandardCategory.TVSport, "Fighting/Wrestling");
+        caps.Categories.AddCategoryMapping(134, NewznabStandardCategory.TVSport, "Fighting Boxing");
+        caps.Categories.AddCategoryMapping(133, NewznabStandardCategory.TVSport, "Fighting MMA");
+        caps.Categories.AddCategoryMapping(132, NewznabStandardCategory.TVSport, "Fighting Wrestling");
         caps.Categories.AddCategoryMapping(72, NewznabStandardCategory.MoviesForeign, "Foreign");
         caps.Categories.AddCategoryMapping(116, NewznabStandardCategory.TVForeign, "Foreign Boxsets");
         caps.Categories.AddCategoryMapping(114, NewznabStandardCategory.MoviesForeign, "Foreign Movies");
         caps.Categories.AddCategoryMapping(115, NewznabStandardCategory.TVForeign, "Foreign TV");
         caps.Categories.AddCategoryMapping(103, NewznabStandardCategory.ConsoleOther, "Games Console");
-        caps.Categories.AddCategoryMapping(105, NewznabStandardCategory.ConsoleOther, "Games Console/Nintendo");
-        caps.Categories.AddCategoryMapping(104, NewznabStandardCategory.ConsolePS4, "Games Console/Playstation");
-        caps.Categories.AddCategoryMapping(106, NewznabStandardCategory.ConsoleXBox, "Games Console/XBOX");
+        caps.Categories.AddCategoryMapping(105, NewznabStandardCategory.ConsoleOther, "Games Console Nintendo");
+        caps.Categories.AddCategoryMapping(104, NewznabStandardCategory.ConsolePS4, "Games Console Playstation");
+        caps.Categories.AddCategoryMapping(106, NewznabStandardCategory.ConsoleXBox, "Games Console XBOX");
         caps.Categories.AddCategoryMapping(6, NewznabStandardCategory.PCGames, "Games PC");
-        caps.Categories.AddCategoryMapping(108, NewznabStandardCategory.PC, "Games PC/Linux");
-        caps.Categories.AddCategoryMapping(107, NewznabStandardCategory.PCMac, "Games PC/Mac");
+        caps.Categories.AddCategoryMapping(108, NewznabStandardCategory.PC, "Games PC Linux");
+        caps.Categories.AddCategoryMapping(107, NewznabStandardCategory.PCMac, "Games PC Mac");
         caps.Categories.AddCategoryMapping(11, NewznabStandardCategory.Movies, "Movie Boxsets");
-        caps.Categories.AddCategoryMapping(118, NewznabStandardCategory.MoviesUHD, "Movie Boxsets/Boxset 4K");
-        caps.Categories.AddCategoryMapping(143, NewznabStandardCategory.MoviesHD, "Movie Boxsets/Boxset HD");
-        caps.Categories.AddCategoryMapping(119, NewznabStandardCategory.MoviesHD, "Movie Boxsets/Boxset HEVC");
-        caps.Categories.AddCategoryMapping(144, NewznabStandardCategory.MoviesSD, "Movie Boxsets/Boxset SD");
+        caps.Categories.AddCategoryMapping(118, NewznabStandardCategory.MoviesUHD, "Movie Boxsets 4K");
+        caps.Categories.AddCategoryMapping(162, NewznabStandardCategory.MoviesHD, "Movie Boxsets AV1");
+        caps.Categories.AddCategoryMapping(143, NewznabStandardCategory.MoviesHD, "Movie Boxsets HD");
+        caps.Categories.AddCategoryMapping(119, NewznabStandardCategory.MoviesHD, "Movie Boxsets HEVC");
+        caps.Categories.AddCategoryMapping(144, NewznabStandardCategory.MoviesSD, "Movie Boxsets SD");
         caps.Categories.AddCategoryMapping(12, NewznabStandardCategory.Movies, "Movies");
         caps.Categories.AddCategoryMapping(117, NewznabStandardCategory.MoviesUHD, "Movies 4K");
+        caps.Categories.AddCategoryMapping(163, NewznabStandardCategory.MoviesHD, "Movies AV1");
         caps.Categories.AddCategoryMapping(145, NewznabStandardCategory.MoviesHD, "Movies HD");
         caps.Categories.AddCategoryMapping(100, NewznabStandardCategory.MoviesHD, "Movies HEVC");
         caps.Categories.AddCategoryMapping(146, NewznabStandardCategory.MoviesSD, "Movies SD");
         caps.Categories.AddCategoryMapping(13, NewznabStandardCategory.Audio, "Music");
-        caps.Categories.AddCategoryMapping(135, NewznabStandardCategory.AudioLossless, "Music/FLAC");
-        caps.Categories.AddCategoryMapping(151, NewznabStandardCategory.Audio, "Karaoke");
+        caps.Categories.AddCategoryMapping(135, NewznabStandardCategory.AudioLossless, "Music FLAC");
+        caps.Categories.AddCategoryMapping(151, NewznabStandardCategory.Audio, "Music Karaoke");
         caps.Categories.AddCategoryMapping(136, NewznabStandardCategory.Audio, "Music Boxset");
         caps.Categories.AddCategoryMapping(148, NewznabStandardCategory.AudioVideo, "Music Videos");
         caps.Categories.AddCategoryMapping(9, NewznabStandardCategory.Other, "Other");
-        caps.Categories.AddCategoryMapping(125, NewznabStandardCategory.Other, "Other/Pictures");
-        caps.Categories.AddCategoryMapping(54, NewznabStandardCategory.TVOther, "Soaps");
-        caps.Categories.AddCategoryMapping(83, NewznabStandardCategory.TVOther, "Specials");
+        caps.Categories.AddCategoryMapping(125, NewznabStandardCategory.Other, "Other Pictures");
+        caps.Categories.AddCategoryMapping(54, NewznabStandardCategory.TVOther, "Other Soaps");
+        caps.Categories.AddCategoryMapping(83, NewznabStandardCategory.TVOther, "Other Specials");
         caps.Categories.AddCategoryMapping(139, NewznabStandardCategory.TV, "TOTM (Freeleech)");
         caps.Categories.AddCategoryMapping(138, NewznabStandardCategory.TV, "TOTW (x2 upload)");
         caps.Categories.AddCategoryMapping(139, NewznabStandardCategory.Movies, "TOTM (Freeleech)");
@@ -177,16 +173,18 @@ private IndexerCapabilities SetCapabilities()
         caps.Categories.AddCategoryMapping(86, NewznabStandardCategory.TVSport, "Sports/MotorSports");
         caps.Categories.AddCategoryMapping(89, NewznabStandardCategory.TVSport, "Sports/Olympics");
         caps.Categories.AddCategoryMapping(126, NewznabStandardCategory.TV, "TV");
-        caps.Categories.AddCategoryMapping(149, NewznabStandardCategory.TV, "TV Specials");
         caps.Categories.AddCategoryMapping(127, NewznabStandardCategory.TVUHD, "TV 4K");
+        caps.Categories.AddCategoryMapping(164, NewznabStandardCategory.TVHD, "TV AV1");
         caps.Categories.AddCategoryMapping(129, NewznabStandardCategory.TVHD, "TV HD");
         caps.Categories.AddCategoryMapping(130, NewznabStandardCategory.TVHD, "TV HEVC");
         caps.Categories.AddCategoryMapping(128, NewznabStandardCategory.TVSD, "TV SD");
+        caps.Categories.AddCategoryMapping(149, NewznabStandardCategory.TV, "TV Specials");
         caps.Categories.AddCategoryMapping(21, NewznabStandardCategory.TVSD, "TV Boxsets");
-        caps.Categories.AddCategoryMapping(120, NewznabStandardCategory.TVUHD, "Boxset TV 4K");
-        caps.Categories.AddCategoryMapping(76, NewznabStandardCategory.TVHD, "Boxset TV HD");
-        caps.Categories.AddCategoryMapping(97, NewznabStandardCategory.TVHD, "Boxset TV HEVC");
-        caps.Categories.AddCategoryMapping(147, NewznabStandardCategory.TVSD, "Boxset TV SD");
+        caps.Categories.AddCategoryMapping(120, NewznabStandardCategory.TVUHD, "TV Boxset 4K");
+        caps.Categories.AddCategoryMapping(165, NewznabStandardCategory.TVUHD, "TV Boxset AV1");
+        caps.Categories.AddCategoryMapping(76, NewznabStandardCategory.TVHD, "TV Boxset HD");
+        caps.Categories.AddCategoryMapping(97, NewznabStandardCategory.TVHD, "TV Boxset HEVC");
+        caps.Categories.AddCategoryMapping(147, NewznabStandardCategory.TVSD, "TV Boxset SD");
 
         return caps;
     }