diff --git a/e107_admin/cache.php b/e107_admin/cache.php
index 3791f74a3..74d816f2f 100644
--- a/e107_admin/cache.php
+++ b/e107_admin/cache.php
@@ -137,7 +137,7 @@ $text = "
 				<tbody>
 					<tr>
 						<td>
-							<strong>".CACLAN_11."</strong>
+							<strong class='e-tip'>".CACLAN_11."</strong>
 							<div class='field-help'>".CACLAN_13."</div>
 						</td>
 						<td>{$contentcache_label}</td>
@@ -147,7 +147,7 @@ $text = "
 					</tr>
 					<tr>
 						<td>
-							<strong>".CACLAN_12."</strong>
+							<strong class='e-tip'>".CACLAN_12."</strong>
 							<div class='field-help'>".CACLAN_14."</div>
 						</td>
 						<td>{$syscache_label}</td>
@@ -157,7 +157,7 @@ $text = "
 					</tr>
 					<tr>
 						<td>
-							<strong>".CACLAN_20."</strong>
+							<strong class='e-tip'>".CACLAN_20."</strong>
 							<div class='field-help'>".CACLAN_21."</div>
 						</td>
 						<td>{$dbcache_label}</td>
@@ -167,7 +167,7 @@ $text = "
 					</tr>
 					<tr>
 						<td>
-							<strong>".CACLAN_22."</strong>
+							<strong class='e-tip'>".CACLAN_22."</strong>
 							<div class='field-help'>".CACLAN_23."</div>
 						</td>
 						<td>{$imgcache_label}</td>
diff --git a/e107_admin/theme.php b/e107_admin/theme.php
index 41e0247e6..c00b364c2 100644
--- a/e107_admin/theme.php
+++ b/e107_admin/theme.php
@@ -24,6 +24,33 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
 
 $e_sub_cat = 'theme_manage';
 
