diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php
index 2c76cc89e..ca2397eb9 100644
--- a/e107_admin/eurl.php
+++ b/e107_admin/eurl.php
@@ -177,12 +177,12 @@ class eurl_admin_ui extends e_admin_controller_ui
 			
 		if($success)
 		{
-			e107::getMessage()->addSuccess($success." SEF URLs were updated.");
+			e107::getMessage()->addSuccess($success. LAN_EURL_SURL_UPD);
 		}
 		
 		if($failed)
 		{
-			e107::getMessage()->addError($failed." SEF URLs were NOT updated.");	
+			e107::getMessage()->addError($failed. LAN_EURL_SURL_NUPD);	
 		}
 		
 		
@@ -740,7 +740,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
 			$bPrimary = $admin['generate']['primary'];
 			
 		
-			$text .= (is_array($admin['generate'])) ? $frm->admin_button('rebuild['.$bTable.']', $bPrimary."::".$bInput."::".$bOutput,'delete',"Rebuild") : "";	  
+			$text .= (is_array($admin['generate'])) ? $frm->admin_button('rebuild['.$bTable.']', $bPrimary."::".$bInput."::".$bOutput,'delete', LAN_EURL_REBUILD) : "";	  
 				  
 
 			$text .= "</td>
diff --git a/e107_admin/theme.php b/e107_admin/theme.php
index 66e9e9aaf..74c6831eb 100644
--- a/e107_admin/theme.php
+++ b/e107_admin/theme.php
@@ -232,13 +232,13 @@ function theme_adminmenu()
 		$var['choose']['text'] = TPVLAN_51;
 		$var['choose']['link'] = e_SELF."?mode=choose";
 		
-		$var['online']['text'] = "Find Themes";
+		$var['online']['text'] = TPVLAN_62;
 		$var['online']['link'] = e_SELF."?mode=online";
 
 		$var['upload']['text'] = TPVLAN_38;
 		$var['upload']['link'] = e_SELF."?mode=upload";
 		
-		$var['convert']['text'] = "Convert";
+		$var['convert']['text'] = TPVLAN_63;
 		$var['convert']['link'] = e_SELF."?mode=convert";
 
       //  $selected = (e_QUERY) ? e_QUERY : "main";
@@ -291,12 +291,13 @@ class theme_builder
 				$newDir[$dir] = $dir;
 			}
 			
