diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs
index f2968ab2b..5514cf47a 100644
--- a/src/Jackett.Common/Indexers/TorrentHeaven.cs
+++ b/src/Jackett.Common/Indexers/TorrentHeaven.cs
@@ -44,52 +44,53 @@ namespace Jackett.Indexers
             Language = "de-de";
             Type = "private";
 
-            AddCategoryMapping(1, TorznabCatType.PCGames); // GAMES/PC
-            AddCategoryMapping(3, TorznabCatType.Console); // GAMES/Sonstige
-            AddCategoryMapping(59, TorznabCatType.ConsolePS4); // GAMES/PlayStation
-            AddCategoryMapping(60, TorznabCatType.ConsolePSP); // GAMES/PSP
-            AddCategoryMapping(63, TorznabCatType.ConsoleWii); // GAMES/Wii
-            AddCategoryMapping(67, TorznabCatType.ConsoleXbox360); // GAMES/XBOX 360
-            AddCategoryMapping(68, TorznabCatType.PCPhoneOther); // GAMES/PDA / Handy
-            AddCategoryMapping(72, TorznabCatType.ConsoleNDS); // GAMES/NDS
+            AddCategoryMapping(1, TorznabCatType.PCGames, "GAMES/PC");
+            AddCategoryMapping(3, TorznabCatType.Console, "GAMES/Sonstige");
+            AddCategoryMapping(59, TorznabCatType.ConsolePS4, "GAMES/PlayStation");
+            AddCategoryMapping(60, TorznabCatType.ConsolePSP, "GAMES/PSP");
+            AddCategoryMapping(63, TorznabCatType.ConsoleWii, "GAMES/Wii");
+            AddCategoryMapping(67, TorznabCatType.ConsoleXbox360, "GAMES/XBOX 360");
+            AddCategoryMapping(68, TorznabCatType.PCPhoneOther, "GAMES/PDA / Handy");
+            AddCategoryMapping(72, TorznabCatType.ConsoleNDS, "GAMES/NDS");
 
-            AddCategoryMapping(7, TorznabCatType.MoviesDVD); // MOVIES/DVD
-            AddCategoryMapping(8, TorznabCatType.MoviesSD); // MOVIES/SD
-            AddCategoryMapping(37, TorznabCatType.MoviesDVD); // MOVIES/DVD Spezial
-            AddCategoryMapping(41, TorznabCatType.MoviesForeign); // MOVIES/International
-            AddCategoryMapping(101, TorznabCatType.MoviesHD); // MOVIES/720p
-            AddCategoryMapping(102, TorznabCatType.MoviesHD); // MOVIES/1080p
-            AddCategoryMapping(103, TorznabCatType.MoviesHD); // MOVIES/AVCHD
-            AddCategoryMapping(104, TorznabCatType.MoviesBluRay); // MOVIES/Bluray
-            AddCategoryMapping(106, TorznabCatType.Movies3D); // MOVIES/3D
+            AddCategoryMapping(7, TorznabCatType.MoviesDVD, "MOVIES/DVD");
+            AddCategoryMapping(8, TorznabCatType.MoviesSD, "MOVIES/SD");
+            AddCategoryMapping(37, TorznabCatType.MoviesDVD, "MOVIES/DVD Spezial");
+            AddCategoryMapping(41, TorznabCatType.MoviesForeign, "MOVIES/International");
+            AddCategoryMapping(101, TorznabCatType.MoviesHD, "MOVIES/720p");
+            AddCategoryMapping(102, TorznabCatType.MoviesHD, "MOVIES/1080p");
+            AddCategoryMapping(103, TorznabCatType.MoviesHD, "MOVIES/AVCHD");
+            AddCategoryMapping(104, TorznabCatType.MoviesBluRay, "MOVIES/Bluray");
+            AddCategoryMapping(106, TorznabCatType.Movies3D, "MOVIES/3D");
+            AddCategoryMapping(109, TorznabCatType.MoviesUHD, "MOVIES/4K");
 
