diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs
index 718578f47..338f04601 100644
--- a/src/Jackett.Common/Indexers/HDSpace.cs
+++ b/src/Jackett.Common/Indexers/HDSpace.cs
@@ -21,14 +21,10 @@ namespace Jackett.Common.Indexers
         private string LoginUrl => SiteLink + "index.php?page=login";
         private string SearchUrl => SiteLink + "index.php?page=torrents&";
 
-        private new ConfigurationDataBasicLogin configData
-        {
-            get => (ConfigurationDataBasicLogin)base.configData;
-            set => base.configData = value;
-        }
+        private new ConfigurationDataBasicLogin configData => (ConfigurationDataBasicLogin)base.configData;
 
         public HDSpace(IIndexerConfigurationService configService, WebClient wc, Logger l, IProtectionService ps)
-            : base(name: "HD-Space",
+            : base("HD-Space",
                    description: "Sharing The Universe",
                    link: "https://hd-space.org/",
                    caps: TorznabUtil.CreateDefaultTorznabTVCaps(),
@@ -36,7 +32,7 @@ namespace Jackett.Common.Indexers
                    client: wc,
                    logger: l,
                    p: ps,
-            configData: new ConfigurationDataBasicLogin())
+                   configData: new ConfigurationDataBasicLogin())
         {
             Encoding = Encoding.UTF8;
             Language = "en-us";
@@ -47,7 +43,6 @@ namespace Jackett.Common.Indexers
             AddCategoryMapping(15, TorznabCatType.MoviesBluRay); // Movie / Blu-ray
             AddMultiCategoryMapping(TorznabCatType.MoviesHD,
                                     19, // Movie / 1080p
-                                    41, // Movie / 4K UHD
                                     18, // Movie / 720p
                                     40, // Movie / Remux
                                     16 // Movie / HD-DVD
@@ -56,18 +51,24 @@ namespace Jackett.Common.Indexers
                                     21, // TV Show / 720p HDTV
                                     22 // TV Show / 1080p HDTV
                 );
-            AddCategoryMapping(30, TorznabCatType.AudioLossless); // Music / Lossless
-            AddCategoryMapping(31, TorznabCatType.AudioVideo); // Music / Videos
             AddMultiCategoryMapping(TorznabCatType.TVDocumentary,
-                                    24, // TV Show / Documentary / 720p
-                                    25 // TV Show / Documentary / 1080p
+                                    24, // Documentary / 720p
+                                    25 // Documentary / 1080p
                 );
+            AddMultiCategoryMapping(TorznabCatType.TVAnime,
+                                    27, // Animation / 720p
+                                    28 // Animation / 1080p
+                );
+            AddCategoryMapping(30, TorznabCatType.AudioLossless); // Music / HQ Audio
+            AddCategoryMapping(31, TorznabCatType.AudioVideo); // Music / Videos
             AddMultiCategoryMapping(TorznabCatType.XXX,
                                     33, // XXX / 720p
                                     34 // XXX / 1080p
                 );
-            AddCategoryMapping("37", TorznabCatType.PC);
-            AddCategoryMapping("38", TorznabCatType.Other);
+            AddCategoryMapping(36, TorznabCatType.MoviesOther); // Trailers
+            AddCategoryMapping(37, TorznabCatType.PC); // Software
+            AddCategoryMapping(38, TorznabCatType.Other); // Others
+            AddCategoryMapping(41, TorznabCatType.MoviesUHD); // Movie / 4K UHD
         }
 
         public override async Task<IndexerConfigurationStatus> ApplyConfiguration(JToken configJson)