diff --git a/less/categories.less b/less/categories.less
index 46c5173..9c8ff7f 100644
--- a/less/categories.less
+++ b/less/categories.less
@@ -80,10 +80,6 @@
 				}
 			}
 
-			small {
-				color: @gray-light;
-			}
-
 			.post-content {
 				blockquote {
 					display: none;
diff --git a/templates/partials/categories/lastpost.tpl b/templates/partials/categories/lastpost.tpl
index f56f503..eedf3cd 100644
--- a/templates/partials/categories/lastpost.tpl
+++ b/templates/partials/categories/lastpost.tpl
@@ -2,7 +2,10 @@
 	<!-- BEGIN posts -->
 	<!-- IF @first -->
 	<p>
-		<strong>{categories.posts.user.username}</strong> <small class="timeago" title="{categories.posts.relativeTime}"></small>
+		<strong>{categories.posts.user.username}</strong>
+		<a href="{relative_path}/topic/{categories.posts.topic.slug}<!-- IF categories.posts.index -->/{categories.posts.index}<!-- ENDIF categories.posts.index -->">
+			<small class="timeago" title="{categories.posts.relativeTime}"></small>
+		</a>
 	</p>
 	<div class="post-content">
 		{categories.posts.content}
diff --git a/templates/partials/category/subcategory.tpl b/templates/partials/category/subcategory.tpl
index 25e026a..5da419d 100644
--- a/templates/partials/category/subcategory.tpl
+++ b/templates/partials/category/subcategory.tpl
@@ -37,7 +37,10 @@
 					<!-- BEGIN posts -->
 					<!-- IF @first -->
 					<p>
-						<strong>{children.posts.user.username}</strong> <small class="timeago" title="{children.posts.relativeTime}"></small>
+						<strong>{children.posts.user.username}</strong>
+						<a href="{relative_path}/topic/{children.posts.topic.slug}<!-- IF children.posts.index -->/{children.posts.index}<!-- ENDIF children.posts.index -->">
+							<small class="timeago" title="{children.posts.relativeTime}"></small>
+						</a>
 					</p>
 					<div class="post-content">
 						{children.posts.content}
diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index 329723c..f8bd394 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -47,10 +47,10 @@
 				</p>
 				<!-- ELSE -->
 				<p class="hidden-xs">
-					<a href="<!-- IF topics.teaser.user.userslug -->{relative_path}/user/{topics.teaser.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.teaser.user.userslug -->">
-						<strong>{topics.teaser.user.username}</strong>
+					<strong>{topics.teaser.user.username}</strong>
+					<a href="{relative_path}/topic/{topics.slug}/{topics.teaser.index}">
+						<small class="timeago" title="{topics.teaser.timestamp}"></small>
 					</a>
-					<small class="timeago" title="{topics.teaser.timestamp}"></small>
 				</p>
 				<p>
 					{topics.teaser.content}