diff --git a/webroot/channel.shs b/webroot/channel.shs
index 3904017..cce4e3b 100644
--- a/webroot/channel.shs
+++ b/webroot/channel.shs
@@ -24,5 +24,5 @@ video_id=($(jq -r '.entries[].id' <<< $data))
 echo "<h1>$title</h1><a href='subscribe.shs?id=$(html_encode "${get_data[id]}")'>Subscribe!</a><br>"
 
 for (( i=0; i<${#video_id[@]}; i++ )); do
-	echo "<a href='watch.shs?v=${video_id[$i]}'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
+	echo "<a href='watch?v=${video_id[$i]}'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
 done
diff --git a/webroot/fav.shs b/webroot/fav.shs
index 312f923..e5550f5 100644
--- a/webroot/fav.shs
+++ b/webroot/fav.shs
@@ -18,5 +18,5 @@ for i in $(tac storage/faves | grep -P "^$(session_get_username ${cookies[sh_ses
 	if [[ ${array[1]} == '' ]]; then
 		break
 	fi
-	echo "<div><a href='watch.shs?v=${array[1]}'><img src='https://i.ytimg.com/vi/${array[1]}/mqdefault.jpg'><br><b>${array[@]:2:999}</b></a><br></div>";
+	echo "<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></div>";
 done
diff --git a/webroot/feed.shs b/webroot/feed.shs
index 797c05e..92b8225 100644
--- a/webroot/feed.shs
+++ b/webroot/feed.shs
@@ -18,7 +18,7 @@ if session_verify "${cookies[sh_session]}"; then
 	queue=$(for (( i=0; i<${#video_id[@]}; i++ )); do echo "$i ${video_date[i]}"; done | sort -k2r | awk '{print $1}')
 	
 	while read i; do
-		echo "<a href='watch.shs?v=${video_id[$i]}'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a>$(date -d "@${video_date[$i]}" "+%H:%M, %d %h %Y")<br>"
+		echo "<a href='watch?v=${video_id[$i]}'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a>$(date -d "@${video_date[$i]}" "+%H:%M, %d %h %Y")<br>"
 	done <<< "$queue"
 else
 	echo "gtfo"
diff --git a/webroot/index.shs b/webroot/index.shs
index 5102d1e..27dc76c 100755
--- a/webroot/index.shs
+++ b/webroot/index.shs
@@ -18,7 +18,7 @@ for i in $(tac storage/faves); do
 	if [[ ${array[1]} == '' ]]; then
 		break
 	fi
-	echo "<div><a href='watch.shs?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>";
+	echo "<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
 
 echo "</div>"
diff --git a/webroot/playlist.shs b/webroot/playlist.shs
index 11acc62..d948872 100644
--- a/webroot/playlist.shs
+++ b/webroot/playlist.shs
@@ -15,5 +15,5 @@ video_title=($(jq -r '.title' <<< $data))
 video_id=($(jq -r '.id' <<< $data))
 
 for (( i=0; i<${#video_id[@]}; i++ )); do
-	echo "<a href='watch.shs?v=${video_id[$i]}&playlist=$(html_encode "${get_data[list]}")'><img src='https://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
+	echo "<a href='watch?v=${video_id[$i]}&playlist=$(html_encode "${get_data[list]}")'><img src='https://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
 done
diff --git a/webroot/search.shs b/webroot/search.shs
index 0111aae..37d9f5b 100755
--- a/webroot/search.shs
+++ b/webroot/search.shs
@@ -32,7 +32,7 @@ if [[ "${get_data[q]}" ]]; then
 	unset IFS
 
 	for (( i=0; i<${#id[@]}; i++ )); do
-		echo "<a href='/watch.shs?v=${id[$i]}'><img src='https://i.ytimg.com/vi/${id[$i]}/mqdefault.jpg'><br>${title[$i]}</a> | ${runtime[$i]} seconds | ${views[$i]} views<br>Uploaded by <a href='/channel.shs?id=${channel_id[$i]}'>${channel[$i]}</a><br>"
+		echo "<a href='/watch?v=${id[$i]}'><img src='https://i.ytimg.com/vi/${id[$i]}/mqdefault.jpg'><br>${title[$i]}</a> | ${runtime[$i]} seconds | ${views[$i]} views<br>Uploaded by <a href='/channel/${channel_id[$i]}'>${channel[$i]}</a><br>"
 	done
 else
 	echo "search for something will 'ya?"
diff --git a/webroot/watch.shs b/webroot/watch.shs
index c8b84a4..533502b 100755
--- a/webroot/watch.shs
+++ b/webroot/watch.shs
@@ -42,7 +42,7 @@ if [[ "${get_data[v]}" ]]; then
 	echo "<h2>$title</h2>
 	<div>
 		<div>
-			Uploaded by <b><a href='channel.shs?id=$channel_id'>$uploader</a></b> on <b>$(date -d "$(echo $video | jq -r '.upload_date' | sed -E 's/..../&-/;s/....-../&-/')" "+%d %B %Y")</b>
+			Uploaded by <b><a href='/channel/$channel_id'>$uploader</a></b> on <b>$(date -d "$(echo $video | jq -r '.upload_date' | sed -E 's/..../&-/;s/....-../&-/')" "+%d %B %Y")</b>
 		</div>
 		<div>
 			<b>$(echo $video | jq -r '.view_count')</b> views<br>
@@ -123,14 +123,14 @@ if [[ "${get_data[v]}" ]]; then
 			var video = document.getElementById('player');
 			// video.play();
 			video.addEventListener('ended',function(){
-				window.location = 'watch.shs?v=$next&playlist=$(html_encode ${get_data[playlist]})';
+				window.location = 'watch?v=$next&playlist=$(html_encode ${get_data[playlist]})';
 			});
 		});
 		</script>"
 		echo "<h1>Playlist</h1>"
 	
 		for (( i=0; i<${#video_id[@]}; i++ )); do
-			echo "<a href='watch.shs?v=${video_id[$i]}&playlist=$(html_encode ${get_data[playlist]})'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
+			echo "<a href='watch?v=${video_id[$i]}&playlist=$(html_encode ${get_data[playlist]})'><img src='http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg'><br>${video_title[$i]}</a><br>"
 		done
 	fi