diff --git a/contrib/js/expand-image.js b/contrib/js/expand-image.js
index 32b1c8c..3efbdc8 100644
--- a/contrib/js/expand-image.js
+++ b/contrib/js/expand-image.js
@@ -4,10 +4,6 @@
 // released into the public domain by Jeff on 2016-04-30
 //
 
-if (typeof _ == 'undefined') {
-  var _ = function(a) { return a; }
-}
-
 // is the filename matching an image?
 function filenameIsImage(fname) {
   return /\.(gif|jpeg|jpg|png|webp)/.test(fname);
@@ -19,7 +15,7 @@ function setupInlineImage(thumb, url) {
   thumb.inlineIsSetUp = true;
   var img = thumb.querySelector("img.thumbnail");
   var expanded = false;
-  var oldurl = img.href;
+  var oldurl = img.src;
   img.onclick = function(ev) {
     if (expanded) {
       img.setAttribute("class", "thumbnail");
@@ -69,4 +65,4 @@ onready(function(){
     observer.observe(document.body, {childList: true, subtree: true});
   }
   
-})
+});
diff --git a/contrib/js/expand-video.js b/contrib/js/expand-video.js
index 5ef2c2b..07b6a0f 100644
--- a/contrib/js/expand-video.js
+++ b/contrib/js/expand-video.js
@@ -3,10 +3,6 @@
 var configRoot = "";
 
 
-if (typeof _ == 'undefined') {
-  var _ = function(a) { return a; };
-}
-
 function setupVideo(thumb, url) {
     if (thumb.videoAlreadySetUp) return;
     thumb.videoAlreadySetUp = true;
diff --git a/contrib/static/nntpchan.js b/contrib/static/nntpchan.js
index d5d7939..042e158 100644
--- a/contrib/static/nntpchan.js
+++ b/contrib/static/nntpchan.js
@@ -15,12 +15,10 @@ parent.appendChild(wrapper);parent.backlink=false;},function(msg){var wrapper=do
 parent.backlink=true;}};parent.backlink=true;}
 function inject_hover_for_element(elem){var elems=elem.getElementsByClassName("backlink");var ls=[];var l=elems.length;for(var idx=0;idx<l;idx++){var e=elems[idx];ls.push(e);}
 for(var elem in ls){inject_hover(prefix,ls[elem]);}}
-function init(prefix){inject_hover_for_element(document);}var banner_count=3;function nntpchan_inject_banners(elem,prefix){var n=Math.floor(Math.random()*banner_count);var banner=prefix+"static/banner_"+n+".jpg";var e=document.createElement("img");e.src=banner;e.id="nntpchan_banner";elem.appendChild(e);}if(typeof _=='undefined'){var _=function(a){return a;}}
-function filenameIsImage(fname){return/\.(gif|jpeg|jpg|png|webp)/.test(fname);}
-function setupInlineImage(thumb,url){if(thumb.inlineIsSetUp)return;thumb.inlineIsSetUp=true;var img=thumb.querySelector("img.thumbnail");var expanded=false;var oldurl=img.href;img.onclick=function(ev){if(expanded){img.setAttribute("class","thumbnail");img.src=oldurl;expanded=false;}else{img.setAttribute("class","thumbnail expanded");img.src=url;expanded=true;}}}
+function init(prefix){inject_hover_for_element(document);}var banner_count=3;function nntpchan_inject_banners(elem,prefix){var n=Math.floor(Math.random()*banner_count);var banner=prefix+"static/banner_"+n+".jpg";var e=document.createElement("img");e.src=banner;e.id="nntpchan_banner";elem.appendChild(e);}function filenameIsImage(fname){return/\.(gif|jpeg|jpg|png|webp)/.test(fname);}
+function setupInlineImage(thumb,url){if(thumb.inlineIsSetUp)return;thumb.inlineIsSetUp=true;var img=thumb.querySelector("img.thumbnail");var expanded=false;var oldurl=img.src;img.onclick=function(ev){if(expanded){img.setAttribute("class","thumbnail");img.src=oldurl;expanded=false;}else{img.setAttribute("class","thumbnail expanded");img.src=url;expanded=true;}}}
 function setupInlineImageIn(element){var thumbs=element.querySelectorAll("a.file");for(var i=0;i<thumbs.length;i++){var url=thumbs[i].children[0].src;if(filenameIsImage(url)){setupInlineImage(thumbs[i],url);}}}
