diff --git a/img/torrents/13.png b/img/torrents/13.png
deleted file mode 100644
index d5f41bd4..00000000
Binary files a/img/torrents/13.png and /dev/null differ
diff --git a/img/torrents/15.png b/img/torrents/15.png
index 21c7de03..b1e1ad28 100644
Binary files a/img/torrents/15.png and b/img/torrents/15.png differ
diff --git a/img/torrents/16.png b/img/torrents/16.png
index b1e1ad28..0923ae4f 100644
Binary files a/img/torrents/16.png and b/img/torrents/16.png differ
diff --git a/img/torrents/17.png b/img/torrents/17.png
deleted file mode 100644
index 0923ae4f..00000000
Binary files a/img/torrents/17.png and /dev/null differ
diff --git a/img/torrents/18.png b/img/torrents/18.png
new file mode 100644
index 00000000..21c7de03
Binary files /dev/null and b/img/torrents/18.png differ
diff --git a/templates/index.html b/templates/index.html
index cfa83be4..16ec2113 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -37,7 +37,7 @@
               <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                   <ul class="nav navbar-nav">
                       <li><a href="https://sukebei.pantsu.cat">Fap</a></li>
-                      <li><a href="{{.URL.Parse "/faq"}}">Faq</a></li>
+                      <li><a href="{{.URL.Parse "/faq"}}">FAQ</a></li>
                       <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
                   </ul>
                   <form class="navbar-form navbar-right" role="search" action="/search" method="get">
@@ -45,22 +45,29 @@
 
                           <select name="c" class="form-control input-sm" value>
                             <option value="_">All categories</option>
-                            <option value="1_" {{if eq .Search.Category "1_"}}selected{{end}}>Software</option>
-                            <option value="1_1" {{if eq .Search.Category "1_1"}}selected{{end}}>Software - Applications</option>
-                            <option value="1_2" {{if eq .Search.Category "1_2"}}selected{{end}}>Software - Games</option>
+                            <option value="3_" {{if eq .Search.Category "3_"}}selected{{end}}>Anime</option>
+                            <option value="3_12" {{if eq .Search.Category "3_12"}}selected{{end}}>Anime - Anime Music Video</option>
+                            <option value="3_5" {{if eq .Search.Category "3_5"}}selected{{end}}>Anime - English-translated</option>
+                            <option value="3_13" {{if eq .Search.Category "3_13"}}selected{{end}}>Anime - Non-English-translated</option>
+                            <option value="3_6" {{if eq .Search.Category "3_6"}}selected{{end}}>Anime - Raw</option>
                             <option value="2_" {{if eq .Search.Category "2_"}}selected{{end}}>Audio</option>
                             <option value="2_3" {{if eq .Search.Category "2_3"}}selected{{end}}>Audio - Lossless</option>
                             <option value="2_4" {{if eq .Search.Category "2_4"}}selected{{end}}>Audio - Lossy</option>
-                            <option value="3_" {{if eq .Search.Category "3_"}}selected{{end}}>Anime</option>
-                            <option value="3_5" {{if eq .Search.Category "3_5"}}selected{{end}}>Anime - English-translated</option>
-                            <option value="3_6" {{if eq .Search.Category "3_6"}}selected{{end}}>Anime - Raw</option>
                             <option value="4_" {{if eq .Search.Category "4_"}}selected{{end}}>Literature</option>
                             <option value="4_7" {{if eq .Search.Category "4_7"}}selected{{end}}>Literature - English-translated</option>
                             <option value="4_8" {{if eq .Search.Category "4_8"}}selected{{end}}>Literature - Raw</option>
+                            <option value="4_14" {{if eq .Search.Category "4_14"}}selected{{end}}>Literature - Non-English-translated</option>
                             <option value="5_" {{if eq .Search.Category "5_"}}selected{{end}}>Live Action</option>
                             <option value="5_9" {{if eq .Search.Category "5_9"}}selected{{end}}>Live Action - English-translated</option>
                             <option value="5_10" {{if eq .Search.Category "5_10"}}selected{{end}}>Live Action - Idol/Promotional Video</option>
+                            <option value="5_18" {{if eq .Search.Category "5_18"}}selected{{end}}>Live Action - Non-English-translated</option>
                             <option value="5_11" {{if eq .Search.Category "5_11"}}selected{{end}}>Live Action - Raw</option>
+                            <option value="6_" {{if eq .Search.Category "6_"}}selected{{end}}>Pictures</option>
+                            <option value="6_15" {{if eq .Search.Category "6_15"}}selected{{end}}>Pictures - Graphics</option>
+                            <option value="6_16" {{if eq .Search.Category "6_16"}}selected{{end}}>Pictures - Photos</option>
+                            <option value="1_" {{if eq .Search.Category "1_"}}selected{{end}}>Software</option>
+                            <option value="1_1" {{if eq .Search.Category "1_1"}}selected{{end}}>Software - Applications</option>
+                            <option value="1_2" {{if eq .Search.Category "1_2"}}selected{{end}}>Software - Games</option>
                           </select>
                           <select name="s" class="form-control input-sm">
                             <option value="">Search all</option>