diff --git a/contrib/handle_archive/main.php b/contrib/handle_archive/main.php
index 13d6f314..976f3ca0 100644
--- a/contrib/handle_archive/main.php
+++ b/contrib/handle_archive/main.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Name: Archive File Handler
+ * Name: Handle Archives
  * Author: Shish <webmaster@shishnet.org>
  * Description: Allow users to upload archives (zip, etc)
  * Documentation:
diff --git a/contrib/handle_flash/main.php b/contrib/handle_flash/main.php
index 6a16b0a2..78528fce 100644
--- a/contrib/handle_flash/main.php
+++ b/contrib/handle_flash/main.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Name: Flash File Handler
+ * Name: Handle Flash
  * Author: Shish <webmaster@shishnet.org>
  * Description: Handle Flash files
  */
diff --git a/contrib/handle_ico/main.php b/contrib/handle_ico/main.php
index 3e337404..43eb22cb 100644
--- a/contrib/handle_ico/main.php
+++ b/contrib/handle_ico/main.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Name: ICO File Handler
+ * Name: Handle ICO
  * Author: Shish <webmaster@shishnet.org>
  * Description: Handle windows icons
  */
diff --git a/contrib/handle_mp3/main.php b/contrib/handle_mp3/main.php
index f2ba6e42..fb84d4d7 100644
--- a/contrib/handle_mp3/main.php
+++ b/contrib/handle_mp3/main.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Name: MP3 File Handler
+ * Name: Handle MP3
  * Author: Shish <webmaster@shishnet.org>
  * Description: Handle MP3 files
  */
diff --git a/contrib/handle_svg/main.php b/contrib/handle_svg/main.php
index 863d76a9..fa904bc2 100644
--- a/contrib/handle_svg/main.php
+++ b/contrib/handle_svg/main.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Name: SVG File Handler
+ * Name: Handle SVG
  * Author: Shish <webmaster@shishnet.org>
  * Description: Handle SVG files
  */
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index a7d11017..7c7a6455 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -11,6 +11,11 @@
  *   extensions and read their documentation
  */
 
+/** @private */
+function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b) {
+	return strcmp($a->name, $b->name);
+}
+
 /** @private */
 class ExtensionInfo {
 	var $ext_name, $name, $link, $author, $email, $description, $documentation, $version;
@@ -69,7 +74,9 @@ class ExtensionInfo {
 	}
 
 	private function is_enabled($fname) {
-		return file_exists("ext/$fname");
+		if(file_exists("ext/$fname") && file_exists("contrib/$fname")) return true; // both
+		if(file_exists("contrib/$fname")) return false; // only disabled (optional)
+		return null; // only active (core)
 	}
 }
 
@@ -123,10 +130,21 @@ class ExtManager extends SimpleExtension {
 
 	private function get_extensions($all) {
 		$extensions = array();
-		$exts = $all ? glob("contrib/*/main.php") : glob("ext/*/main.php");
+		if($all) {
+			$exts = glob("ext/*/main.php");
+			foreach(glob("contrib/*/main.php") as $ae) {
+				if(!in_array("ext".substr($ae, 7), $exts)) {
+					$exts[] = $ae;
+				}
+			}
+		}
+		else {
+			$exts = glob("ext/*/main.php");
+		}
 		foreach($exts as $main) {
 			$extensions[] = new ExtensionInfo($main);
 		}
+		usort($extensions, "__extman_extcmp");
 		return $extensions;
 	}
 
diff --git a/ext/ext_manager/theme.php b/ext/ext_manager/theme.php
index 27ae0846..db8b5548 100644
--- a/ext/ext_manager/theme.php
+++ b/ext/ext_manager/theme.php
@@ -23,7 +23,7 @@ class ExtManagerTheme extends Themelet {
 			$h_description = html_escape($extension->description);
 			if($extension->enabled === TRUE) $h_enabled = " checked='checked'";
 			else if($extension->enabled === FALSE) $h_enabled = "";
-			else $h_enabled = " disabled";
+			else $h_enabled = " disabled checked='checked'";
 			$h_link = make_link("ext_doc/".html_escape($extension->ext_name));
 			$oe = ($n++ % 2 == 0) ? "even" : "odd";
 
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index eef011f4..97444060 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Name: Pixel File Handler
+ * Name: Handle Pixel
  * Author: Shish <webmaster@shishnet.org>
- * Description: Handle JPG, PNG, GIF, etc files
+ * Description: Handle JPEG, PNG, GIF, etc files
  */
 
 class PixelFileHandler extends DataHandlerExtension {
diff --git a/ext/view/main.php b/ext/view/main.php
index ab0aef81..bec26a02 100644
--- a/ext/view/main.php
+++ b/ext/view/main.php
@@ -2,7 +2,7 @@
 /*
  * Name: Image Viewer
  * Author: Shish
- * Description: Allows users too see uploaded images
+ * Description: Allows users to see uploaded images
  */
 
 /*