-			$mes->addInfo("This Wizard will build a theme.xml meta file for your theme.<br />
-				Before you start: <ul>
-						<li>Make sure your theme's directory is writable</b></li>
-						<li>Select your theme's folder to begin.</li>
+			$mes->addInfo(' '.TPVLAN_64.' <br />
+       '.TPVLAN_65.' 
+            <ul> 
+						<li> '.TPVLAN_66.'</li>
+						<li> '.TPVLAN_67.'</li>
 				</ul>
-			");
+	');
 			
 			$text = $frm->open('createPlugin','get',e_SELF."?mode=convert");
 			$text .= "<table class='table adminform'>
@@ -305,7 +306,7 @@ class theme_builder
 							<col class='col-control' />
 						</colgroup>
 				<tr>
-					<td>Select your theme's folder</td>
+					<td> ".TPVLAN_68."</td>
 					<td>".$frm->select("newtheme",$newDir)."</td>
 				</tr>";
 				
@@ -320,12 +321,12 @@ class theme_builder
 			$text .= "				
 				</table>
 				<div class='buttons-bar center'>
-				".$frm->admin_button('step', 2,'other','Go')."
+				".$frm->admin_button('step', 2,'other',LAN_GO)."
 				</div>";
 			
 			$text .= $frm->close();
 			
-			$ns->tablerender(TPVLAN_26.SEP."Converter".SEP."Step 1", $mes->render() . $text);			
+			$ns->tablerender(TPVLAN_26.SEP."Converter".SEP. TPVLAN_CONV_1, $mes->render() . $text);			
 			
 		}	
 
@@ -340,12 +341,12 @@ class theme_builder
 			
 			$data = array(
 				'main' 			=> array('name','lang','version','date', 'compatibility'),
-				'author' 		=> array('name','url'),
-				'summary' 		=> array('summary'),
+			  'author' 		=> array('name','url'),
+				'summary'		=> array('summary'),
 				'description' 	=> array('description'),
 				'keywords' 		=> array('one','two'),
 				'category'		=> array('category'),
-				'copyright'		=> array('copyright'),
+				'copyright' 	=> array('copyright'),
 				'stylesheets' 	=> array('stylesheets')
 		//		'adminLinks'	=> array('url','description','icon','iconSmall','primary'),
 		//		'sitelinks'		=> array('url','description','icon','iconSmall')
@@ -412,12 +413,12 @@ class theme_builder
 			<div class='buttons-bar center'>"
 			.$frm->hidden('newtheme', $this->themeName)
 			.$frm->hidden('xml[custompages]', trim(vartrue($leg['CUSTOMPAGES'])))
-			.$frm->admin_button('step', 3,'other','Generate')."
+			.$frm->admin_button('step', 3,'other',LAN_GENERATE)."
 			</div>";
 			
 			$text .= $frm->close();
 
-			$ns->tablerender(TPVLAN_26.SEP."Converter".SEP."Step 2", $mes->render() . $text);		
+			$ns->tablerender(TPVLAN_26.SEP."Converter".SEP. TPVLAN_CONV_2, $mes->render() . $text);		
 		}
 					
 				
@@ -592,47 +593,47 @@ TEMPLATE;
 			{
 				
 				case 'main-name':
-					$help 		= "The name of your theme. (Must be written in English)";
+					$help 		= TPVLAN_CONV_3;
 					$required 	= true;
 					$pattern 	= "[A-Za-z ]*";
 				break;
 		
 				case 'main-lang':
-					$help 		= "If you have a language file, enter the LAN_XXX value for the theme's name";
+					$help 		= TPVLAN_CONV_4;
 					$required 	= false;
 					$placeholder= " ";
 					$pattern 	= "[A-Z0-9_]*";
 				break;
 				
 				case 'main-date':
-					$help 		= "Creation date of your theme";
+					$help 		= TPVLAN_CONV_6;
 					$required 	= true;
 				break;
 				
 				case 'main-version':
 					$default 	= '1.0';
 					$required 	= true;
-					$help 		= "The version of your theme. Format: x.x";
+					$help 		= TPVLAN_CONV_5;
 					$pattern	= "^[\d]{1,2}\.[\d]{1,2}$";
 				break;
 
 				case 'main-compatibility':
 					$default 	= '2.0';
 					$required 	= true;
-					$help 		= "Compatible with this version of e107";
+					$help 		= TPVLAN_CONV_7;
 					$pattern	= "^[\d]{1,2}\.[\d]{1,2}$";
 				break;
 				
 				case 'author-name':
 					$default 	= (vartrue($default)) ? $default : USERNAME;
 					$required 	= true;
-					$help 		= "Author Name";
+					$help 		= TPVLAN_CONV_8;
 					$pattern	= "[A-Za-z \.0-9]*";
 				break;
 				
 				case 'author-url':
 					$required 	= true;
-					$help 		= "Author Website Url";
+					$help 		= TPVLAN_CONV_9;
 				//	$pattern	= "https?://.+";
 				break;
 				
@@ -641,7 +642,7 @@ TEMPLATE;
 				//break;	
 				
 				case 'summary-summary':
-					$help 		= "A short one-line description of the plugin. (!@#$%^&* characters not permitted) <br />(Must be written in English)";
+					$help 		= TPVLAN_CONV_10;
 					$required 	= true;
 					$size 		= 100;
 					$placeholder= " ";
@@ -650,7 +651,7 @@ TEMPLATE;
 				
 				case 'keywords-one':
 				case 'keywords-two':
-					$help 		= "Keyword/Tag for this theme<br />(Must be written in English)";
+					$help 		= TPVLAN_CONV_11;
 					$required 	= true;
 					$size 		= 20;
 					$placeholder= " ";
@@ -658,7 +659,7 @@ TEMPLATE;
 				break;	
 				
 				case 'description-description':
-					$help 		= "A full description of the theme<br />(Must be written in English)";
+					$help 		= TPVLAN_CONV_12;
 					$required 	= true;
 					$size 		= 100;
 					$placeholder = " ";
@@ -667,7 +668,7 @@ TEMPLATE;
 				
 					
 				case 'category-category':
-					$help 		= "What category of theme is this?";
+					$help 		= TPVLAN_CONV_13;
 					$required 	= true;
 					$size 		= 20;
 				break;
@@ -695,9 +696,9 @@ TEMPLATE;
 						$text .= "<div class='row-fluid'>";
 						$text .= "<div class='controls'>";
 						$text .= "<div class='span3'>".$frm->checkbox($name.'['.$key.'][file]',$file, false, array('label'=>$file))."
-						<div class='field-help'>Enable this stylesheet as a selectable option in the Theme Manager.</div></div>";
+						<div class='field-help'>".TPVLAN_CONV_14."</div></div>";
 						$text .= "<div class='span3'>".$frm->text($name.'['.$key.'][name]', $default, $size, 'placeholder='.$file . $req. $pat)."
-						<div class='field-help'>Give this stylesheet a name</div></div>";
+						<div class='field-help'>".TPVLAN_CONV_15."</div></div>";
 					//	$text .= "<div class='span2'>".$frm->checkbox('css['.$key.'][file]',$file, false, array('label'=>$file))."</div>";
 					//	$text .= "<div class='span2'>".$frm->text('css['.$key.'][name]', $default, $size, 'placeholder='.$placeholder . $req. $pat)."</div>";	
 						$text .= "</div>";
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 432b1d44a..dd16ff46a 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1109,11 +1109,11 @@ class e_form
 		
 		if(vartrue($options['generate']))
 		{
-			$gen = '&nbsp;<a href="#" class="btn btn-default btn-small e-tip" id="Spn_PasswordGenerator" title="Generate a password">Generate</a> ';
+			$gen = '&nbsp;<a href="#" class="btn btn-default btn-small e-tip" id="Spn_PasswordGenerator" title=" '.LAN_GEN_PW.' " >'.LAN_GENERATE.'</a> ';
 			
 			if(empty($options['nomask']))
 			{
-				$gen .= '<a class="btn btn-default btn-small e-tip" href="#" id="showPwd" title="Display the password">Show</a><br />';	
+				$gen .= '<a class="btn btn-default btn-small e-tip" href="#" id="showPwd" title=" '.LAN_DISPL_PW.' ">'.LAN_SHOW.'</a><br />';	
 			}
 		}
 		
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index ca4905b8f..beba196b7 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -670,7 +670,7 @@ class themeHandler
 
 			$text .= "</form>";
 
-			$ns->tablerender(TPVLAN_26.SEP."Available for Download", $mes->render().$text);
+			$ns->tablerender(TPVLAN_26.SEP.TPVLAN_69, $mes->render().$text);
 
 	}
 	
@@ -1102,7 +1102,7 @@ class themeHandler
 			//$main_icon = "<a data-src='".$downloadUrl."' href='{$downloadUrl}' data-target='{$id}' data-loading='".e_IMAGE."/generic/loading_32.gif' class='-e-ajax' title='".$LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt=''  /></a> ";		
 		//	$main_icon = "<a data-toggle='modal' data-modal-caption=\"".$caption."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a> ";
 			
-			$modalCaption = (empty($theme['price'])) ? 'Downloading '.$theme['name']." ".$theme['version'] : 'Purchase '.$theme['name']." ".$theme['version'];
+			$modalCaption = (empty($theme['price'])) ? ' '.LAN_DOWN_THEME.' '.$theme['name']." ".$theme['version'] :' '.LAN_PURCHASE.' '.$theme['name']." ".$theme['version'];
 			$main_icon = "<a class='e-modal btn-default btn btn-sm btn-small btn-inverse' data-modal-caption=\"".$modalCaption."\" rel='external'  href='{$downloadUrl}' data-cache='false' title='".$LAN_DOWNLOAD."' >".$tp->toGlyph('download',array('size'=>'2x'))."</a>";
 		
 			
@@ -1122,7 +1122,7 @@ class themeHandler
 	
 		}
 		
