diff --git a/nyaa/routes.py b/nyaa/routes.py
index 5af9bfa..1a2564a 100644
--- a/nyaa/routes.py
+++ b/nyaa/routes.py
@@ -312,7 +312,6 @@ def _jinja2_filter_rfc822(date, fmt=None):
 def render_rss(label, query):
     rss_xml = flask.render_template('rss.xml',
                                     term=label,
-                                    site_url=flask.request.url_root,
                                     query=query)
     response = flask.make_response(rss_xml)
     response.headers['Content-Type'] = 'application/xml'
diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index c805a68..1b4eb87 100644
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -16,7 +16,7 @@
 			make the navbar not look awful on tablets.
 		-->
 		<link href="/static/css/bootstrap.min.css" rel="stylesheet" id="bsThemeLink">
-		<!-- 
+		<!--
 			This theme changer script needs to be inline and right under the above stylesheet link to prevent FOUC (Flash Of Unstyled Content)
 			Development version is commented out in static/js/main.js at the bottom of the file
 		-->
diff --git a/nyaa/templates/rss.xml b/nyaa/templates/rss.xml
index 160120f..6e50971 100644
--- a/nyaa/templates/rss.xml
+++ b/nyaa/templates/rss.xml
@@ -4,16 +4,16 @@
 		<description>
 			RSS Feed for {{ term }}
 		</description>
-		<link>{{ site_url }}</link>
-		<atom:link href="{{ site_url }}rss" rel="self" type="application/rss+xml" />
+		<link>{{ url_for('home', _external=True) }}</link>
+		<atom:link href="{{ url_for('home', page='rss', _external=True) }}" rel="self" type="application/rss+xml" />
 		{% for torrent in query %}
 		{% if torrent.has_torrent %}
 		<item>
 			<title>{{ torrent.display_name }}</title>
 			<link>
-				{{ site_url }}view/{{ torrent.id }}/torrent
+				{{ url_for('download_torrent', torrent_id=torrent.id, _external=True) }}
 			</link>
-			<guid isPermaLink="true">{{ site_url }}view/{{ torrent.id }}</guid>
+			<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.id, _external=True) }}</guid>
 			<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
 		</item>
 		{% endif %}
diff --git a/nyaa/templates/search_results.html b/nyaa/templates/search_results.html
index 19b8f50..d3ba158 100644
--- a/nyaa/templates/search_results.html
+++ b/nyaa/templates/search_results.html
@@ -1,7 +1,7 @@
 {% macro render_column_header(header_style, center_text=False, sort_key=None, header_title=None) %}
 {% set class_suffix = (search.sort == sort_key) and ("_" + search.order) or "" %}
 {% set th_classes = filter_truthy([sort_key and "sorting" + class_suffix, center_text and "text-center"]) %}
-<th {% if th_classes %} class="{{ ' '.join(th_classes) }}"{% endif %} {% if header_title %}title="{{header_title}}"{% endif %} style="{{header_style}}">
+<th {% if th_classes %} class="{{ ' '.join(th_classes) }}"{% endif %} {% if header_title %}title="{{header_title}}"{% endif %} style="{{ header_style }}">
 	{% if sort_key %}
 	<a href="{% if class_suffix == '_desc' %}{{ modify_query(s=sort_key, o="asc") }}{% else %}{{ modify_query(s=sort_key, o="desc") }}{% endif %}"></a>
 	{% endif %}
@@ -28,19 +28,19 @@
 				{% call render_column_header("width:140px;", center_text=True, sort_key="id", header_title="In UTC") %}
 					<div>Date</div>
 				{% endcall %}
-				
+
 				{% if config.ENABLE_SHOW_STATS %}
 				{% call render_column_header("width:50px;", center_text=True, sort_key="seeders", header_title="Seeds") %}
 					<i class="fa fa-arrow-up" aria-hidden="true"></i>
 				{% endcall %}
 				{% call render_column_header("width:50px;", center_text=True, sort_key="leechers", header_title="Leeches") %}
 					<i class="fa fa-arrow-down" aria-hidden="true"></i>
-					
+
 				{% endcall %}
 				{% call render_column_header("width:50px;", center_text=True, sort_key="downloads", header_title="Completed downloads") %}
 					<i class="fa fa-check" aria-hidden="true"></i>
 				{% endcall %}
-				
+
 				{% endif %}
 			</tr>
 		</thead>
@@ -54,9 +54,9 @@
 					<img src="/static/img/icons/{{ icon_dir }}/{{ cat_id }}.png">
 					</a>
 				</td>
-				<td><a href="/view/{{ torrent.id }}">{{ torrent.display_name | escape }}</a></td>
+				<td><a href="{{ url_for('view_torrent', torrent_id=torrent.id) }}">{{ torrent.display_name | escape }}</a></td>
 				<td style="white-space: nowrap;text-align: center;">
-					{% if torrent.has_torrent %}<a href="/view/{{ torrent.id }}/torrent"><i class="fa fa-fw fa-download"></i></a>{% endif %}
+					{% if torrent.has_torrent %}<a href="{{ url_for('download_torrent', torrent_id=torrent.id) }}"><i class="fa fa-fw fa-download"></i></a>{% endif %}
 					<a href="{{ torrent.magnet_uri }}"><i class="fa fa-fw fa-magnet"></i></a>
 				</td>
 				<td class="text-center">{{ torrent.filesize | filesizeformat(True) }}</td>