-            AddCategoryMapping(14, TorznabCatType.Audio); // AUDIO/Musik
-            AddCategoryMapping(15, TorznabCatType.AudioAudiobook); // AUDIO/Hörbücher
-            AddCategoryMapping(16, TorznabCatType.AudioAudiobook); // AUDIO/Hörspiele
-            AddCategoryMapping(36, TorznabCatType.AudioLossless); // AUDIO/Flac
-            AddCategoryMapping(42, TorznabCatType.AudioOther); // AUDIO/Soundtracks
-            AddCategoryMapping(58, TorznabCatType.AudioVideo); // AUDIO/Musikvideos
+            AddCategoryMapping(14, TorznabCatType.Audio, "AUDIO/Musik");
+            AddCategoryMapping(15, TorznabCatType.AudioAudiobook, "AUDIO/Hörbücher");
+            AddCategoryMapping(16, TorznabCatType.AudioAudiobook, "AUDIO/Hörspiele");
+            AddCategoryMapping(36, TorznabCatType.AudioLossless, "AUDIO/Flac");
+            AddCategoryMapping(42, TorznabCatType.AudioOther, "AUDIO/Soundtracks");
+            AddCategoryMapping(58, TorznabCatType.AudioVideo, "AUDIO/Musikvideos");
 
-            AddCategoryMapping(18, TorznabCatType.TVSD); // TV/Serien SD
-            AddCategoryMapping(19, TorznabCatType.TVHD); // TV/Serien HD 720p
-            AddCategoryMapping(20, TorznabCatType.TVHD); // TV/Serien HD 1080p
-            AddCategoryMapping(49, TorznabCatType.TVSD); // TV/Serien DVD
-            AddCategoryMapping(51, TorznabCatType.TVDocumentary); // TV/Doku SD
-            AddCategoryMapping(52, TorznabCatType.TVDocumentary); // TV/Doku HD
-            AddCategoryMapping(53, TorznabCatType.TV); // TV/Serien Complete Packs
-            AddCategoryMapping(54, TorznabCatType.TVSport); // TV/Sport
-            AddCategoryMapping(66, TorznabCatType.TVFOREIGN); // TV/International
+            AddCategoryMapping(18, TorznabCatType.TVSD, "TV/Serien SD");
+            AddCategoryMapping(19, TorznabCatType.TVHD, "TV/Serien HD 720p");
+            AddCategoryMapping(20, TorznabCatType.TVHD, "TV/Serien HD 1080p");
+            AddCategoryMapping(49, TorznabCatType.TVSD, "TV/Serien DVD");
+            AddCategoryMapping(51, TorznabCatType.TVDocumentary, "TV/Doku SD");
+            AddCategoryMapping(52, TorznabCatType.TVDocumentary, "TV/Doku HD");
+            AddCategoryMapping(53, TorznabCatType.TV, "TV/Serien Complete Packs");
+            AddCategoryMapping(54, TorznabCatType.TVSport, "TV/Sport");
+            AddCategoryMapping(66, TorznabCatType.TVFOREIGN, "TV/International");
 
-            AddCategoryMapping(22, TorznabCatType.Books); // MISC/EBooks
-            AddCategoryMapping(24, TorznabCatType.Other); // MISC/Sonstiges
-            AddCategoryMapping(25, TorznabCatType.Other); // MISC/Tonspuren
-            AddCategoryMapping(108, TorznabCatType.TVAnime); // MISC/Anime
+            AddCategoryMapping(22, TorznabCatType.Books, "MISC/EBooks");
+            AddCategoryMapping(24, TorznabCatType.Other, "MISC/Sonstiges");
+            AddCategoryMapping(25, TorznabCatType.Other, "MISC/Tonspuren");
+            AddCategoryMapping(108, TorznabCatType.TVAnime, "MISC/Anime");
 
-            AddCategoryMapping(28, TorznabCatType.PC); // APPLICATIONS/PC
-            AddCategoryMapping(29, TorznabCatType.PCPhoneOther); // APPLICATIONS/Mobile
-            AddCategoryMapping(30, TorznabCatType.PC); // APPLICATIONS/Sonstige
-            AddCategoryMapping(70, TorznabCatType.PC); // APPLICATIONS/Linux
-            AddCategoryMapping(71, TorznabCatType.PCMac); // APPLICATIONS/Mac
+            AddCategoryMapping(28, TorznabCatType.PC, "APPLICATIONS/PC");
+            AddCategoryMapping(29, TorznabCatType.PCPhoneOther, "APPLICATIONS/Mobile");
+            AddCategoryMapping(30, TorznabCatType.PC, "APPLICATIONS/Sonstige");
+            AddCategoryMapping(70, TorznabCatType.PC, "APPLICATIONS/Linux");
+            AddCategoryMapping(71, TorznabCatType.PCMac, "APPLICATIONS/Mac");
 
             webclient.AddTrustedCertificate(new Uri(SiteLink).Host, certificateHash);
         }