-		$preview_icon 	= "<a class='e-modal btn btn-default btn-sm btn-small btn-inverse' title='Preview/Live-Demo : ".$theme['name']."' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external'  href='".$previewPath."'>".$tp->toGlyph('fa-search',array('size'=>'2x'))."</a>";
+		$preview_icon 	= "<a class='e-modal btn btn-default btn-sm btn-small btn-inverse' title=' ".TPVLAN_70." ".$theme['name']."' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" rel='external'  href='".$previewPath."'>".$tp->toGlyph('fa-search',array('size'=>'2x'))."</a>";
 		
 		
 		if(!in_array($theme['path'], $this->approvedAdminThemes))
@@ -1224,7 +1224,7 @@ class themeHandler
 			//		$text .= "<tr><td style='vertical-align:top; width:25%'><b>Price</b>:</td><td style='vertical-align:top'>".$price."</td></tr>";
 					$text .= "<tr><td style='vertical-align:top; width:25%'><b>".TPVLAN_49."</b>:</td>
 						<td style='vertical-align:top' colspan='2'>";
-					$text .= ($theme['xhtmlcompliant']) ? "W3C XHTML ".$theme['xhtmlcompliant'] : "Not Specified";
+					$text .= ($theme['xhtmlcompliant']) ? "W3C XHTML ".$theme['xhtmlcompliant'] : TPVLAN_71;
 					$text .= ($theme['csscompliant']) ? " &amp; CSS ".$theme['csscompliant'] : "";
 					$text .= "</td></tr>";
 		
