diff --git a/src/Jackett.Common/Definitions/infire.yml b/src/Jackett.Common/Definitions/infire.yml
index 1a2b9801c..308272d27 100644
--- a/src/Jackett.Common/Definitions/infire.yml
+++ b/src/Jackett.Common/Definitions/infire.yml
@@ -10,43 +10,78 @@ links:
 
 caps:
   categorymappings:
-    - {id: 14, cat: Movies/SD, desc: "XviD"}
-    - {id: 15, cat: Movies/HD, desc: "HD 720p"}
-    - {id: 16, cat: Movies/HD, desc: "HD 1080p"}
-    - {id: 17, cat: Movies/DVD, desc: "DVD"}
-    - {id: 18, cat: TV/Documentary, desc: "Dokumentarci"}
-    - {id: 19, cat: Movies/DVD, desc: "DVD/R5"}
-    - {id: 20, cat: Movies/WEB-DL, desc: "WEB/Rip"}
-    - {id: 21, cat: Movies/WEB-DL, desc: "WEB-DL 720p"}
-    - {id: 32, cat: XXX, desc: "XXX"}
-    - {id: 49, cat: Movies/UHD, desc: "HD 2160p"}
-    - {id: 50, cat: Movies/BluRay, desc: "BluRay 1080p"}
-    - {id: 51, cat: Movies/HD, desc: "720p H265"}
-    - {id: 52, cat: Movies/HD, desc: "1080p H265"}
-    - {id: 55, cat: Movies/WEB-DL, desc: "WEB-DL 1080p"}
-    - {id: 23, cat: TV, desc: "TV"}
-    - {id: 24, cat: TV/HD, desc: "HD TV"}
-    - {id: 26, cat: TV/Anime, desc: "Animirano"}
-    - {id: 28, cat: PC/Games, desc: "PC Igre"}
-    - {id: 29, cat: PC/Games, desc: "PC ISO Igre"}
-    - {id: 30, cat: Console/Other, desc: "GBA"}
-    - {id: 31, cat: Console/PS3, desc: "PS2"}
-    - {id: 53, cat: Audio/MP3, desc: "Glasba MP3"}
-    - {id: 54, cat: Audio/Lossless, desc: "Glasba FLAC"}
-    - {id: 34, cat: Console/PS3, desc: "PS3"}
-    - {id: 35, cat: Console/XBox, desc: "Xbox"}
-    - {id: 36, cat: Console/PSP, desc: "PSP"}
-    - {id: 37, cat: TV/Sport, desc: "Sport"}
-    - {id: 38, cat: PC, desc: "Programi"}
-    - {id: 39, cat: Books/EBook, desc: "eKnjige"}
-    - {id: 40, cat: Other, desc: "Slike"}
-    - {id: 41, cat: Audio/Audiobook, desc: "AudioBook"}
-    - {id: 42, cat: Audio/Video, desc: "Music DVD"}
-    - {id: 43, cat: TV/Other, desc: "Videospoti"}
-    - {id: 44, cat: PC/Mobile-Android, desc: "Android"}
-    - {id: 45, cat: PC/Mobile-iOS, desc: "iOS"}
-    - {id: 46, cat: PC/Mac, desc: "Mac"}
-    - {id: 47, cat: PC, desc: "Linux"}
+    # Filmi
+    {id: 14, cat: Movies/SD, desc: "Filmi XviD"}
+    {id: 15, cat: Movies/HD, desc: "Filmi HD 720p"}
+    {id: 16, cat: Movies/HD, desc: "Filmi HD 1080p"}
+    {id: 20, cat: Movies/WEB-DL, desc: "Filmi WEB/Rip"}
+    {id: 21, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 720p"}
+    {id: 49, cat: Movies/UHD, desc: "Filmi HD 2160p"}
+    {id: 50, cat: Movies/HD, desc: "Filmi BluRay 1080p"}
+    {id: 51, cat: Movies/HD, desc: "Filmi 720p H265"}
+    {id: 52, cat: Movies/HD, desc: "Filmi 1080p H265"}
+    {id: 55, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 1080p"}
+    {id: 71, cat: Movies/WEB-DL, desc: "Filmi WEB-DL 2160p"}
+    {id: 72, cat: Movies/HD, desc: "Filmi BluRay 720p"}
+    {id: 73, cat: Movies/HD, desc: "Filmi BluRay Remux"}
+    {id: 74, cat: Movies/UHD, desc: "Filmi UHD Remux"}
+    {id: 77, cat: Movies/HD, desc: "Filmi DrSi"}
+    # TV
+    {id: 23, cat: TV, desc: "TV"}
+    {id: 24, cat: TV/HD, desc: "TV HDTV 720p"}
+    {id: 75, cat: TV/HD, desc: "TV HDTV 1080p"}
+    {id: 76, cat: TV/WEB-DL, desc: "TV WEB/Rip"}
+    {id: 78, cat: TV/WEB-DL, desc: "TV WEB-DL 720p"}
+    {id: 79, cat: TV/WEB-DL, desc: "TV WEB-DL 1080p"}
+    {id: 80, cat: TV/WEB-DL, desc: "TV WEB-DL 2160p"}
+    {id: 81, cat: TV/HD, desc: "TV BluRay 720p"}
+    {id: 82, cat: TV/HD, desc: "TV BluRay 1080p"}
+    # Risanke
+    {id: 26, cat: Movies/Other, desc: "Animirano"}
+    {id: 56, cat: TV/Anime, desc: "Anime"}
+    {id: 93, cat: Movies/Other, desc: "SLOSiNH"}
+    # Igre
+    {id: 29, cat: PC/Games, desc: "Igre PC ISO"}
+    {id: 30, cat: Console/Wii, desc: "Igre Nintendo"}
+    {id: 31, cat: Console/PS2, desc: "Igre Playstation"}
+    {id: 34, cat: Console/XBox One, desc: "Igre Xbox"}
+    {id: 83, cat: PC/Games, desc: "Igre Repack"}
+    # Glasba
+    {id: 42, cat: Audio/Video, desc: "Music DVD"}
+    {id: 43, cat: Audio/Video, desc: "Glasba Videospoti"}
+    {id: 53, cat: Audio/MP3, desc: "Glasba MP3"}
+    {id: 54, cat: Audio/Lossless, desc: "Glasba FLAC"}
+    {id: 62, cat: Audio/Video, desc: "Koncerti"}
+    # Sport
+    {id: 37, cat: TV/Sport, desc: "Sport"}
+    # XXX
+    {id: 60, cat: XXX/Other, desc: "XXX Revije"}
+    {id: 61, cat: XXX/Pack, desc: "XXX Packs"}
+    {id: 66, cat: XXX/SD, desc: "XXX 480p"}
+    {id: 67, cat: XXX/HD, desc: "XXX 720p"}
+    {id: 68, cat: XXX/HD, desc: "XXX 1080p"}
+    {id: 69, cat: XXX/UHD, desc: "XXX 2160p"}
+    {id: 84, cat: XXX/ImageSet, desc: "XXX Slike"}
+    # Disc
+    {id: 85, cat: Movies/DVD, desc: "DVD 5"}
+    {id: 86, cat: Movies/DVD, desc: "DVD 9"}
+    {id: 87, cat: Movies/BluRay, desc: "BD 25"}
+    {id: 88, cat: Movies/BluRay, desc: "BD 50"}
+    {id: 89, cat: Movies/BluRay, desc: "UHD 50"}
+    {id: 90, cat: Movies/BluRay, desc: "UHD 66"}
+    {id: 91, cat: Movies/BluRay, desc: "UHD 100"}
+    # Razno
+    {id: 38, cat: PC/0day, desc: "Programi"}
+    {id: 39, cat: Books/EBook, desc: "eKnjige"}
+    {id: 40, cat: Other, desc: "Slike"}
+    {id: 41, cat: Audio/Audiobook, desc: "AudioBook"}
+    {id: 44, cat: PC/Mobile-Android, desc: "Android"}
+    {id: 45, cat: PC/Mobile-iOS, desc: "iOS"}
+    {id: 46, cat: PC/Mac, desc: "Mac"}
+    {id: 47, cat: PC/ISO, desc: "Linux"}
+    # Dokumentarni
+    {id: 95, cat: TV/Documentary, desc: "Dokumentarni Film"}
+    {id: 96, cat: TV/Documentary, desc: "Dokumentarna Serija"}
 
   modes:
     search: [q]