diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 28b02a1da..d69ea16f7 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -312,7 +312,7 @@ class auth
 		{
 			$text .= "
 			<div class='field'>
-				<label for='code_verify'>".ADLAN_152."</label>"
+				<label for='code_verify'>".LAN_ENTER_CODE."</label>"
 				.$sec_img->renderImage().
 				$sec_img->renderInput()."	
 			</div>";
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 7f3a7dcef..4770ab066 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1622,7 +1622,7 @@ class pluginLanguage
 			
 		
 		
-			return $this->step1();
+			// return $this->step1();
 		}
 
 
@@ -1679,7 +1679,7 @@ class pluginLanguage
 				
 				similar_text($v['value'], $data['value'], $percentSimilar);
 				
-				if((($v['value'] == $data['value'] || $percentSimilar > 80) && $data['file'] != $v['file']))
+				if((($v['value'] == $data['value'] || $percentSimilar > 89) && $data['file'] != $v['file']))
 				{
 					if(strpos($v['lan'],'LAN')===false) // Defined constants that don't contain 'LAN'. 
 					{
@@ -1857,7 +1857,7 @@ class pluginLanguage
 			<th>File</th>
 			<th>Detected LAN</th>
 			<th>LAN Value</th>
-			<th>Found on Line</th>
+			<th class='right'>Found on Line</th>
 			<th style='width:10%'>Status</th>
 			<th>Duplicates / Possible Substitions</th>
 			</tr>
@@ -1875,7 +1875,7 @@ class pluginLanguage
 					<td>".$this->shortPath($v['file'],'script')."</td>
 					<td >".$v['lan']."</td>
 					<td ><small>".$this->lanDefsRaw[$v['lan']]."</small></td>
-					<td>".$v['line']."</td>
+					<td class='right'>".$v['line']."</td>
 					<td>".$this->renderStatus($status,'script')."</td>
 					<td>".$this->renderSimilar($v,'script')."</td> 
 					</tr>";	
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 533636c80..2c7950b0e 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -59,8 +59,8 @@ define("ADLAN_49", "main site administrator");
 define("ADLAN_51", "Please log in to gain access to administration area");
 define("ADLAN_52", "Admin Front Page");
 define("ADLAN_53", "Leave Admin");
-define("ADLAN_54", "Banners");
-define("ADLAN_55", "Configure banners");
+// define("ADLAN_54", "Banners");
+// define("ADLAN_55", "Configure banners");
 //define("ADLAN_56", "Chatbox");
 //define("ADLAN_57", "Configure chatbox");
 define("ADLAN_58", "Emoticons");
@@ -167,7 +167,7 @@ define("ADLAN_149", "Notify");
 define("ADLAN_150", "Admin Email Notifications");
 
 define("ADLAN_151", "Main");
-define("ADLAN_152", "Enter Code");
+// define("ADLAN_152", "Enter Code");
 
 define("ADLAN_153", "Administration Area");
 define("ADLAN_154", "Error contacting Sourceforge to check for new version");
diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php
index 4048e858f..57bd73ae4 100644
--- a/e107_plugins/banner/admin_banner.php
+++ b/e107_plugins/banner/admin_banner.php
@@ -42,7 +42,7 @@ $tp = e107::getParser();
 
 e107::lan('banner',false,'front'); 
 
-e107::lan('banner','admin_banner',true); // e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_admin_banner.php'
+e107::lan('banner',true,true); // e_PLUGIN.'banner/languages/'.e_LANGUAGE.'_admin_banner.php'
 
 
 if(e_QUERY)
diff --git a/e107_plugins/banner/languages/English_admin_banner.php b/e107_plugins/banner/languages/English_admin.php
similarity index 83%
rename from e107_plugins/banner/languages/English_admin_banner.php
rename to e107_plugins/banner/languages/English_admin.php
index 7f751f380..bc1cd0ee1 100644
--- a/e107_plugins/banner/languages/English_admin_banner.php
+++ b/e107_plugins/banner/languages/English_admin.php
@@ -10,12 +10,12 @@ define("BNRLAN_00", "No banners created yet."); // 15
 define("BNRLAN_01", "Banner ID not found.");
 
 // define("BNRLAN_1", "Client"); //27
-define("BNRLAN_2", "Clickthroughs");
-define("BNRLAN_3", "Click %");
-define("BNRLAN_4", "Impressions"); 
-define("BNRLAN_5", "Impressions Left");
+// define("BNRLAN_2", "Clickthroughs");
+// define("BNRLAN_3", "Click %");
+// define("BNRLAN_4", "Impressions"); 
+// define("BNRLAN_5", "Impressions Left");
 
-define("BNRLAN_6", "Unlimited"); // 35
+// define("BNRLAN_6", "Unlimited"); // 35
 define("BNRLAN_7", "Stats"); // 65
 define("BNRLAN_8", "N/A"); // 66
 define("BNRLAN_9", "Starts"); // 45
@@ -33,8 +33,8 @@ define("BNRLAN_18", "End Date"); //37
 // 19 - 24 extra space
 
 define("BNRLAN_25", "Add new or choose existing campaign");
-define("BNRLAN_26", "Enter new campaign");
-define("BNRLAN_27", "New Campaign"); // 26a
+// define("BNRLAN_26", "Enter new campaign");
+// define("BNRLAN_27", "New Campaign"); // 26a
 define("BNRLAN_28", "Add new or choose existing client");
 define("BNRLAN_29", "Enter new client");
 define("BNRLAN_30", "New Client"); // 29a
@@ -61,6 +61,6 @@ define("BNRLAN_43", "How to show the campaigns?"); // BANNER_MENU_L10
 define("BNRLAN_44", "Choose render type ..."); // BANNER_MENU_L11
 define("BNRLAN_45", "One campaign in a single menu"); // BANNER_MENU_L12
 define("BNRLAN_46", "All selected campaigns in one single menu"); // BANNER_MENU_L13
-define("BNRLAN_47", "All selected campaigns in separate menus"); // BANNER_MENU_L14
+// define("BNRLAN_47", "All selected campaigns in separate menus"); // BANNER_MENU_L14
 
 ?>
\ No newline at end of file
diff --git a/e107_plugins/featurebox/e_shortcode.php b/e107_plugins/featurebox/e_shortcode.php
index 1f501a3c2..75016a25c 100644
--- a/e107_plugins/featurebox/e_shortcode.php
+++ b/e107_plugins/featurebox/e_shortcode.php
@@ -115,7 +115,7 @@ class featurebox_shortcodes// must match the plugin's folder name. ie. [PLUGIN_F
 			return $ret;
 		}
 		
-		return e107::getRender()->tablerender(FBLAN_01, $ret, vartrue($parm['tablestyle'], 'featurebox'), true);
+		return e107::getRender()->tablerender(LAN_PLUGIN_FEATUREBOX_NAME, $ret, vartrue($parm['tablestyle'], 'featurebox'), true);
 	}
 	
 	/**
diff --git a/e107_plugins/featurebox/languages/English_admin_featurebox.php b/e107_plugins/featurebox/languages/English_admin_featurebox.php
index 6306c1baf..3830e76cb 100644
--- a/e107_plugins/featurebox/languages/English_admin_featurebox.php
+++ b/e107_plugins/featurebox/languages/English_admin_featurebox.php
@@ -13,7 +13,7 @@ LAN file needs working from scratch after development is stabilized
 */
 
 
