diff --git a/templates/themes/categories/sidebar.html b/templates/themes/categories/sidebar.html
index 171e4e93..5ae6ab38 100644
--- a/templates/themes/categories/sidebar.html
+++ b/templates/themes/categories/sidebar.html
@@ -23,18 +23,31 @@
 		</ul>
 	</fieldset>
 	
-	<fieldset>
-		<legend>Boards</legend>
-		<ul>
+	{% for category, boards in categories %}
+		<fieldset>
+			<legend>
+				{{ category }}
+			</legend>
 			{% for board in boards %}
 				<li>
-					<a href="{{ config.board_path|sprintf(board.uri) }}">
-						{{ board.title }}
-					</a>
+					<a href="{{ board.uri }}">{{ board.title }}</a>
 				</li>
 			{% endfor %}
-		</ul>
-	</fieldset>
+		</fieldset>
+	{% endfor %}
+	
+	{% for category, links in config.custom_categories %}
+		<fieldset>
+			<legend>
+				{{ category }}
+			</legend>
+			{% for title, uri in links %}
+				<li>
+					<a href="{{ uri }}">{{ title }}</a>
+				</li>
+			{% endfor %}
+		</fieldset>
+	{% endfor %}
 </body>
 </html>
 {% endfilter %}
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index ebaca5e9..648034e7 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -29,7 +29,7 @@
 		public static function homepage($settings) {
 			global $config;
 			
-			return Element('themes/frameset/frames.html', Array('config' => $config, 'settings' => $settings));
+			return Element('themes/categories/frames.html', Array('config' => $config, 'settings' => $settings));
 		}
 		
 		// Build news page
@@ -39,7 +39,7 @@
 			$query = query("SELECT * FROM `news` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
 			
-			return Element('themes/frameset/news.html', Array(
+			return Element('themes/categories/news.html', Array(
 				'settings' => $settings,
 				'config' => $config,
 				'news' => $news
@@ -61,7 +61,7 @@
 				}
 			}
 			
-			return Element('themes/frameset/sidebar.html', Array(
+			return Element('themes/categories/sidebar.html', Array(
 				'settings' => $settings,
 				'config' => $config,
 				'categories' => $categories
diff --git a/templates/themes/frameset/sidebar.html b/templates/themes/frameset/sidebar.html
index 5ae6ab38..171e4e93 100644
--- a/templates/themes/frameset/sidebar.html
+++ b/templates/themes/frameset/sidebar.html
@@ -23,31 +23,18 @@
 		</ul>
 	</fieldset>
 	
-	{% for category, boards in categories %}
-		<fieldset>
-			<legend>
-				{{ category }}
-			</legend>
+	<fieldset>
+		<legend>Boards</legend>
+		<ul>
 			{% for board in boards %}
 				<li>
-					<a href="{{ board.uri }}">{{ board.title }}</a>
+					<a href="{{ config.board_path|sprintf(board.uri) }}">
+						{{ board.title }}
+					</a>
 				</li>
 			{% endfor %}
-		</fieldset>
-	{% endfor %}
-	
-	{% for category, links in config.custom_categories %}
-		<fieldset>
-			<legend>
-				{{ category }}
-			</legend>
-			{% for title, uri in links %}
-				<li>
-					<a href="{{ uri }}">{{ title }}</a>
-				</li>
-			{% endfor %}
-		</fieldset>
-	{% endfor %}
+		</ul>
+	</fieldset>
 </body>
 </html>
 {% endfilter %}