diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 9fa0dd053..8bd12c635 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -2347,34 +2347,43 @@ class e_parse extends e_parser
 
 	//	e107::getDebug()->log("Thumb: ".basename($url). print_a($options,true), E107_DBG_BASIC);
 
-		if(isset($options['crop']))
+		if(!empty($options))
 		{
-			$this->thumbCrop = intval($options['crop']);
-		}
-
-		if(isset($options['x']))
-		{
-			$this->thumbEncode($options['x']);
-		}
-				
-		if(vartrue($options['aw']) || vartrue($options['ah']) || ($this->thumbCrop == 1))
-		{
-			if($this->thumbCrop == 1 && !vartrue($options['aw']) && !vartrue($options['ah'])) // Allow templates to determine dimensions. See {SETIMAGE}
-			{
-				$options['aw']	= $this->thumbWidth;
-				$options['ah']	 = $this->thumbHeight;
-			}
-			
-			$thurl .= 'aw='.((integer) vartrue($options['aw'], 0)).'&ah='.((integer) vartrue($options['ah'], 0));
+			$options['w']       = varset($options['w']);
+			$options['h']       = varset($options['h']);
+			$options['crop']    = (isset($options['aw']) || isset($options['ah'])) ? 1 : varset($options['crop']);
+			$options['aw']      = varset($options['aw']);
+			$options['ah']      = varset($options['ah']);
+			$options['x']       = varset($options['x']);
 		}
 		else
 		{
-			if(!vartrue($options['w']) && !vartrue($options['h'])) // Allow templates to determine dimensions. See {SETIMAGE}
+			$options['w']       = $this->thumbWidth;
+			$options['h']       = $this->thumbHeight;
+			$options['crop']    = $this->thumbCrop;
+			$options['aw']      = null;
+			$options['ah']      = null;
+			$options['x']       = $this->thumbEncode;
+
+		}
+
+
+		if(!empty($options['crop']))
+		{
+			if(!empty($options['aw']) || !empty($options['ah']))
 			{
-				 $options['w'] = $this->thumbWidth;
-				 $options['h'] = $this->thumbHeight;
+				$options['w']	= $options['aw'] ;
+				$options['h']	= $options['ah'] ;
 			}
-			$thurl .= 'w='.((integer) vartrue($options['w'], 0)).'&h='.((integer) vartrue($options['h'], 0));
+
+			$thurl .= 'aw='.intval($options['w']).'&ah='.intval($options['h']);
+
+		}
+		else
+		{
+
+			$thurl .= 'w='.intval($options['w']).'&h='.intval($options['h']);
+
 		}
 
 
@@ -2383,7 +2392,7 @@ class e_parse extends e_parser
 			$options['full'] = $full;
 			$options['ext'] = substr($url,-3);
 			$options['thurl'] = $thurl;
-			$options['x'] = $this->thumbEncode();
+		//	$options['x'] = $this->thumbEncode();
 
 			if($sefUrl = $this->thumbUrlSEF($url,$options))
 			{
@@ -2391,7 +2400,7 @@ class e_parse extends e_parser
 			}
 		}
 
-		if(!empty($this->thumbEncode))//base64 encode url
+		if(!empty($options['x'] ))//base64 encode url
 		{
 			$thurl = 'id='.base64_encode($thurl);
 		}
@@ -2411,27 +2420,13 @@ class e_parse extends e_parser
 		if(is_array($width))
 		{
 			$parm = $width;
+			$multiply = $width['size'];
+			$encode = $width['x'];
 			$width = $width['size'];
-
-			if(!empty($parm['aw']) || !empty($parm['aw']) )
-			{
-				$this->thumbWidth($parm['aw']);
-				$this->thumbHeight($parm['ah']);
-				$this->thumbCrop = 1;
-			}
-			elseif(!empty($parm['w']) || !empty($parm['w']) )
-			{
-				$this->thumbWidth($parm['w']);
-				if(isset($parm['h']))
-				{
-					$this->thumbHeight($parm['h']);
-				}
-
-			}
-
 		}
 
-		$encode =  $this->thumbEncode();;
+
+	//	$encode =  $this->thumbEncode();;
 		if($width == null || $width=='all')
 		{
 			$links = array();
@@ -2451,31 +2446,32 @@ class e_parse extends e_parser
 			return implode(", ",$links);
 
 		}
-		elseif($width == '2x')
+		elseif($multiply == '2x' || $multiply == '3x' || $multiply == '4x')
 		{
-			$width = ($this->thumbWidth * 2);
-			$height = ($this->thumbHeight * 2);
-		}
-		elseif($width == '3x')
-		{
-			$width = (!empty($parm['w'])) ? ($parm['w'] * 3) : ($this->thumbWidth * 3);
-			$height = (!empty($parm['h'])) ? ($parm['h'] * 3) : ($this->thumbHeight * 3);
-		}
-		elseif($width == '4x')
-		{
-			$width = (!empty($parm['w'])) ? ($parm['w'] * 4) : ($this->thumbWidth * 4);
-			$height = (!empty($parm['h'])) ? ($parm['h'] * 4) : ($this->thumbHeight * 4);
+
+			if(empty($parm['w']) && isset($parm['h']))
+			{
+				$parm['h'] = ($parm['h'] * $multiply) ;
+				return $this->thumbUrl($src, $parm)." ".$multiply;
+			}
+
+			$width = (!empty($parm['w'])) ? ($parm['w'] * $multiply) : ($this->thumbWidth * $multiply);
+			$height = (!empty($parm['h'])) ? ($parm['h'] * $multiply) : ($this->thumbHeight * $multiply);
 		}
 		else
 		{
 			$height = (($this->thumbHeight * $width) / $this->thumbWidth);
 		}
 
