diff --git a/templates/_search.html b/templates/_search.html
index 0b92998a..f555ba90 100644
--- a/templates/_search.html
+++ b/templates/_search.html
@@ -7,9 +7,9 @@
     <option value="1_2" {{if eq .Search.Category "1_2"}}selected{{end}}>{{T "art_doujinshi"}}</option>
     <option value="1_3" {{if eq .Search.Category "1_3"}}selected{{end}}>{{T "art_games"}}</option>
     <option value="1_4" {{if eq .Search.Category "1_4"}}selected{{end}}>{{T "art_manga"}}</option>
-    <option value="1_5" {{if eq .Search.Category "1_5"}}selected{{end}}>{{T  "art_pictures"}}</option>
+    <option value="1_5" {{if eq .Search.Category "1_5"}}selected{{end}}>{{T "art_pictures"}}</option>
     <option value="2_" {{if eq .Search.Category "2_"}}selected{{end}}>{{T "real_life"}}</option>
-    <option value="2_1" {{if eq .Search.Category "2_1"}}selected{{end}}>{{T "real_life_photobooks_and_Pictures"}}</option>
+    <option value="2_1" {{if eq .Search.Category "2_1"}}selected{{end}}>{{T "real_life_photobooks_and_pictures"}}</option>
     <option value="2_2" {{if eq .Search.Category "2_2"}}selected{{end}}>{{T "real_life_videos"}}</option>
     {{ else }}
     <option value="3_" {{if eq .Search.Category "3_"}}selected{{end}}>{{T "anime"}}</option>
diff --git a/templates/upload.html b/templates/upload.html
index d50076c5..a77300e2 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -22,42 +22,33 @@
       <div class="form-group">
           <label for="c">{{T "category"}}</label>
           <select name="c" id="c" class="form-control input-sm" required>
-
               <option value="">{{T "select_a_torrent_category"}}</option>
               {{ if Sukebei }}
-              <option value="1_" {{if eq .Search.Category "1_"}}selected{{end}}>{{T "art"}}</option>
-              <option value="1_1" {{if eq .Search.Category "1_1"}}selected{{end}}>{{T "art_anime"}}</option>
-              <option value="1_2" {{if eq .Search.Category "1_2"}}selected{{end}}>{{T "art_doujinshi"}}</option>
-              <option value="1_3" {{if eq .Search.Category "1_3"}}selected{{end}}>{{T "art_games"}}</option>
-              <option value="1_4" {{if eq .Search.Category "1_4"}}selected{{end}}>{{T "art_manga"}}</option>
-              <option value="1_5" {{if eq .Search.Category "1_5"}}selected{{end}}>{{T  "art_pictures"}}</option>
-              <option value="2_" {{if eq .Search.Category "2_"}}selected{{end}}>{{T "real_life"}}</option>
-              <option value="2_1" {{if eq .Search.Category "2_1"}}selected{{end}}>{{T "real_life_photobooks_and_Pictures"}}</option>
-              <option value="2_2" {{if eq .Search.Category "2_2"}}selected{{end}}>{{T "real_life_videos"}}</option>
+              <option value="1_1" {{if eq .Category "1_1"}}selected{{end}}>{{T "art_anime"}}</option>
+              <option value="1_2" {{if eq .Category "1_2"}}selected{{end}}>{{T "art_doujinshi"}}</option>
+              <option value="1_3" {{if eq .Category "1_3"}}selected{{end}}>{{T "art_games"}}</option>
+              <option value="1_4" {{if eq .Category "1_4"}}selected{{end}}>{{T "art_manga"}}</option>
+              <option value="1_5" {{if eq .Category "1_5"}}selected{{end}}>{{T "art_pictures"}}</option>
+              <option value="2_1" {{if eq .Category "2_1"}}selected{{end}}>{{T "real_life_photobooks_and_pictures"}}</option>
+              <option value="2_2" {{if eq .Category "2_2"}}selected{{end}}>{{T "real_life_videos"}}</option>
               {{ else }}
