diff --git a/Pimvidious b/Pimvidious
index 4cdd32e..9ec5856 100755
Binary files a/Pimvidious and b/Pimvidious differ
diff --git a/src/genpage.nim b/src/genpage.nim
index 6daff0a..dd9741c 100644
--- a/src/genpage.nim
+++ b/src/genpage.nim
@@ -98,12 +98,12 @@ proc compilePage(content: string, video_uri: string = "", search_query: string =
     page &= pagination
   page &= "<section>"
   for idx, url in urls:
-    let title = url.split("/")[^1].replace("_"," ")
-    if title == "THUMBNUM": 
-      # This was in Porninvidious, but that uses cut instead of last index, 
-      # so probably not necessary here. Leaving a note in case
-      echo "THUMBNUM - do something else here"
-    page &= fmt"""<div><a href="{url}"><img src="{thumbs[idx]}"/><br/>{title}</a></div>"""
+    var 
+      vid_url, vid_thumb: string
+    vid_url = url.replace("THUMBNUM","0")
+    vid_thumb = thumbs[idx].replace("THUMBNUM","1")
+    let title = vid_url.split("/")[^1].replace("_"," ")
+    page &= fmt"""<div><a href="{vid_url}"><img src="{vid_thumb}"/><br/>{title}</a></div>"""
   page &= "</section>"
   if pagination != "":
     page &= pagination