diff --git a/files/templates/default.html b/files/templates/default.html
index 276ad50e1..08b7a9711 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -453,7 +453,7 @@
 
 		// Expand Images on Desktop
 
-		function expandDesktopImage(image, link) {
+		function expandDesktopImage(image) {
 
 		// Link text
 
@@ -470,7 +470,7 @@
 			};
 
 
-		function expandDesktopVideo(video, link) {
+		function expandDesktopVideo(video) {
 
 			// Link text
 
@@ -479,9 +479,9 @@
 
 			var inlineVideo = document.getElementById("desktop-expanded-video");
 
-			inlineVideo.src = Video + "?controls=0";
-			linkText.href = Video;
-			imgLink.href=Video;
+			inlineVideo.src = video + "?controls=0";
+			linkText.href = video;
+			imgLink.href = video;
 
 			linkText.textContent = 'View original';
 		};
diff --git a/files/templates/expanded_video_modal.html b/files/templates/expanded_video_modal.html
index 533e42295..1461ec876 100644
--- a/files/templates/expanded_video_modal.html
+++ b/files/templates/expanded_video_modal.html
@@ -7,7 +7,9 @@
 			<div class="modal-body text-center p-0">
 				<div class="d-inline-block position-relative">
 					<a href="" ref="nofollow noopener" target="_blank" id="desktop-expanded-video-wrap-link">
-						<iframe src="" frameborder="0" class="img-fluid rounded" id="desktop-expanded-video" style="min-width: 250px;"></iframe>
+						<div style="width: 100%; height: 0px; position: relative; padding-bottom: 56.250%;">
+							<iframe id="desktop-expanded-video" src="{{streamurl}}" frameborder="0" width="100%" height="100%" allowfullscreen="" style="width: 100%; height: 100%; position: absolute;"></iframe>
+						</div>
 					</a>
 					<div class="position-absolute d-flex justify-content-between align-items-center w-100 mt-1">
 						<a href="" ref="nofollow noopener" target="_blank" class="text-gray-500 font-weight-bold text-left" id="desktop-expanded-video-link">View original</a>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 95a064b6b..859a75082 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -70,14 +70,21 @@
 				</a>
 				{% elif p.is_image %}
 				<div class="card-header bg-transparent border-0 d-none d-md-flex flex-row flex-nowrap pl-3 p-0">
-					<a href="{{p.realurl(v)}}" style="height: fit-content;" {% if v and v.newtabexternal %}target="_blank"{% endif %} rel="nofollow" data-toggle="modal" data-target="#expandImageModal" onclick="expandDesktopImage('{{p.realurl(v)}}','{{p.realurl(v)}}')"><img src="{{p.thumb_url}}" class="post-img d-none d-md-block" alt="Unable to load image"></a>
+					<a href="{{p.realurl(v)}}" style="height: fit-content;" {% if v and v.newtabexternal %}target="_blank"{% endif %} rel="nofollow" data-toggle="modal" data-target="#expandImageModal" onclick="expandDesktopImage('{{p.realurl(v)}}')"><img src="{{p.thumb_url}}" class="post-img d-none d-md-block" alt="Unable to load image"></a>
 
 				</div>
-				{% elif "streamable.com" in p.url %}
-				<div class="card-header bg-transparent border-0 d-none d-md-flex flex-row flex-nowrap pl-3 p-0">
-					<a href="{{p.realurl(v)}}" style="height: fit-content;" {% if v and v.newtabexternal %}target="_blank"{% endif %} rel="nofollow" data-toggle="modal" data-target="#expandVideoModal" onclick="expandDesktopVideo('{{p.realurl(v)}}','{{p.realurl(v)}}')"><img src="{{p.thumb_url}}" class="post-img d-none d-md-block" alt="Unable to load video"></a>
 
-				</div>
+				{% elif "streamable.com/" in p.realurl(v) %}
+					{% if "streamable.com/e/" in p.realurl(v) %}
+						{% set streamurl=p.realurl(v) %}
+					{% else %}
+						{% set streamurl=p.realurl(v).replace("streamable.com/", "streamable.com/e/") %}
+					{% endif %}
+
+					<div class="card-header bg-transparent border-0 d-none d-md-flex flex-row flex-nowrap pl-3 p-0">
+						<a href="{{streamurl}}" style="height: fit-content;" {% if v and v.newtabexternal %}target="_blank"{% endif %} rel="nofollow" data-toggle="modal" data-target="#expandVideoModal" onclick="expandDesktopVideo('{{streamurl}}')"><img src="{{p.thumb_url}}" class="post-img d-none d-md-block" alt="Unable to load video"></a>
+					</div>
+
 				{% else %}
 				<a {% if v and v.newtabexternal %}target="_blank"{% endif %} href="{{p.realurl(v)}}" rel="nofollow noopener">
 					<img src="{{p.thumb_url}}" class="post-img">