diff --git a/CONTROL/control b/CONTROL/control
index 36afbf2..bfd1a00 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.15-1
+Version: 1.0.15-2
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.13),hmt(>=1.1.21),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),mongoose
diff --git a/webif/html/browse/assets.jim b/webif/html/browse/assets.jim
index 9b6fa39..cc67f2c 100755
--- a/webif/html/browse/assets.jim
+++ b/webif/html/browse/assets.jim
@@ -29,7 +29,7 @@ if {[system pkginst ffmpeg]} {
 
 puts { <li><a href=#vthm>View Thumbnail</a></li> }
 
-puts { <li class=bookmark><a href=#bmarks>Manage Bookmarks</a></li> }
+puts { <li class=bookmark><a href=#bmarks>Bookmarks</a></li> }
 
 if $nicesplice {
 	puts {
diff --git a/webif/html/browse/bookmarks/index.jim b/webif/html/browse/bookmarks/index.jim
index 9a40368..32f7b0b 100755
--- a/webif/html/browse/bookmarks/index.jim
+++ b/webif/html/browse/bookmarks/index.jim
@@ -5,6 +5,7 @@ source /mod/webif/lib/setup
 require ts.class pretty_size
 
 jscss script.js style.css
+jqplugin touchpunch
 header
 
 set rfile [cgi_get file]
diff --git a/webif/html/browse/join/join.jim b/webif/html/browse/join/join.jim
index 74cd55e..b9657b0 100755
--- a/webif/html/browse/join/join.jim
+++ b/webif/html/browse/join/join.jim
@@ -4,7 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-jqplugin progressbar touchbridge
+jqplugin progressbar touchpunch
 jscss join.js join.css
 header
 
diff --git a/webif/html/lib/jquery.plugin/touchpunch/jquery.ui.touch-punch.min.js b/webif/html/lib/jquery.plugin/touchpunch/jquery.ui.touch-punch.min.js
new file mode 100644
index 0000000..31272ce
--- /dev/null
+++ b/webif/html/lib/jquery.plugin/touchpunch/jquery.ui.touch-punch.min.js
@@ -0,0 +1,11 @@
+/*!
+ * jQuery UI Touch Punch 0.2.3
+ *
+ * Copyright 2011–2014, Dave Furfero
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Depends:
+ *  jquery.ui.widget.js
+ *  jquery.ui.mouse.js
+ */
+!function(a){function f(a,b){if(!(a.originalEvent.touches.length>1)){a.preventDefault();var c=a.originalEvent.changedTouches[0],d=document.createEvent("MouseEvents");d.initMouseEvent(b,!0,!0,window,1,c.screenX,c.screenY,c.clientX,c.clientY,!1,!1,!1,!1,0,null),a.target.dispatchEvent(d)}}if(a.support.touch="ontouchend"in document,a.support.touch){var e,b=a.ui.mouse.prototype,c=b._mouseInit,d=b._mouseDestroy;b._touchStart=function(a){var b=this;!e&&b._mouseCapture(a.originalEvent.changedTouches[0])&&(e=!0,b._touchMoved=!1,f(a,"mouseover"),f(a,"mousemove"),f(a,"mousedown"))},b._touchMove=function(a){e&&(this._touchMoved=!0,f(a,"mousemove"))},b._touchEnd=function(a){e&&(f(a,"mouseup"),f(a,"mouseout"),this._touchMoved||f(a,"click"),e=!1)},b._mouseInit=function(){var b=this;b.element.bind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),c.call(b)},b._mouseDestroy=function(){var b=this;b.element.unbind({touchstart:a.proxy(b,"_touchStart"),touchmove:a.proxy(b,"_touchMove"),touchend:a.proxy(b,"_touchEnd")}),d.call(b)}}}(jQuery);
\ No newline at end of file
diff --git a/webif/html/settings/settings.jim b/webif/html/settings/settings.jim
index e57a6c5..7b338cf 100755
--- a/webif/html/settings/settings.jim
+++ b/webif/html/settings/settings.jim
@@ -126,7 +126,7 @@ if {$aclact ne "-" && $acluser ne "-"} {
 	exit
 }
 
-jqplugin form iphone-style-checkboxes
+jqplugin form iphone-style-checkboxes touchpunch
 jscss settings.js
 header
 
diff --git a/webif/lib/ts.class b/webif/lib/ts.class
index 7950b0e..8ee0099 100644
--- a/webif/lib/ts.class
+++ b/webif/lib/ts.class
@@ -165,6 +165,10 @@ proc {ts fetch} {file {checked 0}} {
 		if {![file exists "[file rootname $file].nts"]} { return 0 }
 	}
 
+	if {[file extension $file] ne ".ts"} {
+		set file "[file rootname $file].ts"
+	}
+
 	return [ts parse $file [ts exec $file]]
 }