3 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap2/templates/base.html b/bootstrap2/templates/base.html
index 3e42e65..26195f7 100644
--- a/bootstrap2/templates/base.html
+++ b/bootstrap2/templates/base.html
@@ -82,7 +82,7 @@
               {% endif %}
               {% for cat, null in categories %}
                   <li {% if cat == category %}class="active"{% endif %}>
-                    <a href="{{ SITEURL }}/category/{{ cat }}.html">
+                    <a href="{{ SITEURL }}/{{ cat.url }}">
 						<i class="icon-folder-open icon-large"></i>{{ cat }}
 					</a>
                   </li>
diff --git a/bootstrap2/templates/sidebar.html b/bootstrap2/templates/sidebar.html
index fb94733..ae2e009 100644
--- a/bootstrap2/templates/sidebar.html
+++ b/bootstrap2/templates/sidebar.html
@@ -19,7 +19,7 @@
 <li class="nav-header"><h4><i class="icon-folder-close icon-large"></i>Categories</h4></li>
 {% for cat, null in categories %}
 <li>
-<a href="{{ SITEURL }}/category/{{ cat }}.html">
+<a href="{{ SITEURL }}/{{ cat.url }}">
     <i class="icon-folder-open icon-large"></i>{{ cat }}
 </a>
 </li>
@@ -28,7 +28,7 @@
 <li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li>
 {% for tag in tag_cloud %}
 <li class="tag-{{ tag.1 }}">
-    <a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">
+    <a href="{{ SITEURL }}/{{ tag.0.url }}">
         <i class="icon-tag icon-large"></i>{{ tag.0 }}
     </a>
 </li>
@@ -40,4 +40,4 @@
 {% if SIDEBAR_CUSTOM %}
     {{ SIDEBAR_CUSTOM }}
 {% endif %}
-</ul>
-\ No newline at end of file
+</ul>
diff --git a/bootstrap2/templates/tags.html b/bootstrap2/templates/tags.html
index 6e8a22f..862eff6 100644
--- a/bootstrap2/templates/tags.html
+++ b/bootstrap2/templates/tags.html
@@ -4,10 +4,10 @@
 <li class="nav-header"><h4><i class="icon-tags icon-large"></i>Tags</h4></li>
 {% for tag in tag_cloud %}
 <li class="tag-{{ tag.1 }}">
-	<a href="{{ SITEURL }}/tag/{{ tag.0 }}.html">
+	<a href="{{ SITEURL }}/{{ tag.0.url }}">
 		<i class="icon-tag icon-large"></i>{{ tag.0 }}
 	</a>
 </li>
 {% endfor %}
 </ul>
-{% endblock %}
-\ No newline at end of file
+{% endblock %}