diff --git a/mod.php b/mod.php
index 908bc167..f6ed73d2 100644
--- a/mod.php
+++ b/mod.php
@@ -284,7 +284,7 @@
 					$query->execute() or error(db_error($query));
 					
 					// Build theme
-					$config['build_function'](themeSettings());
+					$theme['build_function'](themeSettings());
 				} else {
 					$body = '<form action="" method="post">';
 					
@@ -355,14 +355,14 @@
 									'<th class="minimal">Actions</th>' .
 									'<td><ul style="padding:0 20px">' .
 										'<li>' .
-											'<a title="Use theme" href="?/themes/frameset">Use</a>' .
+											'<a title="Use theme" href="?/themes/' . $_theme . '">Use</a>' .
 										'</li>' .
 										'<li>' .
 											confirmLink('Remove', 'Uninstall theme', 'Are you sure you want to permanently remove this theme?', 'themes/' . $_theme . '/uninstall') .
 										'</li>' .
 									'</ul></td>' .
 								'</tr>' .
-							'</tr>';
+								'<tr style="height:40px"><td colspan="2"><hr/></td></tr>';
 					}
 					$body .= '</table>';
 				}
diff --git a/templates/homepage/basic/theme.php b/templates/homepage/basic/theme.php
index fb45be66..1251cfff 100644
--- a/templates/homepage/basic/theme.php
+++ b/templates/homepage/basic/theme.php
@@ -23,7 +23,7 @@
 	);
 	
 	// Unique function name for building everything
-	$config['build_function'] = 'basic_build';
+	$theme['build_function'] = 'basic_build';
 	
 	function basic_build($settings) {
 		Basic::build($settings);
diff --git a/templates/homepage/frameset/theme.php b/templates/homepage/frameset/theme.php
index 329ec2c6..8b96402d 100644
--- a/templates/homepage/frameset/theme.php
+++ b/templates/homepage/frameset/theme.php
@@ -26,7 +26,7 @@ Users never have to leave the homepage; they can do all their browsing from the
 	);
 	
 	// Unique function name for building everything
-	$config['build_function'] = 'frameset_build';
+	$theme['build_function'] = 'frameset_build';
 	
 	function frameset_build($settings) {
 		Frameset::build($settings);