diff --git a/CONTROL/control b/CONTROL/control
index e774a6b..0a89c58 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.8-5
+Version: 1.2.8-6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),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),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
+Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/6484/
diff --git a/boot/xinit.d/ahw b/boot/xinit.d/ahw
index 2d4d204..e2a6a04 100755
Binary files a/boot/xinit.d/ahw and b/boot/xinit.d/ahw differ
diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim
index 6cb92dd..2c3e8f0 100755
--- a/webif/html/browse/file.jim
+++ b/webif/html/browse/file.jim
@@ -210,11 +210,10 @@ if {[$ts get bookmarks]} {
 puts "
 	</table>
 "
-puts "
-<script type=text/javascript>
-var file = '$file';
-"
+puts "<div class=hidden id=file>$file</div>"
 puts {
+<script type=text/javascript>
+var file = $('#file').text();
 $('button').button();
 $('.tvdbchoose').on('click', function() {
 	window.location.href = '/browse/tvdb/episode.jim?file=' +
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 75ee071..d68e55d 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -603,13 +603,14 @@ proc {system usbmounts} {{full 0}} {
 		set num 0
 		catch {
 			set num [
-			    exec grep -cE {/media/(usb-)?drive} /proc/mounts]
+			    exec grep -cE {/media/(usb-|gpt-)?drive} \
+				/proc/mounts]
 		}
 		return $num
 	}
 	set ret {}
 	if {[catch {
-		set lines [exec grep -E {media/(usb-)?drive} /proc/mounts]
+		set lines [exec grep -E {media/(usb-|gpt-)?drive} /proc/mounts]
 	}]} { return $ret }
 	foreach line [split $lines "\n"] {
 		lassign $line dev mp