Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 210)
+++ trunk/wb/install/save.php	(revision 211)
@@ -581,7 +581,7 @@
 	// Load addons into DB
 	$dirs['modules'] = WB_PATH.'/modules/';
 	$dirs['templates'] = WB_PATH.'/templates/';
-	$dirs['language'] = WB_PATH.'/languages/';
+	$dirs['languages'] = WB_PATH.'/languages/';
 	foreach($dirs AS $type => $dir) {
 		if($handle = opendir($dir)) {
 			while(false !== ($file = readdir($handle))) {
Index: trunk/wb/admin/templates/uninstall.php
===================================================================
--- trunk/wb/admin/templates/uninstall.php	(revision 210)
+++ trunk/wb/admin/templates/uninstall.php	(revision 211)
@@ -63,7 +63,7 @@
 	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
 } else {
 	// Remove entry from DB
-	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$file."' AND type = 'template' LIMIT 0,1");
+	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$file."' AND type = 'template'");
 }
 
 // Update pages that use this template with default template
Index: trunk/wb/admin/templates/install.php
===================================================================
--- trunk/wb/admin/templates/install.php	(revision 210)
+++ trunk/wb/admin/templates/install.php	(revision 211)
@@ -120,7 +120,7 @@
 }
 
 // Load template info into DB
-load_module($template_dir);
+load_template($template_dir);
 
 // Print success message
 $admin->print_success($success_message);
Index: trunk/wb/admin/languages/uninstall.php
===================================================================
--- trunk/wb/admin/languages/uninstall.php	(revision 210)
+++ trunk/wb/admin/languages/uninstall.php	(revision 211)
@@ -56,7 +56,7 @@
 	$admin->print_error($MESSAGE['GENERIC']['CANNOT_UNINSTALL']);
 } else {
 	// Remove entry from DB
-	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$_POST['code']."' AND type = 'language' LIMIT 0,1");
+	$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE directory = '".$_POST['code']."' AND type = 'language'");
 }
 
 // Print success message
Index: trunk/wb/admin/languages/install.php
===================================================================
--- trunk/wb/admin/languages/install.php	(revision 210)
+++ trunk/wb/admin/languages/install.php	(revision 211)
@@ -97,7 +97,7 @@
 change_mode($language_file, 'file');
 
 // Load language info into DB
-load_module(WB_PATH.'/languages/'.$language_file);
+load_language($language_file);
 
 // Restore to correct language
 require(WB_PATH.'/languages/'.LANGUAGE.'.php');