@@ -1311,7 +1311,7 @@ class themeHandler
 							{
 								foreach ($pref['sitetheme_custompages'][$key] as $cp)
 								{
-									$custompage_diz .= "<a href='#element-to-be-shown-{$key}' title='Set pages which should automatically use this layout. One per line.' class='e-tip btn btn-default btn-xs btn-mini e-expandit'>".trim($cp)."</a>&nbsp;";
+									$custompage_diz .= "<a href='#element-to-be-shown-{$key}' title=' ".TPVLAN_72." ' class='e-tip btn btn-default btn-xs btn-mini e-expandit'>".trim($cp)."</a>&nbsp;";
 									if($count > 4)
 									{
 										$custompage_diz .= "...";
@@ -1322,7 +1322,7 @@ class themeHandler
 							}
 							else
 							{
-								$custompage_diz = "<a href='#element-to-be-shown-{$key}' title='Set pages which should automatically use this layout. One per line.' class='e-tip btn btn-xs btn-default btn-mini e-expandit'>None</a> ";
+								$custompage_diz = "<a href='#element-to-be-shown-{$key}' title=' ".TPVLAN_72." ' class='e-tip btn btn-xs btn-default btn-mini e-expandit'>".LAN_NONE."</a> ";
 							}
 			
 							
@@ -1618,13 +1618,13 @@ class themeHandler
 		
 // 		print_a($preset); 
 		//TODO LAN
-		$text = "<div class='btn-group pull-right'>".$frm->admin_button("setMenuPreset[".$key."]", "Activate Menus",'other');
+		$text = "<div class='btn-group pull-right'>".$frm->admin_button("setMenuPreset[".$key."]", TPVLAN_73,'other');
 		$text .= '<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
 		<span class="caret"></span>
 		</button>
 		<ul class="dropdown-menu col-selection">
 		<!-- dropdown menu links -->
-		<li class="dropdown-header">Activates the following:</li>
+		<li class="dropdown-header">'.TPVLAN_74.'</li>
 		';
 										
 		foreach($preset as $val)
diff --git a/e107_languages/English/English.php b/e107_languages/English/English.php
index e2899e872..b73c98257 100644
--- a/e107_languages/English/English.php
+++ b/e107_languages/English/English.php
@@ -117,7 +117,9 @@ define("LAN_RELATED", "Related");
 
 define("LAN_ENTER_USRNAME_EMAIL", "Please enter your username or email"); // admin php hover field admin name
 define("LAN_PWD_REQUIRED", "Password is required"); // admin php hover field admin password
-
+define("LAN_SHOW", "Show");
+define("LAN_GENERATE", "Generate");
+define("LAN_SUMMARY", "Summary");  // TODO   more files use summary replace
 
 
 ?>
\ No newline at end of file
diff --git a/e107_languages/English/admin/help/theme.php b/e107_languages/English/admin/help/theme.php
index 724055b79..3b50c3006 100644
--- a/e107_languages/English/admin/help/theme.php
+++ b/e107_languages/English/admin/help/theme.php
@@ -16,5 +16,5 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-$text = "The theme manager allows you to set your site's public theme and your admin areas theme.";
+$text = "The theme manager allows you to set your site's public theme and your admin areas theme.<br /><br />Look at the tooltips (when available) for description  ";
 $ns -> tablerender("Theme Manager Help", $text);
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 1f33481ad..662c4067a 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -331,7 +331,8 @@ define("LAN_STATUS", "Status");
 define("LAN_URL", "URL");
 
 define("LAN_OWNER", "Owner");
-
+define("LAN_PURCHASE", "Purchase ");
+define("LAN_DOWN_THEME", "Downloading ");
 
 define("LAN_ID", "ID");
 
@@ -415,7 +416,9 @@ define("LAN_CUSTOM_URL", "Custom URL");
 define("LAN_CUSTOM_URL_DISABLED", "Disabled or Enter Custom URL");
 
 define("LAN_GENERAL", "General");
-define("LAN_GENERATE", "Generate");
+//define("LAN_GENERATE", "Generate"); //moved to English php
+define("LAN_GEN_PW", "Generate a password");
+define("LAN_DISPL_PW", "Display the password");
 define("LAN_WILL_OVERWRITE_SEF", "This will overwrite your existing SEF URL.");
 
 // TODO - move e_form related LANS below, add new lan_form.php file (for both front/back-end)
diff --git a/e107_languages/English/admin/lan_eurl.php b/e107_languages/English/admin/lan_eurl.php
index 69d918061..ea8cd1ed0 100644
--- a/e107_languages/English/admin/lan_eurl.php
+++ b/e107_languages/English/admin/lan_eurl.php
@@ -30,7 +30,8 @@ define("LAN_EURL_FORM_HELP_EXAMPLE", "Base URL");
 
 // messages
 define("LAN_EURL_ERR_ALIAS_MODULE", "Alias &quot;%1\$s&quot; can't be saved - there is a system URL profile with the same name. Please choose another alias value for system URL profile &quot;%2\$s&quot;"); // FIXME HTML IN LAN
-
+define("LAN_EURL_SURL_UPD",    "&nbsp; SEF URLs were updated.");
+define("LAN_EURL_SURL_NUPD",    "&nbsp; SEF URLs were NOT updated.");
 // settings
 define("LAN_EURL_SETTINGS_PATHINFO", "Remove filename from the URL");
 define("LAN_EURL_SETTINGS_MAINMODULE", "Associate Root namespace");
@@ -129,4 +130,5 @@ define("LAN_EURL_SYSTEM_REWRITE_DESCR", "URLs for pages like Not Found, Access d
 // System
 define("LAN_EURL_CORE_INDEX", "Front Page");
 define("LAN_EURL_CORE_INDEX_INFO", "Front Page can't have an alias.");
+define("LAN_EURL_REBUILD",    "Rebuild");
 //define("LAN_EURL_", "");
\ No newline at end of file
diff --git a/e107_languages/English/admin/lan_frontpage.php b/e107_languages/English/admin/lan_frontpage.php
index 9166c803a..859a0ee93 100644
--- a/e107_languages/English/admin/lan_frontpage.php
+++ b/e107_languages/English/admin/lan_frontpage.php
@@ -19,6 +19,7 @@ define("FRTLAN_51", "Other");
 define("FRTLAN_PAGE_TITLE", "Front Page");
 define("FRTLAN_56", "duplicate definition for class:");
 define("FRTLAN_57", "Software error");
+define("FRTLAN_61", "Selection");
 
 // define("FRTLAN_53", "User Class");
 //define("FRTLAN_1", "Front Page settings updated.");
diff --git a/e107_languages/English/admin/lan_theme.php b/e107_languages/English/admin/lan_theme.php
index 31bb8a87b..cf05b957b 100644
--- a/e107_languages/English/admin/lan_theme.php
+++ b/e107_languages/English/admin/lan_theme.php
@@ -74,5 +74,37 @@ define("TPVLAN_58", "This theme comes with pre-installed example content (such a
 define("TPVLAN_59", "Please be aware that the example content will [b]overwrite[/b] your current content with the following");
 define("TPVLAN_60", "[x] record(s) in your [y] table");
 define("TPVLAN_61", "Would you like to [b]replace[/b] your current content with the default example content provided by the theme?");
+define("TPVLAN_62", "Find Themes");
+define("TPVLAN_63", "Convert");
+
+define("TPVLAN_64", "This Wizard will build a theme.xml meta file for your theme.");
+define("TPVLAN_65", "Before you start : ");
+define("TPVLAN_66", "Make sure your theme's directory is writable");
+define("TPVLAN_67", "Select your theme's folder to begin.");
+define("TPVLAN_68", "Select your theme's folder");
+define("TPVLAN_69", "Available for Download");
+define("TPVLAN_70", "Preview/Live-demo : ");
+define("TPVLAN_71", "Not Specified");
+define("TPVLAN_72", "Set pages which should automatically use this layout. One per line.");
+define("TPVLAN_73", "Activate Menus");
+define("TPVLAN_74", "Activates the following:");
+
+// convert
+define("TPVLAN_CONV_1", "Step 1");
+define("TPVLAN_CONV_2", "Step 2");
+define("TPVLAN_CONV_3", "The name of your theme. (Must be written in English)");
+define("TPVLAN_CONV_4", "If you have a language file, enter the LAN_XXX value for the theme's name");
+define("TPVLAN_CONV_5", "The version of your theme. Format: x.x");
+define("TPVLAN_CONV_6", "Creation date of your theme");
+define("TPVLAN_CONV_7", "Compatible with this version of e107");
+define("TPVLAN_CONV_8", "Author Name");
+define("TPVLAN_CONV_9", "Author Website Url");
+define("TPVLAN_CONV_10", "A short one-line description of the plugin. (!@#$%^&* characters not permitted)(Must be written in English)");
+define("TPVLAN_CONV_11", "Keyword/Tag for this theme (Must be written in English)");
+define("TPVLAN_CONV_12", "A full description of the theme (Must be written in English)");
+define("TPVLAN_CONV_13", "What category of theme is this?");
+define("TPVLAN_CONV_14", "Enable this stylesheet as a selectable option in the Theme Manager.");
+define("TPVLAN_CONV_15", "Give this stylesheet a name");
+
 
 ?>
\ No newline at end of file