diff --git a/templates/themes/default/watch.t b/templates/themes/default/watch.t
index f98c038..7e6b82e 100644
--- a/templates/themes/default/watch.t
+++ b/templates/themes/default/watch.t
@@ -12,7 +12,8 @@
 	<div>
 		<b>{{.view_count}}</b> views<br>
 		<b>{{.like_count}}</b> likes, <b>{{.dislike_count}}</b> dislikes.<br>
-{{.fav}}
+		{{.fav}}
+		{{.sub}}
 <br><br>
 		</div>
 	</div>
diff --git a/templates/themes/default/watch_flash.t b/templates/themes/default/watch_flash.t
index f98c038..7e6b82e 100644
--- a/templates/themes/default/watch_flash.t
+++ b/templates/themes/default/watch_flash.t
@@ -12,7 +12,8 @@
 	<div>
 		<b>{{.view_count}}</b> views<br>
 		<b>{{.like_count}}</b> likes, <b>{{.dislike_count}}</b> dislikes.<br>
-{{.fav}}
+		{{.fav}}
+		{{.sub}}
 <br><br>
 		</div>
 	</div>
diff --git a/webroot/index.shs b/webroot/index.shs
index 4629c09..1980ee5 100755
--- a/webroot/index.shs
+++ b/webroot/index.shs
@@ -11,5 +11,7 @@ for i in $(tac storage/faves); do
 	if [[ ${array[1]} == '' ]]; then
 		break
 	fi
-	storage[favourites]+="<div><a href='watch?v=${array[1]}'><img src='https://i.ytimg.com/vi/${array[1]}/mqdefault.jpg'><br><b>${array[@]:2:999}</b></a><br>Favourited by ${array[0]}</div>";
+	strings[favourites]+="<div><a href='watch?v=${array[1]}'><img src='https://i.ytimg.com/vi/${array[1]}/mqdefault.jpg'><br><b>${array[@]:2:999}</b></a><br>Favourited by ${array[0]}</div>";
 done
+
+render_unsafe strings "${cfg[namespace]}/templates/themes/${cfg[template]}/index.t"
diff --git a/webroot/watch.shs b/webroot/watch.shs
index ede7756..475cebd 100755
--- a/webroot/watch.shs
+++ b/webroot/watch.shs
@@ -57,18 +57,18 @@ if [[ "${get_data[v]}" ]]; then
 				strings[fav]="<a href='unfav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Remove from favourites</a><br>"
 			fi
 		fi
-		if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "$channel_id") == '' ]]; then
+		if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "${strings[channel_id]}") == '' ]]; then
 			if [[ ${cfg[template]} == 'default' ]]; then
-				strings[fav]="<a href='subscribe.shs?id=$channel_id' target='_blank'>Subscribe to $uploader!</a><br>"
+				strings[sub]="<a href='subscribe.shs?id=${strings[channel_id]}' target='_blank'>Subscribe to ${strings[uploader]}!</a><br>"
 			fi
 		else
 			if [[ ${cfg[template]} == 'default' ]]; then
-				strings[fav]="<a href='unsubscribe.shs?id=$channel_id' target='_blank'>Unsubscribe from $uploader</a><br>"
+				strings[sub]="<a href='unsubscribe.shs?id=${strings[channel_id]}' target='_blank'>Unsubscribe from ${strings[uploader]}</a><br>"
 			fi
 		fi
 	else
 		if [[ ${cfg[template]} == 'default' ]]; then
-			strings[fav]="<b><a href='/login.shs?r=$(echo ${r[url]} | sed -s 's/?/___/')'>Log in</a> to add this video to your favourites and/or subscribe to this channel!</b><br>"
+			strings[fav]="<b><a href='/login.shs?r=$(sed -s 's/?/___/' <<< "${r[url]}")'>Log in</a> to add this video to your favourites and/or subscribe to this channel!</b><br>"
 		fi
 	fi
 	strings[description]=$(echo "$video" | jq -r '.description' | sed -E 's/$/<br>/g')
diff --git a/webroot/watch_flash.shs b/webroot/watch_flash.shs
index 177006f..b5d7cc0 100755
--- a/webroot/watch_flash.shs
+++ b/webroot/watch_flash.shs
@@ -50,20 +50,20 @@ if [[ "${get_data[v]}" ]]; then
 	if [[ ${cookies[sh_session]} ]]; then
 		if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/faves | grep "${get_data[v]}") == '' ]]; then
 			if [[ ${cfg[template]} == 'default' ]]; then
-				echo "<a href='fav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Add to favourites</a><br>"
+				strings[fav]="<a href='fav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Add to favourites</a><br>"
 			fi
 		else
 			if [[ ${cfg[template]} == 'default' ]]; then
-				echo "<a href='unfav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Remove from favourites</a><br>"
+				strings[fav]="<a href='unfav.shs?v=$(sed -s 's/<//g;' <<< "${get_data[v]}")' target='_blank'>Remove from favourites</a><br>"
 			fi
 		fi
-		if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "$channel_id") == '' ]]; then
+		if [[ $(grep $(session_get_username "${cookies[sh_session]}") storage/subscribed | grep "${strings[channel_id]}") == '' ]]; then
 			if [[ ${cfg[template]} == 'default' ]]; then
-				echo "<a href='subscribe.shs?id=$channel_id' target='_blank'>Subscribe to $uploader!</a><br>"
+				strings[sub]="<a href='subscribe.shs?id=${strings[channel_id]}' target='_blank'>Subscribe to $uploader!</a><br>"
 			fi
 		else
 			if [[ ${cfg[template]} == 'default' ]]; then
-				echo "<a href='unsubscribe.shs?id=$channel_id' target='_blank'>Unsubscribe from $uploader</a><br>"
+				strings[sub]="<a href='unsubscribe.shs?id=${strings[channel_id]}' target='_blank'>Unsubscribe from $uploader</a><br>"
 			fi
 		fi
 	else