diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 01ae5c912..0d1483334 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -3003,10 +3003,11 @@ class e_parser
 		$ytqry = http_build_query($ytpref);
 		
 		if($type == 'youtube')
-		{		
-			
-			$video =  '<iframe width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="border:0px" allowfullscreen></iframe>';
-			$thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
+		{
+		//	$thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
+			$thumbSrc = "http://i1.ytimg.com/vi/".$id."/mqdefault.jpg";
+			$video =  '<iframe width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="background-size: 100%;background-image: url('.$thumbSrc.');border:0px" allowfullscreen></iframe>';
+
 		
 			if($thumb == 'tag')
 			{
diff --git a/e107_plugins/tinymce4/templates/admin.xml b/e107_plugins/tinymce4/templates/admin.xml
index e95e6cea3..8a83cff70 100644
--- a/e107_plugins/tinymce4/templates/admin.xml
+++ b/e107_plugins/tinymce4/templates/admin.xml
@@ -4,7 +4,8 @@
         insertdatetime media nonbreaking save table contextmenu directionality emoticons template paste textcolor</plugins>
 	<menubar>edit view format insert table tools</menubar>
 	<toolbar1>undo redo | styleselect | bold italic forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | e107-image e107-video e107-glyph | preview</toolbar1>
-	<external_plugins>e107 example</external_plugins>
+	<external_plugins>e107 example compat3x</external_plugins>
 	<image_advtab>true</image_advtab>
 	<extended_valid_elements>i[*], object[*],embed[*],bbcode[*]</extended_valid_elements>
+    <table_default_attributes>{  class: 'table table-striped table-bordered'   }</table_default_attributes>
 </tinymce>
diff --git a/e107_plugins/tinymce4/templates/mainadmin.xml b/e107_plugins/tinymce4/templates/mainadmin.xml
index 9db5c26f0..fa460297d 100644
--- a/e107_plugins/tinymce4/templates/mainadmin.xml
+++ b/e107_plugins/tinymce4/templates/mainadmin.xml
@@ -19,5 +19,6 @@
             description: "Adds an example."
         }
     ]
-</templates>
+    </templates>
+    <table_default_attributes>{  class: 'table table-striped table-bordered'   }</table_default_attributes>
 </tinymce>
diff --git a/e107_plugins/tinymce4/wysiwyg.php b/e107_plugins/tinymce4/wysiwyg.php
index a2efde29e..9b503b9bf 100644
--- a/e107_plugins/tinymce4/wysiwyg.php
+++ b/e107_plugins/tinymce4/wysiwyg.php
@@ -233,6 +233,11 @@ class wysiwyg
 				
 	function convertBoolean($string)
 	{
+
+		if(substr($string,0,1) == '{')
+		{
+			return $string;
+		}
 	
 		if(is_string($string))
 		{
@@ -319,6 +324,9 @@ class wysiwyg
 		$ret['relative_urls']			= false;  //Media Manager prefers it like this. 
 		$ret['preformatted']			= true;
 		$ret['document_base_url']		= SITEURL;
+
+	//	$ret['table_default_attributes'] = json_encode(array('class'=>'table table-striped' ));
+
 		
 		if(!empty($ret['templates']))
 		{