diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index c6ed40e3c..e80fb0bee 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -1373,6 +1373,40 @@ class themeHandler
 
 		
 					$text .= $itext;
+
+					$wildcard = false;
+					$curCss = array();
+
+
+					foreach($theme['css'] as $k=>$vl)
+					{
+						if($vl['name'] == '*')
+						{
+							unset($theme['css'][$k]);
+							$wildcard = true;
+						}
+						else
+						{
+							$curCss[] = $vl['name'];
+						}
+					}
+
+
+					if($wildcard == true)
+					{
+						foreach($theme['files'] as $val)
+						{
+							if(substr($val,-4) == '.css' && substr($val,0,5) != 'admin_' && !in_array($val, $curCss))
+							{
+								$theme['css'][] = array('name'=>$val, 'info'=>'User-added Stylesheet', 'nonadmin'=>1);
+							}
+						}
+
+					}
+
+
+
+
 					
 					if(array_key_exists("multipleStylesheets", $theme) && $mode)
 					{
diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php
index 666435807..1d50e87cd 100644
--- a/e107_plugins/social/e_shortcode.php
+++ b/e107_plugins/social/e_shortcode.php
@@ -108,10 +108,12 @@ class social_shortcodes extends e_shortcode
 		
 		$size			= varset($parm['size'],		'md');
 		
-		//TODO LANS ie. "Share on [x]" in English_global.php 
+		//TODO LANS ie. "Share on [x]" in English_global.php
+
+		$emailMessage = "Check out this link: "; //TODO LAN
 		
 		$providers = array(
-			'email'				=> array('icon'	=> 'e-social-mail',			'title'=>"Email to someone",	'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=Check out this link: [u]"),
+			'email'				=> array('icon'	=> 'e-social-mail',			'title'=>"Email to someone",	'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=".urlencode($emailMessage)."[u]"),
 			'facebook-like'		=> array('icon' => 'e-social-thumbs-up',	'title'=>"Like on Facebook",	'url' => "http://www.facebook.com/plugins/like.php?href=[u]"),
 			'facebook-share'	=> array('icon' => 'e-social-facebook',		'title'=>"Share on Facebook",	'url' => "http://www.facebook.com/sharer.php?u=[u]&t=[t]"),
 			'twitter'			=> array('icon' => 'e-social-twitter',		'title'=>"Share on Twitter",	'url' => "http://twitter.com/share?url=[u]&text=[t]"),
@@ -171,7 +173,7 @@ class social_shortcodes extends e_shortcode
 			$text = '<div class="btn-group '.$dir.'">
 				  <a class="e-tip btn btn-dropdown btn-default btn-'.$size.' dropdown-toggle" data-toggle="dropdown" href="#" title="Share">'.$label.'</a>
 				 
-				  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"  style="min-width:435px">
+				  <ul class="dropdown-menu" role="menu"  style="min-width:435px">
 				  
 				    <li><div class="btn-group" style="padding-left: 7px;">'.implode("\n",$opt).'</div></li>
 				  </ul>
diff --git a/e107_plugins/social/twitter_menu.php b/e107_plugins/social/twitter_menu.php
index b25416dfc..f3ed8821b 100644
--- a/e107_plugins/social/twitter_menu.php
+++ b/e107_plugins/social/twitter_menu.php
@@ -30,7 +30,7 @@ if(deftrue('XURL_TWITTER'))
 
 
 
-	$text = '<a class="twitter-timeline" data-theme="'.$theme.'" href="'.XURL_TWITTER.'" data-tweet-limit="'.$limit.'" data-widget-id="'.$widgetId.'" height="'.$height.'"  data-screen-name="'.$screenName.'" data-chrome="noheader nofooter transparent noscrollbar">Tweets by @'.$screenName.'</a>';
+	$text = '<a class="twitter-timeline" data-theme="'.$theme.'" href="'.XURL_TWITTER.'" data-tweet-limit="'.$limit.'" data-widget-id="'.$widgetId.'" style="height:'.$height.'px" data-screen-name="'.$screenName.'" data-chrome="noheader nofooter transparent noscrollbar">Tweets by @'.$screenName.'</a>';
 
 
 	e107::getRender()->tablerender('Twitter',$text,'twitter-menu');
diff --git a/e107_themes/bootstrap3/theme.php b/e107_themes/bootstrap3/theme.php
index eb3cb8e4c..b9649d345 100644
--- a/e107_themes/bootstrap3/theme.php
+++ b/e107_themes/bootstrap3/theme.php
@@ -113,11 +113,19 @@ function tablestyle($caption, $text, $id='', $info=array())
 		</div>';	
 		return;
 	}
-	
-	echo '<h2 class="caption">'.$caption.'</h2>
-			
-			'.$text.'
-			';
+
+
+
+	// default.
+
+	if(!empty($caption))
+	{
+		echo '<h2 class="caption">'.$caption.'</h2>';
+	}
+
+	echo $text;
+
+
 					
 	return;
 	
diff --git a/e107_themes/bootstrap3/theme.xml b/e107_themes/bootstrap3/theme.xml
index 55e9b9f92..fbe736f50 100644
--- a/e107_themes/bootstrap3/theme.xml
+++ b/e107_themes/bootstrap3/theme.xml
@@ -18,6 +18,7 @@
 	</screenshots>
 	<stylesheets>
 		<css file="style.css" name="Default"  />
+        <css file="*" name="*"  />
 	</stylesheets>
 	<layouts>
 		<layout name='jumbotron_home' title='Jumbotron (home)' default='false'>