diff --git a/e107_admin/language.php b/e107_admin/language.php
index e2d425d06..a76f1af13 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2013 e107 Inc (e107.org)
+ * Copyright (C) 2008-2017 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -1091,7 +1091,7 @@ class lanDeveloper
 
 	function disableUnused($data)
 	{
-		$data = str_replace("2008-2010","2008-2013", $data);
+		$data = str_replace("2008-2010","2008-2017", $data);
 		$data = str_replace(' * $URL$
  * $Revision$
  * $Id$
@@ -1166,21 +1166,29 @@ class lanDeveloper
 		//	print_a($_SESSION['languageTools_lanFileList']);
 
 
-		$text .= "
-						<tr>
-							<td><div class='alert-info alert alert-block'>".e107::getParser()->toHTML(LANG_LAN_140, true)."</div></td>
-							<td class='form-inline'>
-								<select name='deprecatedLans[]' multiple style='height:200px'>
-									<option value=''>".LANG_LAN_141."</option>";
+		$text .= "	<tr>
+						<td><div class='alert-info alert alert-block'>".e107::getParser()->toHTML(LANG_LAN_140, true)."</div></td>
+					</tr>
+					<tr>
+						<td class='form-inline'>
+							<select name='deprecatedLans[]' multiple style='height:200px'>
+								<option value=''>".LANG_LAN_141."</option>";
 
 
 		$omit = array('languages','\.png','\.gif','handlers');
 		$lans = $fl->get_files(e_ADMIN,'.php','standard',0);
+		asort($lans);
+
 		$fl->setFileFilter(array("^e_"));
 		$root = $fl->get_files(e_BASE,'.*?/?.*?\.php',$omit,0);
+		asort($root);
 
 		$templates = $fl->get_files(e_CORE."templates",'.*?/?.*?\.php',$omit,0);
+		asort($templates);
+
 		$shortcodes = $fl->get_files(e_CORE."shortcodes",'.*?/?.*?\.php',$omit,1);
+		asort($shortcodes);
+
 		$exclude = array('lan_admin.php');
 
 		$srch = array(e_ADMIN,e_PLUGIN, e_CORE, e_BASE );
@@ -1261,7 +1269,7 @@ class lanDeveloper
 
 		$selected = ($_POST['deprecatedLanFile'][0] == 'auto') ? "selected='selected'" :"";
 		$text .= "<option value='auto' {$selected}>".LANG_LAN_142."</option><optgroup label='".LANG_LAN_143."'>\n";//Auto-Detect
-
+		asort($_SESSION['languageTools_lanFileList']);
 		foreach($_SESSION['languageTools_lanFileList'] as $val)
 		{
 			if(strstr($val,e_SYSTEM))
diff --git a/e107_languages/English/admin/lan_language.php b/e107_languages/English/admin/lan_language.php
index 1786c8eae..a13c8f7b6 100644
--- a/e107_languages/English/admin/lan_language.php
+++ b/e107_languages/English/admin/lan_language.php
@@ -61,6 +61,8 @@ define("LANG_LAN_141", "Select Script...");
 define("LANG_LAN_142", "Auto-Detect");
 define("LANG_LAN_143", "Specific LAN file:");
 define("LANG_LAN_144", "Must be re-enabled");
+
+define("LANG_LAN_148", "Normal Mode");
 define("LANG_LAN_149", "Value");
 define("LANG_LAN_150", "[b]Search ENTIRE core before commenting out ANY LAN from ANY language file.[/b]");
 ?>