diff --git a/templates/categories.tpl b/templates/categories.tpl
index 0af9cbfb5..7da0123a9 100644
--- a/templates/categories.tpl
+++ b/templates/categories.tpl
@@ -1,7 +1,11 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header"></div>
+<div widget-area="header">
+	<!-- BEGIN widgets.header -->
+	{{widgets.header.html}}
+	<!-- END widgets.header -->
+</div>
 <div class="row">
-	<div class="col-lg-12 col-sm-12" has-widget-class="col-lg-9 col-sm-12" has-widget-target="sidebar">
+	<div class="<!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
 		<h1 class="categories-title">[[pages:categories]]</h1>
 		<ul class="categories" itemscope itemtype="http://www.schema.org/ItemList">
 			<!-- BEGIN categories -->
@@ -9,6 +13,14 @@
 			<!-- END categories -->
 		</ul>
 	</div>
-	<div widget-area="sidebar" class="col-lg-3 col-sm-12 hidden"></div>
+	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
+		<!-- BEGIN widgets.sidebar -->
+		{{widgets.sidebar.html}}
+		<!-- END widgets.sidebar -->
+	</div>
+</div>
+<div widget-area="footer">
+	<!-- BEGIN widgets.footer -->
+	{{widgets.footer.html}}
+	<!-- END widgets.footer -->
 </div>
-<div widget-area="footer"></div>
diff --git a/templates/category.tpl b/templates/category.tpl
index 7056c7d68..c9d58e954 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -1,7 +1,11 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header"></div>
+<div widget-area="header">
+	<!-- BEGIN widgets.header -->
+	{{widgets.header.html}}
+	<!-- END widgets.header -->
+</div>
 <div class="row">
-	<div class="category col-lg-12 col-sm-12" has-widget-class="category col-lg-9 col-sm-12" has-widget-target="sidebar">
+	<div class="category <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
 		<!-- IMPORT partials/category/subcategory.tpl -->
 
 		<!-- IF children.length --><hr class="hidden-xs"/><!-- ENDIF children.length -->
@@ -38,9 +42,17 @@
 			<!-- IMPORT partials/paginator.tpl -->
 		<!-- ENDIF config.usePagination -->
 	</div>
-	<div widget-area="sidebar" class="col-lg-3 col-sm-12 hidden"></div>
+	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
+		<!-- BEGIN widgets.sidebar -->
+		{{widgets.sidebar.html}}
+		<!-- END widgets.sidebar -->
+	</div>
+</div>
+<div widget-area="footer">
+	<!-- BEGIN widgets.footer -->
+	{{widgets.footer.html}}
+	<!-- END widgets.footer -->
 </div>
-<div widget-area="footer"></div>
 
 <!-- IMPORT partials/move_thread_modal.tpl -->
 
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 73a471183..72a3d00f6 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -1,7 +1,11 @@
 <!-- IMPORT partials/breadcrumbs.tpl -->
-<div widget-area="header"></div>
+<div widget-area="header">
+	<!-- BEGIN widgets.header -->
+	{{widgets.header.html}}
+	<!-- END widgets.header -->
+</div>
 <div class="row">
-	<div class="topic col-lg-12 col-sm-12" has-widget-class="topic col-lg-9 col-sm-12" has-widget-target="sidebar">
+	<div class="topic <!-- IF widgets.sidebar.length -->col-lg-9 col-sm-12<!-- ELSE -->col-lg-12<!-- ENDIF widgets.sidebar.length -->">
 
 		<h1 component="post/header" class="hidden-xs" itemprop="name">
 
@@ -66,9 +70,17 @@
 			</div>
 		</div>
 	</div>
-	<div widget-area="sidebar" class="col-lg-3 col-sm-12 hidden"></div>
+	<div widget-area="sidebar" class="col-lg-3 col-sm-12 <!-- IF !widgets.sidebar.length -->hidden<!-- ENDIF !widgets.sidebar.length -->">
+		<!-- BEGIN widgets.sidebar -->
+		{{widgets.sidebar.html}}
+		<!-- END widgets.sidebar -->
+	</div>
+</div>
+<div widget-area="footer">
+	<!-- BEGIN widgets.footer -->
+	{{widgets.footer.html}}
+	<!-- END widgets.footer -->
 </div>
-<div widget-area="footer"></div>
 
 <!-- IF !config.usePagination -->
 <noscript>