-              <option value="3_" {{if eq .Search.Category "3_"}}selected{{end}}>{{T "anime"}}</option>
-              <option value="3_12" {{if eq .Search.Category "3_12"}}selected{{end}}>{{T "anime_amv"}}</option>
-              <option value="3_5" {{if eq .Search.Category "3_5"}}selected{{end}}>{{T "anime_english_translated"}}</option>
-              <option value="3_13" {{if eq .Search.Category "3_13"}}selected{{end}}>{{T "anime_non_english_translated"}}</option>
-              <option value="3_6" {{if eq .Search.Category "3_6"}}selected{{end}}>{{T "anime_raw"}}</option>
-              <option value="2_" {{if eq .Search.Category "2_"}}selected{{end}}>{{T "audio"}}</option>
-              <option value="2_3" {{if eq .Search.Category "2_3"}}selected{{end}}>{{T "audio_lossless"}}</option>
-              <option value="2_4" {{if eq .Search.Category "2_4"}}selected{{end}}>{{T "audio_lossy"}}</option>
-              <option value="4_" {{if eq .Search.Category "4_"}}selected{{end}}>{{T "literature"}}</option>
-              <option value="4_7" {{if eq .Search.Category "4_7"}}selected{{end}}>{{T "literature_english_translated"}}</option>
-              <option value="4_8" {{if eq .Search.Category "4_8"}}selected{{end}}>{{T "literature_raw"}}</option>
-              <option value="4_14" {{if eq .Search.Category "4_14"}}selected{{end}}>{{T "literature_non_english_translated"}}</option>
-              <option value="5_" {{if eq .Search.Category "5_"}}selected{{end}}>{{T "live_action"}}</option>
-              <option value="5_9" {{if eq .Search.Category "5_9"}}selected{{end}}>{{T "live_action_english_translated"}}</option>
-              <option value="5_10" {{if eq .Search.Category "5_10"}}selected{{end}}>{{T "live_action_idol_pv"}}</option>
-              <option value="5_18" {{if eq .Search.Category "5_18"}}selected{{end}}>{{T "live_action_non_english_translated"}}</option>
-              <option value="5_11" {{if eq .Search.Category "5_11"}}selected{{end}}>{{T "live_action_raw"}}</option>
-              <option value="6_" {{if eq .Search.Category "6_"}}selected{{end}}>{{T "pictures"}}</option>
-              <option value="6_15" {{if eq .Search.Category "6_15"}}selected{{end}}>{{T "pictures_graphics"}}</option>
-              <option value="6_16" {{if eq .Search.Category "6_16"}}selected{{end}}>{{T "pictures_photos"}}</option>
-              <option value="1_" {{if eq .Search.Category "1_"}}selected{{end}}>{{T "software"}}</option>
-              <option value="1_1" {{if eq .Search.Category "1_1"}}selected{{end}}>{{T "software_applications"}}</option>
-              <option value="1_2" {{if eq .Search.Category "1_2"}}selected{{end}}>{{T "software_games"}}</option>
+              <option value="3_12" {{if eq .Category "3_12"}}selected{{end}}>{{T "anime_amv"}}</option>
+              <option value="3_5" {{if eq .Category "3_5"}}selected{{end}}>{{T "anime_english_translated"}}</option>
+              <option value="3_13" {{if eq .Category "3_13"}}selected{{end}}>{{T "anime_non_english_translated"}}</option>
+              <option value="3_6" {{if eq .Category "3_6"}}selected{{end}}>{{T "anime_raw"}}</option>
+              <option value="2_3" {{if eq .Category "2_3"}}selected{{end}}>{{T "audio_lossless"}}</option>
+              <option value="2_4" {{if eq .Category "2_4"}}selected{{end}}>{{T "audio_lossy"}}</option>
+              <option value="4_7" {{if eq .Category "4_7"}}selected{{end}}>{{T "literature_english_translated"}}</option>
+              <option value="4_8" {{if eq .Category "4_8"}}selected{{end}}>{{T "literature_raw"}}</option>
+              <option value="4_14" {{if eq .Category "4_14"}}selected{{end}}>{{T "literature_non_english_translated"}}</option>
+              <option value="5_9" {{if eq .Category "5_9"}}selected{{end}}>{{T "live_action_english_translated"}}</option>
+              <option value="5_10" {{if eq .Category "5_10"}}selected{{end}}>{{T "live_action_idol_pv"}}</option>
+              <option value="5_18" {{if eq .Category "5_18"}}selected{{end}}>{{T "live_action_non_english_translated"}}</option>
+              <option value="5_11" {{if eq .Category "5_11"}}selected{{end}}>{{T "live_action_raw"}}</option>
+              <option value="6_15" {{if eq .Category "6_15"}}selected{{end}}>{{T "pictures_graphics"}}</option>
+              <option value="6_16" {{if eq .Category "6_16"}}selected{{end}}>{{T "pictures_photos"}}</option>
+              <option value="1_1" {{if eq .Category "1_1"}}selected{{end}}>{{T "software_applications"}}</option>
+              <option value="1_2" {{if eq .Category "1_2"}}selected{{end}}>{{T "software_games"}}</option>
               {{ end }}
           </select>
       </div>
diff --git a/translations/en-us.all.json b/translations/en-us.all.json
index c1e06cbe..37432d4e 100644
--- a/translations/en-us.all.json
+++ b/translations/en-us.all.json
@@ -459,6 +459,38 @@
     "id": "software_games",
     "translation": "Software - Games"
   },
+  {
+    "id": "art",
+    "translation": "Art"
+  },
+  {
+    "id": "art_anime",
+    "translation": "Art - Anime"
+  },
+  {
+    "id": "art_doujinshi",
+    "translation": "Art - Doujinshi"
+  },
+  {
+    "id": "art_games",
+    "translation": "Art - Games"
+  },
+  {
+    "id": "art_manga",
+    "translation": "Art - Manga"
+  },
+  {
+    "id": "real_life",
+    "translation": "Real Life"
+  },
+  {
+    "id": "real_life_photobooks_and_pictures",
+    "translation": "Real Life - Photobooks and Pictures"
+  },
+  {
+    "id": "real_life_videos",
+    "translation": "Real Life - Videos"
+  },
   {
     "id": "torrent_description",
     "translation": "Torrent Description"