diff --git a/service/user/locale/en-us.all.json b/service/user/locale/en-us.all.json
index 1998a873..647d8868 100644
--- a/service/user/locale/en-us.all.json
+++ b/service/user/locale/en-us.all.json
@@ -122,5 +122,57 @@
   {
     "id":"see_more_torrents_from",
     "translation": "See more torrents from %s "
+  },
+  {
+	"id":"category",
+	"translation": "Category"
+  },
+  {
+    "id": "name",
+    "translation": "Name"
+  },
+  {
+    "id": "date",
+    "translation": "Date"
+  },
+  {
+    "id": "size",
+    "translation": "Size"
+  },
+  {
+    "id": "links",
+    "translation": "Links"
+  },
+  {
+    "id": "home",
+    "translation": "Home"
+  },
+  {
+    "id": "error_404",
+    "translation": "Error 404"
+  },
+  {
+    "id": "toggle_navigation",
+    "translation": "Toggle navigation"
+  },
+  {
+    "id": "upload",
+    "translation": "Upload"
+  },
+  {
+    "id": "faq",
+    "translation": "FAQ"
+  },
+  {
+    "id": "fap",
+    "translation": "Fap"
+  },
+  {
+    "id": "advanced_search",
+    "translation": "Advanced Search"
+  },
+  {
+    "id": "nothing_here",
+    "translation": "Nothing Here."
   }
 ]
diff --git a/templates/home.html b/templates/home.html
index c39ec9e6..8a37d437 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -1,4 +1,4 @@
-{{define "title"}}Home{{end}}
+{{define "title"}}{{T "home"}}{{end}}
 {{define "contclass"}}cont-home{{end}}
 {{define "content"}}
 	<div class="blockBody">
@@ -11,11 +11,11 @@
       <div class="table-responsive">
           <table class="table custom-table-hover">
           <tr>
-              <th>Category</th>
-              <th>Name</th>
-              <th>Date</th>
-              <th>Size</th>
-              <th>Links</th>
+			  <th>{{T "category"}}</th>
+			  <th>{{T "name"}}</th>
+			  <th>{{T "date"}}</th>
+			  <th>{{T "size"}}</th>
+			  <th>{{T "links"}}</th>
           </tr>
           {{ range .ListTorrents}}
           <tr class="torrent-info
diff --git a/templates/index.html b/templates/index.html
index 30a0d98b..f85e3fbf 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <title>Nyaa Pantsu - {{block "title" .}}Error 404{{end}}</title>
+	<title>Nyaa Pantsu - {{block "title" .}}{{ T "error_404" }}{{end}}</title>
     <link rel="icon" type="image/png" href="/img/favicon.png?v=3" />
 
     <!-- RSS Feed with Context -->
@@ -33,7 +33,7 @@
           <div class="container">
               <div class="navbar-header">
                   <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                      <span class="sr-only">Toggle navigation</span>
+					  <span class="sr-only">{{ T "toggle_navigation" }}</span>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
                       <span class="icon-bar"></span>
@@ -42,10 +42,10 @@
               </div>
               <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                   <ul class="nav navbar-nav">
-                      <li><a href="{{.URL.Parse "/upload"}}">Upload</a/></li>
-                      <li><a href="{{.URL.Parse "/faq"}}">FAQ</a></li>
+					  <li><a href="{{.URL.Parse "/upload"}}">{{T "upload"}}</a/></li>
+					  <li><a href="{{.URL.Parse "/faq"}}">{{T "faq"}}</a></li>
                       <li><a href="{{ genRouteWithQuery "feed" .URL }}">RSS</a></li>
-                      <li><a href="https://sukebei.pantsu.cat">Fap</a></li>
+					  <li><a href="https://sukebei.pantsu.cat">{{T "fap"}}</a></li>
                       <li><a href="irc://irc.rizon.net/nyaapantsu">IRC</a></li>
 
                   </ul>
@@ -71,7 +71,7 @@
       <div class="container {{block "contclass" .}}generic{{end}}" id="container">
       {{if not .Search.HideAdvancedSearch}}
       <div class="blockBody" style="text-align:center">
-        <font size="4.5">Advanced Search</font><br />
+        <font size="4.5">{{T "advanced_search"}}</font><br />
         <form class="navbar-form" role="search" action="/search" method="get">
           <div class="form-group">
             {{block "search_common" .}}{{end}}
@@ -84,7 +84,7 @@
       <div style="margin:0.5em"></div>
       {{end}}
 
-        {{block "content" .}}Nothing Here.{{end}}
+        {{block "content" .}}{{T "nothing_here"}}{{end}}
       </div>
 
       <!-- bottom padding -->