diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl
index fd47097a5c..ce058f507e 100644
--- a/view/theme/frio/templates/photo_view.tpl
+++ b/view/theme/frio/templates/photo_view.tpl
@@ -3,7 +3,7 @@
 {{* "live-photos" is needed for js autoupdate *}}
 <div id="live-photos"></div>
 
-<div id="photo-view-{{$id}}" class="general-content-wrapper">
+<div id="photo-view-{{$id}}" class="generic-page-wrapper">
 	<h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
 	<div id="photo-edit-link-wrap">
@@ -53,7 +53,7 @@
 		<div id="photo-like-div">
 			{{$likebuttons}}
 			{{$like}}
-			{{$dislike}}	
+			{{$dislike}}
 		</div>
 		{{/if}}
 		<hr>
diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl
index 4372b10264..1162dc3ac6 100644
--- a/view/theme/frio/templates/photos_upload.tpl
+++ b/view/theme/frio/templates/photos_upload.tpl
@@ -1,52 +1,53 @@
+<div class="generic-page-wrapper">
 
-<h3>{{$pagename}}</h3>
+	<h3>{{$pagename}}</h3>
 
-<div id="photos-usage-message">{{$usage}}</div>
+	<div id="photos-usage-message">{{$usage}}</div>
 
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+	<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+		<div id="photos-upload-new-wrapper" >
+			<div id="photos-upload-newalbum-div">
+				<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+			</div>
+			<input class="form-control" id="photos-upload-newalbum" type="text" name="newalbum" />
 		</div>
-		<input class="form-control" id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-div">
-			<label id="photos-upload-existing-album-text" for="photos-upload-album-select">{{$existalbumtext}}</label>
+		<div id="photos-upload-new-end"></div>
+
+		<div id="photos-upload-exist-wrapper">
+			<div id="photos-upload-existing-album-div">
+				<label id="photos-upload-existing-album-text" for="photos-upload-album-select">{{$existalbumtext}}</label>
+			</div>
+			<select class="form-control" id="photos-upload-album-select" name="album" size="4">
+				{{$albumselect}}
+			</select>
 		</div>
-		<select class="form-control" id="photos-upload-album-select" name="album" size="4">
-		{{$albumselect}}
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
+		<div id="photos-upload-exist-end"></div>
 
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div pull-left" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked/>
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
-	</div>
-
-
-	<div id="photos-upload-perms" class="photos-upload-perms pull-right" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
-		</a>
-	</div>
-	<div id="photos-upload-perms-end" class="clear"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			{{$aclselect}}
+		<div id="photos-upload-noshare-div" class="photos-upload-noshare-div pull-left" >
+			<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked/>
+			<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
 		</div>
-	</div>
 
-	<div id="photos-upload-spacer"></div>
+		<div id="photos-upload-perms" class="photos-upload-perms pull-right" >
+			<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+				<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+			</a>
+		</div>
+		<div id="photos-upload-perms-end" class="clear"></div>
 
-	{{$alt_uploader}}
+		<div style="display: none;">
+			<div id="photos-upload-permissions-wrapper">
+				{{$aclselect}}
+			</div>
+		</div>
 
-	{{$default_upload_box}}
-	{{$default_upload_submit}}
+		<div id="photos-upload-spacer"></div>
 
-	<div class="photos-upload-end" ></div>
-</form>
+		{{$alt_uploader}}
 
+		{{$default_upload_box}}
+		{{$default_upload_submit}}
+
+		<div class="photos-upload-end" ></div>
+	</form>
+</div>