diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index 0a39336e..d9d0cfd3 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -147,7 +147,12 @@ class VideoFileHandler extends DataHandlerExtension {
 			require_once('lib/getid3/getid3/getid3.php');
 			$getID3 = new getID3;
 			$ThisFileInfo = $getID3->analyze($file);
-			if (isset($ThisFileInfo['mime_type']) && ($ThisFileInfo['mime_type'] == "video/webm" || $ThisFileInfo['mime_type'] == "video/quicktime" || $ThisFileInfo['mime_type'] == "application/ogg" || $ThisFileInfo['mime_type'] == 'video/x-flv')) {
+			if (isset($ThisFileInfo['mime_type']) && (
+					$ThisFileInfo['mime_type'] == "video/webm"      ||
+					$ThisFileInfo['mime_type'] == "video/quicktime" ||
+					$ThisFileInfo['mime_type'] == "application/ogg" ||
+					$ThisFileInfo['mime_type'] == 'video/x-flv')
+			) {
 				return TRUE;
 			}
 		}
diff --git a/ext/handle_video/theme.php b/ext/handle_video/theme.php
index e13a57c9..3cb88674 100644
--- a/ext/handle_video/theme.php
+++ b/ext/handle_video/theme.php
@@ -7,28 +7,38 @@ class VideoFileHandlerTheme extends Themelet {
 		$ext = strtolower($image->get_ext());
 		
 		if ($ext == "mp4") {
-			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br><script language='JavaScript' type='text/javascript'>
+			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
+			<script language='JavaScript' type='text/javascript'>
 if( navigator.userAgent.match(/Firefox/i) ||
 	navigator.userAgent.match(/Opera/i) ||
 	(navigator.userAgent.match(/MSIE/i) && parseFloat(navigator.appVersion.split('MSIE')[1]) < 9)){
-		document.write(\"<object data='$data_href/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'><param value='#000000' name='bgcolor'><param name='allowFullScreen' value='true'><param value='high' name='quality'><param value='opaque' name='wmode'><param value='source=$ilink&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'></object>\");
+		document.write(\"<object data='{$data_href}/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'><param value='#000000' name='bgcolor'><param name='allowFullScreen' value='true'><param value='high' name='quality'><param value='opaque' name='wmode'><param value='source=$ilink&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'></object>\");
 }
 else {	
-		document.write(\"<video controls='controls' autoplay='autoplay'>\");
+		document.write(\"<video controls autoplay loop'>\");
 		document.write(\"<source src='" . make_link("/image/" . $image->id) . "' type='video/mp4' />\");
-		document.write(\"<object data='$data_href/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'><param value='#000000' name='bgcolor'><param name='allowFullScreen' value='true'><param value='high' name='quality'><param value='opaque' name='wmode'><param value='source=$ilink&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'></object>\");
+		document.write(\"<object data='{$data_href}/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'><param value='#000000' name='bgcolor'><param name='allowFullScreen' value='true'><param value='high' name='quality'><param value='opaque' name='wmode'><param value='source=$ilink&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'></object>\");
 }
 </script>
 <noscript>Javascript appears to be disabled. Please enable it and try again.</noscript>";
 		} elseif ($ext == "flv") {
-			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br><object data='$data_href/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'><param value='#000000' name='bgcolor'><param name='allowFullScreen' value='true'><param value='high' name='quality'><param value='opaque' name='wmode'><param value='source=$ilink&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'></object>";
+			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
+			<object data='{$data_href}/lib/Jaris/bin/JarisFLVPlayer.swf' id='VideoPlayer' type='application/x-shockwave-flash' height='" . strval($image->height + 1). "px' width='" . strval($image->width) . "px'>
+			<param value='#000000' name='bgcolor'>
+			<param name='allowFullScreen' value='true'>
+			<param value='high' name='quality'>
+			<param value='opaque' name='wmode'>
+			<param value='source={$ilink}&amp;type=video&amp;streamtype=file&amp;controltype=0' name='flashvars'>
+			</object>";
 		} elseif ($ext == "ogv") {
-			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br><video controls='controls' autoplay='autoplay'>
+			$html = "Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
+			<video controls autoplay loop>
 			<source src='" . make_link("/image/" . $image->id) . "' type='video/ogg' />
 			</video>";
 		} elseif ($ext == "webm") {
 			$ie_only = "<!--[if IE]><p>To view webm files with IE, please <a href='http://tools.google.com/dlpage/webmmf/' target='_blank'>download this plugin</a>.</p><![endif]-->";
-			$html = $ie_only ."Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br><video controls='controls' autoplay='autoplay'>
+			$html = $ie_only ."Video not playing? <a href='" . $image->parse_link_template(make_link('image/$id/$id%20-%20$tags.$ext')) . "'>Click here</a> to download the file.<br/>
+			<video controls autoplay loop>
 			<source src='" . make_link("/image/" . $image->id) . "' type='video/webm' />
 			</video>";
 		}