diff --git a/CONTROL/control b/CONTROL/control
index 82bbccb..3151732 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.9.13-7
+Version: 0.9.13-8
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.0.3),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2)
diff --git a/var/mongoose/html/img/remote_split.png b/var/mongoose/html/img/remote_split.png
deleted file mode 100644
index 603292b..0000000
Binary files a/var/mongoose/html/img/remote_split.png and /dev/null differ
diff --git a/var/mongoose/html/img/transmit-green.png b/var/mongoose/html/img/transmit-green.png
deleted file mode 100644
index 9f16865..0000000
Binary files a/var/mongoose/html/img/transmit-green.png and /dev/null differ
diff --git a/var/mongoose/html/img/transmit.png b/var/mongoose/html/img/transmit.png
deleted file mode 100644
index 1254a94..0000000
Binary files a/var/mongoose/html/img/transmit.png and /dev/null differ
diff --git a/var/mongoose/html/remote/remote.jim b/var/mongoose/html/remote/remote.jim
deleted file mode 100755
index 9f4797d..0000000
--- a/var/mongoose/html/remote/remote.jim
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-puts "Content-Type: text/html"
-puts ""
-
-header
-
-puts {
-<script type=text/javascript src=/js/enadis.js></script>
-<script type=text/javascript src=script.js></script>
-
-<div style="position: relative">
-<img style="position: absolute; top: -38px; left: 50px; width: 40px"
-    src=/img/transmit.png id=xmit1 class=hidden>
-<img style="position: absolute; top: -38px; left: 320px; width: 40px"
-    src=/img/transmit.png id=xmit2 class=hidden>
-
-<img src=/img/remote_split.png usemap=#remmap alt="" border=0>
-</div>
-
-<map name="remmap">
-<area shape=circle coords=48,70,21 code=MUTE xmit=1>
-<area shape=circle coords=190,70,21 code=STANDBY xmit=1>
-
-<xarea shape=rect coords=30,104,67,127 code=PVR xmit=1>
-<xarea shape=rect coords=77,104,115,127 code=TV xmit=1>
-<xarea shape=rect coords=127,104,162,127 code=DVD xmit=1>
-<xarea shape=rect coords=175,104,211,127 code=AUDIOD xmit=1>
-
-<area shape=circle coords=57,161,21 code=ONE xmit=1>
-<area shape=circle coords=57,213,21 code=FOUR xmit=1>
-<area shape=circle coords=57,263,21 code=SEVEN xmit=1>
-<area shape=circle coords=57,314,21 code=PORTAL xmit=1>
-<area shape=circle coords=119,161,21 code=TWO xmit=1>
-<area shape=circle coords=119,213,21 code=FIVE xmit=1>
-<area shape=circle coords=119,263,21 code=EIGHT xmit=1>
-<area shape=circle coords=119,314,21 code=ZERO xmit=1>
-<area shape=circle coords=182,161,21 code=THREE xmit=1>
-<area shape=circle coords=182,213,21 code=SIX xmit=1>
-<area shape=circle coords=182,263,21 code=NINE xmit=1>
-<area shape=circle coords=182,314,21 code=MENU xmit=1>
-
-<area shape=rect coords=30,349,67,370 code=PLAY xmit=1>
-<area shape=rect coords=78,349,114,370 code=PAUSE xmit=1>
-<area shape=rect coords=126,349,162,370 code=STOP xmit=1>
-<area shape=rect coords=175,349,213,370 code=REC xmit=1>
-
-<area shape=rect coords=30,384,67,406 code=REW xmit=1>
-<area shape=rect coords=78,384,114,406 code=FF xmit=1>
-<area shape=rect coords=126,384,162,406 code=SKIP/BACK xmit=1>
-<area shape=rect coords=175,384,213,406 code=SKIP/FORW xmit=1>
-
-<area shape=circle coords=46,435,17 code=RED xmit=1>
-<area shape=circle coords=96,435,17 code=GREEN xmit=1>
-<area shape=circle coords=147,435,17 code=YELLOW xmit=1>
-<area shape=circle coords=198,435,17 code=BLUE xmit=1>
-
-<area shape=circle coords=391,144,27 code=OK xmit=2>
-
-<area shape=circle coords=391,96,17 code=UP xmit=2>
-<area shape=circle coords=391,191,17 code=DOWN xmit=2>
-<area shape=circle coords=342,144,17 code=LEFT xmit=2>
-<area shape=circle coords=440,144,17 code=RIGHT xmit=2>
-
-<area shape=circle coords=321,77,16 code=MEDIA xmit=2>
-<area shape=circle coords=459,77,16 code=GUIDE xmit=2>
-<area shape=circle coords=321,212,16 code=EXIT xmit=2>
-<area shape=circle coords=459,212,16 code=BACK xmit=2>
-
-<area shape=rect coords=303,246,344,283 code=VOL+ xmit=2>
-<area shape=rect coords=303,307,344,348 code=VOL- xmit=2>
-
-<area shape=rect coords=435,246,480,283 code=P+ xmit=2>
-<area shape=rect coords=435,307,480,348 code=P+ xmit=2>
-
-<area shape=circle coords=392,266,17 code=LIST xmit=2>
-<area shape=circle coords=392,328,17 code=INFO xmit=2>
-
-<area shape=rect coords=300,368,336,391 code=OPT+ xmit=2>
-<area shape=rect coords=348,368,384,391 code=AUDIO xmit=2>
-<area shape=rect coords=396,368,432,391 code=SUB xmit=2>
-<area shape=rect coords=444,368,481,391 code=TV/RADIO xmit=2>
-
-<area shape=rect coords=300,403,336,426 code=TEXT xmit=2>
-<area shape=rect coords=348,403,384,426 code=ADDBOOKMARK xmit=2>
-<area shape=rect coords=396,403,432,426 code=BOOKMARKS xmit=2>
-<area shape=rect coords=444,403,481,426 code=SLOW xmit=2>
-
-<area shape=rect coords=300,438,336,463 code=SOURCE xmit=2>
-<area shape=rect coords=348,438,384,463 code=SLEEP xmit=2>
-<area shape=rect coords=396,438,432,463 code=V-FORMAT xmit=2>
-<area shape=rect coords=444,438,481,463 code=WIDE xmit=2>
-
-</map>
-}
-
-footer
-
diff --git a/var/mongoose/html/remote/script.js b/var/mongoose/html/remote/script.js
deleted file mode 100644
index 021d03d..0000000
--- a/var/mongoose/html/remote/script.js
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$(function() {
-
-$('area').click(function() {
-	var code = $(this).attr('code');
-	var x = $(this).attr('xmit');
-
-	console.log("CODE: %o", code);
-
-	$('#xmit' + x).fadeIn('fast').delay(500).fadeOut('fast');
-	$.get('send.jim?code=' + code);
-}).hover(
-	function() { $(this).css('cursor', 'pointer'); },
-	function() { $(this).css('cursor', 'auto'); }
-);
-
-});
-
diff --git a/var/mongoose/html/remote/send.jim b/var/mongoose/html/remote/send.jim
deleted file mode 100755
index 2293857..0000000
--- a/var/mongoose/html/remote/send.jim
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-puts "Content-Type: text/plain"
-puts ""
-
-cgi_input
-
-set cmd [cgi_get code ZERO]
-
-puts [exec /mod/bin/ir {*}$cmd] 
-
diff --git a/var/mongoose/include/menuicons.jim b/var/mongoose/include/menuicons.jim
index dfcac68..5b0d088 100755
--- a/var/mongoose/include/menuicons.jim
+++ b/var/mongoose/include/menuicons.jim
@@ -39,7 +39,7 @@ menuitem "EPG" "/images/328_1_26_Menu_TV_Guide.png" \
 	$epglink 217 228
 
 if {[file exists "/mod/bin/ir"]} {
-	menuitem "Remote" "/img/remote.png" /remote/remote.jim 217 228
+	menuitem "Remote" "/img/remote.png" /plugin/ir/remote.jim 217 228
 }
 
 puts {</div><div style="clear: both; padding-top: 1em">}
