3 files changed, 7 insertions, 7 deletions
diff --git a/Just-Read/templates/archives.html b/Just-Read/templates/archives.html
index 72fd2a5..e4f26b8 100644
--- a/Just-Read/templates/archives.html
+++ b/Just-Read/templates/archives.html
@@ -30,7 +30,7 @@
 		<h2>Tags</h2>
 		<ul class="tag">
 		{% for tag in tag_cloud|sort %}
-		    <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li>
+		    <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
 		{% endfor %}
 		</ul>
 	</div>
@@ -43,4 +43,4 @@
 		$("#jquerytabs").tabs();
 	});
 </script>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}
diff --git a/Just-Read/templates/metadata.html b/Just-Read/templates/metadata.html
index c051c75..b4865f8 100644
--- a/Just-Read/templates/metadata.html
+++ b/Just-Read/templates/metadata.html
@@ -1,12 +1,12 @@
 <div class="meta wrapper">
 	<time datetime="{{ article.date.isoformat() }}" pubdate>{{ article.locale_date }}</time>
 	<ul class="tag clearfix">
-		<li><a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a></li>
+		<li><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></li>
 {% if article.tags %}
 	{% for tag in article.tags %}
-		<li><a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a></li>
+		<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
 	{% endfor %}
 {% endif %}
 	</ul>
 	{% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">Download the .pdf</a></p>{% endif %}
-</div>
-\ No newline at end of file
+</div>
diff --git a/Just-Read/templates/tags.html b/Just-Read/templates/tags.html
index 8ddbcd1..27240ef 100644
--- a/Just-Read/templates/tags.html
+++ b/Just-Read/templates/tags.html
@@ -8,10 +8,10 @@
 	
 	<ul class="tag">
     {% for tag in tag_cloud %}
-        <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">{{ tag.0 }}</a></li>
+        <li class="tag-{{ tag.1 }}"><a href="{{ SITEURL }}/{{ tag.0.url }}">{{ tag.0 }}</a></li>
     {% endfor %}
 	</ul>
 
 </div>
 </div>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}