-//define("FBLAN_01", "Feature Box");
+//define("LAN_PLUGIN_FEATUREBOX_NAME", "Feature Box");
 //define("FBLAN_02", "Displays an animated area on the top of your page with news-items and other content you would like to feature.");
 //define("FBLAN_03", "Configure feature box"); //FIXME LAN  - use generic. 
 //define("FBLAN_04", "Feature Box plugin has been successfully installed. To add messages and configure, return to the main admin page and click on the feature box icon in the plugin section.");
diff --git a/e107_plugins/featurebox/languages/English_front_featurebox.php b/e107_plugins/featurebox/languages/English_front_featurebox.php
index 798ad9a1d..0c9eddfe6 100644
--- a/e107_plugins/featurebox/languages/English_front_featurebox.php
+++ b/e107_plugins/featurebox/languages/English_front_featurebox.php
@@ -6,6 +6,6 @@
 * Featurebox front-end language defines
 */
 
-define("FBLAN_01", "Feature Box");
+// define("FBLAN_01", "Feature Box");
 // define("FBLAN_02", "read more"); // Already used in admin area. 
 ?>
\ No newline at end of file
diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php
index 9217a4e2f..c27d53048 100644
--- a/e107_plugins/forum/forum_viewforum.php
+++ b/e107_plugins/forum/forum_viewforum.php
@@ -675,7 +675,7 @@ function fadminoptions($thread_info)
 	$tp = e107::getParser();
 	
 //	$text = "<form method='post' action='".e_REQUEST_URI."' id='frmMod_{$forumId}_{$threadId}' style='margin:0;'>";
