diff --git a/templates/partials/category/sort.tpl b/templates/partials/category/sort.tpl
index 8009d15..0205dad 100644
--- a/templates/partials/category/sort.tpl
+++ b/templates/partials/category/sort.tpl
@@ -1,7 +1,5 @@
-
-
 <!-- IF loggedIn -->
-<div class="btn-group thread-sort">
+<div class="btn-group" component="thread/sort">
 	<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">
 		<span class="visible-sm-inline visible-md-inline visible-lg-inline">[[topic:sort_by]]</span>
 		<span class="visible-xs-inline"><i class="fa fa-fw fa-sort"></i></span>
diff --git a/templates/partials/thread_sort.tpl b/templates/partials/topic/sort.tpl
similarity index 86%
rename from templates/partials/thread_sort.tpl
rename to templates/partials/topic/sort.tpl
index fd825cf..3593275 100644
--- a/templates/partials/thread_sort.tpl
+++ b/templates/partials/topic/sort.tpl
@@ -1,5 +1,5 @@
 <!-- IF loggedIn -->
-<div class="btn-group thread-sort hidden-xs hidden-sm">
+<div class="btn-group hidden-xs hidden-sm" component="thread/sort">
 	<button class="btn dropdown-toggle" data-toggle="dropdown" type="button">[[topic:sort_by]] <span class="caret"></span></button>
 	<ul class="dropdown-menu">
 		<li><a href="#" class="oldest_to_newest" data-sort="oldest_to_newest"><i class="fa fa-fw"></i> [[topic:oldest_to_newest]]</a></li>
diff --git a/templates/topic.tpl b/templates/topic.tpl
index a6673fd..9980462 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -4,7 +4,7 @@
 	<h1 component="post/header" itemprop="name">
 
 		<i class="fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"></i> <i class="fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->"></i> <span class="topic-title" component="topic/title">{title}</span>
-		<!-- IMPORT partials/thread_sort.tpl -->
+		<!-- IMPORT partials/topic/sort.tpl -->
 
 		<button component="topic/follow" class="btn hidden-xs hidden-sm <!-- IF isFollowing -->hidden<!-- ENDIF isFollowing -->">
 			<span>[[topic:watch]]</span> <i class="fa fa-eye"></i>