diff --git a/var/mongoose/include/toolbar.jim b/var/mongoose/include/toolbar.jim
index 8d25359..8780d9c 100755
--- a/var/mongoose/include/toolbar.jim
+++ b/var/mongoose/include/toolbar.jim
@@ -36,7 +36,7 @@ puts {
 }
 
 if {[file exists "/mod/bin/ir"]} {
-	tb "/img/remote.png" "Remote" "/remote/remote.jim"
+	tb "/img/remote.png" "Remote" "/plugin/ir/remote.jim"
 }
 tb "/images/323_1_10_Menu_Video.png" "Browse" "/cgi-bin/browse.jim"
 tb "/images/321_1_00_Menu_CHList.png" "Schedule" "/sched/sched.jim"
diff --git a/var/mongoose/lib/epg.class b/var/mongoose/lib/epg.class
index 3e6a60a..42edf98 100644
--- a/var/mongoose/lib/epg.class
+++ b/var/mongoose/lib/epg.class
@@ -424,14 +424,16 @@ proc {epg favlist} {} {
 	"] { lindex $i end }]
 }
 
-proc {epg channellist} {} {
+proc {epg channellist} {{field usLcn}} {
 	global channeldb
 
 	set channels {}
 	lmap i [$channeldb query "
-		select usSvcid, szSvcName
+		select $field, szSvcName
 		from TBL_SVC
-	"] { set channels([string range [lindex $i 3] 1 end]) [lindex $i 1] }
+		order by 1
+	"] { lappend channels [list \
+	    [string range [lindex $i 3] 1 end] [lindex $i 1] ] }
 
 	return $channels
 }