+e107::css("inline","
+
+.admin-theme-thumb			{    }
+.admin-theme-thumb:hover	{ opacity:0.4 }
+
+.admin-theme-options		{ transition: opacity .20s ease-in-out;
+							 -moz-transition: opacity .20s ease-in-out;
+							 -webkit-transition: opacity .20s ease-in-out;
+							 opacity:0.1; 
+							 width:100%;
+							 height:80px;
+							 padding-top:50px;
+							 white-space:nowrap;
+							 background-color:black;
+							 display:block;position:relative; text-align:center; vertical-align:middle; top:-141px;}
+
+.admin-theme-options:hover	{ opacity:0.8; }
+
+.admin-theme-title			{ font-size: 15px; overflow:hidden; white-space:no-wrap; width:200px; position:relative; top:-130px; }
+
+.admin-theme-select			{border:1px dotted silver;background-color:#DDDDDD;float:left }
+
+.admin-theme-select-active	{ background-color:red;float:left }
+
+.admin-theme-cell			{ width:202px; height:160px; -moz-border-radius: 5px; border-radius: 5px; }
+");
+
 require_once("auth.php");
 
 require_once(e_HANDLER."theme_handler.php");
diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php
index 097d01607..e4f078afe 100644
--- a/e107_core/shortcodes/batch/bbcode_shortcodes.php
+++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php
@@ -140,7 +140,7 @@ class bbcode_shortcodes extends e_shortcode
 		
 		
 		$text .="<!-- Start of Size selector -->
-		<div id='{$this->var['tagid']}' style='display:none;margin-left:0px;margin-right:0px; position: absolute; left:340px; top:60px;z-index:5000;' >";
+		<div id='{$this->var['tagid']}' class='e-hideme col-selection' style='position:relative;top:30px;left:200px' >";
 		$text .="<div style='position:relative;bottom:30px; left:125px; width:100px'>";
 		$text .= "<table class='fborder' style='background-color: #fff'>
 		<tr><td class='forumheader3'>
diff --git a/e107_files/jslib/core/admin.jquery.js b/e107_files/jslib/core/admin.jquery.js
index 8c2153b79..09809c267 100644
--- a/e107_files/jslib/core/admin.jquery.js
+++ b/e107_files/jslib/core/admin.jquery.js
@@ -1,16 +1,26 @@
 $(document).ready(function()
 {
-
-		$("input,textarea,select,.e-tip").each(function(c) {
+		// run tips on title attribute. 
+		$(".e-tip").each(function() {
+			var tip = $(this).attr('title');
+			if(!tip)
+			{
+				return;
+			}
 			
+			$(this).tipsy({opacity:1.0,fade:true});
+			// $(this).css( 'cursor', 'pointer' )
+		});
+		
+		
+	
+		// run tips on .field-help 
+		$("input,textarea,select,label,.e-tip").each(function(c) {
+					
 			$(this).nextAll(".field-help").hide();
 		//	alert('hello');
 			$(this).tipsy({title: function() {
 				var tip = $(this).nextAll(".field-help").text();
-				if(!tip)
-				{
-				 var tip = $(this).find(".field-help").text();	
-				}
 				 return tip; 
 				},
 				fade: true,
@@ -19,16 +29,14 @@ $(document).ready(function()
 			});
 		
 		});
-		
-		
-		
-		$(".e-radio-multi").each(function() {
+	
+	
+			$(".e-radio-multi").each(function() {
 		//	$(this).nextAll(".field-help").hide();
 		//	$(this).nextAll(":input").tipsy({title: 'hello'});
 			
 		});
 		
-		
 		$(".e-tags").tagit();
 		
 		
diff --git a/e107_files/jslib/core/all.jquery.js b/e107_files/jslib/core/all.jquery.js
index 533d844ab..fb31a8034 100644
--- a/e107_files/jslib/core/all.jquery.js
+++ b/e107_files/jslib/core/all.jquery.js
@@ -121,7 +121,7 @@ $(document).ready(function()
 		
 		// 	Tooltips for bbarea. 
 		$(".bbcode_buttons").tipsy({gravity: 's',opacity: 1.0, fade: true,html: true});
-		$("a.e-tip").tipsy({gravity: 'w',opacity: 1.0, fade: true,html: true});
+	//	$("a.e-tip").tipsy({gravity: 'w',opacity: 1.0, fade: true,html: true});
 	//	var tabs = $('#tab-container').clone(true);
 	//	$('#htmlEditor').append(tabs);
 
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 780be1a7c..6d4e3b194 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -669,12 +669,12 @@ class themeHandler
 		
 		$previewbutton = (!$mode ? "<input class='button top' type='submit' name='preview_".$theme['id']."' value='".TPVLAN_9."' /> " : "");
 		
-		$main_icon = ($pref['sitetheme'] != $theme['path']) ? "<input class='top' type='image' src='".e_IMAGE_ABS."admin_images/main_16.png'  name='selectmain[".$theme['id']."]' alt='' title=\"".TPVLAN_10."\" />\n" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S16' />";
-		$info_icon = "<a href='#themeInfo_".$theme['id']."' class='e-expandit' title='Click to select columns to display'><img src='".e_IMAGE_ABS."admin_images/info_16.png' alt='' title=\"".TPVLAN_7."\" class='icon S16' /></a>\n";
-		$preview_icon = "<input class='top' type='image' src='".e_IMAGE_ABS."admin_images/search_16.png'  name=\"preview[".$theme['id']."]\" title='".TPVLAN_9." #".$theme['id']."' />\n";
-		$admin_icon = ($pref['admintheme'] != $theme['path']) ? "<input class='top' type='image' src='".e_IMAGE_ABS."e107_icon_16.png'  name='selectadmin[".$theme['id']."]' alt='' title=\"".TPVLAN_32."\" />\n" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S16' />";
+		$main_icon = ($pref['sitetheme'] != $theme['path']) ? "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."admin_images/main_32.png'  name='selectmain[".$theme['id']."]' alt='' title=\"".TPVLAN_10."\" />" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S32' />";
+		$info_icon = "<a href='#themeInfo_".$theme['id']."' class='e-modal e-tip' title='".TPVLAN_7."'><img src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' class='icon S32' /></a>";
+		$preview_icon = "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."admin_images/search_32.png'  name=\"preview[".$theme['id']."]\" title='".TPVLAN_9." #".$theme['id']."' />";
+		$admin_icon = ($pref['admintheme'] != $theme['path']) ? "<input class='top e-tip' type='image' src='".e_IMAGE_ABS."e107_icon_32.png'  name='selectadmin[".$theme['id']."]' alt='' title=\"".TPVLAN_32."\" />\n" : "<img src='".ADMIN_TRUE_ICON_PATH."' alt='' title='' class='icon S32' />";
 		
-		$newpreview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img src='".$theme['preview']."' style='width:200px; height:160px;' alt='' />" : "<img src='".e_IMAGE_ABS."admin_images/nopreview.png' style='width:200px;height:160px;' title='".TPVLAN_12."' alt='' />")."</a>";
+		$newpreview = "<a href='".e_BASE."news.php?themepreview.".$theme['id']."' title='".TPVLAN_9."' >".($theme['preview'] ? "<img class='admin-theme-thumb' src='".$theme['preview']."' style='width:200px; height:160px;' alt='' />" : "<img class='admin-theme-thumb' src='".e_IMAGE_ABS."admin_images/nopreview.png' style='width:200px;height:160px;' title='".TPVLAN_12."' alt='' />")."</a>";
 		
 		// Choose a Theme to Install.
 		if(!$mode)
@@ -682,14 +682,13 @@ class themeHandler
 			// styles NEED to be put into style.css
 			
 			$borderStyle = (($pref['sitetheme'] == $theme['path']) || ($pref['admintheme'] == $theme['path'])) ? "border:1px solid black" : "border:1px dotted silver;background-color:#DDDDDD";
-			$text = "<div class='f-left block-text' style='margin:5px;".$borderStyle.";width:202px;height:160px'>
-					<div style='height:130px;overflow:hidden;border:1px solid black;margin-bottom:10px'>".$newpreview."</div>
-					<div class='f-left mediumtext' style='width:55%;font-weight:bold'>".$theme['name']." ".$theme['version']."</div>
-					<div class='f-right right' style='width:45%;height:16px'>\n\n\n".$main_icon.$admin_icon.$info_icon.$preview_icon."\n\n</div>";
-			
-			//FIXME e-hideme doesn't work when JS is turned off. 
-			// This popup information should be loaded with ajax. 		
-			$text .=	"<div id='themeInfo_".$theme['id']."' class='e-hideme col-selection' style='position:relative;top:30px;width:480px'>\n".$this->renderThemeInfo($theme)."</div>\n";
+			$text = "<div class='f-left block-text admin-theme-cell' style='margin:5px;".$borderStyle.";'>
+					<div style='height:130px;overflow:hidden;border:1px solid black;margin-bottom:10px'>".$newpreview."</div>";
+			$text .= "<div class='admin-theme-options'>".$main_icon.$admin_icon.$info_icon.$preview_icon."</div>";
+					
+			$text .= "<div class='admin-theme-title'>".$theme['name']." ".$theme['version']."</div>";
+		//	$text .= "<div class='f-right right' style='width:45%;height:16px'>\n\n\n".$main_icon.$admin_icon.$info_icon.$preview_icon."\n\n</div>";
+			$text .=	"<div id='themeInfo_".$theme['id']."' class='e-hideme col-selection' style='background-color:white;position:relative;top:-130px;width:480px'>\n".$this->renderThemeInfo($theme)."</div>\n";
 
 			$text .= "</div>";
 			return $text;