-onready(function(){setupInlineImageIn(document);if(window.MutationObserver){var observer=new MutationObserver(function(mutations){for(var i=0;i<mutations.length;i++){var additions=mutations[i].addedNodes;if(additions==null)continue;for(var j=0;j<additions.length;j++){var node=additions[j];if(node.nodeType==1){setupInlineImageIn(node);}}}});observer.observe(document.body,{childList:true,subtree:true});}})var configRoot="";if(typeof _=='undefined'){var _=function(a){return a;};}
-function setupVideo(thumb,url){if(thumb.videoAlreadySetUp)return;thumb.videoAlreadySetUp=true;var video=null;var videoContainer,videoHide;var expanded=false;var hovering=false;var loop=true;var loopControls=[document.createElement("span"),document.createElement("span")];var fileInfo=thumb.parentNode.querySelector(".fileinfo");var mouseDown=false;function unexpand(){if(expanded){expanded=false;if(video.pause)video.pause();videoContainer.style.display="none";thumb.style.display="inline";video.style.maxWidth="inherit";video.style.maxHeight="inherit";}}
+onready(function(){setupInlineImageIn(document);if(window.MutationObserver){var observer=new MutationObserver(function(mutations){for(var i=0;i<mutations.length;i++){var additions=mutations[i].addedNodes;if(additions==null)continue;for(var j=0;j<additions.length;j++){var node=additions[j];if(node.nodeType==1){setupInlineImageIn(node);}}}});observer.observe(document.body,{childList:true,subtree:true});}});var configRoot="";function setupVideo(thumb,url){if(thumb.videoAlreadySetUp)return;thumb.videoAlreadySetUp=true;var video=null;var videoContainer,videoHide;var expanded=false;var hovering=false;var loop=true;var loopControls=[document.createElement("span"),document.createElement("span")];var fileInfo=thumb.parentNode.querySelector(".fileinfo");var mouseDown=false;function unexpand(){if(expanded){expanded=false;if(video.pause)video.pause();videoContainer.style.display="none";thumb.style.display="inline";video.style.maxWidth="inherit";video.style.maxHeight="inherit";}}
 function unhover(){if(hovering){hovering=false;if(video.pause)video.pause();videoContainer.style.display="none";video.style.maxWidth="inherit";video.style.maxHeight="inherit";}}
 function getVideo(){if(video==null){video=document.createElement("video");video.src=url;video.loop=loop;video.innerText=_("Your browser does not support HTML5 video.");videoHide=document.createElement("img");videoHide.src=configRoot+"static/collapse.gif";videoHide.alt="[ - ]";videoHide.title="Collapse video";videoHide.style.marginLeft="-15px";videoHide.style.cssFloat="left";videoHide.addEventListener("click",unexpand,false);videoContainer=document.createElement("div");videoContainer.style.paddingLeft="15px";videoContainer.style.display="none";videoContainer.appendChild(videoHide);videoContainer.appendChild(video);thumb.parentNode.insertBefore(videoContainer,thumb.nextSibling);video.addEventListener("mousedown",function(e){if(e.button==0)mouseDown=true;},false);video.addEventListener("mouseup",function(e){if(e.button==0)mouseDown=false;},false);video.addEventListener("mouseenter",function(e){mouseDown=false;},false);video.addEventListener("mouseout",function(e){if(mouseDown&&e.clientX-video.getBoundingClientRect().left<=0){unexpand();}
 mouseDown=false;},false);}}