diff --git a/templates/convo_row.html b/templates/convo_row.html
index d690c71c..6dcddb72 100644
--- a/templates/convo_row.html
+++ b/templates/convo_row.html
@@ -1,16 +1,16 @@
 {{/** TODO: Temporary hack until we find a more granular way of doing this. Perhaps, a custom include function? **/}}
 {{if .Header.Theme.BgAvatars}}
 {{range .Posts}}
-<div id="post-{{.ID}}" class="rowitem passive deletable_block editable_parent simple {{.ClassName}}" style="background-image:url({{.User.Avatar}}),url(/s/post-avatar-bg.jpg);background-position:0px {{if le .ContentLines 5}}-1{{end}}0px;">
+<div id="post-{{.ID}}"class="rowitem passive deletable_block editable_parent simple {{.ClassName}}"style="background-image:url({{.User.Avatar}}),url(/s/post-avatar-bg.jpg);background-position:0px {{if le .ContentLines 5}}-1{{end}}0px;">
 	<span class="editable_block user_content simple">{{.Body}}</span>
 	<span class="controls">
 		<a href="{{.User.Link}}"class="real_username username">{{.User.Name}}</a>&nbsp;&nbsp;
 
-		{{if .CanModify}}<a href="/user/convo/edit/submit/{{.ID}}?s={{$.CurrentUser.Session}}" class="mod_button" title="{{lang "profile.comments_edit_tooltip"}}" aria-label="{{lang "profile.comments_edit_aria"}}"><button class="username edit_item edit_label"></button></a>
+		{{if .CanModify}}<a href="/user/convo/edit/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_edit_tooltip"}}"aria-label="{{lang "profile.comments_edit_aria"}}"><button class="username edit_item edit_label"></button></a>
 
-		<a href="/user/convo/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}" class="mod_button" title="{{lang "profile.comments_delete_tooltip"}}" aria-label="{{lang "profile.comments_delete_aria"}}"><button class="username delete_item delete_label"></button></a>{{end}}
+		<a href="/user/convo/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_delete_tooltip"}}"aria-label="{{lang "profile.comments_delete_aria"}}"><button class="username delete_item delete_label"></button></a>{{end}}
 
-		<a class="mod_button" href="/report/submit/{{.ID}}?s={{$.CurrentUser.Session}}&type=convo-reply"><button class="username report_item flag_label" title="{{lang "profile.comments_report_tooltip"}}" aria-label="{{lang "profile.comments_report_aria"}}"></button></a>
+		<a class="mod_button"href="/report/submit/{{.ID}}?s={{$.CurrentUser.Session}}&type=convo-reply"><button class="username report_item flag_label"title="{{lang "profile.comments_report_tooltip"}}"aria-label="{{lang "profile.comments_report_aria"}}"></button></a>
 
 		{{if .User.Tag}}<a class="username hide_on_mobile user_tag"style="float:right;">{{.User.Tag}}</a>{{end}}
 	</span>
diff --git a/templates/convo_row_alt.html b/templates/convo_row_alt.html
index 9f7579f7..4a5034cb 100644
--- a/templates/convo_row_alt.html
+++ b/templates/convo_row_alt.html
@@ -10,12 +10,12 @@
 		</div>
 		<span class="controls">
 			{{if .CanModify}}
-			<a href="/user/convo/edit/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_edit_tooltip"}}" aria-label="{{lang "profile.comments_edit_aria"}}"><button class="username edit_item edit_label"></button></a>
+			<a href="/user/convo/edit/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_edit_tooltip"}}"aria-label="{{lang "profile.comments_edit_aria"}}"><button class="username edit_item edit_label"></button></a>
 			
-			<a href="/user/convo/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_delete_tooltip"}}" aria-label="{{lang "profile.comments_delete_aria"}}"><button class="username delete_item delete_label"></button></a>
+			<a href="/user/convo/delete/submit/{{.ID}}?s={{$.CurrentUser.Session}}"class="mod_button"title="{{lang "profile.comments_delete_tooltip"}}"aria-label="{{lang "profile.comments_delete_aria"}}"><button class="username delete_item delete_label"></button></a>
 			{{end}}
 
-			<a class="mod_button"href="/report/submit/{{.ID}}?s={{$.CurrentUser.Session}}&type=convo-reply"><button class="username report_item flag_label"title="{{lang "profile.comments_report_tooltip"}}" aria-label="{{lang "profile.comments_report_aria"}}"></button></a>
+			<a class="mod_button"href="/report/submit/{{.ID}}?s={{$.CurrentUser.Session}}&type=convo-reply"><button class="username report_item flag_label"title="{{lang "profile.comments_report_tooltip"}}"aria-label="{{lang "profile.comments_report_aria"}}"></button></a>
 		</span>
 	</div>
 	<div class="content_column">
diff --git a/templates/paginator.html b/templates/paginator.html
index 3a38c457..ed3135a1 100644
--- a/templates/paginator.html
+++ b/templates/paginator.html
@@ -1,14 +1,14 @@
 {{if gt .LastPage 1}}
 <div class="pageset">