-	$text .= '<div class="btn-group"><button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
+	$text .= '<div class="btn-group"><button class="btn btn-default btn-sm btn-mini dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
     </button>
     <ul class="dropdown-menu pull-right">	
diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php
index df3535891..2e2abfd1e 100644
--- a/e107_plugins/forum/forum_viewtopic.php
+++ b/e107_plugins/forum/forum_viewtopic.php
@@ -200,9 +200,9 @@ $forum->set_crumb(true, '', $tVars); // Set $BREADCRUMB (and BACKLINK)
 //$tVars->BACKLINK = $tVars->BREADCRUMB;
 //$tVars->FORUM_CRUMB = $crumbs['forum_crumb'];
 $tVars->THREADNAME = $tp->toHTML($thread->threadInfo['thread_name'], true, 'no_hook, emotes_off');
-$tVars->NEXTPREV = "<a class='btn btn-small' href='" . $e107->url->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>&laquo; " . LAN_FORUM_2001 . "</a>";
+$tVars->NEXTPREV = "<a class='btn btn-default btn-small' href='" . $e107->url->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>&laquo; " . LAN_FORUM_2001 . "</a>";
 $tVars->NEXTPREV .= ' | '; // enabled to make it look better on v1 templates
-$tVars->NEXTPREV .= "<a class='btn btn-small' href='" . $e107->url->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>" . LAN_FORUM_2002 . " &raquo;</a>";
+$tVars->NEXTPREV .= "<a class='btn btn-default btn-small' href='" . $e107->url->create('forum/thread/prev', array('id' => $thread->threadId)) . "'>" . LAN_FORUM_2002 . " &raquo;</a>";
 
 if ($forum->prefs->get('track') && USER)
 {
@@ -210,7 +210,7 @@ if ($forum->prefs->get('track') && USER)
 	$url = $e107->url->create('forum/thread/view', array('id' => $thread->threadId), 'encode=0'); // encoding could break AJAX call
 	$tVars->TRACK .= "
 			<span id='forum-track-trigger-container'>
-			<a class='btn btn-small' href='{$url}' id='forum-track-trigger'>{$img}</a>
+			<a class='btn btn-default btn-small' href='{$url}' id='forum-track-trigger'>{$img}</a>
 			</span>
 			<script type='text/javascript'>
 			e107.runOnLoad(function(){
diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
index 8665a0396..c24d51e76 100644
--- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
+++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php
@@ -430,8 +430,8 @@ class plugin_forum_view_shortcodes extends e_shortcode
 								
 		$text = '<div class="btn-group ">
 
-    <a class="btn btn-small" href="'.e_BASE.'user.php?id.'.$this->postInfo['post_user'].'">'.$username.'</a>
-    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+    <a class="btn btn-default btn-small" href="'.e_BASE.'user.php?id.'.$this->postInfo['post_user'].'">'.$username.'</a>
+    <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
     <span class="caret"></span>
     </button>
     <ul class="dropdown-menu left">
@@ -474,7 +474,7 @@ class plugin_forum_view_shortcodes extends e_shortcode
 		// {EMAILITEM} {PRINTITEM} {REPORTIMG}{EDITIMG}{QUOTEIMG}
 		
 		$text = '<div class="btn-group pull-right">
-    	<button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+    	<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
     	Options
     	<span class="caret"></span>
     	</button>
diff --git a/e107_plugins/forum/templates/forum_poll_template.php b/e107_plugins/forum/templates/forum_poll_template.php
index 8e4222c82..87f9286ae 100644
--- a/e107_plugins/forum/templates/forum_poll_template.php
+++ b/e107_plugins/forum/templates/forum_poll_template.php
@@ -17,21 +17,19 @@ $FORUM_POLL_TEMPLATE = array();
 
 $FORUM_POLL_TEMPLATE['form']['start'] = "
 <div class='clearfix'>
-	<div class='well span6'>
-		<div class='control-group'>
-			<ul class='nav nav-list'>
-				<li class='nav-header'>
-					Poll: {QUESTION}
-				</li>
+	<div class='well col-md-8 span6'>
+		<div class='form-group control-group'>
+			Poll: {QUESTION}
+			
 ";
 
 $FORUM_POLL_TEMPLATE['form']['item'] = "
-			<li>
+			<div class='radio'>
 				{ANSWER} 
-			</li>";
+			</div>";
 
 $FORUM_POLL_TEMPLATE['form']['end'] = "
-			</ul>
+			
 		</div>
 		<div class='control-group'>
 			 <div class='controls text-center'>
@@ -42,8 +40,6 @@ $FORUM_POLL_TEMPLATE['form']['end'] = "
 </div>
 ";
 
-
-
 /*	v2.x template for forum polls when user HAS voted		*/
 
 $FORUM_POLL_TEMPLATE['results']['start'] = "
diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php
index d5ef9f4c8..3e4107d98 100644
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -117,7 +117,7 @@ class gsitemap
 			
 			$mes->addInfo($text);
 			
-			$ns -> tablerender(GSLAN_40, $mes->render());
+			$ns -> tablerender(GSLAN_24, $mes->render());
 			return;
 		}
 		else
@@ -564,7 +564,7 @@ function admin_config_adminmenu()
 	$var['import']['link'] = e_SELF."?import";
 	$var['import']['perm'] = "0";
 	
-	show_admin_menu(GSLAN_19, $action, $var);
+	show_admin_menu(LAN_PLUGIN_GSITEMAP_NAME, $action, $var);
 }
 
 ?>
diff --git a/e107_plugins/gsitemap/languages/English_admin_gsitemap.php b/e107_plugins/gsitemap/languages/English_admin_gsitemap.php
index 2aeac4a85..f3c80334d 100644
--- a/e107_plugins/gsitemap/languages/English_admin_gsitemap.php
+++ b/e107_plugins/gsitemap/languages/English_admin_gsitemap.php
@@ -28,7 +28,7 @@ define("GSLAN_15", "monthly");
 define("GSLAN_16", "yearly");
 
 define("GSLAN_18", "Import ticked links");
-define("GSLAN_19", "Google Sitemap");
+// define("GSLAN_19", "Google Sitemap");
 define("GSLAN_20", "Listing");
 define("GSLAN_21", "Instructions");
 define("GSLAN_22", "Create New Entry");
@@ -47,7 +47,7 @@ define("GSLAN_36", "You can also enter individual links manually by clicking 'Cr
 define("GSLAN_37", "Once you have some entries, go to [URL] and enter the following URL -> <b>".SITEURL."gsitemap.php</b> - if this url doesn't look right to you, please make sure your site url is correct in admin -> preferences");
 define("GSLAN_38", "For more information on Google Sitemap protocol, go to [URL].");
 define("GSLAN_39", "No links in sitemap - import sitelinks?");
-define("GSLAN_40", "Google Sitemap Entries");
+// define("GSLAN_40", "Google Sitemap Entries");
 
 //define("GSLAN_Name", "Sitemap");
 // define("GSLAN_17", "never");
diff --git a/e107_plugins/gsitemap/plugin.xml b/e107_plugins/gsitemap/plugin.xml
index 2086ac1cf..21a3b67bc 100644
--- a/e107_plugins/gsitemap/plugin.xml
+++ b/e107_plugins/gsitemap/plugin.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: plugin.xml,v 1.7 2009-10-22 04:14:45 e107coders Exp $ -->
-<e107Plugin name="LAN_PLUGIN_GSITEMAP_NAME" lan="GSLAN_19" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
+<e107Plugin name="Google Sitemap" lan="LAN_PLUGIN_GSITEMAP_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="security@e107.org" />
 	<description lan="LAN_PLUGIN_GSITEMAP_DESCRIPTION">Generates a Google Sitemap</description>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
diff --git a/e107_plugins/import/plugin.xml b/e107_plugins/import/plugin.xml
index 7f072e2c6..07eb0d7fa 100644
--- a/e107_plugins/import/plugin.xml
+++ b/e107_plugins/import/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <e107Plugin name="Import into e107" lan="LAN_PLUGIN_IMPORT_NAME" version="1.0" date="2012-08-01" compatibility="2.0" installRequired="true">
 	<author name="e107 Inc." url="http://e107.org" email="devs@e107.org" />
-	<description lan="LAN_PLUGIN_IMPORT_DIZ">Import data from Wordpress, Joomla, Drupal, Blogpost, RSS and other formats.</description>
+	<description lan="LAN_PLUGIN_IMPORT_DESCRIPTION">Import data from Wordpress, Joomla, Drupal, Blogpost, RSS and other formats.</description>
 	<category>tools</category>
 	<copyright>Copyright e107 Inc e107.org, Licensed under GPL (http://www.gnu.org/licenses/gpl.txt)</copyright>
 	<adminLinks>
diff --git a/e107_plugins/linkwords/admin_config.php b/e107_plugins/linkwords/admin_config.php
index b526939ba..5a05286df 100644
--- a/e107_plugins/linkwords/admin_config.php
+++ b/e107_plugins/linkwords/admin_config.php
@@ -41,7 +41,7 @@ $lw_context_areas = array(
 		);
 
 // Yes, I know its a silly order - but that's history!
-$lwaction_vals = array(1=>LWLAN_51, 0=>LWLAN_52, 2=>LWLAN_53, 3=>LWLAN_54);
+$lwaction_vals = array(1=>LAN_INACTIVE, 0=>LWLAN_52, 2=>LWLAN_53, 3=>LWLAN_54);
 $frm = e107::getForm();
 // Generate dropdown for possible actions on finding a linkword
 function lw_act_opts($curval)
diff --git a/e107_plugins/pm/languages/English_admin_pm.php b/e107_plugins/pm/languages/English_admin_pm.php
index b58498311..74374d8fd 100755
--- a/e107_plugins/pm/languages/English_admin_pm.php
+++ b/e107_plugins/pm/languages/English_admin_pm.php
@@ -50,7 +50,7 @@ define('ADLAN_PM_54', "Main settings");
 define('ADLAN_PM_55', "Limits");
 
 //define('ADLAN_PM_57', "This plugin is a fully featured Private Messaging system.");
-define('ADLAN_PM_58', "Private Messenger");
+// define('ADLAN_PM_58', "Private Messenger");
 define('ADLAN_PM_59', 'Maintenance');
 define('ADLAN_PM_60', 'PM Maintenance');
 //define('ADLAN_PM_61', 'Execute');
diff --git a/e107_plugins/poll/languages/English.php b/e107_plugins/poll/languages/English.php
index c7c73cfec..0d5b77af5 100644
--- a/e107_plugins/poll/languages/English.php
+++ b/e107_plugins/poll/languages/English.php
@@ -75,7 +75,7 @@ define("POLLAN_45", "Poll successfully updated");
 
 // TODO NEED TO BE RENAMED!
 
-// define("LAN_FORUM_3029", "If you do not wish to add a poll to your topic, leave the fields blank."); // LAN_386
+define("LAN_FORUM_3029", "If you do not wish to add a poll to your topic, leave the fields blank."); // LAN_386
 define("LAN_FORUM_3030", "Poll question"); // LAN_5
 define("LAN_FORUM_3031", "Poll answer"); // LAN_391
 define("LAN_FORUM_3032", "Add another answer"); // LAN_6
diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php
index 13ba66cc9..4c791a0d8 100644
--- a/e107_plugins/poll/poll_class.php
+++ b/e107_plugins/poll/poll_class.php
@@ -661,8 +661,8 @@ class poll
 
 				$text .= "</div>"; // end pollsection div
 
-				$text .= "<div  class='control-group'>
-							<input class='btn' type='button' id='addoption' name='addoption' value='".LAN_FORUM_3032."' />
+				$text .= "<div  class='form-group control-group'>
+							<input class='btn btn-default' type='button' id='addoption' name='addoption' value='".LAN_FORUM_3032."' />
 						</div>
 
 			</form>";
@@ -798,7 +798,7 @@ class poll
 			$text .= "</span><br />";
 		}
 
-		$text .="</div><input class='btn' type='button' name='addoption' value='".POLLAN_8."' onclick=\"duplicateHTML('pollopt','pollsection')\" /><br />
+		$text .="</div><input class='btn btn-default' type='button' name='addoption' value='".POLLAN_8."' onclick=\"duplicateHTML('pollopt','pollsection')\" /><br />
 		</td></tr>
 
 		<tr>