diff --git a/view/templates/video_top.tpl b/view/templates/video_top.tpl
index 8348d702cd..132b89807d 100644
--- a/view/templates/video_top.tpl
+++ b/view/templates/video_top.tpl
@@ -1,19 +1,13 @@
-
 <div class="video-top-wrapper lframe" id="video-top-wrapper-{{$video.id}}">
-	{{* v4.0.0 of VideoJS requires that there be a "data-setup" tag in the
-	    <video> element for it to process the tag *}}
 	{{* set preloading to none to lessen the load on the server *}}
-	<video id="video-{{$video.id}}" class="video-js vjs-default-skin"
-	  controls preload="none" data-setup="" width="400" height="264">
-	 <source src="{{$video.src}}" type="{{$video.mime}}" />
+	<video controls preload="none" data-setup="" width="100%" height="auto">
+		<source src="{{$video.src}}" type="{{$video.mime}}" />
 	</video>
 
-	{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}
-	{{if $delete_url }}
-		<form method="post" action="{{$delete_url}}">
+{{if $delete_url }}
+	<form method="post" action="{{$delete_url}}">
 		<input type="submit" name="delete" value="X" class="video-delete"></input>
 		<input type="hidden" name="id" value="{{$video.id}}"></input>
-		</form>
-	{{/if}}
+	</form>
+{{/if}}
 </div>
-
diff --git a/view/templates/videos_head.tpl b/view/templates/videos_head.tpl
index bdb0ff9e70..e69de29bb2 100644
--- a/view/templates/videos_head.tpl
+++ b/view/templates/videos_head.tpl
@@ -1,6 +0,0 @@
-<link href="library/video-js/video-js.css" rel="stylesheet">
-<script src="library/video-js/video.js"></script>
-<script>
-   videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
-</script>
-
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 75ada9b0b2..728a55b9ca 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -3553,10 +3553,6 @@ div.jGrowl div.info {
   margin: 0px 10px 10px 0px;
   position: relative;
 }
-.videos .video-top-wrapper .video-js {
-  width: 300px!important;
-  height: 232px!important;
-}
 .videos .video-top-wrapper .video-delete {
   position: absolute;
   opacity: 0;
diff --git a/view/theme/frost-mobile/templates/videos_end.tpl b/view/theme/frost-mobile/templates/videos_end.tpl
deleted file mode 100644
index 858cbc5720..0000000000
--- a/view/theme/frost-mobile/templates/videos_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<script src="library/video-js/video.js"></script>
-<script>
-   videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
-</script>
-
diff --git a/view/theme/frost-mobile/templates/videos_head.tpl b/view/theme/frost-mobile/templates/videos_head.tpl
deleted file mode 100644
index 41e4424600..0000000000
--- a/view/theme/frost-mobile/templates/videos_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<link href="library/video-js/video-js.css" rel="stylesheet">
-
diff --git a/view/theme/frost/templates/videos_end.tpl b/view/theme/frost/templates/videos_end.tpl
deleted file mode 100644
index 858cbc5720..0000000000
--- a/view/theme/frost/templates/videos_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<script src="library/video-js/video.js"></script>
-<script>
-   videojs.options.flash.swf = "{{$baseurl}}/library/video-js/video-js.swf"
-</script>
-
diff --git a/view/theme/frost/templates/videos_head.tpl b/view/theme/frost/templates/videos_head.tpl
deleted file mode 100644
index 41e4424600..0000000000
--- a/view/theme/frost/templates/videos_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<link href="library/video-js/video-js.css" rel="stylesheet">
-
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 36a0a6aee7..a0924c9713 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -2154,10 +2154,6 @@ ul.tabs li .active {
   margin: 0 10px 10px 0;
   position: relative;
 }
-.videos .video-top-wrapper .video-js {
-  width: 200px!important;
-  height: 132px!important;
-}
 .videos .video-top-wrapper .video-delete {
   position: absolute;
   opacity: 0;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 9776faeb00..904d41fb27 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -2154,10 +2154,6 @@ ul.tabs li .active {
   margin: 0 10px 10px 0;
   position: relative;
 }
-.videos .video-top-wrapper .video-js {
-  width: 200px!important;
-  height: 132px!important;
-}
 .videos .video-top-wrapper .video-delete {
   position: absolute;
   opacity: 0;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 4760d4b434..2a046a87a4 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -2154,10 +2154,6 @@ ul.tabs li .active {
   margin: 0 10px 10px 0;
   position: relative;
 }
-.videos .video-top-wrapper .video-js {
-  width: 200px!important;
-  height: 132px!important;
-}
 .videos .video-top-wrapper .video-delete {
   position: absolute;
   opacity: 0;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 53bb7e38a6..91c8074d9f 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -1441,11 +1441,6 @@ ul.tabs {
 		margin: 0 10px 10px 0;
 		position: relative;
 
-		.video-js {
-			width: 200px!important;
-			height: 132px!important;
-		}
-
 		.video-delete {
 			position: absolute;
 			opacity: 0;
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 48a89c0b40..507b4b5709 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -3322,10 +3322,6 @@ img.photo-album-photo {
   margin: 0px 10px 10px 0px;
   position: relative;
 }
-.videos .video-top-wrapper .video-js {
-  width: 300px!important;
-  height: 232px!important;
-}
 .videos .video-top-wrapper .video-delete {
   position: absolute;
   opacity: 0;