-	{{if gt .Page 1}}<div class="pageitem pagefirst"><a href="?page=1" aria-label="{{lang "paginator.first_page_aria"}}">{{lang "paginator.first_page"}}</a></div>
-	<div class="pageitem pageprev"><a href="?page={{subtract .Page 1}}" rel="prev" aria-label="{{lang "paginator.prev_page_aria"}}">{{lang "paginator.prev_page"}}</a></div>
-	<link rel="prev" href="?page={{subtract .Page 1}}"/>{{end}}
+	{{if gt .Page 1}}<div class="pageitem pagefirst"><a href="?page=1"aria-label="{{lang "paginator.first_page_aria"}}">{{lang "paginator.first_page"}}</a></div>
+	<div class="pageitem pageprev"><a href="?page={{subtract .Page 1}}"rel="prev"aria-label="{{lang "paginator.prev_page_aria"}}">{{lang "paginator.prev_page"}}</a></div>
+	<link rel="prev"href="?page={{subtract .Page 1}}">{{end}}
 	{{range .PageList}}
 	<div class="pageitem{{if eq . $.Page}} pagecurrent{{end}}"><a href="?page={{.}}">{{.}}</a></div>
 	{{end}}
 	{{if ne .LastPage .Page}}
-	<link rel="next" href="?page={{add .Page 1}}"/>
-	<div class="pageitem pagenext"><a href="?page={{add .Page 1}}" rel="next" aria-label="{{lang "paginator.next_page_aria"}}">{{lang "paginator.next_page"}}</a></div>
-	<div class="pageitem pagelast"><a href="?page={{.LastPage}}" aria-label="{{lang "paginator.last_page_aria"}}">{{lang "paginator.last_page"}}</a></div>{{end}}
+	<link rel="next"href="?page={{add .Page 1}}">
+	<div class="pageitem pagenext"><a href="?page={{add .Page 1}}"rel="next"aria-label="{{lang "paginator.next_page_aria"}}">{{lang "paginator.next_page"}}</a></div>
+	<div class="pageitem pagelast"><a href="?page={{.LastPage}}"aria-label="{{lang "paginator.last_page_aria"}}">{{lang "paginator.last_page"}}</a></div>{{end}}
 </div>
 {{end}}
\ No newline at end of file
diff --git a/templates/panel_forums.html b/templates/panel_forums.html
index 898e787e..e6fa14e2 100644
--- a/templates/panel_forums.html
+++ b/templates/panel_forums.html
@@ -6,7 +6,7 @@
 </div>
 <div id="panel_forums" class="colstack_item rowlist">
 	{{range .ItemList}}
-	<div data-fid="{{.ID}}" class="rowitem editable_parent panel_forum_item{{if not .Desc}} forum_no_desc{{end}}">
+	<div data-fid="{{.ID}}"class="rowitem editable_parent panel_forum_item{{if not .Desc}} forum_no_desc{{end}}">
 		<span class="grip"></span>
 		<span id="panel_forums_left_box">
 			{{/** TODO: Make sure the forum_active_name class is set and unset when the activity status of this forum is changed **/}}
diff --git a/templates/topic_alt_quick_reply.html b/templates/topic_alt_quick_reply.html
index e67ef6ed..1a9f4c39 100644
--- a/templates/topic_alt_quick_reply.html
+++ b/templates/topic_alt_quick_reply.html
@@ -16,7 +16,7 @@
 		<input form="quick_post_form"id="has_poll_input"name="has_poll"type="hidden"value=0>
 		<div class="formrow real_first_child">
 			<div class="formitem">
-				<textarea id="input_content"form="quick_post_form"name="content"placeholder="{{lang "topic.reply_content_alt"}}" required></textarea>
+				<textarea id="input_content"form="quick_post_form"name="content"placeholder="{{lang "topic.reply_content_alt"}}"required></textarea>
 			</div>
 		</div>
 		<div class="formrow poll_content_row auto_hide">
@@ -33,7 +33,7 @@
 				<button form="quick_post_form"name="reply-button"class="formbutton">{{lang "topic.reply_button"}}</button>
 				<button form="quick_post_form"class="formbutton"id="add_poll_button">{{lang "topic.reply_add_poll_button"}}</button>
 				{{if .CurrentUser.Perms.UploadFiles}}
-				<input name="upload_files"form="quick_post_form"id="upload_files"multiple type="file" class="auto_hide">
+				<input name="upload_files"form="quick_post_form"id="upload_files"multiple type="file"class="auto_hide">
 				<label for="upload_files"class="formbutton add_file_button">{{lang "topic.reply_add_file_button"}}</label>
 				<div id="upload_file_dock"></div>{{end}}
 			</div>
diff --git a/themes/nox/public/main.css b/themes/nox/public/main.css
index 4920eab7..1eaafd6a 100644
--- a/themes/nox/public/main.css
+++ b/themes/nox/public/main.css
@@ -798,6 +798,9 @@ sp.topic_item .submit_edit {
 	width: 100%;
 	max-width: 320px;
 }
+video {
+	width: 100%;
+}
 blockquote {
 	background-color: #555555;
 	border-radius: 3px;
diff --git a/themes/shadow/public/main.css b/themes/shadow/public/main.css
index 1d4b457b..627ab842 100644
--- a/themes/shadow/public/main.css
+++ b/themes/shadow/public/main.css
@@ -949,6 +949,9 @@ input[type=checkbox]:checked + label.poll_option_label .sel {
 	background-color: rgb(71,71,71);
 	padding: 10px;
 }
+video {
+	width: 100%;
+}
 blockquote {
 	background-color: rgb(71,71,71);
 	margin: 0px;
diff --git a/themes/tempra_simple/public/main.css b/themes/tempra_simple/public/main.css
index 0f10fa9c..4c4dcd9c 100644
--- a/themes/tempra_simple/public/main.css
+++ b/themes/tempra_simple/public/main.css
@@ -560,6 +560,9 @@ input, select {
 	background-color: white;
 	padding: 10px;
 }
+video {
+	width: 100%;
+}
 /*blockquote {
 	background-color: #EEEEEE;
 	padding: 12px;