-		$parms = !empty($this->thumbCrop) ? array('aw' => $width, 'ah' => $height) : array('w'  => $width,	'h'  => $height	);
+		$parms = array('w'=>$width,'h'=>$height,'crop'=> $parm['crop'],'x'=>$parm['x'], 'aw'=>$parm['aw'],'ah'=>$parm['ah']);
+
+	//	$parms = !empty($this->thumbCrop) ? array('aw' => $width, 'ah' => $height, 'x'=>$encode) : array('w'  => $width,	'h'  => $height, 'x'=>$encode	);
+
+		// $parms['x'] = $encode;
 
-		$parms['x'] = $encode;
 		return $this->thumbUrl($src, $parms)." ".$width."w";
 
+
 	}
 
 
@@ -2519,6 +2515,7 @@ class e_parse extends e_parser
 		}
 		else
 		{
+			// e107::getDebug()->log("SEF URL False: ".$url);
 			return false;
 		}
 
@@ -2529,6 +2526,10 @@ class e_parse extends e_parser
 		{
 			$sefUrl .= 'a'.intval($options['aw']) .'xa'. intval($options['ah']);
 		}
+		elseif(!empty($options['crop']))
+		{
+			$sefUrl .= 'a'.intval($options['w']) .'xa'. intval($options['h']);
+		}
 		else
 		{
 			$sefUrl .= intval($options['w']) .'x'. intval($options['h']);
@@ -3660,46 +3661,23 @@ class e_parser
 			return null;
 		}
 
-		if(!empty($parm['aw']) || !empty($parm['ah']))
-		{
-			$parm['w'] = $parm['aw'];
-			$parm['h'] = $parm['ah'];
-			$parm['crop'] = 1;
-			unset($parm['aw'],$parm['ah']);
-		}
-
-		if(!empty($parm['w']))
-		{
-			$tp->thumbWidth($parm['w']);
-		}
-
-		if(!empty($parm['h']))
-		{
-			$tp->thumbHeight($parm['h']);
-		}
-
-		if(!empty($parm['crop']))
-		{
-			$tp->thumbCrop(true);
-		}
-
-		if(!empty($parm['x']))
-		{
-			$tp->thumbEncode(true);
-		}
-
-		if(empty($parm['w']))
-		{
-			$parm['w'] = $tp->thumbWidth();
-		}
-
 
 		if(strpos($file,'e_MEDIA')!==false || strpos($file,'e_THEME')!==false || strpos($file,'e_PLUGIN')!==false) //v2.x path.
 		{
 
-			$path = $tp->thumbUrl($file);
+			if(!isset($parm['w']) && !isset($parm['h']))
+			{
+				$parm['w']      = $tp->thumbWidth();
+				$parm['h']      = $tp->thumbHeight();
+				$parm['crop']   = $tp->thumbCrop();
+				$parm['x']      = $tp->thumbEncode();
+			}
+
+			unset($parm['src']);
+			$path = $tp->thumbUrl($file,$parm);
 			$srcSetParm = $parm;
 			$srcSetParm['size'] = ($parm['w'] < 100) ? '4x' : '2x';
+
 			$parm['srcset'] = $tp->thumbSrcSet($file, $srcSetParm);
 
 		}
diff --git a/e107_plugins/siteinfo/e_shortcode.php b/e107_plugins/siteinfo/e_shortcode.php
index 13d34e8fa..ced8dfa96 100644
--- a/e107_plugins/siteinfo/e_shortcode.php
+++ b/e107_plugins/siteinfo/e_shortcode.php
@@ -159,7 +159,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 
 			if(empty($parm['noresize']) && !empty($logopref)) // resize by default - avoiding large files.
 			{
-				 $logo = $tp->thumbUrl($logopref,$parm);
+				 $logo = $logopref;
 			}
 		}
 		elseif(!deftrue('BOOTSTRAP'))
@@ -167,11 +167,25 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 			$dimensions = getimagesize($path);
 		}
 
-		$imageStyle = (empty($dimensions)) ? '' : " style='width: ".$dimensions[0]."px; height: ".$dimensions[1]."px' ";
+		$opts = array('alt'=>SITENAME, 'class'=>'logo img-responsive');
 
-		$image = "<img class='logo img-responsive' src='".$logo."' ".$imageStyle." alt='".SITENAME."' />\n";
-	
+		if(!empty($dimensions[0]))
+		{
+			$opts['w'] = $dimensions[0];
 
+		}
+
+		if(!empty($dimensions[1]))
+		{
+			$opts['h'] = $dimensions[1];
+		}
+
+	//	$imageStyle = (empty($dimensions)) ? '' : " style='width: ".$dimensions[0]."px; height: ".$dimensions[1]."px' ";
+	//	$image = "<img class='logo img-responsive' src='".$logo."' ".$imageStyle." alt='".SITENAME."' />\n";
+
+
+
+		$image = $tp->toImage($logo,$opts);
 		
 
 		if (isset($link) && $link)
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 80c7a1579..a91f49c92 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -405,7 +405,7 @@ i.s-message-debug	{ background-position: -1480px 0; width: 32px; height: 32px;
   line-height: 20px;
   text-align: left;
   vertical-align: top;
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #0a0a0a;
 }
 .fborder th , .fcaption {
   font-weight: bold;
@@ -1241,6 +1241,17 @@ li.rssRow > div {
 
 .xdebug-error { color: black; font-size:1.5em }
 
+
+
+/* Legacy Styling  */
+.fborder .forumheader3    { padding: 8px; line-height: 1.42857143; vertical-align: top; border-top: 1px solid #0a0a0a; }
+
+
+
+
+
+
+
 /*
 
 body { background-color: rgb(68, 68, 68); }