From fd817a5662caa6633565643af2b51f5b1fb6d150 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 26 Aug 2012 16:04:21 -0500
Subject: system-templates:  remote shuffle. -move ATI and snapstream to new
 class ATI -moved dvico to favorites -renamed mceusb to mce -renamed common ->
 favorites

---
 abs/core/system-templates/PKGBUILD                 |   2 +-
 .../remotes/ATI/ATI_Remote_Wonder/lircd.conf       |  76 ++
 .../templates/remotes/ATI/ATI_Remote_Wonder/lircrc | 636 +++++++++++++++
 .../remotes/ATI/ATI_Remote_Wonder/preview.jpg      | Bin 0 -> 63480 bytes
 .../remotes/ATI/ATI_Remote_Wonder_Plus/lircd.conf  | 198 +++++
 .../remotes/ATI/ATI_Remote_Wonder_Plus/lircrc      | 258 ++++++
 .../remotes/ATI/ATI_Remote_Wonder_Plus/preview.jpg | Bin 0 -> 25555 bytes
 .../ATI/snapstream_firefly/lircd.snapstrm.conf     | 127 +++
 .../ATI/snapstream_firefly/lircrc-snapstrm.txt     | 590 ++++++++++++++
 .../remotes/ATI/snapstream_firefly/preview.jpg     | Bin 0 -> 63750 bytes
 .../common/MX-500-jams/lircd.conf.MX-500-JAMS      | 115 ---
 .../templates/remotes/common/MX-500-jams/lircrc    | 832 -------------------
 .../remotes/common/MX-500-jams/preview.jpg         | Bin 10473 -> 0 bytes
 .../remotes/common/mceusb/lircd.conf.mceusb        | 163 ----
 .../templates/remotes/common/mceusb/lircrc-mceusb  | 877 --------------------
 .../templates/remotes/common/mceusb/preview.jpg    | Bin 12551 -> 0 bytes
 .../templates/remotes/common/no_remote/preview.jpg | Bin 3087 -> 0 bytes
 .../remotes/common/streamzap/lircd.conf.streamzap  |  72 --
 .../templates/remotes/common/streamzap/lircrc      | 832 -------------------
 .../templates/remotes/common/streamzap/preview.jpg | Bin 83195 -> 0 bytes
 .../favorites/MX-500-jams/lircd.conf.MX-500-JAMS   | 115 +++
 .../templates/remotes/favorites/MX-500-jams/lircrc | 832 +++++++++++++++++++
 .../remotes/favorites/MX-500-jams/preview.jpg      | Bin 0 -> 10473 bytes
 .../remotes/favorites/dvico/lircd.conf.fusionHDTV  | 226 ++++++
 .../templates/remotes/favorites/dvico/lircrc.txt   | 883 +++++++++++++++++++++
 .../templates/remotes/favorites/dvico/preview.jpg  | Bin 0 -> 29813 bytes
 .../templates/remotes/favorites/dvico/remote.run   |   3 +
 .../remotes/favorites/mce/lircd.conf.mceusb        | 163 ++++
 .../templates/remotes/favorites/mce/lircrc-mceusb  | 877 ++++++++++++++++++++
 .../templates/remotes/favorites/mce/preview.jpg    | Bin 0 -> 12551 bytes
 .../remotes/favorites/no_remote/preview.jpg        | Bin 0 -> 3087 bytes
 .../favorites/streamzap/lircd.conf.streamzap       |  72 ++
 .../templates/remotes/favorites/streamzap/lircrc   | 832 +++++++++++++++++++
 .../remotes/favorites/streamzap/preview.jpg        | Bin 0 -> 83195 bytes
 abs/core/system-templates/templates/remotes/i2c.id |  26 +-
 .../remotes/other/ATI_Remote_Wonder/lircd.conf     |  76 --
 .../remotes/other/ATI_Remote_Wonder/lircrc         | 636 ---------------
 .../remotes/other/ATI_Remote_Wonder/preview.jpg    | Bin 63480 -> 0 bytes
 .../other/ATI_Remote_Wonder_Plus/lircd.conf        | 198 -----
 .../remotes/other/ATI_Remote_Wonder_Plus/lircrc    | 258 ------
 .../other/ATI_Remote_Wonder_Plus/preview.jpg       | Bin 25555 -> 0 bytes
 .../remotes/other/dvico/lircd.conf.fusionHDTV      | 226 ------
 .../templates/remotes/other/dvico/lircrc.txt       | 883 ---------------------
 .../templates/remotes/other/dvico/preview.jpg      | Bin 29813 -> 0 bytes
 .../templates/remotes/other/dvico/remote.run       |   3 -
 .../templates/remotes/other/no_remote/preview.jpg  | Bin 3087 -> 0 bytes
 .../templates/remotes/other/unknown/preview.jpg    | Bin 1587 -> 0 bytes
 .../templates/remotes/receiver_usb.id              |  68 +-
 48 files changed, 5935 insertions(+), 5220 deletions(-)
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircd.conf
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircrc
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircd.conf
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircrc
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/common/MX-500-jams/lircd.conf.MX-500-JAMS
 delete mode 100644 abs/core/system-templates/templates/remotes/common/MX-500-jams/lircrc
 delete mode 100644 abs/core/system-templates/templates/remotes/common/MX-500-jams/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/common/mceusb/lircd.conf.mceusb
 delete mode 100644 abs/core/system-templates/templates/remotes/common/mceusb/lircrc-mceusb
 delete mode 100644 abs/core/system-templates/templates/remotes/common/mceusb/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/common/no_remote/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/common/streamzap/lircd.conf.streamzap
 delete mode 100755 abs/core/system-templates/templates/remotes/common/streamzap/lircrc
 delete mode 100644 abs/core/system-templates/templates/remotes/common/streamzap/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircd.conf.MX-500-JAMS
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircrc
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/MX-500-jams/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/dvico/lircd.conf.fusionHDTV
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/dvico/lircrc.txt
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/dvico/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/dvico/remote.run
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/mce/lircd.conf.mceusb
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/mce/lircrc-mceusb
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/mce/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/no_remote/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap
 create mode 100755 abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/streamzap/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircd.conf
 delete mode 100644 abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircrc
 delete mode 100644 abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircd.conf
 delete mode 100644 abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircrc
 delete mode 100644 abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/other/dvico/lircd.conf.fusionHDTV
 delete mode 100644 abs/core/system-templates/templates/remotes/other/dvico/lircrc.txt
 delete mode 100644 abs/core/system-templates/templates/remotes/other/dvico/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/other/dvico/remote.run
 delete mode 100644 abs/core/system-templates/templates/remotes/other/no_remote/preview.jpg
 delete mode 100644 abs/core/system-templates/templates/remotes/other/unknown/preview.jpg

diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index ad61536..f5314f5 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=2.0
-pkgrel=15
+pkgrel=17
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircd.conf b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircd.conf
new file mode 100644
index 0000000..087b9ad
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircd.conf
@@ -0,0 +1,76 @@
+# brand: ATI Remote Wonder
+# model no. of remote control: 5000023600
+# devices being controlled by this remote: ATI USB Receiver
+#
+# Found on a linpvr.org forum, thanks.
+
+begin remote
+
+  name  ati_remote
+  bits           40
+  eps            30
+  aeps          100
+
+  one             0     0
+  zero            0     0
+  gap          235966
+  toggle_bit      0
+
+
+      begin codes
+          a                        0x00000014D5000000
+          b                        0x00000014D6010000
+          power                    0x00000014D7020000
+          tv                       0x00000014D8030000
+          dvd                      0x00000014D9040000
+          web                      0x00000014DA050000
+          media_library            0x00000014DB060000
+          drag                     0x00000014DC070000
+          mouse-button_left        0x000000144D780000
+          mouse-button_right       0x00000014517C0000
+          mouse-up                 0x0000001447720000
+          mouse-down               0x0000001448730000
+          mouse-left               0x0000001445700000
+          mouse-right              0x0000001446710000
+          mouse-left_up            0x0000001449740000
+          mouse-right_up           0x000000144A750000
+          mouse-left_down          0x000000144C770000
+          mouse-right_down         0x000000144B760000
+          vol-up                   0x00000014DD080000
+          vol-down                 0x00000014DE090000
+          mute                     0x00000014DF0A0000
+          chan-up                  0x00000014E00B0000
+          chan-down                0x00000014E10C0000
+          1                        0x00000014E20D0000
+          2                        0x00000014E30E0000
+          3                        0x00000014E40F0000
+          4                        0x00000014E5100000
+          5                        0x00000014E6110000
+          6                        0x00000014E7120000
+          7                        0x00000014E8130000
+          8                        0x00000014E9140000
+          9                        0x00000014EA150000
+          0                        0x00000014EC170000
+          dvd-root_menu            0x00000014EB160000
+          launch_setup             0x00000014ED180000
+          c                        0x00000014EE190000
+          d                        0x00000014F01B0000
+          tv_on_demand             0x00000014F11C0000
+          max_window               0x00000014F5200000
+          cursor-up                0x00000014EF1A0000
+          cursor-down              0x00000014F7220000
+          cursor-left              0x00000014F21D0000
+          cursor-right             0x00000014F41F0000
+          ok                       0x00000014F31E0000
+          e                        0x00000014F6210000
+          f                        0x00000014F8230000
+          rewind                   0x00000014F9240000
+          play                     0x00000014FA250000
+          fastforward              0x00000014FB260000
+          record                   0x00000014FC270000
+          stop                     0x00000014FD280000
+          pause                    0x00000014FE290000
+      end codes
+
+end remote
+
diff --git a/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircrc b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircrc
new file mode 100644
index 0000000..01519a8
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircrc
@@ -0,0 +1,636 @@
+# ~/.mythtv/lircrc
+# 
+# MythTV native LIRC config file for
+# the ATI-Wonder Remote
+# using lirc_atiusb driver
+# 
+
+begin
+#Jumppoint for Program Guide created in Mythweb
+    prog = mythtv
+    button = tv
+    config = ! 
+    repeat = 5
+end
+
+begin
+#Jumppoint for DVD playback created in Mythweb
+    prog = mythtv
+    button = dvd
+    config = @
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+#Jumppoint for MythWeater created in Mythweb
+    button = web
+    config = #
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+#Jumppoint for MythVideo created in Mythweb
+    button = media_library
+    config = $
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+#Jumppoint for MythWeater created in Mythweb
+    button = HAND
+    config = %
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = 1
+config = 1
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 2
+config = 2
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 3
+config = 3
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 4
+config = 4
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 5
+config = 5
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 6
+config = 6
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 7
+config = 7
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 8
+config = 8
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 9
+config = 9
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 0
+config = 0
+repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = mouse-up
+    config = Up
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = mouse-down
+    config = Down
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = mouse-left
+    config = Left
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = mouse-right
+    config = Right
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = mouse-button-right
+    config = Esc
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+# Enter button
+    button = mouse-button-left
+    config = Return
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = power
+    config = Esc
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+# Enter button
+    button = ok
+    config = Return
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = cursor-up
+    config = Up
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = cursor-down
+    config = Down
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = cursor-left
+    config = Left
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = cursor-right
+    config = Right
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = D
+    config = Esc
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = chan-up
+config = Up
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = chan-down
+config = Down
+    repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = vol-down
+  repeat = 3
+  config = F10  
+end
+
+begin
+  prog = mythtv
+  button = vol-up
+  repeat = 3
+  config = F11  
+end
+begin
+    prog = mythtv
+    button = mute
+    config = F9  
+    repeat = 5
+end
+
+begin
+# Mute for MythMusic
+    prog = mythtv
+    button = mute
+    config = |  
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = dvd-root_menu
+    config = M  
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+# Enter button
+    button = launch_setup
+    config = Return
+    repeat = 5
+end
+
+
+begin
+    prog = mythtv
+    button = a 
+    config = S  
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = b
+    config = I   
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = c
+    config = T   
+    repeat = 5
+end
+
+begin
+prog = mythtv
+# Change focus for PiP (to change channel in the other window)
+button = max_window
+config = B
+    repeat = 5
+end
+
+begin
+prog = mythtv
+# Toggle PiP on/off
+button = tv_on_demand
+config = V
+    repeat = 5
+end
+
+begin
+    prog = mythtv
+    button = rewind
+    config = Left  
+    repeat = 5
+end
+
+
+begin
+    prog = mythtv
+    button = fastforward
+    config = Right  
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = record
+config = R
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = stop
+config = Esc
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = play
+config = P
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = pause
+config = P
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = e
+# Use for backwards commercial skip
+config = Q
+    repeat = 5
+end
+
+begin
+prog = mythtv
+button = f
+# Use for forward commercial skip
+config = Z
+    repeat = 5
+end
+
+#Mplayer
+
+begin
+prog = mplayer
+button = play
+config = pause
+    repeat = 5
+end
+
+begin
+prog = mplayer
+button = pause
+config = pause
+    repeat = 5
+end
+
+begin
+prog = mplayer
+button = stop
+config = quit
+    repeat = 5
+end
+
+begin
+prog = mplayer
+button = power
+config = quit
+    repeat = 5
+end
+
+begin
+prog = mplayer
+button = d
+config = quit
+    repeat = 5
+end
+
+begin
+prog = mplayer
+button = mouse-button-right
+config = quit
+    repeat = 5
+end
+
+begin
+prog = mplayer
+button = mute
+config = mute
+    repeat = 5
+end
+
+begin
+prog = mplayer
+button = e
+repeat = 6
+config = seek -10
+end
+
+begin
+prog = mplayer
+button = r
+repeat = 6
+config = seek 10
+end
+
+begin
+prog = mplayer
+button = rewind
+repeat = 6
+config = seek -70
+end
+
+begin
+prog = mplayer
+button = fastforward
+repeat = 6
+config = seek 70
+end
+
+begin
+prog = mplayer
+button = vol-down
+repeat = 6
+config = volume -1
+end
+
+begin
+prog = mplayer
+button = vol-up
+repeat = 6
+config = volume 1
+end
+
+#Xine
+
+begin
+prog = xine
+button = play
+config = Play
+end
+
+begin
+prog = xine
+button = pause
+config = PAUSE
+end
+
+begin
+prog = xine
+button = stop
+config = Stop
+end
+
+begin
+prog = xine
+button = power
+config = Quit
+end
+
+begin
+prog = xine
+button = d
+config = quit
+end
+
+begin
+prog = xine
+button = mouse-button-right
+config = quit
+end
+
+begin
+prog = xine
+button = cursor-up
+repeat = 4
+config = EventUp
+end
+
+begin
+prog = xine
+button = cursor-down
+repeat = 4
+config = EventDown
+end
+
+begin
+prog = xine
+button = cursor-left
+repeat = 4
+config = EventLeft
+end
+
+begin
+prog = xine
+button = corsor-right
+repeat = 4
+config = EventRight
+end
+
+begin
+prog = xine
+button = ok
+repeat = 0
+config = EventSelect
+end
+
+begin
+prog = xine
+button = mouse-up
+repeat = 4
+config = EventUp
+end
+
+begin
+prog = xine
+button = mouse-down
+repeat = 4
+config = EventDown
+end
+
+begin
+prog = xine
+button = mouse-left
+repeat = 4
+config = EventLeft
+end
+
+begin
+prog = xine
+button = mouse-right
+repeat = 4
+config = EventRight
+end
+
+begin
+prog = xine
+button = mouse-button-left
+repeat = 0
+config = EventSelect
+end
+
+begin
+prog = xine
+button = dvd-root_menu
+repeat = 0
+config = Menu
+end
+
+#vol down
+begin
+prog = xine
+button = vol-down
+repeat = 1
+config = Volume-
+end
+
+#vol up
+begin
+prog = xine
+button = vol-up
+repeat = 1
+config = Volume+
+end
+
+begin
+prog = xine
+button = tv_on_demand
+repeat = 1
+config = ZoomIn
+end
+
+begin
+prog = xine
+button = max_window
+repeat = 1
+config = ZoomOut
+end
+
+#skip chapter forward
+begin
+prog = xine
+button = fastforward
+repeat = 1
+config = EventNext
+end
+
+#skip chapter backward
+begin
+prog = xine
+button = rewind
+repeat = 1
+config = EventPrior
+end
+
+begin
+prog = xine
+button = f
+repeat = 2
+config = SeekRelative+45
+end
+
+begin
+prog = xine
+button = e
+repeat = 2
+config = SeekRelative-45
+end 
+
+
+
+
+
diff --git a/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/preview.jpg
new file mode 100644
index 0000000..351a111
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircd.conf b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircd.conf
new file mode 100644
index 0000000..6b1172a
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircd.conf
@@ -0,0 +1,198 @@
+
+# Please make this file available to others
+# by sending it to <lirc@bartelmus.de>
+#
+# this config file was automatically generated
+# using lirc-0.8.0pre3(atiusb) on Tue Feb  7 19:33:37 2006
+#
+# contributed by 
+# edited 2/19/2006 for dual code generation problem
+#
+# brand: ATI Remote Wonder Plus / RW3 
+# model no. of remote control: 5000026900
+# devices being controlled by this remote: 500002700
+#
+
+begin remote
+
+  name ATI_RWP 
+  bits           24
+  eps            30
+  aeps          100
+
+  one             0     0
+  zero            0     0
+  post_data_bits  16
+  post_data      0x0
+  gap          243966
+  min_repeat      2 
+  toggle_bit      0
+
+
+      begin codes
+	  
+          A                        0x155580
+          A                        0x15D500
+
+          B			   0x155681
+          B                        0x15D601
+		  
+          ?                        0x155A85
+          ?                        0x15da05
+          
+          POWER                    0x15d702
+          POWER                    0x155782
+		  
+          FM                       0x15F11C
+          FM                       0x15719C
+
+          TV                       0x155883
+          TV                       0x15d803
+
+          GUIDE                    0x15DB06
+          GUIDE                    0x155B86
+
+          TV2                      0x15FF2A
+          TV2                      0x157FAA
+
+          DVD                      0x15D904
+          DVD                      0x155984
+		  
+          Vol+                     0x155D88
+          Vol+			   0x15dd08
+		  
+          Vol-                     0x15DE09
+          Vol-                     0x155e89
+		  
+          Ch+                      0x15608B
+          Ch+                      0x15e00b
+		  
+          Ch-                      0x15E10C
+          Ch-                      0x15618c
+		  
+          Mute                     0x155F8A
+          Mute                     0x15df0a
+		  
+          ATI                      0x15022D
+          ATI                      0x1582ad
+
+          Maximize                 0x1575A0
+          Maximize                 0x15f520
+		  
+          Hand		           0x15dc07
+          Hand                     0x155c87
+
+          Mouse_LeftButton         0x154d78
+          Mouse_LeftButton         0x15cdf8  
+		  
+          Mouse_RightButton        0x15517c 
+          Mouse_RightButton        0x15d1fc 
+		  
+          Mouse_Up                 0x15C7F2
+          Mouse_Up                 0x154772
+		  
+          Mouse_Down               0x154873
+          Mouse_Down               0x15c8f3 
+		  
+          Mouse_Left               0x154570
+          Mouse_Left               0x15c5f0
+		  
+          Mouse_Right              0x154671
+          Mouse_Right              0x15c6f1
+		  
+          Mouse_UpRight            0x154A75
+          Mouse_UpRight            0x15caf5
+		  
+          Mouse_UpLeft             0x15C9F4
+          Mouse_UpLeft             0x154974 
+		  
+          Mouse_DownRight          0x15CBF6
+          Mouse_DownRight          0x154b76 
+		  
+          Mouse_DownLeft           0x154c77
+          Mouse_DownLeft           0x15ccf7
+		  
+          Play                     0x157AA5
+          Play                     0x15fa25
+		  
+          Pause                    0x15FE29
+          Pause                    0x157ea9
+		  
+          Stop                     0x157DA8
+          Stop                     0x15fd28 
+		  
+          Previous                 0x15F924
+          Previous                 0x1579a4
+		  
+          Next                     0x157BA6
+          Next                     0x15fb26
+		  
+          Record                   0x15fc27
+          Record		   0x157ca7
+		  
+          C                        0x156E99
+          C                        0x15ee19 
+
+          D                        0x15F01B
+          D                        0x15709b
+		  
+          E                        0x1576A1
+          E                        0x15f621
+		  
+          F                        0x15F823
+          F                        0x1578a3
+		  
+          OK                       0x15739E
+          OK                       0x15f31e
+		  
+          Information              0x15012C
+          Information              0x1581ac
+		  
+          Clock                    0x1580AB
+          Clock			   0x15002b
+		  
+          1                        0x15E20D
+          1                        0x15628d
+          2                        0x15638E
+          2                        0x15e30e
+          3                        0x15E40F
+          3                        0x15648f
+          4                        0x156590
+          4                        0x15e510
+          5                        0x15E611
+          5                        0x156691
+          6                        0x156792
+          6                        0x15e712
+          7                        0x15E813
+          7                        0x156893
+          8                        0x156994
+          8                        0x15e914
+          9                        0x15EA15
+          9                        0x156a95
+          0                        0x156C97
+          0                        0x15ec17
+		  
+          Checkmark                0x15ED18
+          Checkmark                0x156d98
+
+          Dropdown                 0x156B96
+          Dropdown                 0x15eb16
+		  
+          Arrow_Up                 0x156F9A
+          Arrow_Up                 0x15EF1A
+		  
+          Arrow_Down               0x15F722
+          Arrow_Down               0x1577a2 
+		  
+          Arrow_Right              0x15749F
+          Arrow_Right              0x15f41f
+		  
+          Arrow_Left               0x15F21D
+          Arrow_Left               0x15729d
+		  
+      end codes
+
+end remote
+
+
+
diff --git a/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircrc b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircrc
new file mode 100644
index 0000000..85365c4
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircrc
@@ -0,0 +1,258 @@
+begin
+prog = mythtv
+button = A
+config = E
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = B
+config = O
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Stop
+config = Esc
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Next
+config = U
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Maximize
+config = V
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Pause
+config = P
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Play
+config = P
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Mute
+config = |
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Vol-
+config = [
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Vol+
+config = ]
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = f
+config = PgDown
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = d
+config = PgUp
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = c
+config = F4
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = e
+config = Esc
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Arrow_Right
+config = Right
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Arrow_Left
+config = Left
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Arrow_Up
+config = Up
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Arrow_Down
+config = Down
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Ch+
+config = Up
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Ch-
+config = Down
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = OK
+config = Return
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 1
+config = 1
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 2
+config = 2
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 3
+config = 3
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 4
+config = 4
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 5
+config = 5
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 6
+config = 6
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 7
+config = 7
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 8
+config = 8
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 9
+config = 9
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = 0
+config = 0
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Information
+config = i
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Checkmark
+config = Enter
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Dropdown
+config = M
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = TV
+config = F9
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = GUIDE
+config = M
+repeat = 5
+end
+
+begin
+prog = mythtv
+button = Clock
+config = I
+repeat = 5
+end
diff --git a/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/preview.jpg
new file mode 100644
index 0000000..36612e5
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
new file mode 100644
index 0000000..288bb51
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
@@ -0,0 +1,127 @@
+# Please make this file available to others
+# by sending it to <lirc@bartelmus.de>
+#
+# this config file was automatically generated
+# using lirc-0.7.0(any) on Fri Mar 11 08:51:45 2005
+#
+# contributed by
+#
+# brand: Snapstream Firefly Remote
+# model no. of remote control:
+# devices being controlled by this remote:
+#
+
+begin remote
+
+name Snapstream_Firefly
+bits 40
+eps 30
+aeps 100
+
+one 0 0
+zero 0 0
+gap 219964
+toggle_bit 0
+
+
+begin codes
+MAXI 0x0000001481AC0000
+MAXI 0x00000014012C0000
+CLOSE 0x00000014D7020000
+CLOSE 0x0000001457820000
+1 0x00000014628D0000
+1 0x00000014E20D0000
+2 0x00000014E30E0000
+2 0x00000014638E0000
+3 0x00000014648F0000
+3 0x00000014E40F0000
+4 0x00000014E5100000
+4 0x0000001465900000
+5 0x0000001466910000
+5 0x00000014E6110000
+6 0x00000014E7120000
+6 0x0000001467920000
+7 0x0000001468930000
+7 0x00000014E8130000
+8 0x00000014E9140000
+8 0x0000001469940000
+9 0x000000146A950000
+9 0x00000014EA150000
+0 0x00000014EC170000
+0 0x000000146C970000
+BACK 0x000000146B960000
+BACK 0x00000014EB160000
+ENT 0x00000014ED180000
+ENT 0x000000146D980000
+VOL+ 0x000000145E890000
+VOL+ 0x00000014DE090000
+VOL- 0x000000145D880000
+VOL- 0x00000014DD080000
+MUTE 0x000000145F8A0000
+MUTE 0x00000014DF0A0000
+FIREFLY 0x0000001455800000
+FIREFLY 0x00000014D5000000
+CH+ 0x00000014608B0000
+CH+ 0x00000014E00B0000
+CH- 0x00000014618C0000
+CH- 0x00000014E10C0000
+INFO 0x0000001483AE0000
+INFO 0x00000014032E0000
+OPTION 0x0000001484AF0000
+OPTION 0x00000014042F0000
+UP 0x000000146F9A0000
+UP 0x00000014EF1A0000
+LEFT 0x00000014729D0000
+LEFT 0x00000014F21D0000
+DOWN 0x0000001477A20000
+DOWN 0x00000014F7220000
+RIGHT 0x00000014749F0000
+RIGHT 0x00000014F41F0000
+OK 0x00000014739E0000
+OK 0x00000014F31E0000
+MENU 0x00000014719C0000
+MENU 0x00000014F11C0000
+EXIT 0x0000001475A00000
+EXIT 0x00000014F5200000
+REC 0x00000014FC270000
+REC 0x000000147CA70000
+PLAY 0x00000014FA250000
+PLAY 0x000000147AA50000
+STOP 0x00000014FD280000
+STOP 0x000000147DA80000
+REW 0x00000014F9240000
+REW 0x0000001479A40000
+FWD 0x00000014FB260000
+FWD 0x000000147BA60000
+PREV 0x00000014002B0000
+PREV 0x0000001480AB0000
+PAUSE 0x00000014FE290000
+PAUSE 0x000000147EA90000
+NEXT 0x00000014FF2A0000
+NEXT 0x000000147FAA0000
+MUSIC 0x00000014DB060000
+MUSIC 0x000000145B860000
+PHOTOS 0x00000014DA050000
+PHOTOS 0x000000145A850000
+DVD 0x00000014D9040000
+DVD 0x0000001459840000
+TV 0x00000014D8030000
+TV 0x0000001458830000
+VIDEO 0x00000014DC070000
+VIDEO 0x000000145C870000
+HELP 0x00000014D6010000
+HELP 0x0000001456810000
+MOUSE 0x00000014022D0000
+MOUSE 0x0000001482AD0000
+A 0x00000014EE190000
+A 0x000000146E990000
+B 0x00000014F01B0000
+B 0x00000014709B0000
+C 0x00000014F6210000
+C 0x0000001476A10000
+D 0x00000014F8230000
+D 0x0000001478A30000
+
+end codes
+
+end remote
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/common/MX-500-jams/lircd.conf.MX-500-JAMS b/abs/core/system-templates/templates/remotes/common/MX-500-jams/lircd.conf.MX-500-JAMS
deleted file mode 100644
index b76d32c..0000000
--- a/abs/core/system-templates/templates/remotes/common/MX-500-jams/lircd.conf.MX-500-JAMS
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
-#
-# contributed by Christoph Bartelmus
-#
-# brand:                       Streamzap
-# model no. of remote control: PC Remote
-# devices being controlled by this remote: USB receiver
-#
-
-begin remote
-
-  name  Streamzap_PC_Remote
-  bits            6
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           889  889
-  zero          889  889
-  plead         889
-  pre_data_bits   8
-  pre_data       0xA3
-  gap          108344
-  toggle_bit      2
-
-
-      begin codes
-          0                        0x00
-          1                        0x01
-          2                        0x02
-          3                        0x03
-          4                        0x04
-          5                        0x05
-          6                        0x06
-          7                        0x07
-          8                        0x08
-          9                        0x09
-          POWER                    0x0A
-          MUTE                     0x0B
-          CH_UP                    0x0C
-          VOL_UP                   0x0D
-          CH_DOWN                  0x0E
-          VOL_DOWN                 0x0F
-          UP                       0x10
-          LEFT                     0x11
-          OK                       0x12
-          RIGHT                    0x13
-          DOWN                     0x14
-          MENU                     0x15
-          EXIT                     0x16
-          PLAY                     0x17
-          PAUSE                    0x18
-          STOP                     0x19
-          |<<                      0x1A
-          >>|                      0x1B
-          RECORD                   0x1C
-          <<                       0x1D
-          >>                       0x1E
-          RED                      0x20
-          GREEN                    0x21
-          YELLOW                   0x22
-          BLUE                     0x23
-      end codes
-
-end remote
-
-
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.2(streamzap) on Mon Dec  5 08:45:02 2005
-#
-# contributed by 
-#
-# brand:                       RS_LD_120-MX500
-# model no. of remote control: 
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  RS_LD
-  bits           15
-  flags SPACE_ENC|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           384  1920
-  zero          384   896
-  ptrail        384
-  gap          70400
-  min_repeat      2
-  toggle_bit      0
-
-
-      begin codes
-          RESET 	   0x19FD
-          TIME             0X1902
-          BLANK            0X1B02
-          PICTURE          0X1882
-          ASPECT           0X1A82
-          BROWSE           0X1982
-          DELETE           0X1B82
-          CARD             0X1842
-          CARD_SOURCE      0X1A42
-          SPARE1           0X1942
-      end codes
-
-end remote
-
-
diff --git a/abs/core/system-templates/templates/remotes/common/MX-500-jams/lircrc b/abs/core/system-templates/templates/remotes/common/MX-500-jams/lircrc
deleted file mode 100644
index 5e668b5..0000000
--- a/abs/core/system-templates/templates/remotes/common/MX-500-jams/lircrc
+++ /dev/null
@@ -1,832 +0,0 @@
-# StreamZap Remote
-# 'config' must either be a literal key, e.g. 'config = l' or must
-# refer to a defined key in MythTV, e.g. 'config = PLAY'a
-
-
-#restart frontend
-begin
-        remote = RS_LD
-        button = RESET
-        prog   = irexec
-        repeat = 0
-        config = /usr/bin/restartfrontend.sh
-end
-
-#time
-begin
-        remote = RS_LD
-        button = TIME
-        prog   = irexec
-        repeat = 10
-        config = /usr/bin/saytime.sh
-end
-
-#screen blank
-begin
-        remote = RS_LD
-        button = BLANK
-        prog   = irexec
-        repeat = 0
-#      config  = ls
-        config = xset s activate ; xset s blank
-end
-
-
-#picture
-begin
-REMOTE = RS_LD
-prog = mythtv
-button = PICTURE
-repeat = 4
-config = f
-end
-
-#change aspect
-begin
-remote = RS_LD
-prog = mythtv
-button = ASPECT
-# change aspect ratio
-config = w
-end
-
-#Browse
-begin
-remote = RS_LD
-prog = mythtv
-button = BROWSE
-repeat = 8
-config = o
-end
-
-# delete key
-begin
-remote = RS_LD
-prog = mythtv
-button = DELETE
-repeat = 8
-config = d
-end
-
-
-#change card
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD
-repeat = 8
-config = y
-end
-
-# Change TV card input
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD_SOURCE
-repeat = 4
-config = C
-end
-
-
-
-# Cycle through channel history
-begin
-remote = Streamzap_PC_Remote
-prog = mythtv
-button = BLUE
-repeat = 4
-config = H
-end
-
-# Bring up OSD info
-begin
-remote =  Streamzap_PC_Remote
-prog = mythtv
-button = YELLOW
-repeat = 4
-config = i
-end
-
-
-
-
-begin
-prog = mythtv
-button = 0
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-end
-
-begin
-prog = mythtv
-button = POWER
-config = Esc
-end
-
-# ???
-begin
-prog = mythtv
-button = MUTE
-config = F9
-end
-
-begin
-prog = mythtv
-button = CH_UP
-repeat = 3
-config = PgUp
-end
-
-begin
-prog = mythtv
-button = VOL_UP
-repeat = 3
-config = ]
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-repeat = 3
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = VOL_DOWN
-repeat = 3
-config = [
-end
-
-begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = Left
-end
-
-begin
-prog = mythtv
-button = OK
-config = Return
-end
-
-begin
-prog = mythtv
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = Right
-end
-
-begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = MENU
-config = m
-end
-
-begin
-prog = mythtv
-button = EXIT
-config = Esc
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = Space
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = p
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-end
-
-begin
-prog = mythtv
-# skip backward
-button = |<<
-config = PgUp
-end
-
-begin
-prog = mythtv
-# skip forward
-button = >>|
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = RECORD
-config = r
-end
-
-begin
-prog = mythtv
-# rewind
-button = <<
-config = Home
-end
-
-begin
-prog = mythtv
-# fast forward
-button = >>
-config = End
-end
-
-begin
-prog = mythtv
-button = RED
-# Delete
-config = d
-end
-
-begin
-prog = mythtv
-button = GREEN
-# Info
-config = i
-end
-
-#begin
-#prog = mythtv
-#button = YELLOW
-# change aspect ratio
-#config = w
-#end
-
-begin
-prog = mythtv
-button = BLUE
-config = Tab
-end
-
-# MPLAYER
-begin
-prog = mplayer
-button = POWER
-config = quit
-end
-
-begin
-prog = mplayer
-button = MUTE
-config = mute
-end
-
-begin
-prog = mplayer
-button = VOL_UP
-repeat = 3
-config = volume +1
-end
-
-begin
-prog = mplayer
-button = VOL_DOWN
-repeat = 3
-config = volume -1
-end
-
-begin
-prog = mplayer
-button = UP
-repeat = 3
-config = seek +10
-end
-
-begin
-prog = mplayer
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = seek -60
-end
-
-begin
-prog = mplayer
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = seek +60
-end
-
-begin
-prog = mplayer
-button = DOWN
-repeat = 3
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = EXIT
-config = quit
-end
-
-begin
-prog = mplayer
-button = play
-config = speed_set 1.0
-end
-
-begin
-    prog = mplayer
-    button = pause
-    config = pause
-end
-
-begin
-prog = mplayer
-button = STOP
-config = quit
-end
-
-begin
-prog = mplayer
-# skip backward
-button = |<<
-config = seek -600
-end
-
-begin
-prog = mplayer
-# skip forward
-button = >>|
-config = seek +600
-end
-
-begin
-prog = mplayer
-# slow forward
-button = <<
-config = speed_mult 0.5
-end
-
-begin
-prog = mplayer
-# fast forward
-button = >>
-config = speed_mult 2.0
-end
-
-### xine  commands
-
-begin
-prog = xine
-button = YELLOW
-repeat = 4
-#config = ToggleVisiblity
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 4
-config = SeekRelative+60
-end
-
-# increase brightness by 10
-begin
-        button = DELETE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl+
-end
-
-# decrease brightness by 10
-begin
-        button = PICTURE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl-
-end
-
-
-begin
-prog = xine
-button = PAUSE
-repeat = 4
-config = Pause
-end
-
-begin
-prog = xine
-button = PLAY
-repeat = 4
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 4
-config = mute
-end
-
-begin
-prog = xine
-button = <<
-repeat = 4
-config = SeekRelative-30
-end
-
-begin
-prog = xine
-button =  >>
-repeat = 4
-#config = SeekRelative+30
-config =  SpeedFaster
-end
-
-begin
-prog = xine
-button = POWER
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = EXIT
-repeat = 4
-config = quit
-end
-
-
-begin
-prog = xine
-button = FREEZE
-repeat = 4
-config =  SeekRelative+1200
-end
-
-begin
-prog = xine
-button = MOVE
-repeat = 4
-config =  SeekRelative-1200
-end
-
-begin
-prog   = xine
-button = 3
-config = SpuNext
-repeat = 0
-end
-
-# Select previous sub picture (subtitle) channel.
-begin
-button = 1
-prog   = xine
-repeat = 0
-config = SpuPrior
-end
-
-# Select next audio channel.
-begin
-button = 9
-prog   = xine
-repeat = 0
-config = AudioChannelNext
-end
-
-# Select previous audio channel.
-begin
-button = 7
-prog   = xine
-repeat = 0
-config = AudioChannelPrior
-end
-
-
-
-# Up event.
-begin
-
-button = UP
-prog   = xine
-repeat = 8
-config = EventUp
-end
-
-# Down event.
-begin
-
-button = DOWN
-prog   = xine
-repeat = 8
-config = EventDown
-end
-
-# Left event.
-begin
-
-button = LEFT
-prog   = xine
-repeat = 8
-config = EventLeft
-end
-
-# Right event.
-begin
-
-button = RIGHT
-prog   = xine
-repeat = 8
-config = EventRight
-end
-
-# Select event.
-begin
-prog   = xine
-button = ok
-repeat = 8
-config = EventSelect
-end
-
-# Down Chapter
-begin
-
-button = CH_DOWN
-prog   = xine
-repeat = 8
-config = EventPrior
-end
-
-# Next Chapter.
-begin
-
-button = CH_UP
-prog   = xine
-repeat = 8
-config = EventNext
-end
-
-# menu.
-begin
-
-button = record
-prog   = xine
-repeat = 8
-config = RootMenu
-end
-
-# Toggle aspect ratio
-begin
-prog   = xine
-button = ASPECT
-repeat = 0
-config = ToggleAspectRatio
-end
-
-
-
-#######xmms
-begin xmms
-  begin
-    prog = xmms
-    button = PLAY
-    config = PLAY
-  end
-  begin
-    prog = xmms
-    button = clear
-    config = PLAYLIST_CLEAR
-  end
-  begin
-    prog = xmms
-    button = load
-    config = PLAYLIST_ADD .xmms/xmms.m3u
-   end
-  begin
-    prog = xmms
-    button = PAUSE
-    config = PAUSE
-  end
-  begin
-    prog = xmms
-    button = STOP
-    config = STOP
-  end
-  begin
-    prog = xmms
-    button = EXIT
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = POWER
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = CH_UP
-    config = NEXT
-  end
-  begin
-    prog = xmms
-    button = CH_DOWN
-    config = PREV
-  end
-  
-
-
-begin
-    prog = xmms
-    button = >>|
-    config = NEXT
-  end
-begin
-    prog = xmms
-    button = |<<
-    config = PREV
-end
-
-
-begin
-    prog = xmms
-    button = <<
-    config = FWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = <<
-    config = BWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = volup
-    config = VOL_UP 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = voldown
-    config = VOL_DOWN 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = 1
-    config = ONE
-  end
-  begin
-    prog = xmms
-    button = 2
-    config = TWO
-  end
-  begin
-    prog = xmms
-    button = 3
-    config = THREE
-  end
-  begin
-    prog = xmms
-    button = 4
-    config = FOUR
-  end
-  begin
-    prog = xmms
-    button = 5
-    config = FIVE
-  end
-  begin
-    prog = xmms
-    button = 6
-    config = SIX
-  end
-  begin
-    prog = xmms
-    button = 7
-    config = SEVEN
-  end
-  begin
-    prog = xmms
-    button = 8
-    config = EIGHT
-  end
-  begin
-    prog = xmms
-    button = 9
-    config = NINE
-  end
-  begin
-    prog = xmms
-    button = 0
-    config = ZERO
-  end
-  begin
-    prog = xmms
-    button = enter
-    config = SETPOS
-  end
-end xmms
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/core/system-templates/templates/remotes/common/MX-500-jams/preview.jpg b/abs/core/system-templates/templates/remotes/common/MX-500-jams/preview.jpg
deleted file mode 100644
index 38857f9..0000000
Binary files a/abs/core/system-templates/templates/remotes/common/MX-500-jams/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/common/mceusb/lircd.conf.mceusb b/abs/core/system-templates/templates/remotes/common/mceusb/lircd.conf.mceusb
deleted file mode 100644
index b1c26b6..0000000
--- a/abs/core/system-templates/templates/remotes/common/mceusb/lircd.conf.mceusb
+++ /dev/null
@@ -1,163 +0,0 @@
-#
-# RC-6 config file
-#
-# source: http://home.hccnet.nl/m.majoor/projects__remote_control.htm
-#         http://home.hccnet.nl/m.majoor/pronto.pdf
-#
-# used by: Philips
-#
-#########
-#
-# Philips Media Center Edition remote control
-# For use with the USB MCE ir receiver
-#
-# Dan Conti  dconti|acm.wwu.edu
-#
-# Updated with codes for MCE 2005 Remote additional buttons
-# *, #, Teletext, Red, Green, Yellow & Blue Buttons
-# Note: TV power button transmits no code until programmed.
-# Updated 12th September 2005
-# Graham Auld - mce|graham.auld.me.uk
-#
-# Radio, Print, RecTV are only available on the HP Media Center remote control
-#
-
-begin remote
-
-  name 		mceusb
-  bits        	16
-  flags 	RC6|CONST_LENGTH
-  eps         	30
-  aeps     	100
-
-  header       	2667   	889
-  one           444   	444
-  zero          444   	444
-  pre_data_bits 21
-  pre_data      0x37FF0
-  gap          	105000
-  toggle_bit    22
-  rc6_mask    	0x100000000
-
-  begin codes
-#-------------------------------------------------------------b9
-	Testb90		0x00007b90
-	Testb91		0x00007b91
-	Testb92		0x00007b92
-	Testb93		0x00007b93
-	Testb94		0x00007b94
-	Testb95		0x00007b95
-	Testb96		0x00007b96
-	Testb97		0x00007b97
-	Testb98		0x00007b98
-	Testb99		0x00007b99
-	TV?????		0x00007b9a
-	Messenger	0x00007b9b
-	Testb9c		0x00007b9c
-	Testb9d		0x00007b9d
-	Testb9e		0x00007b9e
-	Testb9f		0x00007b9f
-#-------------------------------------------------------------ba
-	Testba0 	0x00007ba0
-	Blue		0x00007ba1
-	Yellow		0x00007ba2
-	Green		0x00007ba3
-	Red		0x00007ba4
-	Teletext	0x00007ba5
-	Testba6 	0x00007ba6
-	Testba7 	0x00007ba7
-	Testba8 	0x00007ba8
-	Testba9 	0x00007ba9
-	Testbaa 	0x00007baa
-	Testbab 	0x00007bab
-	Testbac 	0x00007bac
-	Testbad 	0x00007bad
-	Testbae 	0x00007bae
-        Radio    	0x00007baf
-#-------------------------------------------------------------bb
-	Testbb0 	0x00007bb0
-	Print           0x00007bb1
-	Testbb2 	0x00007bb2
-	Testbb3 	0x00007bb3
-	Testbb4 	0x00007bb4
-	Videos		0x00007bb5
-	Pictures 	0x00007bb6
-	RecordedTV      0x00007bb7
-	Music 		0x00007bb8
-	TV            	0x00007bb9
-	Testbba 	0x00007bba
-	Testbbb 	0x00007bbb
-	Testbbc 	0x00007bbc
-	Testbbd 	0x00007bbd
-	Testbbe 	0x00007bbe
-	Testbbf 	0x00007bbf
-#-------------------------------------------------------------- bc
-        Testbc0     	0x00007bc0
-	Testbc1     	0x00007bc1
-        Testbc2     	0x00007bc2
-        Testbc3     	0x00007bc3
-        Testbc4     	0x00007bc4
-       	Testbc5     	0x00007bc5
-       	Testbc6     	0x00007bc6
-       	Testbc7     	0x00007bc7
-       	Testbc8     	0x00007bc8
-       	Testbc9     	0x00007bc9
-        Testbca     	0x00007bca
-        Testbcb     	0x00007bcb
-        Testbcc     	0x00007bcc
-        Testbcd     	0x00007bcd
-        Testbce     	0x00007bce
-       	Testbcf     	0x00007bcf
-#---------------------------------------------------------------bd
-       	Testbd0 	0x00007bd0
-       	Testbd1 	0x00007bd1
-       	Testbd2 	0x00007bd2
-       	Testbd3 	0x00007bd3
-       	Testbd4 	0x00007bd4
-       	Testbd5 	0x00007bd5
-       	Testbd6 	0x00007bd6
-       	Testbd7 	0x00007bd7
-       	Testbd8 	0x00007bd8
-       	Guide           0x00007bd9
-       	LiveTV          0x00007bda
-       	DVDMenu 	0x00007bdb
-       	Back            0x00007bdc
-       	OK              0x00007bdd
-       	Right           0x00007bde
-       	Left            0x00007bdf
-#--------------------------------------------------------------be
-       	Down            0x00007be0
-       	Up              0x00007be1
-       	Star            0x00007be2
-       	Hash            0x00007be3
-       	Replay          0x00007be4
-       	Skip            0x00007be5
-       	Stop            0x00007be6
-       	Pause           0x00007be7
-       	Record          0x00007be8
-       	Play            0x00007be9
-       	Rewind          0x00007bea
-       	Forward 	0x00007beb
-       	ChannelDown     0x00007bec
-       	ChannelUp       0x00007bed
-       	VolumeDown      0x00007bee
-       	VolumeUp        0x00007bef
-#---------------------------------------------------------------bf
-       	More            0x00007bf0
-       	Mute            0x00007bf1
-       	Start           0x00007bf2
-       	Power           0x00007bf3
-       	Enter           0x00007bf4
-       	Clear           0x00007bf5
-       	Nine            0x00007bf6
-       	Eight           0x00007bf7
-       	Seven           0x00007bf8
-       	Six             0x00007bf9
-       	Five            0x00007bfa
-       	Four            0x00007bfb
-       	Three           0x00007bfc
-       	Two             0x00007bfd
-       	One             0x00007bfe
-       	Zero            0x00007bff
-  end codes
-end remote
diff --git a/abs/core/system-templates/templates/remotes/common/mceusb/lircrc-mceusb b/abs/core/system-templates/templates/remotes/common/mceusb/lircrc-mceusb
deleted file mode 100644
index a6a8c48..0000000
--- a/abs/core/system-templates/templates/remotes/common/mceusb/lircrc-mceusb
+++ /dev/null
@@ -1,877 +0,0 @@
-# /home/mythtv/.mythtv/lircrc
-#
-# From Knoppmyth R5.5 - Copied by UniCav
-#
-# Media Center Edition Remote Control and 
-# Remote Control Keys on Media Center Keyboard
-#
-##############################################################################
-# For use with the USB MCE ir receiver
-# MythTV LIRC config file for the mceusb2 or lirc_mod_mce module
-
-# Info about lircrc statment
-#begin
-#  prog    = ... Program controlled, irxevent, irexec, mythtv, mplayer, 
-#                xine, or others
-#  remote  = ... mceusb, or what ever you happen to have or want to call it
-#  button  = ... remote keys names from your lircd.conf file
-#  repeat  = ... repeat = 2 is fast, repeat = 4 is slower
-#  delay   = ... delay before repeat, 1 is short, 4 is longer
-#  config  = ... output key presses to key bindings editor
-#  mode    = ...
-#  flags   = ...
-#end
-
-# Test your new Lirc settings
-#   /etc/init.d/lirc restart    To restart Lirc
-#   ctrl-alt-backspace          To restart the frontend
-
-# Updated January 30th 2008 BAK
-# for the Knoppmyth project
-
-################################### irexec ###################################
-# the lirc irexec program must be running for this section
-
-# Will perform a complete shutdown
-#begin
-#       prog   = irexec
-#       button = Power
-#       config = /usr/bin/sudo halt
-#end
-
-############################### Mythtv Section ###############################
-# MythTV Key Binding Editor     location
-# Mythtv Menu >>Utilities / Setup >>Edit Keys
-# Key Bindings can also be found in Myth Web
-
-# Record
-begin
-  prog   = mythtv
-  button = Record
-  config = R
-end
-
-# Stop
-begin
-  prog   = mythtv
-  button = Stop
-  config = Esc
-end
-
-# Pause
-begin
-  prog   = mythtv
-  button = Pause
-  config = P
-end
-
-# Rewind (while viewing)
-begin
-  prog   = mythtv
-  button = Rewind
-  repeat = 0
-  delay  = 1
-  config = <
-end
-
-# Fast forward (while viewing)
-begin
-  prog   = mythtv
-  button = Forward
-  repeat = 0
-  delay  = 1
-  config = >
-end
-
-# Play
-begin
-  prog   = mythtv
-  button = Play
-  config = L
-end
-
-# Skip backward (1 min default)
-begin
-  prog   = mythtv
-  button = Replay
-  repeat = 4
-  delay  = 4
-  config = PgUp
-end
-
-# Skip forward (1 min default)
-begin
-  prog   = mythtv
-  button = Skip
-  repeat = 4
-  delay  = 4
-  config = PgDown
-end
-
-#<><><><><><><><><><><> Mythtv Control <><><><>
-
-# Escape/Exit/Back
-begin
-  prog   = mythtv
-  button = Back
-  config = Esc
-end
-
-# Bring up OSD info
-begin
-  prog   = mythtv
-  button = More
-  config = I
-end
-
-begin
-  prog   = mythtv
-  button = Left
-  repeat = 2
-  delay  = 4
-  config = Left
-end
-
-begin
-  prog   = mythtv
-  button = Right
-  repeat = 2
-  delay  = 4
-  config = Right
-end
-
-begin
-  prog   = mythtv
-  button = Up
-  repeat = 2
-  delay  = 4
-  config = Up
-end
-
-begin
-  prog   = mythtv
-  button = Down
-  repeat = 2
-  delay  = 4
-  config = Down
-end
-
-# OK/Select
-begin
-  prog   = mythtv
-  button = OK
-  config = Return
-end
-
-# The Start Button is really just a Menu key
-begin
-  prog   = mythtv
-  button = Start
-  config = M
-end
-
-#<><><><><><><><><><><><><><><>
-
-# Volume-Up
-begin
-  prog   = mythtv
-  button = VolumeUp
-  repeat = 1
-  config = ]
-end
-
-# Volume-Down
-begin
-  prog   = mythtv
-  button = VolumeDown
-  repeat = 1
-  config = [
-end
-
-# Mute
-begin
-  prog   = mythtv
-  button = Mute
-  config = |
-end
-
-# Channel Up
-begin
-  prog   = mythtv
-  button = ChannelUp
-  repeat = 3
-# delay  = 1
-  config = Up
-end
-
-# Channel Down
-begin
-  prog   = mythtv
-  button = ChannelDown
-  config = Down
-  repeat = 3
-# delay  = 1
-end
-
-# Numbers 0-9 <><><><><><><><><><><>
-
-begin
-  prog   = mythtv
-  button = One
-# repeat = 2
-  config = 1
-end
-
-begin
-  prog   = mythtv
-  button = Two
-# repeat = 2
-  config = 2
-end
-
-begin
-  prog   = mythtv
-  button = Three
-# repeat = 2
-  config = 3
-end
-
-begin
-  prog   = mythtv
-  button = Four
-# repeat = 2
-  config = 4
-end
-
-begin
-  prog   = mythtv
-  button = Five
-# repeat = 2
-  config = 5
-end
-
-begin
-  prog   = mythtv
-  button = Six
-# repeat = 2
-  config = 6
-end
-
-begin
-  prog   = mythtv
-  button = Seven
-# repeat = 2
-  config = 7
-end
-
-begin
-  prog   = mythtv
-  button = Eight
-# repeat = 2
-  config = 8
-End
-
-begin
-  prog   = mythtv
-  button = Nine
-# repeat = 2
-  config = 9
-end
-
-begin
-  prog   = mythtv
-  button = Zero
-# repeat = 2
-  config = 0
-end
-
-#<><><><><><><><><><><><><><><><><><><><>
-# Seek to previous commercial cut point
-# or remove all cut points from the Editing Cutlist
-begin
-  prog   = mythtv
-  button = Star
-  config = Q
-end
-
-# Seek to next commercial cut point
-# or add commericial cut points to the Editing Cutlist
-begin
-  prog   = mythtv
-  button = Hash
-  config = Z
-end
-
-# Brings up the delete box
-begin
-  prog   = mythtv
-  button = Clear
-  repeat = 0
-  config = D
-end
-
-# Toggle Editing Cutlist on or off
-begin
-  prog   = mythtv
-  button = Enter
-  repeat = 0
-  config = E
-end
-
-#<><><><><><><><> Additional Remote Commands <><><><><><><><>
-# All buttons in this section must be configured using
-# MythTV's KeyBindings JumpPoints editor.
-# >>> Utilities/ Setup >>> Edit Keys >>> JumpPoints >>>
-
-# Listen to Myth Music
-begin
-  prog   = mythtv
-  button = Music
-  config = Ctrl+Alt+M
-end
-
-# at this time connects to MythStreem
-begin
-  prog = mythtv
-  button = Radio
-  config = Ctrl+Alt+S
-end
-
-# View Pictures
-begin
-  prog   = mythtv
-  button = Pictures
-  config = Ctrl+Alt+P
-end
-
-# Watch Videos
-begin
-  prog   = mythtv
-  button = Videos
-  config = Ctrl+Alt+V
-end
-
-# Watch Live TV with Live TV Guide open
-begin
-  prog   = mythtv
-  button = TV
-  config = Ctrl+Alt+K
-end
-
-# Watch Live TV
-begin
-  prog   = mythtv
-  button = LiveTV
-  config = Ctrl+Alt+L
-end
-
-# Recorded TV Programs
-begin
-  prog   = mythtv
-  button = RecordedTV
-  config = Ctrl+Alt+R
-end
-
-# Program Guide
-begin
-  prog   = mythtv
-  button = Guide
-  config = Ctrl+Alt+G
-end
-
-# Play DVD
-# There must be a disk in the DVD drive or it dos nothing
-begin
-  prog   = mythtv
-  button = DVDMenu
-  config = Ctrl+Alt+D
-end
-
-# unused key
-#begin
-#  prog   = mythtv
-#  button = Messenger
-#  config = Ctrl+Alt+A
-#end
-
-# <><><><><><><><><><><><><> Teletext Buttons <><><><><><><><><><><>
-
-# Teletext = Show interactive MHEG screens
-begin
-  prog   = mythtv
-  button = Teletext
-  config = F7
-end
-
-# Red = Red button for interactive screens.
-begin
-  prog   = mythtv
-  button = Red
-  config = F2
-end
-
-# Green = Green button for interactive screens.
-begin
-  prog   = mythtv
-  button = Green
-  config = F3
-end
-
-# Yellow = Yellow button for interactive screens.
-begin
-  prog   = mythtv
-  button = Yellow
-  config = F4
-end
-
-# Blue = Blue button for interactive screens.
-begin
-  prog   = mythtv
-  button = Blue
-  config = F5
-end
-
-
-######################## MPlayer Section #####################################
-# "mplayer -input keylist" Prints all keys that can be bound to commands.
-# "mplayer -input cmdlist" Prints all commands that can be bound to keys
-# "man mplayer" Prints documentation for MPlayer
-
-# Show OSD
-begin
-  prog   = mplayer
-  button = OK
-  config = osd
-end
-
-# Pause playback
-begin
-  prog   = mplayer
-  button = Pause
-  config = pause
-end
-
-# If paused, resume playing
-begin
-  prog   = mplayer
-  button = Play
-  config = pause
-end
-
-# Stop playback and exit
-begin
-  prog   = mplayer
-  button = Stop
-  config = quit
-end
-
-# Volume-Up
-begin
-  prog   = mplayer
-  button = VolumeUp
-  repeat = 2
-  config = volume +1
-end
-
-# Volume-Down
-begin
-  prog   = mplayer
-  button = VolumeDown
-  repeat = 2
-  config = volume -1
-end
-
-# Mute
-begin
-  prog   = mplayer
-  button = Mute
-  config = mute
-end
-
-# Seek back 60 seconds
-begin
-  prog   = mplayer
-  button = Left
-  repeat = 2
-  config = seek -60
-end
-
-# Seek forward 60 seconds
-begin
-  prog   = mplayer
-  button = Right
-  repeat = 2
-  config = seek +60
-end
-
-# Seek back 10 seconds
-begin
-  prog   = mplayer
-  button = Rewind
-  repeat = 2
-  config = seek -10
-end
-
-# Seek forward 30 seconds
-begin
-  prog   = mplayer
-  button = Forward
-  repeat = 2
-  config = seek +30
-end
-
-# Quit
-begin
-  prog   = mplayer
-  button = Back
-  config = quit
-end
-
-# Seek forward 10 minutes
-begin
-  prog   = mplayer
-  button = Skip
-  repeat = 2
-  config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-  prog   = mplayer
-  button = Replay
-  repeat = 2
-  config = seek -600
-end
-
-# increase brightness
-begin
-  prog   = mplayer
-  button = ChannelUp
-  repeat = 2
-  config = brightness +1
-end
-
-# decrease brightness
-begin
-  prog   = mplayer
-  button = ChannelDown
-  repeat = 2
-  config = brightness -1
-end
-
-# Toggle full-screen
-#begin
-#  prog   = mplayer
-#  button = #???????????????????????????
-#  repeat = 2
-#  config = vo_fullscreen
-#end
-
-
-########################## XINE Section ######################################
-#
-# For a compleate list of Xine's Lirc Keybindings use comand
-#        xine --keymap=lirc>.lircrc.xine.keybindings
-# This creates a file in current directory called ".lircrc.xine.keybindings"
-# Note: Xine has diferent sets of keybindings for lirc and keyboard
-
-##  01/14/2008
-# xine key bindings.
-# Automatically generated by xine-ui version 0.99.6cvs.
-
-#<><><><><><><><><><> Xine Video Movement <><><><>
-
-# start playback
-begin
-  prog   = xine
-  button = Play
-  config = Play
-end
-
-# playback pause toggle
-begin
-  prog   = xine
-  button = Pause
-  config = Pause
-end
-
-# stop playback
-begin
-  prog   = xine
-  button = Stop
-  config = Stop
-end
-
-# take a snapshot
-#begin
-#   prog   = xine
-#   button = Record
-#   repeat = 2
-#   config = Snapshot
-#end
-
-begin
-  prog   = xine
-  button = Forward
-  repeat = 2
-# delay  = 1
-  config = SeekRelative+7
-end
-
-begin
-  prog   = xine
-  button = Rewind
-  repeat = 2
-# delay  = 1
-  config = SeekRelative-7
-end
-
-# set position to -60 seconds in current stream
-begin
-  prog   = xine
-  button = Replay
-  repeat = 2
-  delay  = 1
-  config = SeekRelative-60
-end
-
-# set position to +60 seconds in current stream
-begin
-  prog   = xine
-  button = Skip
-  repeat = 2
-  delay  = 1
-  config = SeekRelative+60
-end
-#<><><><><><><><><><><><>Xine Control<><><><><><><><><>
-
-# quit the program
-begin
-  prog   = xine
-  button = Back
-  config = Quit
-end
-
-#display stream information using OSD
-begin
-  prog   = xine
-  button = More
-  config = OSDStreamInfos
-end
-
-# menu navigate up
-begin
-  prog   = xine
-  button = Up
-  repeat = 2
-  delay  = 2
-  config = EventUp
-end
-
-# menu navigate down
-begin
-  prog   = xine
-  button = Down
-  repeat = 2
-  delay  = 2
-  config = EventDown
-end
-
-# menu navigate left
-begin
-  prog   = xine
-  button = Left
-  repeat = 2
-  delay  = 2
-  config = EventLeft
-end
-
-# menu navigate right
-begin
-  prog   = xine
-  button = Right
-  repeat = 2
-  delay  = 2
-  config = EventRight
-end
-
-# menu select
-begin
-  prog   = xine
-  button = OK
-  config = EventSelect
-end
-
-# jump to Root Menu
-begin
-  prog   = xine
-  button = Start
-  config = Menu
-end
-
-#<><><><><><><><><><><><><><><><><><><> Xine Volume / Channel <><><><><><><><>
-
-# increment audio volume
-begin
-  prog   = xine
-  button = VolumeUp
-  repeat = 1
-  config = Volume+
-end
-
-# decrement audio volume
-begin
-  prog   = xine
-  button = VolumeDown
-  repeat = 1
-  config = Volume-
-end
-
-# audio muting toggle
-begin
-  prog   = xine
-  button = Mute
-  config = Mute
-end
-
-# increase brightness by 10
-begin
-  prog   = xine
-  button = ChannelUp
-  config = BrightnessControl+
-end
-
-# decrease brightness by 10
-begin
-  prog   = xine
-  button = ChannelDown
-  config = BrightnessControl-
-end
-
-#<><><><><><><><><><><><><><><><><> Xine Menu <><><><>
-
-# unused key
-#begin
-#   prog   = xine
-#   button = RecordedTV
-#   config = ????????
-#end
-
-# visibility toggle of stream info window
-begin
-  prog   = xine
-  button = Guide
-  config = SetupShow
-end
-
-# unused key
-#begin
-#  prog   = xine
-#  button = LiveTV
-#  config = ????????
-#end
-
-# jump to Title Menu
-begin
-  prog   = xine
-  button = DVDMenu
-  config = RootMenu
-end
-
-#<><><><><><><><><><><><><><><><><> Xine Stream Position <><><><>
-
-# set position in current stream
-
-begin
-  prog   = xine
-  button = Zero
-  config = SetPosition0%
-end
-
-begin
-  prog   = xine
-  button = One
-  config = SetPosition10%
-end
-
-begin
-  prog   = xine
-  button = Two
-  config = SetPosition20%
-end
-
-begin
-  prog   = xine
-  button = Three
-  config = SetPosition30%
-end
-
-begin
-  prog   = xine
-  button = Four
-  config = SetPosition40%
-end
-
-begin
-  prog   = xine
-  button = Five
-  config = SetPosition50%
-end
-
-begin
-  prog   = xine
-  button = Six
-  config = SetPosition60%
-end
-
-begin
-  prog   = xine
-  button = Seven
-  config = SetPosition70%
-end
-
-begin
-  prog   = xine
-  button = Eight
-  config = SetPosition80%
-end
-
-begin
-  prog   = xine
-  button = Nine
-  config = SetPosition90%
-end
-
-#<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
-
-# decrement playback speed (slow motion slowdown)
-begin
-  prog   = xine
-  button = Star
-  config = SpeedSlower
-end
-
-# increment playback speed (slow motion speedup)
-begin
-  prog   = xine
-  button = Hash
-  config = SpeedFaster
-end
-
-# reset playback speed
-begin
-  prog   = xine
-  button = Clear
-  config = SpeedReset
-end
-
-# set position to -30 seconds in current stream     config = SeekRelative-30
-# set position to +30 seconds in current stream     config = SeekRelative+30
-# eject the current medium                          config = Eject
-# zoom in                                           config = ZoomIn
-# zoom out                                          config = ZoomOut
-# fullscreen toggle                                 config = ToggleFullscreen
-
-##
-# End of xine .
-##
diff --git a/abs/core/system-templates/templates/remotes/common/mceusb/preview.jpg b/abs/core/system-templates/templates/remotes/common/mceusb/preview.jpg
deleted file mode 100644
index 0aa6a4a..0000000
Binary files a/abs/core/system-templates/templates/remotes/common/mceusb/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/common/no_remote/preview.jpg b/abs/core/system-templates/templates/remotes/common/no_remote/preview.jpg
deleted file mode 100644
index 1d887dd..0000000
Binary files a/abs/core/system-templates/templates/remotes/common/no_remote/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/common/streamzap/lircd.conf.streamzap b/abs/core/system-templates/templates/remotes/common/streamzap/lircd.conf.streamzap
deleted file mode 100644
index 36b52fa..0000000
--- a/abs/core/system-templates/templates/remotes/common/streamzap/lircd.conf.streamzap
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
-#
-# contributed by Christoph Bartelmus
-#
-# brand:                       Streamzap
-# model no. of remote control: PC Remote
-# devices being controlled by this remote: USB receiver
-#
-
-begin remote
-
-  name  Streamzap_PC_Remote
-  bits            6
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           889  889
-  zero          889  889
-  plead         889
-  pre_data_bits   8
-  pre_data       0xA3
-  gap          108344
-  toggle_bit      2
-
-
-      begin codes
-          0                        0x00
-          1                        0x01
-          2                        0x02
-          3                        0x03
-          4                        0x04
-          5                        0x05
-          6                        0x06
-          7                        0x07
-          8                        0x08
-          9                        0x09
-          POWER                    0x0A
-          MUTE                     0x0B
-          CH_UP                    0x0C
-          VOL_UP                   0x0D
-          CH_DOWN                  0x0E
-          VOL_DOWN                 0x0F
-          UP                       0x10
-          LEFT                     0x11
-          OK                       0x12
-          RIGHT                    0x13
-          DOWN                     0x14
-          MENU                     0x15
-          EXIT                     0x16
-          PLAY                     0x17
-          PAUSE                    0x18
-          STOP                     0x19
-          |<<                      0x1A
-          >>|                      0x1B
-          RECORD                   0x1C
-          <<                       0x1D
-          >>                       0x1E
-          RED                      0x20
-          GREEN                    0x21
-          YELLOW                   0x22
-          BLUE                     0x23
-          DISP                     0x24
-          PTZ                      0x25
-          HELP                     0x26
-      end codes
-
-end remote
-
-
diff --git a/abs/core/system-templates/templates/remotes/common/streamzap/lircrc b/abs/core/system-templates/templates/remotes/common/streamzap/lircrc
deleted file mode 100755
index 5e668b5..0000000
--- a/abs/core/system-templates/templates/remotes/common/streamzap/lircrc
+++ /dev/null
@@ -1,832 +0,0 @@
-# StreamZap Remote
-# 'config' must either be a literal key, e.g. 'config = l' or must
-# refer to a defined key in MythTV, e.g. 'config = PLAY'a
-
-
-#restart frontend
-begin
-        remote = RS_LD
-        button = RESET
-        prog   = irexec
-        repeat = 0
-        config = /usr/bin/restartfrontend.sh
-end
-
-#time
-begin
-        remote = RS_LD
-        button = TIME
-        prog   = irexec
-        repeat = 10
-        config = /usr/bin/saytime.sh
-end
-
-#screen blank
-begin
-        remote = RS_LD
-        button = BLANK
-        prog   = irexec
-        repeat = 0
-#      config  = ls
-        config = xset s activate ; xset s blank
-end
-
-
-#picture
-begin
-REMOTE = RS_LD
-prog = mythtv
-button = PICTURE
-repeat = 4
-config = f
-end
-
-#change aspect
-begin
-remote = RS_LD
-prog = mythtv
-button = ASPECT
-# change aspect ratio
-config = w
-end
-
-#Browse
-begin
-remote = RS_LD
-prog = mythtv
-button = BROWSE
-repeat = 8
-config = o
-end
-
-# delete key
-begin
-remote = RS_LD
-prog = mythtv
-button = DELETE
-repeat = 8
-config = d
-end
-
-
-#change card
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD
-repeat = 8
-config = y
-end
-
-# Change TV card input
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD_SOURCE
-repeat = 4
-config = C
-end
-
-
-
-# Cycle through channel history
-begin
-remote = Streamzap_PC_Remote
-prog = mythtv
-button = BLUE
-repeat = 4
-config = H
-end
-
-# Bring up OSD info
-begin
-remote =  Streamzap_PC_Remote
-prog = mythtv
-button = YELLOW
-repeat = 4
-config = i
-end
-
-
-
-
-begin
-prog = mythtv
-button = 0
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-end
-
-begin
-prog = mythtv
-button = POWER
-config = Esc
-end
-
-# ???
-begin
-prog = mythtv
-button = MUTE
-config = F9
-end
-
-begin
-prog = mythtv
-button = CH_UP
-repeat = 3
-config = PgUp
-end
-
-begin
-prog = mythtv
-button = VOL_UP
-repeat = 3
-config = ]
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-repeat = 3
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = VOL_DOWN
-repeat = 3
-config = [
-end
-
-begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = Left
-end
-
-begin
-prog = mythtv
-button = OK
-config = Return
-end
-
-begin
-prog = mythtv
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = Right
-end
-
-begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = MENU
-config = m
-end
-
-begin
-prog = mythtv
-button = EXIT
-config = Esc
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = Space
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = p
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-end
-
-begin
-prog = mythtv
-# skip backward
-button = |<<
-config = PgUp
-end
-
-begin
-prog = mythtv
-# skip forward
-button = >>|
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = RECORD
-config = r
-end
-
-begin
-prog = mythtv
-# rewind
-button = <<
-config = Home
-end
-
-begin
-prog = mythtv
-# fast forward
-button = >>
-config = End
-end
-
-begin
-prog = mythtv
-button = RED
-# Delete
-config = d
-end
-
-begin
-prog = mythtv
-button = GREEN
-# Info
-config = i
-end
-
-#begin
-#prog = mythtv
-#button = YELLOW
-# change aspect ratio
-#config = w
-#end
-
-begin
-prog = mythtv
-button = BLUE
-config = Tab
-end
-
-# MPLAYER
-begin
-prog = mplayer
-button = POWER
-config = quit
-end
-
-begin
-prog = mplayer
-button = MUTE
-config = mute
-end
-
-begin
-prog = mplayer
-button = VOL_UP
-repeat = 3
-config = volume +1
-end
-
-begin
-prog = mplayer
-button = VOL_DOWN
-repeat = 3
-config = volume -1
-end
-
-begin
-prog = mplayer
-button = UP
-repeat = 3
-config = seek +10
-end
-
-begin
-prog = mplayer
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = seek -60
-end
-
-begin
-prog = mplayer
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = seek +60
-end
-
-begin
-prog = mplayer
-button = DOWN
-repeat = 3
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = EXIT
-config = quit
-end
-
-begin
-prog = mplayer
-button = play
-config = speed_set 1.0
-end
-
-begin
-    prog = mplayer
-    button = pause
-    config = pause
-end
-
-begin
-prog = mplayer
-button = STOP
-config = quit
-end
-
-begin
-prog = mplayer
-# skip backward
-button = |<<
-config = seek -600
-end
-
-begin
-prog = mplayer
-# skip forward
-button = >>|
-config = seek +600
-end
-
-begin
-prog = mplayer
-# slow forward
-button = <<
-config = speed_mult 0.5
-end
-
-begin
-prog = mplayer
-# fast forward
-button = >>
-config = speed_mult 2.0
-end
-
-### xine  commands
-
-begin
-prog = xine
-button = YELLOW
-repeat = 4
-#config = ToggleVisiblity
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 4
-config = SeekRelative+60
-end
-
-# increase brightness by 10
-begin
-        button = DELETE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl+
-end
-
-# decrease brightness by 10
-begin
-        button = PICTURE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl-
-end
-
-
-begin
-prog = xine
-button = PAUSE
-repeat = 4
-config = Pause
-end
-
-begin
-prog = xine
-button = PLAY
-repeat = 4
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 4
-config = mute
-end
-
-begin
-prog = xine
-button = <<
-repeat = 4
-config = SeekRelative-30
-end
-
-begin
-prog = xine
-button =  >>
-repeat = 4
-#config = SeekRelative+30
-config =  SpeedFaster
-end
-
-begin
-prog = xine
-button = POWER
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = EXIT
-repeat = 4
-config = quit
-end
-
-
-begin
-prog = xine
-button = FREEZE
-repeat = 4
-config =  SeekRelative+1200
-end
-
-begin
-prog = xine
-button = MOVE
-repeat = 4
-config =  SeekRelative-1200
-end
-
-begin
-prog   = xine
-button = 3
-config = SpuNext
-repeat = 0
-end
-
-# Select previous sub picture (subtitle) channel.
-begin
-button = 1
-prog   = xine
-repeat = 0
-config = SpuPrior
-end
-
-# Select next audio channel.
-begin
-button = 9
-prog   = xine
-repeat = 0
-config = AudioChannelNext
-end
-
-# Select previous audio channel.
-begin
-button = 7
-prog   = xine
-repeat = 0
-config = AudioChannelPrior
-end
-
-
-
-# Up event.
-begin
-
-button = UP
-prog   = xine
-repeat = 8
-config = EventUp
-end
-
-# Down event.
-begin
-
-button = DOWN
-prog   = xine
-repeat = 8
-config = EventDown
-end
-
-# Left event.
-begin
-
-button = LEFT
-prog   = xine
-repeat = 8
-config = EventLeft
-end
-
-# Right event.
-begin
-
-button = RIGHT
-prog   = xine
-repeat = 8
-config = EventRight
-end
-
-# Select event.
-begin
-prog   = xine
-button = ok
-repeat = 8
-config = EventSelect
-end
-
-# Down Chapter
-begin
-
-button = CH_DOWN
-prog   = xine
-repeat = 8
-config = EventPrior
-end
-
-# Next Chapter.
-begin
-
-button = CH_UP
-prog   = xine
-repeat = 8
-config = EventNext
-end
-
-# menu.
-begin
-
-button = record
-prog   = xine
-repeat = 8
-config = RootMenu
-end
-
-# Toggle aspect ratio
-begin
-prog   = xine
-button = ASPECT
-repeat = 0
-config = ToggleAspectRatio
-end
-
-
-
-#######xmms
-begin xmms
-  begin
-    prog = xmms
-    button = PLAY
-    config = PLAY
-  end
-  begin
-    prog = xmms
-    button = clear
-    config = PLAYLIST_CLEAR
-  end
-  begin
-    prog = xmms
-    button = load
-    config = PLAYLIST_ADD .xmms/xmms.m3u
-   end
-  begin
-    prog = xmms
-    button = PAUSE
-    config = PAUSE
-  end
-  begin
-    prog = xmms
-    button = STOP
-    config = STOP
-  end
-  begin
-    prog = xmms
-    button = EXIT
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = POWER
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = CH_UP
-    config = NEXT
-  end
-  begin
-    prog = xmms
-    button = CH_DOWN
-    config = PREV
-  end
-  
-
-
-begin
-    prog = xmms
-    button = >>|
-    config = NEXT
-  end
-begin
-    prog = xmms
-    button = |<<
-    config = PREV
-end
-
-
-begin
-    prog = xmms
-    button = <<
-    config = FWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = <<
-    config = BWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = volup
-    config = VOL_UP 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = voldown
-    config = VOL_DOWN 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = 1
-    config = ONE
-  end
-  begin
-    prog = xmms
-    button = 2
-    config = TWO
-  end
-  begin
-    prog = xmms
-    button = 3
-    config = THREE
-  end
-  begin
-    prog = xmms
-    button = 4
-    config = FOUR
-  end
-  begin
-    prog = xmms
-    button = 5
-    config = FIVE
-  end
-  begin
-    prog = xmms
-    button = 6
-    config = SIX
-  end
-  begin
-    prog = xmms
-    button = 7
-    config = SEVEN
-  end
-  begin
-    prog = xmms
-    button = 8
-    config = EIGHT
-  end
-  begin
-    prog = xmms
-    button = 9
-    config = NINE
-  end
-  begin
-    prog = xmms
-    button = 0
-    config = ZERO
-  end
-  begin
-    prog = xmms
-    button = enter
-    config = SETPOS
-  end
-end xmms
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/core/system-templates/templates/remotes/common/streamzap/preview.jpg b/abs/core/system-templates/templates/remotes/common/streamzap/preview.jpg
deleted file mode 100644
index 4d1a5fe..0000000
Binary files a/abs/core/system-templates/templates/remotes/common/streamzap/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircd.conf.MX-500-JAMS b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircd.conf.MX-500-JAMS
new file mode 100644
index 0000000..b76d32c
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircd.conf.MX-500-JAMS
@@ -0,0 +1,115 @@
+#
+# this config file was automatically generated
+# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
+#
+# contributed by Christoph Bartelmus
+#
+# brand:                       Streamzap
+# model no. of remote control: PC Remote
+# devices being controlled by this remote: USB receiver
+#
+
+begin remote
+
+  name  Streamzap_PC_Remote
+  bits            6
+  flags RC5|CONST_LENGTH
+  eps            30
+  aeps          100
+
+  one           889  889
+  zero          889  889
+  plead         889
+  pre_data_bits   8
+  pre_data       0xA3
+  gap          108344
+  toggle_bit      2
+
+
+      begin codes
+          0                        0x00
+          1                        0x01
+          2                        0x02
+          3                        0x03
+          4                        0x04
+          5                        0x05
+          6                        0x06
+          7                        0x07
+          8                        0x08
+          9                        0x09
+          POWER                    0x0A
+          MUTE                     0x0B
+          CH_UP                    0x0C
+          VOL_UP                   0x0D
+          CH_DOWN                  0x0E
+          VOL_DOWN                 0x0F
+          UP                       0x10
+          LEFT                     0x11
+          OK                       0x12
+          RIGHT                    0x13
+          DOWN                     0x14
+          MENU                     0x15
+          EXIT                     0x16
+          PLAY                     0x17
+          PAUSE                    0x18
+          STOP                     0x19
+          |<<                      0x1A
+          >>|                      0x1B
+          RECORD                   0x1C
+          <<                       0x1D
+          >>                       0x1E
+          RED                      0x20
+          GREEN                    0x21
+          YELLOW                   0x22
+          BLUE                     0x23
+      end codes
+
+end remote
+
+
+
+# Please make this file available to others
+# by sending it to <lirc@bartelmus.de>
+#
+# this config file was automatically generated
+# using lirc-0.7.2(streamzap) on Mon Dec  5 08:45:02 2005
+#
+# contributed by 
+#
+# brand:                       RS_LD_120-MX500
+# model no. of remote control: 
+# devices being controlled by this remote:
+#
+
+begin remote
+
+  name  RS_LD
+  bits           15
+  flags SPACE_ENC|CONST_LENGTH
+  eps            30
+  aeps          100
+
+  one           384  1920
+  zero          384   896
+  ptrail        384
+  gap          70400
+  min_repeat      2
+  toggle_bit      0
+
+
+      begin codes
+          RESET 	   0x19FD
+          TIME             0X1902
+          BLANK            0X1B02
+          PICTURE          0X1882
+          ASPECT           0X1A82
+          BROWSE           0X1982
+          DELETE           0X1B82
+          CARD             0X1842
+          CARD_SOURCE      0X1A42
+          SPARE1           0X1942
+      end codes
+
+end remote
+
+
diff --git a/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircrc b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircrc
new file mode 100644
index 0000000..5e668b5
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircrc
@@ -0,0 +1,832 @@
+# StreamZap Remote
+# 'config' must either be a literal key, e.g. 'config = l' or must
+# refer to a defined key in MythTV, e.g. 'config = PLAY'a
+
+
+#restart frontend
+begin
+        remote = RS_LD
+        button = RESET
+        prog   = irexec
+        repeat = 0
+        config = /usr/bin/restartfrontend.sh
+end
+
+#time
+begin
+        remote = RS_LD
+        button = TIME
+        prog   = irexec
+        repeat = 10
+        config = /usr/bin/saytime.sh
+end
+
+#screen blank
+begin
+        remote = RS_LD
+        button = BLANK
+        prog   = irexec
+        repeat = 0
+#      config  = ls
+        config = xset s activate ; xset s blank
+end
+
+
+#picture
+begin
+REMOTE = RS_LD
+prog = mythtv
+button = PICTURE
+repeat = 4
+config = f
+end
+
+#change aspect
+begin
+remote = RS_LD
+prog = mythtv
+button = ASPECT
+# change aspect ratio
+config = w
+end
+
+#Browse
+begin
+remote = RS_LD
+prog = mythtv
+button = BROWSE
+repeat = 8
+config = o
+end
+
+# delete key
+begin
+remote = RS_LD
+prog = mythtv
+button = DELETE
+repeat = 8
+config = d
+end
+
+
+#change card
+begin
+remote = RS_LD
+prog = mythtv
+button = CARD
+repeat = 8
+config = y
+end
+
+# Change TV card input
+begin
+remote = RS_LD
+prog = mythtv
+button = CARD_SOURCE
+repeat = 4
+config = C
+end
+
+
+
+# Cycle through channel history
+begin
+remote = Streamzap_PC_Remote
+prog = mythtv
+button = BLUE
+repeat = 4
+config = H
+end
+
+# Bring up OSD info
+begin
+remote =  Streamzap_PC_Remote
+prog = mythtv
+button = YELLOW
+repeat = 4
+config = i
+end
+
+
+
+
+begin
+prog = mythtv
+button = 0
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+config = 9
+end
+
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+# ???
+begin
+prog = mythtv
+button = MUTE
+config = F9
+end
+
+begin
+prog = mythtv
+button = CH_UP
+repeat = 3
+config = PgUp
+end
+
+begin
+prog = mythtv
+button = VOL_UP
+repeat = 3
+config = ]
+end
+
+begin
+prog = mythtv
+button = CH_DOWN
+repeat = 3
+config = PgDown
+end
+
+begin
+prog = mythtv
+button = VOL_DOWN
+repeat = 3
+config = [
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = LEFT
+# navigates, or skips back during playback or live tv.
+config = Left
+end
+
+begin
+prog = mythtv
+button = OK
+config = Return
+end
+
+begin
+prog = mythtv
+button = RIGHT
+# navigates, or skips forwards during playback or live tv.
+config = Right
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = MENU
+config = m
+end
+
+begin
+prog = mythtv
+button = EXIT
+config = Esc
+end
+
+begin
+prog = mythtv
+button = PLAY
+config = Space
+end
+
+begin
+prog = mythtv
+button = PAUSE
+config = p
+end
+
+begin
+prog = mythtv
+button = STOP
+config = Esc
+end
+
+begin
+prog = mythtv
+# skip backward
+button = |<<
+config = PgUp
+end
+
+begin
+prog = mythtv
+# skip forward
+button = >>|
+config = PgDown
+end
+
+begin
+prog = mythtv
+button = RECORD
+config = r
+end
+
+begin
+prog = mythtv
+# rewind
+button = <<
+config = Home
+end
+
+begin
+prog = mythtv
+# fast forward
+button = >>
+config = End
+end
+
+begin
+prog = mythtv
+button = RED
+# Delete
+config = d
+end
+
+begin
+prog = mythtv
+button = GREEN
+# Info
+config = i
+end
+
+#begin
+#prog = mythtv
+#button = YELLOW
+# change aspect ratio
+#config = w
+#end
+
+begin
+prog = mythtv
+button = BLUE
+config = Tab
+end
+
+# MPLAYER
+begin
+prog = mplayer
+button = POWER
+config = quit
+end
+
+begin
+prog = mplayer
+button = MUTE
+config = mute
+end
+
+begin
+prog = mplayer
+button = VOL_UP
+repeat = 3
+config = volume +1
+end
+
+begin
+prog = mplayer
+button = VOL_DOWN
+repeat = 3
+config = volume -1
+end
+
+begin
+prog = mplayer
+button = UP
+repeat = 3
+config = seek +10
+end
+
+begin
+prog = mplayer
+button = LEFT
+# navigates, or skips back during playback or live tv.
+config = seek -60
+end
+
+begin
+prog = mplayer
+button = RIGHT
+# navigates, or skips forwards during playback or live tv.
+config = seek +60
+end
+
+begin
+prog = mplayer
+button = DOWN
+repeat = 3
+config = seek -10
+end
+
+begin
+prog = mplayer
+button = EXIT
+config = quit
+end
+
+begin
+prog = mplayer
+button = play
+config = speed_set 1.0
+end
+
+begin
+    prog = mplayer
+    button = pause
+    config = pause
+end
+
+begin
+prog = mplayer
+button = STOP
+config = quit
+end
+
+begin
+prog = mplayer
+# skip backward
+button = |<<
+config = seek -600
+end
+
+begin
+prog = mplayer
+# skip forward
+button = >>|
+config = seek +600
+end
+
+begin
+prog = mplayer
+# slow forward
+button = <<
+config = speed_mult 0.5
+end
+
+begin
+prog = mplayer
+# fast forward
+button = >>
+config = speed_mult 2.0
+end
+
+### xine  commands
+
+begin
+prog = xine
+button = YELLOW
+repeat = 4
+#config = ToggleVisiblity
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 4
+config = SeekRelative+60
+end
+
+# increase brightness by 10
+begin
+        button = DELETE
+        prog   = xine
+        repeat = 4
+        config = BrightnessControl+
+end
+
+# decrease brightness by 10
+begin
+        button = PICTURE
+        prog   = xine
+        repeat = 4
+        config = BrightnessControl-
+end
+
+
+begin
+prog = xine
+button = PAUSE
+repeat = 4
+config = Pause
+end
+
+begin
+prog = xine
+button = PLAY
+repeat = 4
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 4
+config = quit
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 4
+config = mute
+end
+
+begin
+prog = xine
+button = <<
+repeat = 4
+config = SeekRelative-30
+end
+
+begin
+prog = xine
+button =  >>
+repeat = 4
+#config = SeekRelative+30
+config =  SpeedFaster
+end
+
+begin
+prog = xine
+button = POWER
+repeat = 4
+config = quit
+end
+
+begin
+prog = xine
+button = EXIT
+repeat = 4
+config = quit
+end
+
+
+begin
+prog = xine
+button = FREEZE
+repeat = 4
+config =  SeekRelative+1200
+end
+
+begin
+prog = xine
+button = MOVE
+repeat = 4
+config =  SeekRelative-1200
+end
+
+begin
+prog   = xine
+button = 3
+config = SpuNext
+repeat = 0
+end
+
+# Select previous sub picture (subtitle) channel.
+begin
+button = 1
+prog   = xine
+repeat = 0
+config = SpuPrior
+end
+
+# Select next audio channel.
+begin
+button = 9
+prog   = xine
+repeat = 0
+config = AudioChannelNext
+end
+
+# Select previous audio channel.
+begin
+button = 7
+prog   = xine
+repeat = 0
+config = AudioChannelPrior
+end
+
+
+
+# Up event.
+begin
+
+button = UP
+prog   = xine
+repeat = 8
+config = EventUp
+end
+
+# Down event.
+begin
+
+button = DOWN
+prog   = xine
+repeat = 8
+config = EventDown
+end
+
+# Left event.
+begin
+
+button = LEFT
+prog   = xine
+repeat = 8
+config = EventLeft
+end
+
+# Right event.
+begin
+
+button = RIGHT
+prog   = xine
+repeat = 8
+config = EventRight
+end
+
+# Select event.
+begin
+prog   = xine
+button = ok
+repeat = 8
+config = EventSelect
+end
+
+# Down Chapter
+begin
+
+button = CH_DOWN
+prog   = xine
+repeat = 8
+config = EventPrior
+end
+
+# Next Chapter.
+begin
+
+button = CH_UP
+prog   = xine
+repeat = 8
+config = EventNext
+end
+
+# menu.
+begin
+
+button = record
+prog   = xine
+repeat = 8
+config = RootMenu
+end
+
+# Toggle aspect ratio
+begin
+prog   = xine
+button = ASPECT
+repeat = 0
+config = ToggleAspectRatio
+end
+
+
+
+#######xmms
+begin xmms
+  begin
+    prog = xmms
+    button = PLAY
+    config = PLAY
+  end
+  begin
+    prog = xmms
+    button = clear
+    config = PLAYLIST_CLEAR
+  end
+  begin
+    prog = xmms
+    button = load
+    config = PLAYLIST_ADD .xmms/xmms.m3u
+   end
+  begin
+    prog = xmms
+    button = PAUSE
+    config = PAUSE
+  end
+  begin
+    prog = xmms
+    button = STOP
+    config = STOP
+  end
+  begin
+    prog = xmms
+    button = EXIT
+    config = QUIT
+    flags = mode
+  end
+
+  begin
+    prog = xmms
+    button = POWER
+    config = QUIT
+    flags = mode
+  end
+
+  begin
+    prog = xmms
+    button = CH_UP
+    config = NEXT
+  end
+  begin
+    prog = xmms
+    button = CH_DOWN
+    config = PREV
+  end
+  
+
+
+begin
+    prog = xmms
+    button = >>|
+    config = NEXT
+  end
+begin
+    prog = xmms
+    button = |<<
+    config = PREV
+end
+
+
+begin
+    prog = xmms
+    button = <<
+    config = FWD 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = <<
+    config = BWD 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = volup
+    config = VOL_UP 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = voldown
+    config = VOL_DOWN 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = 1
+    config = ONE
+  end
+  begin
+    prog = xmms
+    button = 2
+    config = TWO
+  end
+  begin
+    prog = xmms
+    button = 3
+    config = THREE
+  end
+  begin
+    prog = xmms
+    button = 4
+    config = FOUR
+  end
+  begin
+    prog = xmms
+    button = 5
+    config = FIVE
+  end
+  begin
+    prog = xmms
+    button = 6
+    config = SIX
+  end
+  begin
+    prog = xmms
+    button = 7
+    config = SEVEN
+  end
+  begin
+    prog = xmms
+    button = 8
+    config = EIGHT
+  end
+  begin
+    prog = xmms
+    button = 9
+    config = NINE
+  end
+  begin
+    prog = xmms
+    button = 0
+    config = ZERO
+  end
+  begin
+    prog = xmms
+    button = enter
+    config = SETPOS
+  end
+end xmms
+
+#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/preview.jpg
new file mode 100644
index 0000000..38857f9
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/lircd.conf.fusionHDTV b/abs/core/system-templates/templates/remotes/favorites/dvico/lircd.conf.fusionHDTV
new file mode 100644
index 0000000..7f03ba1
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/lircd.conf.fusionHDTV
@@ -0,0 +1,226 @@
+#
+# contributed by  Chris Pascoe
+#
+# brand:                       DVICO
+# model no. of remote control: DVB-T 
+# devices being controlled by this remote:
+#
+
+begin remote
+
+  name  DVICO
+  bits            32
+  eps             0
+  aeps            0
+
+  one             0     0
+  zero            0     0
+  pre_data_bits   32
+  pre_data 0x10046
+  gap          195755
+  post_data_bits  0
+  toggle_bit     0
+
+      begin codes
+          1                        0x00000000000011F9
+          2                        0x00000000000012F9
+          3                        0x00000000000013F9
+          4                        0x00000000000014F9
+          5                        0x00000000000015F9
+          6                        0x00000000000016F9
+          7                        0x00000000000017F9
+          8                        0x00000000000018F9
+          9                        0x00000000000019F9
+          0                        0x00000000000010F9
+          power                    0x0000000000000AF9
+          pcoff                    0x0000000000000CF9
+          camera                   0x0000000000001AF9
+          record                   0x0000000000001BF9
+          chup                     0x00000000000000F9
+          chdown                   0x00000000000001F9
+          volup                    0x00000000000002F9
+          voldown                  0x00000000000003F9
+          playpause                0x0000000000001FF9
+          rew                      0x0000000000001CF9
+          stop                     0x0000000000001EF9
+          ff                       0x0000000000001DF9
+          folder                   0x00000000000040F9
+          atvdtv                   0x00000000000006F9
+          dvhs                     0x00000000000041F9
+          menu                     0x00000000000008F9
+          aspect                   0x00000000000007F9
+          zoom                     0x00000000000004F9
+          epg                      0x0000000000000BF9
+          mute                     0x0000000000000DF9
+          back                     0x0000000000000EF9
+          hd                       0x0000000000000FF9
+          red                      0x00000000000005F9
+          green                    0x00000000000009F9
+          yellow                   0x00000000000042F9
+          blue                     0x00000000000043F9
+      end codes
+
+end remote
+
+#
+# this config file was automatically generated
+# using lirc-0.7.0(dvico) on Sat Jun 18 00:56:01 2005
+#
+# contributed by anonymous
+#
+# brand:                       DVICO
+# model no. of remote control: MCE Remote
+#
+
+begin remote
+
+  name           DVICO_MCE
+  bits           32
+  eps            30
+  aeps          100
+
+  one             0     0
+  zero            0     0
+  pre_data_bits   8
+  pre_data       0x0
+  post_data_bits  8
+  post_data      0x0
+  gap          195956
+  toggle_bit      0
+
+
+      begin codes
+          ok                       0x0000000000FE5E00
+          dtv                      0x0000000000FE0200
+          mp3                      0x0000000000FE0E00
+          dvd                      0x0000000000FE1A00
+          cpf                      0x0000000000FE1E00
+          setup                    0x0000000000FE1600
+          tv_onoff                 0x0000000000FE4600
+          guide                    0x0000000000FE0A00
+          back                     0x0000000000FE4900
+          more                     0x0000000000FE5900
+          dvd_menu                 0x0000000000FE4D00
+          alt_tab                  0x0000000000FE5500
+          replay                   0x0000000000FE0F00
+          skip                     0x0000000000FE1200
+          up                       0x0000000000FE5100
+          down                     0x0000000000FE5300
+          left                     0x0000000000FE5B00
+          right                    0x0000000000FE5F00
+          start                    0x0000000000FE4200
+          vol_up                   0x0000000000FE1500
+          vol_down                 0x0000000000FE0500
+          ch_up                    0x0000000000FE1100
+          ch_down                  0x0000000000FE0900
+          snapshot                 0x0000000000FE5200
+          live                     0x0000000000FE5A00
+          folder_open              0x0000000000FE1900
+          1                        0x0000000000FE0B00
+          2                        0x0000000000FE1700
+          3                        0x0000000000FE1B00
+          4                        0x0000000000FE0700
+          5                        0x0000000000FE5000
+          6                        0x0000000000FE5400
+          7                        0x0000000000FE4800
+          8                        0x0000000000FE4C00
+          9                        0x0000000000FE5800
+          0                        0x0000000000FE0300
+          aspect                   0x0000000000FE1300
+          fullscreen               0x0000000000FE1F00
+          rewind                   0x0000000000FE4300
+          playpause                0x0000000000FE4700
+          fastforward              0x0000000000FE4F00
+          stop                     0x0000000000FE0D00
+          mute                     0x0000000000FE5700
+          record                   0x0000000000FE0100
+	  white_onoff              0x0000000000FE4E00
+      end codes
+
+end remote
+
+
+#
+# this config file was automatically generated
+# using lirc-0.7.3-CVS(dvico) on Thu Sep  1 21:36:06 2005
+#
+# contributed by: David Bussenschutt <buzz|oska.com>
+#
+# brand:     "DViCO"   
+# model no. of remote control:  "Fusion Remote MCE"     
+# devices being controlled by this remote: My MythTV install
+#
+
+begin remote
+
+  name  DVICO_MCE
+  bits            8
+  eps            30
+  aeps          100
+
+  one             0     0
+  zero            0     0
+  pre_data_bits   48
+  pre_data       0x100460000
+  post_data_bits  8
+  post_data      0xFE
+  gap          195843
+  toggle_bit      0
+
+
+      begin codes
+          ok                       0x5e
+          up                       0x51
+          down                     0x53
+          left                     0x5B
+          right                    0x5F
+          setup                    0x16
+          tv_onoff                 0x46
+          guide                    0x0A
+          dtv                      0x02
+          mp3                      0x0E
+          dvd                      0x1A
+          cpf                      0x1E
+          back                     0x49
+          more                     0x59
+          dvd_menu                 0x4D
+          alt_tab                  0x55
+          replay                   0x0F
+          skip                     0x12
+          start                    0x42
+          vol_up                   0x15
+          vol_down                 0x05
+          ch_up                    0x11
+          ch_down                  0x09
+          photo                    0x52
+          live                     0x5A
+          folder                   0x19
+          1                        0x0B
+          2                        0x17
+          3                        0x1B
+          4                        0x07
+          5                        0x50
+          6                        0x54
+          7                        0x48
+          8                        0x4C
+          9                        0x58
+          0                        0x03
+          ratio                    0x13
+          zoom                     0x1F
+          rew                      0x43
+          playpause                0x47
+          ff                       0x4F
+          mute                     0x57
+          stop                     0x0D
+          rec                      0x01
+          power_onoff              0x4e
+          phantom1                 0x7b
+          phantom2                 0x6b
+          phantom3                 0x77
+          phantom4                 0x4b
+          phantom5                 0x3b
+      end codes
+
+end remote
+
+
diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/lircrc.txt b/abs/core/system-templates/templates/remotes/favorites/dvico/lircrc.txt
new file mode 100644
index 0000000..283ac05
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/lircrc.txt
@@ -0,0 +1,883 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the Fustion
+#
+
+begin
+  #Jumppoint for DVD playback created in Mythweb
+  prog = mythtv
+  button = dvd
+  config = @
+end
+
+begin
+  #Jumppoint for MythWeater created in Mythweb
+  prog = mythtv
+  button = start
+  config = #
+end
+
+begin
+  #Jumppoint for MythVideo created in Mythweb
+  prog = mythtv
+  button = cpf
+  config = $
+end
+
+begin
+  prog = mythtv
+  #Jumppoint for LiveTV created in Mythweb
+  button = dtv
+  config = ^
+end
+
+begin
+  prog = mythtv
+  #Jumppoint for Music created in Mythweb
+  button = mp3
+  config = F8
+end
+
+begin
+  prog = mythtv
+  button = 1
+  config = 1
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 2
+  config = 2
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 3
+  config = 3
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 4
+  config = 4
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 5
+  config = 5
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 6
+  config = 6
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 7
+  config = 7
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 8
+  config = 8
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 9
+  config = 9
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = 0
+  config = 0
+  repeat = 5
+end
+
+begin
+  prog = mythtv
+  button = camera
+  config = A
+end
+
+begin
+  prog = mythtv
+  button = up
+  config = Up
+end
+
+begin
+  prog = mythtv
+  button = chup
+  config = Up
+  repeat = 2
+end
+
+begin
+  prog = mythtv
+  button = down
+  config = Down
+end
+
+begin
+  prog = mythtv
+  button = chdown
+  config = Down
+  repeat = 2
+end
+
+begin
+  prog = mythtv
+  button = left
+  config = Left
+end
+
+begin
+  prog = mythtv
+  button = voldown
+  config = Left
+  repeat = 2
+end
+
+begin
+  prog = mythtv
+  button = right
+  config = Right
+end
+
+begin
+  prog = mythtv
+  button = volup
+  config = Right
+  repeat = 2
+end
+
+begin
+  prog = mythtv
+  button = replay
+  config = Left
+end
+
+begin
+  prog = mythtv
+  button = skip
+  config = Right
+end
+
+begin
+  prog = mythtv
+  button = back
+  config = Esc
+end
+
+# Enter button
+begin
+  prog = mythtv
+  button = ok
+  config = Return
+end
+
+begin
+  prog = mythtv
+  button = playpause
+  config = Return
+end
+
+begin
+  prog = mythtv
+  button = tv_onoff
+  config = Esc
+end
+
+begin
+  prog = mythtv
+  button = power
+  config = Esc
+end
+
+begin
+  prog = mythtv
+  button = ch_up
+  config = Up
+end
+
+begin
+  prog = mythtv
+  button = ch_down
+  config = Down
+end
+
+begin
+  prog = mythtv
+  button = vol_down
+  repeat = 3
+  config = F10
+end
+
+begin
+  prog = mythtv
+  button = yellow
+  repeat = 3
+  config = F10
+end
+
+begin
+  prog = mythtv
+  button = vol_up
+  repeat = 3
+  config = F11
+end
+
+begin
+  prog = mythtv
+  button = blue
+  repeat = 3
+  config = F11
+end
+
+begin
+  prog = mythtv
+  button = more
+  config = I
+end
+
+begin
+  prog = mythtv
+  button = green
+  config = I
+end
+
+begin
+  prog = mythtv
+  button = red
+  config = D
+end
+
+begin
+  prog = mythtv
+  button = ff
+  config = >
+  repeat = 2
+end
+
+begin
+  prog = mythtv
+  button = rew
+  config = <
+  repeat = 2
+end
+
+begin
+  prog = mythtv
+  button = power_onoff
+  config = Y
+end
+
+begin
+  prog = mythtv
+  button = live
+  config = C
+end
+
+########### Start Of TV #############
+
+#Jumppoint for Program Guide created in Mythweb
+begin
+  prog = mythtv
+  button = guide
+  config = S
+end
+
+begin
+  prog = mythtv
+  button = epg
+  config = S
+end
+
+begin
+  prog = mythtv
+  button = dvd_menu
+  config = M
+end
+
+begin
+  prog = mythtv
+  button = menu
+  config = M
+end
+
+begin
+  prog = mythtv
+  button = ratio
+  config = W
+end
+
+begin
+  prog = mythtv
+  button = rec
+  config = R
+end
+
+begin
+  prog = mythtv
+  button = record
+  config = R
+end
+
+begin
+  prog = mythtv
+  button = alt_tab
+  # Use for forward commercial skip
+  config = Z
+end
+
+begin
+  prog = mythtv
+  button = folder
+  # Use for Teletext
+  config = T
+end
+
+########### Start Of Music #############
+
+begin
+  # Mute for MythMusic
+  prog = mythtv
+  button = mute
+  config = |
+end
+
+begin
+  prog = mythtv
+  button = DVD_ROOTMENU
+  config = M
+end
+
+begin
+  prog = mythtv
+  # Enter button
+  button = SETUP
+  config = Return
+end
+
+begin
+  prog = mythtv
+  button = A
+  config = S
+end
+
+begin
+  prog = mythtv
+  button = B
+  config = I
+end
+
+begin
+  prog = mythtv
+  button = C
+  config = T
+end
+
+begin
+  prog = mythtv
+  # Change focus for PiP (to change channel in the other window)
+  button = MAXAMIZE
+  config = B
+end
+
+begin
+  prog = mythtv
+  # Toggle PiP on/off
+  button = TV_ON_DEMAND
+  config = V
+end
+
+begin
+  prog = mythtv
+  button = BACK
+  config = <
+end
+
+begin
+  prog = mythtv
+  button = NEXT
+  config = >
+end
+
+begin
+  prog = mythtv
+  button = BACK
+  config = Left
+end
+
+
+begin
+  prog = mythtv
+  button = NEXT
+  config = Right
+end
+
+begin
+  prog = mythtv
+  button = RECCORD
+  config = R
+end
+
+begin
+  prog = mythtv
+  button = STOP
+  config = P
+end
+
+begin
+  prog = mythtv
+  button = PLAY
+  config = P
+end
+
+begin
+  prog = mythtv
+  button = PAUSE
+  config = P
+end
+
+#Page Up/Down
+begin
+  prog = mythtv
+  button = E
+  config = PgUp
+end
+
+begin
+  prog = mythtv
+  button = F
+  config = PgDown
+end
+
+begin
+  prog = mythtv
+  button = E
+  # Use for backwards commercial skip
+  config = Q
+end
+
+begin
+  prog = mythtv
+  button = F
+  # Use for forward commercial skip
+  config = Z
+end
+
+#Mplayer
+
+begin
+  prog = mplayer
+  button = PLAY
+  config = pause
+end
+
+begin
+  prog = mplayer
+  button = PAUSE
+  config = pause
+end
+
+begin
+  prog = mplayer
+  button = STOP
+  config = pause
+end
+
+begin
+  prog = mplayer
+  button = POWER
+  config = quit
+end
+
+begin
+  prog = mplayer
+  button = D
+  config = quit
+end
+
+begin
+  prog = mplayer
+  button = MOUSE_RIGHT_BTN
+  config = quit
+end
+
+begin
+  prog = mplayer
+  button = MUTE
+  config = mute
+end
+
+begin
+  prog = mplayer
+  button = E
+  repeat = 6
+  config = seek -10
+end
+
+begin
+  prog = mplayer
+  button = F
+  repeat = 6
+  config = seek 10
+end
+
+begin
+  prog = mplayer
+  button = Left
+  repeat = 6
+  config = seek -70
+end
+
+begin
+  prog = mplayer
+  button = chup
+  repeat = 6
+  config = seek -70
+end
+
+begin
+  prog = mplayer
+  button = Right
+  repeat = 6
+  config = seek 70
+end
+
+begin
+  prog = mplayer
+  button = chdown
+  repeat = 6
+  config = seek 70
+end
+
+begin
+  prog = mplayer
+  button = ch_up
+  config = seek 10
+end
+
+begin
+  prog = mplayer
+  button = volup
+  config = seek 10
+end
+
+begin
+  prog = mplayer
+  button = ch_down
+  config = seek -10
+end
+
+begin
+  prog = mplayer
+  button = voldown
+  config = seek -10
+end
+
+begin
+  prog = mplayer
+  button = vol_down
+  repeat = 6
+  config = volume -1
+end
+
+begin
+  prog = mplayer
+  button = yellow
+  repeat = 6
+  config = volume -1
+end
+
+begin
+  prog = mplayer
+  button = vol_up
+  repeat = 6
+  config = volume 1
+end
+
+begin
+  prog = mplayer
+  button = blue
+  repeat = 6
+  config = volume 1
+end
+
+begin
+  prog = mplayer
+  button = 1
+  config = 1
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 2
+  config = 2
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 3
+  config = 3
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 4
+  config = 4
+  repeat = 5
+end
+
+
+begin
+  prog = mplayer
+  button = 5
+  config = 5
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 6
+  config = 6
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 7
+  config = 7
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 8
+  config = 8
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 9
+  config = 9
+  repeat = 5
+end
+
+begin
+  prog = mplayer
+  button = 0
+  config = 0
+  repeat = 5
+end
+
+
+#Xine
+
+begin
+  prog = xine
+  button = PLAY
+  config = Play
+end
+
+begin
+  prog = xine
+  button = PAUSE
+  config = PAUSE
+end
+
+begin
+  prog = xine
+  button = STOP
+  config = Stop
+end
+
+begin
+  prog = xine
+  button = POWER
+  config = Quit
+end
+
+begin
+  prog = xine
+  button = D
+  config = quit
+end
+
+begin
+  prog = xine
+  button = MOUSE_RIGHT_BTN
+  config = quit
+end
+
+begin
+  prog = xine
+  button = ARROW_UP
+  repeat = 4
+  config = EventUp
+end
+
+begin
+  prog = xine
+  button = ARROW_DOWN
+  repeat = 4
+  config = EventDown
+end
+
+begin
+  prog = xine
+  button = ARROW_LEFT
+  repeat = 4
+  config = EventLeft
+end
+
+begin
+  prog = xine
+  button = ARROW_RIGHT
+  repeat = 4
+  config = EventRight
+end
+
+begin
+  prog = xine
+  button = OK
+  repeat = 0
+  config = EventSelect
+end
+
+begin
+  prog = xine
+  button = MOUSE_UP
+  repeat = 4
+  config = EventUp
+end
+
+begin
+  prog = xine
+  button = MOUSE_DOWN
+  repeat = 4
+  config = EventDown
+end
+
+begin
+  prog = xine
+  button = MOUSE_LEFT
+  repeat = 4
+  config = EventLeft
+end
+
+begin
+  prog = xine
+  button = MOUSE_RIGHT
+  repeat = 4
+  config = EventRight
+end
+
+begin
+  prog = xine
+  button = MOUSE_LEFT_BTN
+  repeat = 0
+  config = EventSelect
+end
+
+begin
+  prog = xine
+  button = DVD_ROOTMENU
+  repeat = 0
+  config = Menu
+end
+
+#vol down
+begin
+  prog = xine
+  button = VOL_DOWN
+  repeat = 1
+  config = Volume-
+end
+
+begin
+  prog = xine
+  button = yellow
+  repeat = 1
+  config = Volume-
+end
+
+#vol up
+begin
+  prog = xine
+  button = VOL_UP
+  repeat = 1
+  config = Volume+
+end
+
+begin
+  prog = xine
+  button = blue
+  repeat = 1
+  config = Volume+
+end
+
+begin
+  prog = xine
+  button = TV_ON_DEMAND
+  repeat = 1
+  config = ZoomIn
+end
+
+begin
+  prog = xine
+  button = MAXAMIZE
+  repeat = 1
+  config = ZoomOut
+end
+
+#skip chapter forward
+begin
+  prog = xine
+  button = NEXT
+  repeat = 1
+  config = EventNext
+end
+
+#skip chapter backward
+begin
+  prog = xine
+  button = BACK
+  repeat = 1
+  config = EventPrior
+end
+
+begin
+  prog = xine
+  button = F
+  repeat = 2
+  config = SeekRelative+45
+end
+
+begin
+  prog = xine
+  button = E
+  repeat = 2
+  config = SeekRelative-45
+end
diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/dvico/preview.jpg
new file mode 100644
index 0000000..1ec179d
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/favorites/dvico/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/remote.run b/abs/core/system-templates/templates/remotes/favorites/dvico/remote.run
new file mode 100644
index 0000000..7721acd
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/remote.run
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/sbin/lircd -r -n -d /dev/remotes/dvicoIR --driver=dvico  --output /var/run/lirc/lircd
diff --git a/abs/core/system-templates/templates/remotes/favorites/mce/lircd.conf.mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/lircd.conf.mceusb
new file mode 100644
index 0000000..b1c26b6
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/mce/lircd.conf.mceusb
@@ -0,0 +1,163 @@
+#
+# RC-6 config file
+#
+# source: http://home.hccnet.nl/m.majoor/projects__remote_control.htm
+#         http://home.hccnet.nl/m.majoor/pronto.pdf
+#
+# used by: Philips
+#
+#########
+#
+# Philips Media Center Edition remote control
+# For use with the USB MCE ir receiver
+#
+# Dan Conti  dconti|acm.wwu.edu
+#
+# Updated with codes for MCE 2005 Remote additional buttons
+# *, #, Teletext, Red, Green, Yellow & Blue Buttons
+# Note: TV power button transmits no code until programmed.
+# Updated 12th September 2005
+# Graham Auld - mce|graham.auld.me.uk
+#
+# Radio, Print, RecTV are only available on the HP Media Center remote control
+#
+
+begin remote
+
+  name 		mceusb
+  bits        	16
+  flags 	RC6|CONST_LENGTH
+  eps         	30
+  aeps     	100
+
+  header       	2667   	889
+  one           444   	444
+  zero          444   	444
+  pre_data_bits 21
+  pre_data      0x37FF0
+  gap          	105000
+  toggle_bit    22
+  rc6_mask    	0x100000000
+
+  begin codes
+#-------------------------------------------------------------b9
+	Testb90		0x00007b90
+	Testb91		0x00007b91
+	Testb92		0x00007b92
+	Testb93		0x00007b93
+	Testb94		0x00007b94
+	Testb95		0x00007b95
+	Testb96		0x00007b96
+	Testb97		0x00007b97
+	Testb98		0x00007b98
+	Testb99		0x00007b99
+	TV?????		0x00007b9a
+	Messenger	0x00007b9b
+	Testb9c		0x00007b9c
+	Testb9d		0x00007b9d
+	Testb9e		0x00007b9e
+	Testb9f		0x00007b9f
+#-------------------------------------------------------------ba
+	Testba0 	0x00007ba0
+	Blue		0x00007ba1
+	Yellow		0x00007ba2
+	Green		0x00007ba3
+	Red		0x00007ba4
+	Teletext	0x00007ba5
+	Testba6 	0x00007ba6
+	Testba7 	0x00007ba7
+	Testba8 	0x00007ba8
+	Testba9 	0x00007ba9
+	Testbaa 	0x00007baa
+	Testbab 	0x00007bab
+	Testbac 	0x00007bac
+	Testbad 	0x00007bad
+	Testbae 	0x00007bae
+        Radio    	0x00007baf
+#-------------------------------------------------------------bb
+	Testbb0 	0x00007bb0
+	Print           0x00007bb1
+	Testbb2 	0x00007bb2
+	Testbb3 	0x00007bb3
+	Testbb4 	0x00007bb4
+	Videos		0x00007bb5
+	Pictures 	0x00007bb6
+	RecordedTV      0x00007bb7
+	Music 		0x00007bb8
+	TV            	0x00007bb9
+	Testbba 	0x00007bba
+	Testbbb 	0x00007bbb
+	Testbbc 	0x00007bbc
+	Testbbd 	0x00007bbd
+	Testbbe 	0x00007bbe
+	Testbbf 	0x00007bbf
+#-------------------------------------------------------------- bc
+        Testbc0     	0x00007bc0
+	Testbc1     	0x00007bc1
+        Testbc2     	0x00007bc2
+        Testbc3     	0x00007bc3
+        Testbc4     	0x00007bc4
+       	Testbc5     	0x00007bc5
+       	Testbc6     	0x00007bc6
+       	Testbc7     	0x00007bc7
+       	Testbc8     	0x00007bc8
+       	Testbc9     	0x00007bc9
+        Testbca     	0x00007bca
+        Testbcb     	0x00007bcb
+        Testbcc     	0x00007bcc
+        Testbcd     	0x00007bcd
+        Testbce     	0x00007bce
+       	Testbcf     	0x00007bcf
+#---------------------------------------------------------------bd
+       	Testbd0 	0x00007bd0
+       	Testbd1 	0x00007bd1
+       	Testbd2 	0x00007bd2
+       	Testbd3 	0x00007bd3
+       	Testbd4 	0x00007bd4
+       	Testbd5 	0x00007bd5
+       	Testbd6 	0x00007bd6
+       	Testbd7 	0x00007bd7
+       	Testbd8 	0x00007bd8
+       	Guide           0x00007bd9
+       	LiveTV          0x00007bda
+       	DVDMenu 	0x00007bdb
+       	Back            0x00007bdc
+       	OK              0x00007bdd
+       	Right           0x00007bde
+       	Left            0x00007bdf
+#--------------------------------------------------------------be
+       	Down            0x00007be0
+       	Up              0x00007be1
+       	Star            0x00007be2
+       	Hash            0x00007be3
+       	Replay          0x00007be4
+       	Skip            0x00007be5
+       	Stop            0x00007be6
+       	Pause           0x00007be7
+       	Record          0x00007be8
+       	Play            0x00007be9
+       	Rewind          0x00007bea
+       	Forward 	0x00007beb
+       	ChannelDown     0x00007bec
+       	ChannelUp       0x00007bed
+       	VolumeDown      0x00007bee
+       	VolumeUp        0x00007bef
+#---------------------------------------------------------------bf
+       	More            0x00007bf0
+       	Mute            0x00007bf1
+       	Start           0x00007bf2
+       	Power           0x00007bf3
+       	Enter           0x00007bf4
+       	Clear           0x00007bf5
+       	Nine            0x00007bf6
+       	Eight           0x00007bf7
+       	Seven           0x00007bf8
+       	Six             0x00007bf9
+       	Five            0x00007bfa
+       	Four            0x00007bfb
+       	Three           0x00007bfc
+       	Two             0x00007bfd
+       	One             0x00007bfe
+       	Zero            0x00007bff
+  end codes
+end remote
diff --git a/abs/core/system-templates/templates/remotes/favorites/mce/lircrc-mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/lircrc-mceusb
new file mode 100644
index 0000000..a6a8c48
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/mce/lircrc-mceusb
@@ -0,0 +1,877 @@
+# /home/mythtv/.mythtv/lircrc
+#
+# From Knoppmyth R5.5 - Copied by UniCav
+#
+# Media Center Edition Remote Control and 
+# Remote Control Keys on Media Center Keyboard
+#
+##############################################################################
+# For use with the USB MCE ir receiver
+# MythTV LIRC config file for the mceusb2 or lirc_mod_mce module
+
+# Info about lircrc statment
+#begin
+#  prog    = ... Program controlled, irxevent, irexec, mythtv, mplayer, 
+#                xine, or others
+#  remote  = ... mceusb, or what ever you happen to have or want to call it
+#  button  = ... remote keys names from your lircd.conf file
+#  repeat  = ... repeat = 2 is fast, repeat = 4 is slower
+#  delay   = ... delay before repeat, 1 is short, 4 is longer
+#  config  = ... output key presses to key bindings editor
+#  mode    = ...
+#  flags   = ...
+#end
+
+# Test your new Lirc settings
+#   /etc/init.d/lirc restart    To restart Lirc
+#   ctrl-alt-backspace          To restart the frontend
+
+# Updated January 30th 2008 BAK
+# for the Knoppmyth project
+
+################################### irexec ###################################
+# the lirc irexec program must be running for this section
+
+# Will perform a complete shutdown
+#begin
+#       prog   = irexec
+#       button = Power
+#       config = /usr/bin/sudo halt
+#end
+
+############################### Mythtv Section ###############################
+# MythTV Key Binding Editor     location
+# Mythtv Menu >>Utilities / Setup >>Edit Keys
+# Key Bindings can also be found in Myth Web
+
+# Record
+begin
+  prog   = mythtv
+  button = Record
+  config = R
+end
+
+# Stop
+begin
+  prog   = mythtv
+  button = Stop
+  config = Esc
+end
+
+# Pause
+begin
+  prog   = mythtv
+  button = Pause
+  config = P
+end
+
+# Rewind (while viewing)
+begin
+  prog   = mythtv
+  button = Rewind
+  repeat = 0
+  delay  = 1
+  config = <
+end
+
+# Fast forward (while viewing)
+begin
+  prog   = mythtv
+  button = Forward
+  repeat = 0
+  delay  = 1
+  config = >
+end
+
+# Play
+begin
+  prog   = mythtv
+  button = Play
+  config = L
+end
+
+# Skip backward (1 min default)
+begin
+  prog   = mythtv
+  button = Replay
+  repeat = 4
+  delay  = 4
+  config = PgUp
+end
+
+# Skip forward (1 min default)
+begin
+  prog   = mythtv
+  button = Skip
+  repeat = 4
+  delay  = 4
+  config = PgDown
+end
+
+#<><><><><><><><><><><> Mythtv Control <><><><>
+
+# Escape/Exit/Back
+begin
+  prog   = mythtv
+  button = Back
+  config = Esc
+end
+
+# Bring up OSD info
+begin
+  prog   = mythtv
+  button = More
+  config = I
+end
+
+begin
+  prog   = mythtv
+  button = Left
+  repeat = 2
+  delay  = 4
+  config = Left
+end
+
+begin
+  prog   = mythtv
+  button = Right
+  repeat = 2
+  delay  = 4
+  config = Right
+end
+
+begin
+  prog   = mythtv
+  button = Up
+  repeat = 2
+  delay  = 4
+  config = Up
+end
+
+begin
+  prog   = mythtv
+  button = Down
+  repeat = 2
+  delay  = 4
+  config = Down
+end
+
+# OK/Select
+begin
+  prog   = mythtv
+  button = OK
+  config = Return
+end
+
+# The Start Button is really just a Menu key
+begin
+  prog   = mythtv
+  button = Start
+  config = M
+end
+
+#<><><><><><><><><><><><><><><>
+
+# Volume-Up
+begin
+  prog   = mythtv
+  button = VolumeUp
+  repeat = 1
+  config = ]
+end
+
+# Volume-Down
+begin
+  prog   = mythtv
+  button = VolumeDown
+  repeat = 1
+  config = [
+end
+
+# Mute
+begin
+  prog   = mythtv
+  button = Mute
+  config = |
+end
+
+# Channel Up
+begin
+  prog   = mythtv
+  button = ChannelUp
+  repeat = 3
+# delay  = 1
+  config = Up
+end
+
+# Channel Down
+begin
+  prog   = mythtv
+  button = ChannelDown
+  config = Down
+  repeat = 3
+# delay  = 1
+end
+
+# Numbers 0-9 <><><><><><><><><><><>
+
+begin
+  prog   = mythtv
+  button = One
+# repeat = 2
+  config = 1
+end
+
+begin
+  prog   = mythtv
+  button = Two
+# repeat = 2
+  config = 2
+end
+
+begin
+  prog   = mythtv
+  button = Three
+# repeat = 2
+  config = 3
+end
+
+begin
+  prog   = mythtv
+  button = Four
+# repeat = 2
+  config = 4
+end
+
+begin
+  prog   = mythtv
+  button = Five
+# repeat = 2
+  config = 5
+end
+
+begin
+  prog   = mythtv
+  button = Six
+# repeat = 2
+  config = 6
+end
+
+begin
+  prog   = mythtv
+  button = Seven
+# repeat = 2
+  config = 7
+end
+
+begin
+  prog   = mythtv
+  button = Eight
+# repeat = 2
+  config = 8
+End
+
+begin
+  prog   = mythtv
+  button = Nine
+# repeat = 2
+  config = 9
+end
+
+begin
+  prog   = mythtv
+  button = Zero
+# repeat = 2
+  config = 0
+end
+
+#<><><><><><><><><><><><><><><><><><><><>
+# Seek to previous commercial cut point
+# or remove all cut points from the Editing Cutlist
+begin
+  prog   = mythtv
+  button = Star
+  config = Q
+end
+
+# Seek to next commercial cut point
+# or add commericial cut points to the Editing Cutlist
+begin
+  prog   = mythtv
+  button = Hash
+  config = Z
+end
+
+# Brings up the delete box
+begin
+  prog   = mythtv
+  button = Clear
+  repeat = 0
+  config = D
+end
+
+# Toggle Editing Cutlist on or off
+begin
+  prog   = mythtv
+  button = Enter
+  repeat = 0
+  config = E
+end
+
+#<><><><><><><><> Additional Remote Commands <><><><><><><><>
+# All buttons in this section must be configured using
+# MythTV's KeyBindings JumpPoints editor.
+# >>> Utilities/ Setup >>> Edit Keys >>> JumpPoints >>>
+
+# Listen to Myth Music
+begin
+  prog   = mythtv
+  button = Music
+  config = Ctrl+Alt+M
+end
+
+# at this time connects to MythStreem
+begin
+  prog = mythtv
+  button = Radio
+  config = Ctrl+Alt+S
+end
+
+# View Pictures
+begin
+  prog   = mythtv
+  button = Pictures
+  config = Ctrl+Alt+P
+end
+
+# Watch Videos
+begin
+  prog   = mythtv
+  button = Videos
+  config = Ctrl+Alt+V
+end
+
+# Watch Live TV with Live TV Guide open
+begin
+  prog   = mythtv
+  button = TV
+  config = Ctrl+Alt+K
+end
+
+# Watch Live TV
+begin
+  prog   = mythtv
+  button = LiveTV
+  config = Ctrl+Alt+L
+end
+
+# Recorded TV Programs
+begin
+  prog   = mythtv
+  button = RecordedTV
+  config = Ctrl+Alt+R
+end
+
+# Program Guide
+begin
+  prog   = mythtv
+  button = Guide
+  config = Ctrl+Alt+G
+end
+
+# Play DVD
+# There must be a disk in the DVD drive or it dos nothing
+begin
+  prog   = mythtv
+  button = DVDMenu
+  config = Ctrl+Alt+D
+end
+
+# unused key
+#begin
+#  prog   = mythtv
+#  button = Messenger
+#  config = Ctrl+Alt+A
+#end
+
+# <><><><><><><><><><><><><> Teletext Buttons <><><><><><><><><><><>
+
+# Teletext = Show interactive MHEG screens
+begin
+  prog   = mythtv
+  button = Teletext
+  config = F7
+end
+
+# Red = Red button for interactive screens.
+begin
+  prog   = mythtv
+  button = Red
+  config = F2
+end
+
+# Green = Green button for interactive screens.
+begin
+  prog   = mythtv
+  button = Green
+  config = F3
+end
+
+# Yellow = Yellow button for interactive screens.
+begin
+  prog   = mythtv
+  button = Yellow
+  config = F4
+end
+
+# Blue = Blue button for interactive screens.
+begin
+  prog   = mythtv
+  button = Blue
+  config = F5
+end
+
+
+######################## MPlayer Section #####################################
+# "mplayer -input keylist" Prints all keys that can be bound to commands.
+# "mplayer -input cmdlist" Prints all commands that can be bound to keys
+# "man mplayer" Prints documentation for MPlayer
+
+# Show OSD
+begin
+  prog   = mplayer
+  button = OK
+  config = osd
+end
+
+# Pause playback
+begin
+  prog   = mplayer
+  button = Pause
+  config = pause
+end
+
+# If paused, resume playing
+begin
+  prog   = mplayer
+  button = Play
+  config = pause
+end
+
+# Stop playback and exit
+begin
+  prog   = mplayer
+  button = Stop
+  config = quit
+end
+
+# Volume-Up
+begin
+  prog   = mplayer
+  button = VolumeUp
+  repeat = 2
+  config = volume +1
+end
+
+# Volume-Down
+begin
+  prog   = mplayer
+  button = VolumeDown
+  repeat = 2
+  config = volume -1
+end
+
+# Mute
+begin
+  prog   = mplayer
+  button = Mute
+  config = mute
+end
+
+# Seek back 60 seconds
+begin
+  prog   = mplayer
+  button = Left
+  repeat = 2
+  config = seek -60
+end
+
+# Seek forward 60 seconds
+begin
+  prog   = mplayer
+  button = Right
+  repeat = 2
+  config = seek +60
+end
+
+# Seek back 10 seconds
+begin
+  prog   = mplayer
+  button = Rewind
+  repeat = 2
+  config = seek -10
+end
+
+# Seek forward 30 seconds
+begin
+  prog   = mplayer
+  button = Forward
+  repeat = 2
+  config = seek +30
+end
+
+# Quit
+begin
+  prog   = mplayer
+  button = Back
+  config = quit
+end
+
+# Seek forward 10 minutes
+begin
+  prog   = mplayer
+  button = Skip
+  repeat = 2
+  config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+  prog   = mplayer
+  button = Replay
+  repeat = 2
+  config = seek -600
+end
+
+# increase brightness
+begin
+  prog   = mplayer
+  button = ChannelUp
+  repeat = 2
+  config = brightness +1
+end
+
+# decrease brightness
+begin
+  prog   = mplayer
+  button = ChannelDown
+  repeat = 2
+  config = brightness -1
+end
+
+# Toggle full-screen
+#begin
+#  prog   = mplayer
+#  button = #???????????????????????????
+#  repeat = 2
+#  config = vo_fullscreen
+#end
+
+
+########################## XINE Section ######################################
+#
+# For a compleate list of Xine's Lirc Keybindings use comand
+#        xine --keymap=lirc>.lircrc.xine.keybindings
+# This creates a file in current directory called ".lircrc.xine.keybindings"
+# Note: Xine has diferent sets of keybindings for lirc and keyboard
+
+##  01/14/2008
+# xine key bindings.
+# Automatically generated by xine-ui version 0.99.6cvs.
+
+#<><><><><><><><><><> Xine Video Movement <><><><>
+
+# start playback
+begin
+  prog   = xine
+  button = Play
+  config = Play
+end
+
+# playback pause toggle
+begin
+  prog   = xine
+  button = Pause
+  config = Pause
+end
+
+# stop playback
+begin
+  prog   = xine
+  button = Stop
+  config = Stop
+end
+
+# take a snapshot
+#begin
+#   prog   = xine
+#   button = Record
+#   repeat = 2
+#   config = Snapshot
+#end
+
+begin
+  prog   = xine
+  button = Forward
+  repeat = 2
+# delay  = 1
+  config = SeekRelative+7
+end
+
+begin
+  prog   = xine
+  button = Rewind
+  repeat = 2
+# delay  = 1
+  config = SeekRelative-7
+end
+
+# set position to -60 seconds in current stream
+begin
+  prog   = xine
+  button = Replay
+  repeat = 2
+  delay  = 1
+  config = SeekRelative-60
+end
+
+# set position to +60 seconds in current stream
+begin
+  prog   = xine
+  button = Skip
+  repeat = 2
+  delay  = 1
+  config = SeekRelative+60
+end
+#<><><><><><><><><><><><>Xine Control<><><><><><><><><>
+
+# quit the program
+begin
+  prog   = xine
+  button = Back
+  config = Quit
+end
+
+#display stream information using OSD
+begin
+  prog   = xine
+  button = More
+  config = OSDStreamInfos
+end
+
+# menu navigate up
+begin
+  prog   = xine
+  button = Up
+  repeat = 2
+  delay  = 2
+  config = EventUp
+end
+
+# menu navigate down
+begin
+  prog   = xine
+  button = Down
+  repeat = 2
+  delay  = 2
+  config = EventDown
+end
+
+# menu navigate left
+begin
+  prog   = xine
+  button = Left
+  repeat = 2
+  delay  = 2
+  config = EventLeft
+end
+
+# menu navigate right
+begin
+  prog   = xine
+  button = Right
+  repeat = 2
+  delay  = 2
+  config = EventRight
+end
+
+# menu select
+begin
+  prog   = xine
+  button = OK
+  config = EventSelect
+end
+
+# jump to Root Menu
+begin
+  prog   = xine
+  button = Start
+  config = Menu
+end
+
+#<><><><><><><><><><><><><><><><><><><> Xine Volume / Channel <><><><><><><><>
+
+# increment audio volume
+begin
+  prog   = xine
+  button = VolumeUp
+  repeat = 1
+  config = Volume+
+end
+
+# decrement audio volume
+begin
+  prog   = xine
+  button = VolumeDown
+  repeat = 1
+  config = Volume-
+end
+
+# audio muting toggle
+begin
+  prog   = xine
+  button = Mute
+  config = Mute
+end
+
+# increase brightness by 10
+begin
+  prog   = xine
+  button = ChannelUp
+  config = BrightnessControl+
+end
+
+# decrease brightness by 10
+begin
+  prog   = xine
+  button = ChannelDown
+  config = BrightnessControl-
+end
+
+#<><><><><><><><><><><><><><><><><> Xine Menu <><><><>
+
+# unused key
+#begin
+#   prog   = xine
+#   button = RecordedTV
+#   config = ????????
+#end
+
+# visibility toggle of stream info window
+begin
+  prog   = xine
+  button = Guide
+  config = SetupShow
+end
+
+# unused key
+#begin
+#  prog   = xine
+#  button = LiveTV
+#  config = ????????
+#end
+
+# jump to Title Menu
+begin
+  prog   = xine
+  button = DVDMenu
+  config = RootMenu
+end
+
+#<><><><><><><><><><><><><><><><><> Xine Stream Position <><><><>
+
+# set position in current stream
+
+begin
+  prog   = xine
+  button = Zero
+  config = SetPosition0%
+end
+
+begin
+  prog   = xine
+  button = One
+  config = SetPosition10%
+end
+
+begin
+  prog   = xine
+  button = Two
+  config = SetPosition20%
+end
+
+begin
+  prog   = xine
+  button = Three
+  config = SetPosition30%
+end
+
+begin
+  prog   = xine
+  button = Four
+  config = SetPosition40%
+end
+
+begin
+  prog   = xine
+  button = Five
+  config = SetPosition50%
+end
+
+begin
+  prog   = xine
+  button = Six
+  config = SetPosition60%
+end
+
+begin
+  prog   = xine
+  button = Seven
+  config = SetPosition70%
+end
+
+begin
+  prog   = xine
+  button = Eight
+  config = SetPosition80%
+end
+
+begin
+  prog   = xine
+  button = Nine
+  config = SetPosition90%
+end
+
+#<><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
+
+# decrement playback speed (slow motion slowdown)
+begin
+  prog   = xine
+  button = Star
+  config = SpeedSlower
+end
+
+# increment playback speed (slow motion speedup)
+begin
+  prog   = xine
+  button = Hash
+  config = SpeedFaster
+end
+
+# reset playback speed
+begin
+  prog   = xine
+  button = Clear
+  config = SpeedReset
+end
+
+# set position to -30 seconds in current stream     config = SeekRelative-30
+# set position to +30 seconds in current stream     config = SeekRelative+30
+# eject the current medium                          config = Eject
+# zoom in                                           config = ZoomIn
+# zoom out                                          config = ZoomOut
+# fullscreen toggle                                 config = ToggleFullscreen
+
+##
+# End of xine .
+##
diff --git a/abs/core/system-templates/templates/remotes/favorites/mce/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/mce/preview.jpg
new file mode 100644
index 0000000..0aa6a4a
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/favorites/mce/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/favorites/no_remote/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/no_remote/preview.jpg
new file mode 100644
index 0000000..1d887dd
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/favorites/no_remote/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap
new file mode 100644
index 0000000..36b52fa
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap
@@ -0,0 +1,72 @@
+#
+# this config file was automatically generated
+# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
+#
+# contributed by Christoph Bartelmus
+#
+# brand:                       Streamzap
+# model no. of remote control: PC Remote
+# devices being controlled by this remote: USB receiver
+#
+
+begin remote
+
+  name  Streamzap_PC_Remote
+  bits            6
+  flags RC5|CONST_LENGTH
+  eps            30
+  aeps          100
+
+  one           889  889
+  zero          889  889
+  plead         889
+  pre_data_bits   8
+  pre_data       0xA3
+  gap          108344
+  toggle_bit      2
+
+
+      begin codes
+          0                        0x00
+          1                        0x01
+          2                        0x02
+          3                        0x03
+          4                        0x04
+          5                        0x05
+          6                        0x06
+          7                        0x07
+          8                        0x08
+          9                        0x09
+          POWER                    0x0A
+          MUTE                     0x0B
+          CH_UP                    0x0C
+          VOL_UP                   0x0D
+          CH_DOWN                  0x0E
+          VOL_DOWN                 0x0F
+          UP                       0x10
+          LEFT                     0x11
+          OK                       0x12
+          RIGHT                    0x13
+          DOWN                     0x14
+          MENU                     0x15
+          EXIT                     0x16
+          PLAY                     0x17
+          PAUSE                    0x18
+          STOP                     0x19
+          |<<                      0x1A
+          >>|                      0x1B
+          RECORD                   0x1C
+          <<                       0x1D
+          >>                       0x1E
+          RED                      0x20
+          GREEN                    0x21
+          YELLOW                   0x22
+          BLUE                     0x23
+          DISP                     0x24
+          PTZ                      0x25
+          HELP                     0x26
+      end codes
+
+end remote
+
+
diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc
new file mode 100755
index 0000000..5e668b5
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc
@@ -0,0 +1,832 @@
+# StreamZap Remote
+# 'config' must either be a literal key, e.g. 'config = l' or must
+# refer to a defined key in MythTV, e.g. 'config = PLAY'a
+
+
+#restart frontend
+begin
+        remote = RS_LD
+        button = RESET
+        prog   = irexec
+        repeat = 0
+        config = /usr/bin/restartfrontend.sh
+end
+
+#time
+begin
+        remote = RS_LD
+        button = TIME
+        prog   = irexec
+        repeat = 10
+        config = /usr/bin/saytime.sh
+end
+
+#screen blank
+begin
+        remote = RS_LD
+        button = BLANK
+        prog   = irexec
+        repeat = 0
+#      config  = ls
+        config = xset s activate ; xset s blank
+end
+
+
+#picture
+begin
+REMOTE = RS_LD
+prog = mythtv
+button = PICTURE
+repeat = 4
+config = f
+end
+
+#change aspect
+begin
+remote = RS_LD
+prog = mythtv
+button = ASPECT
+# change aspect ratio
+config = w
+end
+
+#Browse
+begin
+remote = RS_LD
+prog = mythtv
+button = BROWSE
+repeat = 8
+config = o
+end
+
+# delete key
+begin
+remote = RS_LD
+prog = mythtv
+button = DELETE
+repeat = 8
+config = d
+end
+
+
+#change card
+begin
+remote = RS_LD
+prog = mythtv
+button = CARD
+repeat = 8
+config = y
+end
+
+# Change TV card input
+begin
+remote = RS_LD
+prog = mythtv
+button = CARD_SOURCE
+repeat = 4
+config = C
+end
+
+
+
+# Cycle through channel history
+begin
+remote = Streamzap_PC_Remote
+prog = mythtv
+button = BLUE
+repeat = 4
+config = H
+end
+
+# Bring up OSD info
+begin
+remote =  Streamzap_PC_Remote
+prog = mythtv
+button = YELLOW
+repeat = 4
+config = i
+end
+
+
+
+
+begin
+prog = mythtv
+button = 0
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+config = 9
+end
+
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+# ???
+begin
+prog = mythtv
+button = MUTE
+config = F9
+end
+
+begin
+prog = mythtv
+button = CH_UP
+repeat = 3
+config = PgUp
+end
+
+begin
+prog = mythtv
+button = VOL_UP
+repeat = 3
+config = ]
+end
+
+begin
+prog = mythtv
+button = CH_DOWN
+repeat = 3
+config = PgDown
+end
+
+begin
+prog = mythtv
+button = VOL_DOWN
+repeat = 3
+config = [
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = LEFT
+# navigates, or skips back during playback or live tv.
+config = Left
+end
+
+begin
+prog = mythtv
+button = OK
+config = Return
+end
+
+begin
+prog = mythtv
+button = RIGHT
+# navigates, or skips forwards during playback or live tv.
+config = Right
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = MENU
+config = m
+end
+
+begin
+prog = mythtv
+button = EXIT
+config = Esc
+end
+
+begin
+prog = mythtv
+button = PLAY
+config = Space
+end
+
+begin
+prog = mythtv
+button = PAUSE
+config = p
+end
+
+begin
+prog = mythtv
+button = STOP
+config = Esc
+end
+
+begin
+prog = mythtv
+# skip backward
+button = |<<
+config = PgUp
+end
+
+begin
+prog = mythtv
+# skip forward
+button = >>|
+config = PgDown
+end
+
+begin
+prog = mythtv
+button = RECORD
+config = r
+end
+
+begin
+prog = mythtv
+# rewind
+button = <<
+config = Home
+end
+
+begin
+prog = mythtv
+# fast forward
+button = >>
+config = End
+end
+
+begin
+prog = mythtv
+button = RED
+# Delete
+config = d
+end
+
+begin
+prog = mythtv
+button = GREEN
+# Info
+config = i
+end
+
+#begin
+#prog = mythtv
+#button = YELLOW
+# change aspect ratio
+#config = w
+#end
+
+begin
+prog = mythtv
+button = BLUE
+config = Tab
+end
+
+# MPLAYER
+begin
+prog = mplayer
+button = POWER
+config = quit
+end
+
+begin
+prog = mplayer
+button = MUTE
+config = mute
+end
+
+begin
+prog = mplayer
+button = VOL_UP
+repeat = 3
+config = volume +1
+end
+
+begin
+prog = mplayer
+button = VOL_DOWN
+repeat = 3
+config = volume -1
+end
+
+begin
+prog = mplayer
+button = UP
+repeat = 3
+config = seek +10
+end
+
+begin
+prog = mplayer
+button = LEFT
+# navigates, or skips back during playback or live tv.
+config = seek -60
+end
+
+begin
+prog = mplayer
+button = RIGHT
+# navigates, or skips forwards during playback or live tv.
+config = seek +60
+end
+
+begin
+prog = mplayer
+button = DOWN
+repeat = 3
+config = seek -10
+end
+
+begin
+prog = mplayer
+button = EXIT
+config = quit
+end
+
+begin
+prog = mplayer
+button = play
+config = speed_set 1.0
+end
+
+begin
+    prog = mplayer
+    button = pause
+    config = pause
+end
+
+begin
+prog = mplayer
+button = STOP
+config = quit
+end
+
+begin
+prog = mplayer
+# skip backward
+button = |<<
+config = seek -600
+end
+
+begin
+prog = mplayer
+# skip forward
+button = >>|
+config = seek +600
+end
+
+begin
+prog = mplayer
+# slow forward
+button = <<
+config = speed_mult 0.5
+end
+
+begin
+prog = mplayer
+# fast forward
+button = >>
+config = speed_mult 2.0
+end
+
+### xine  commands
+
+begin
+prog = xine
+button = YELLOW
+repeat = 4
+#config = ToggleVisiblity
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 4
+config = SeekRelative+60
+end
+
+# increase brightness by 10
+begin
+        button = DELETE
+        prog   = xine
+        repeat = 4
+        config = BrightnessControl+
+end
+
+# decrease brightness by 10
+begin
+        button = PICTURE
+        prog   = xine
+        repeat = 4
+        config = BrightnessControl-
+end
+
+
+begin
+prog = xine
+button = PAUSE
+repeat = 4
+config = Pause
+end
+
+begin
+prog = xine
+button = PLAY
+repeat = 4
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 4
+config = quit
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 4
+config = mute
+end
+
+begin
+prog = xine
+button = <<
+repeat = 4
+config = SeekRelative-30
+end
+
+begin
+prog = xine
+button =  >>
+repeat = 4
+#config = SeekRelative+30
+config =  SpeedFaster
+end
+
+begin
+prog = xine
+button = POWER
+repeat = 4
+config = quit
+end
+
+begin
+prog = xine
+button = EXIT
+repeat = 4
+config = quit
+end
+
+
+begin
+prog = xine
+button = FREEZE
+repeat = 4
+config =  SeekRelative+1200
+end
+
+begin
+prog = xine
+button = MOVE
+repeat = 4
+config =  SeekRelative-1200
+end
+
+begin
+prog   = xine
+button = 3
+config = SpuNext
+repeat = 0
+end
+
+# Select previous sub picture (subtitle) channel.
+begin
+button = 1
+prog   = xine
+repeat = 0
+config = SpuPrior
+end
+
+# Select next audio channel.
+begin
+button = 9
+prog   = xine
+repeat = 0
+config = AudioChannelNext
+end
+
+# Select previous audio channel.
+begin
+button = 7
+prog   = xine
+repeat = 0
+config = AudioChannelPrior
+end
+
+
+
+# Up event.
+begin
+
+button = UP
+prog   = xine
+repeat = 8
+config = EventUp
+end
+
+# Down event.
+begin
+
+button = DOWN
+prog   = xine
+repeat = 8
+config = EventDown
+end
+
+# Left event.
+begin
+
+button = LEFT
+prog   = xine
+repeat = 8
+config = EventLeft
+end
+
+# Right event.
+begin
+
+button = RIGHT
+prog   = xine
+repeat = 8
+config = EventRight
+end
+
+# Select event.
+begin
+prog   = xine
+button = ok
+repeat = 8
+config = EventSelect
+end
+
+# Down Chapter
+begin
+
+button = CH_DOWN
+prog   = xine
+repeat = 8
+config = EventPrior
+end
+
+# Next Chapter.
+begin
+
+button = CH_UP
+prog   = xine
+repeat = 8
+config = EventNext
+end
+
+# menu.
+begin
+
+button = record
+prog   = xine
+repeat = 8
+config = RootMenu
+end
+
+# Toggle aspect ratio
+begin
+prog   = xine
+button = ASPECT
+repeat = 0
+config = ToggleAspectRatio
+end
+
+
+
+#######xmms
+begin xmms
+  begin
+    prog = xmms
+    button = PLAY
+    config = PLAY
+  end
+  begin
+    prog = xmms
+    button = clear
+    config = PLAYLIST_CLEAR
+  end
+  begin
+    prog = xmms
+    button = load
+    config = PLAYLIST_ADD .xmms/xmms.m3u
+   end
+  begin
+    prog = xmms
+    button = PAUSE
+    config = PAUSE
+  end
+  begin
+    prog = xmms
+    button = STOP
+    config = STOP
+  end
+  begin
+    prog = xmms
+    button = EXIT
+    config = QUIT
+    flags = mode
+  end
+
+  begin
+    prog = xmms
+    button = POWER
+    config = QUIT
+    flags = mode
+  end
+
+  begin
+    prog = xmms
+    button = CH_UP
+    config = NEXT
+  end
+  begin
+    prog = xmms
+    button = CH_DOWN
+    config = PREV
+  end
+  
+
+
+begin
+    prog = xmms
+    button = >>|
+    config = NEXT
+  end
+begin
+    prog = xmms
+    button = |<<
+    config = PREV
+end
+
+
+begin
+    prog = xmms
+    button = <<
+    config = FWD 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = <<
+    config = BWD 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = volup
+    config = VOL_UP 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = voldown
+    config = VOL_DOWN 10
+    repeat = 2
+  end
+  begin
+    prog = xmms
+    button = 1
+    config = ONE
+  end
+  begin
+    prog = xmms
+    button = 2
+    config = TWO
+  end
+  begin
+    prog = xmms
+    button = 3
+    config = THREE
+  end
+  begin
+    prog = xmms
+    button = 4
+    config = FOUR
+  end
+  begin
+    prog = xmms
+    button = 5
+    config = FIVE
+  end
+  begin
+    prog = xmms
+    button = 6
+    config = SIX
+  end
+  begin
+    prog = xmms
+    button = 7
+    config = SEVEN
+  end
+  begin
+    prog = xmms
+    button = 8
+    config = EIGHT
+  end
+  begin
+    prog = xmms
+    button = 9
+    config = NINE
+  end
+  begin
+    prog = xmms
+    button = 0
+    config = ZERO
+  end
+  begin
+    prog = xmms
+    button = enter
+    config = SETPOS
+  end
+end xmms
+
+#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/streamzap/preview.jpg
new file mode 100644
index 0000000..4d1a5fe
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/favorites/streamzap/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/i2c.id b/abs/core/system-templates/templates/remotes/i2c.id
index 175bba2..92a2fbb 100644
--- a/abs/core/system-templates/templates/remotes/i2c.id
+++ b/abs/core/system-templates/templates/remotes/i2c.id
@@ -1,14 +1,12 @@
-0070:4000|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:4009|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:4801|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:4803|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:0003|Hauppauge|WinTV PVR 250|hauppauge-grey
-
-
-0070:0009|Hauppauge|WinTV PVR 150|hauppauge-grey
-0070:0801|Hauppauge|WinTV PVR 150|hauppauge-grey
-0070:0807|Hauppauge|WinTV PVR 150|hauppauge-grey
-0070:8003|Hauppauge|WinTV PVR 150|hauppauge-grey
-0070:8801|Hauppauge|WinTV PVR 150|hauppauge-grey
-0070:c801|Hauppauge|WinTV PVR 150|hauppauge-grey
-0270:0801|Hauppauge|WinTV PVR 120|hauppauge-grey
\ No newline at end of file
+0070:4000|Hauppauge|WinTV PVR 250|hauppauge-grey|hauppauge
+0070:4009|Hauppauge|WinTV PVR 250|hauppauge-grey|hauppauge
+0070:4801|Hauppauge|WinTV PVR 250|hauppauge-grey|hauppauge
+0070:4803|Hauppauge|WinTV PVR 250|hauppauge-grey|hauppauge
+0070:0003|Hauppauge|WinTV PVR 250|hauppauge-grey|hauppauge
+0070:0009|Hauppauge|WinTV PVR 150|hauppauge-grey|hauppauge
+0070:0801|Hauppauge|WinTV PVR 150|hauppauge-grey|hauppauge
+0070:0807|Hauppauge|WinTV PVR 150|hauppauge-grey|hauppauge
+0070:8003|Hauppauge|WinTV PVR 150|hauppauge-grey|hauppauge
+0070:8801|Hauppauge|WinTV PVR 150|hauppauge-grey|hauppauge
+0070:c801|Hauppauge|WinTV PVR 150|hauppauge-grey|hauppauge
+0270:0801|Hauppauge|WinTV PVR 120|hauppauge-grey|hauppauge
diff --git a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircd.conf b/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircd.conf
deleted file mode 100644
index 087b9ad..0000000
--- a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircd.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-# brand: ATI Remote Wonder
-# model no. of remote control: 5000023600
-# devices being controlled by this remote: ATI USB Receiver
-#
-# Found on a linpvr.org forum, thanks.
-
-begin remote
-
-  name  ati_remote
-  bits           40
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  gap          235966
-  toggle_bit      0
-
-
-      begin codes
-          a                        0x00000014D5000000
-          b                        0x00000014D6010000
-          power                    0x00000014D7020000
-          tv                       0x00000014D8030000
-          dvd                      0x00000014D9040000
-          web                      0x00000014DA050000
-          media_library            0x00000014DB060000
-          drag                     0x00000014DC070000
-          mouse-button_left        0x000000144D780000
-          mouse-button_right       0x00000014517C0000
-          mouse-up                 0x0000001447720000
-          mouse-down               0x0000001448730000
-          mouse-left               0x0000001445700000
-          mouse-right              0x0000001446710000
-          mouse-left_up            0x0000001449740000
-          mouse-right_up           0x000000144A750000
-          mouse-left_down          0x000000144C770000
-          mouse-right_down         0x000000144B760000
-          vol-up                   0x00000014DD080000
-          vol-down                 0x00000014DE090000
-          mute                     0x00000014DF0A0000
-          chan-up                  0x00000014E00B0000
-          chan-down                0x00000014E10C0000
-          1                        0x00000014E20D0000
-          2                        0x00000014E30E0000
-          3                        0x00000014E40F0000
-          4                        0x00000014E5100000
-          5                        0x00000014E6110000
-          6                        0x00000014E7120000
-          7                        0x00000014E8130000
-          8                        0x00000014E9140000
-          9                        0x00000014EA150000
-          0                        0x00000014EC170000
-          dvd-root_menu            0x00000014EB160000
-          launch_setup             0x00000014ED180000
-          c                        0x00000014EE190000
-          d                        0x00000014F01B0000
-          tv_on_demand             0x00000014F11C0000
-          max_window               0x00000014F5200000
-          cursor-up                0x00000014EF1A0000
-          cursor-down              0x00000014F7220000
-          cursor-left              0x00000014F21D0000
-          cursor-right             0x00000014F41F0000
-          ok                       0x00000014F31E0000
-          e                        0x00000014F6210000
-          f                        0x00000014F8230000
-          rewind                   0x00000014F9240000
-          play                     0x00000014FA250000
-          fastforward              0x00000014FB260000
-          record                   0x00000014FC270000
-          stop                     0x00000014FD280000
-          pause                    0x00000014FE290000
-      end codes
-
-end remote
-
diff --git a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircrc b/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircrc
deleted file mode 100644
index 01519a8..0000000
--- a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/lircrc
+++ /dev/null
@@ -1,636 +0,0 @@
-# ~/.mythtv/lircrc
-# 
-# MythTV native LIRC config file for
-# the ATI-Wonder Remote
-# using lirc_atiusb driver
-# 
-
-begin
-#Jumppoint for Program Guide created in Mythweb
-    prog = mythtv
-    button = tv
-    config = ! 
-    repeat = 5
-end
-
-begin
-#Jumppoint for DVD playback created in Mythweb
-    prog = mythtv
-    button = dvd
-    config = @
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-#Jumppoint for MythWeater created in Mythweb
-    button = web
-    config = #
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-#Jumppoint for MythVideo created in Mythweb
-    button = media_library
-    config = $
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-#Jumppoint for MythWeater created in Mythweb
-    button = HAND
-    config = %
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 0
-config = 0
-repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = mouse-up
-    config = Up
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = mouse-down
-    config = Down
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = mouse-left
-    config = Left
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = mouse-right
-    config = Right
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = mouse-button-right
-    config = Esc
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-# Enter button
-    button = mouse-button-left
-    config = Return
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = power
-    config = Esc
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-# Enter button
-    button = ok
-    config = Return
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = cursor-up
-    config = Up
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = cursor-down
-    config = Down
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = cursor-left
-    config = Left
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = cursor-right
-    config = Right
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = D
-    config = Esc
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = chan-up
-config = Up
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = chan-down
-config = Down
-    repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = vol-down
-  repeat = 3
-  config = F10  
-end
-
-begin
-  prog = mythtv
-  button = vol-up
-  repeat = 3
-  config = F11  
-end
-begin
-    prog = mythtv
-    button = mute
-    config = F9  
-    repeat = 5
-end
-
-begin
-# Mute for MythMusic
-    prog = mythtv
-    button = mute
-    config = |  
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = dvd-root_menu
-    config = M  
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-# Enter button
-    button = launch_setup
-    config = Return
-    repeat = 5
-end
-
-
-begin
-    prog = mythtv
-    button = a 
-    config = S  
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = b
-    config = I   
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = c
-    config = T   
-    repeat = 5
-end
-
-begin
-prog = mythtv
-# Change focus for PiP (to change channel in the other window)
-button = max_window
-config = B
-    repeat = 5
-end
-
-begin
-prog = mythtv
-# Toggle PiP on/off
-button = tv_on_demand
-config = V
-    repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = rewind
-    config = Left  
-    repeat = 5
-end
-
-
-begin
-    prog = mythtv
-    button = fastforward
-    config = Right  
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = record
-config = R
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = stop
-config = Esc
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = play
-config = P
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = pause
-config = P
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = e
-# Use for backwards commercial skip
-config = Q
-    repeat = 5
-end
-
-begin
-prog = mythtv
-button = f
-# Use for forward commercial skip
-config = Z
-    repeat = 5
-end
-
-#Mplayer
-
-begin
-prog = mplayer
-button = play
-config = pause
-    repeat = 5
-end
-
-begin
-prog = mplayer
-button = pause
-config = pause
-    repeat = 5
-end
-
-begin
-prog = mplayer
-button = stop
-config = quit
-    repeat = 5
-end
-
-begin
-prog = mplayer
-button = power
-config = quit
-    repeat = 5
-end
-
-begin
-prog = mplayer
-button = d
-config = quit
-    repeat = 5
-end
-
-begin
-prog = mplayer
-button = mouse-button-right
-config = quit
-    repeat = 5
-end
-
-begin
-prog = mplayer
-button = mute
-config = mute
-    repeat = 5
-end
-
-begin
-prog = mplayer
-button = e
-repeat = 6
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = r
-repeat = 6
-config = seek 10
-end
-
-begin
-prog = mplayer
-button = rewind
-repeat = 6
-config = seek -70
-end
-
-begin
-prog = mplayer
-button = fastforward
-repeat = 6
-config = seek 70
-end
-
-begin
-prog = mplayer
-button = vol-down
-repeat = 6
-config = volume -1
-end
-
-begin
-prog = mplayer
-button = vol-up
-repeat = 6
-config = volume 1
-end
-
-#Xine
-
-begin
-prog = xine
-button = play
-config = Play
-end
-
-begin
-prog = xine
-button = pause
-config = PAUSE
-end
-
-begin
-prog = xine
-button = stop
-config = Stop
-end
-
-begin
-prog = xine
-button = power
-config = Quit
-end
-
-begin
-prog = xine
-button = d
-config = quit
-end
-
-begin
-prog = xine
-button = mouse-button-right
-config = quit
-end
-
-begin
-prog = xine
-button = cursor-up
-repeat = 4
-config = EventUp
-end
-
-begin
-prog = xine
-button = cursor-down
-repeat = 4
-config = EventDown
-end
-
-begin
-prog = xine
-button = cursor-left
-repeat = 4
-config = EventLeft
-end
-
-begin
-prog = xine
-button = corsor-right
-repeat = 4
-config = EventRight
-end
-
-begin
-prog = xine
-button = ok
-repeat = 0
-config = EventSelect
-end
-
-begin
-prog = xine
-button = mouse-up
-repeat = 4
-config = EventUp
-end
-
-begin
-prog = xine
-button = mouse-down
-repeat = 4
-config = EventDown
-end
-
-begin
-prog = xine
-button = mouse-left
-repeat = 4
-config = EventLeft
-end
-
-begin
-prog = xine
-button = mouse-right
-repeat = 4
-config = EventRight
-end
-
-begin
-prog = xine
-button = mouse-button-left
-repeat = 0
-config = EventSelect
-end
-
-begin
-prog = xine
-button = dvd-root_menu
-repeat = 0
-config = Menu
-end
-
-#vol down
-begin
-prog = xine
-button = vol-down
-repeat = 1
-config = Volume-
-end
-
-#vol up
-begin
-prog = xine
-button = vol-up
-repeat = 1
-config = Volume+
-end
-
-begin
-prog = xine
-button = tv_on_demand
-repeat = 1
-config = ZoomIn
-end
-
-begin
-prog = xine
-button = max_window
-repeat = 1
-config = ZoomOut
-end
-
-#skip chapter forward
-begin
-prog = xine
-button = fastforward
-repeat = 1
-config = EventNext
-end
-
-#skip chapter backward
-begin
-prog = xine
-button = rewind
-repeat = 1
-config = EventPrior
-end
-
-begin
-prog = xine
-button = f
-repeat = 2
-config = SeekRelative+45
-end
-
-begin
-prog = xine
-button = e
-repeat = 2
-config = SeekRelative-45
-end 
-
-
-
-
-
diff --git a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/preview.jpg b/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/preview.jpg
deleted file mode 100644
index 351a111..0000000
Binary files a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircd.conf b/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircd.conf
deleted file mode 100644
index 6b1172a..0000000
--- a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircd.conf
+++ /dev/null
@@ -1,198 +0,0 @@
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.8.0pre3(atiusb) on Tue Feb  7 19:33:37 2006
-#
-# contributed by 
-# edited 2/19/2006 for dual code generation problem
-#
-# brand: ATI Remote Wonder Plus / RW3 
-# model no. of remote control: 5000026900
-# devices being controlled by this remote: 500002700
-#
-
-begin remote
-
-  name ATI_RWP 
-  bits           24
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  post_data_bits  16
-  post_data      0x0
-  gap          243966
-  min_repeat      2 
-  toggle_bit      0
-
-
-      begin codes
-	  
-          A                        0x155580
-          A                        0x15D500
-
-          B			   0x155681
-          B                        0x15D601
-		  
-          ?                        0x155A85
-          ?                        0x15da05
-          
-          POWER                    0x15d702
-          POWER                    0x155782
-		  
-          FM                       0x15F11C
-          FM                       0x15719C
-
-          TV                       0x155883
-          TV                       0x15d803
-
-          GUIDE                    0x15DB06
-          GUIDE                    0x155B86
-
-          TV2                      0x15FF2A
-          TV2                      0x157FAA
-
-          DVD                      0x15D904
-          DVD                      0x155984
-		  
-          Vol+                     0x155D88
-          Vol+			   0x15dd08
-		  
-          Vol-                     0x15DE09
-          Vol-                     0x155e89
-		  
-          Ch+                      0x15608B
-          Ch+                      0x15e00b
-		  
-          Ch-                      0x15E10C
-          Ch-                      0x15618c
-		  
-          Mute                     0x155F8A
-          Mute                     0x15df0a
-		  
-          ATI                      0x15022D
-          ATI                      0x1582ad
-
-          Maximize                 0x1575A0
-          Maximize                 0x15f520
-		  
-          Hand		           0x15dc07
-          Hand                     0x155c87
-
-          Mouse_LeftButton         0x154d78
-          Mouse_LeftButton         0x15cdf8  
-		  
-          Mouse_RightButton        0x15517c 
-          Mouse_RightButton        0x15d1fc 
-		  
-          Mouse_Up                 0x15C7F2
-          Mouse_Up                 0x154772
-		  
-          Mouse_Down               0x154873
-          Mouse_Down               0x15c8f3 
-		  
-          Mouse_Left               0x154570
-          Mouse_Left               0x15c5f0
-		  
-          Mouse_Right              0x154671
-          Mouse_Right              0x15c6f1
-		  
-          Mouse_UpRight            0x154A75
-          Mouse_UpRight            0x15caf5
-		  
-          Mouse_UpLeft             0x15C9F4
-          Mouse_UpLeft             0x154974 
-		  
-          Mouse_DownRight          0x15CBF6
-          Mouse_DownRight          0x154b76 
-		  
-          Mouse_DownLeft           0x154c77
-          Mouse_DownLeft           0x15ccf7
-		  
-          Play                     0x157AA5
-          Play                     0x15fa25
-		  
-          Pause                    0x15FE29
-          Pause                    0x157ea9
-		  
-          Stop                     0x157DA8
-          Stop                     0x15fd28 
-		  
-          Previous                 0x15F924
-          Previous                 0x1579a4
-		  
-          Next                     0x157BA6
-          Next                     0x15fb26
-		  
-          Record                   0x15fc27
-          Record		   0x157ca7
-		  
-          C                        0x156E99
-          C                        0x15ee19 
-
-          D                        0x15F01B
-          D                        0x15709b
-		  
-          E                        0x1576A1
-          E                        0x15f621
-		  
-          F                        0x15F823
-          F                        0x1578a3
-		  
-          OK                       0x15739E
-          OK                       0x15f31e
-		  
-          Information              0x15012C
-          Information              0x1581ac
-		  
-          Clock                    0x1580AB
-          Clock			   0x15002b
-		  
-          1                        0x15E20D
-          1                        0x15628d
-          2                        0x15638E
-          2                        0x15e30e
-          3                        0x15E40F
-          3                        0x15648f
-          4                        0x156590
-          4                        0x15e510
-          5                        0x15E611
-          5                        0x156691
-          6                        0x156792
-          6                        0x15e712
-          7                        0x15E813
-          7                        0x156893
-          8                        0x156994
-          8                        0x15e914
-          9                        0x15EA15
-          9                        0x156a95
-          0                        0x156C97
-          0                        0x15ec17
-		  
-          Checkmark                0x15ED18
-          Checkmark                0x156d98
-
-          Dropdown                 0x156B96
-          Dropdown                 0x15eb16
-		  
-          Arrow_Up                 0x156F9A
-          Arrow_Up                 0x15EF1A
-		  
-          Arrow_Down               0x15F722
-          Arrow_Down               0x1577a2 
-		  
-          Arrow_Right              0x15749F
-          Arrow_Right              0x15f41f
-		  
-          Arrow_Left               0x15F21D
-          Arrow_Left               0x15729d
-		  
-      end codes
-
-end remote
-
-
-
diff --git a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircrc b/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircrc
deleted file mode 100644
index 85365c4..0000000
--- a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/lircrc
+++ /dev/null
@@ -1,258 +0,0 @@
-begin
-prog = mythtv
-button = A
-config = E
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = B
-config = O
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Stop
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Next
-config = U
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Maximize
-config = V
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Pause
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Play
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Mute
-config = |
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Vol-
-config = [
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Vol+
-config = ]
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = f
-config = PgDown
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = d
-config = PgUp
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = c
-config = F4
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = e
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Arrow_Right
-config = Right
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Arrow_Left
-config = Left
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Arrow_Up
-config = Up
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Arrow_Down
-config = Down
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Ch+
-config = Up
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Ch-
-config = Down
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = OK
-config = Return
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 0
-config = 0
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Information
-config = i
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Checkmark
-config = Enter
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Dropdown
-config = M
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = TV
-config = F9
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = GUIDE
-config = M
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = Clock
-config = I
-repeat = 5
-end
diff --git a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/preview.jpg b/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/preview.jpg
deleted file mode 100644
index 36612e5..0000000
Binary files a/abs/core/system-templates/templates/remotes/other/ATI_Remote_Wonder_Plus/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/other/dvico/lircd.conf.fusionHDTV b/abs/core/system-templates/templates/remotes/other/dvico/lircd.conf.fusionHDTV
deleted file mode 100644
index 7f03ba1..0000000
--- a/abs/core/system-templates/templates/remotes/other/dvico/lircd.conf.fusionHDTV
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# contributed by  Chris Pascoe
-#
-# brand:                       DVICO
-# model no. of remote control: DVB-T 
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  DVICO
-  bits            32
-  eps             0
-  aeps            0
-
-  one             0     0
-  zero            0     0
-  pre_data_bits   32
-  pre_data 0x10046
-  gap          195755
-  post_data_bits  0
-  toggle_bit     0
-
-      begin codes
-          1                        0x00000000000011F9
-          2                        0x00000000000012F9
-          3                        0x00000000000013F9
-          4                        0x00000000000014F9
-          5                        0x00000000000015F9
-          6                        0x00000000000016F9
-          7                        0x00000000000017F9
-          8                        0x00000000000018F9
-          9                        0x00000000000019F9
-          0                        0x00000000000010F9
-          power                    0x0000000000000AF9
-          pcoff                    0x0000000000000CF9
-          camera                   0x0000000000001AF9
-          record                   0x0000000000001BF9
-          chup                     0x00000000000000F9
-          chdown                   0x00000000000001F9
-          volup                    0x00000000000002F9
-          voldown                  0x00000000000003F9
-          playpause                0x0000000000001FF9
-          rew                      0x0000000000001CF9
-          stop                     0x0000000000001EF9
-          ff                       0x0000000000001DF9
-          folder                   0x00000000000040F9
-          atvdtv                   0x00000000000006F9
-          dvhs                     0x00000000000041F9
-          menu                     0x00000000000008F9
-          aspect                   0x00000000000007F9
-          zoom                     0x00000000000004F9
-          epg                      0x0000000000000BF9
-          mute                     0x0000000000000DF9
-          back                     0x0000000000000EF9
-          hd                       0x0000000000000FF9
-          red                      0x00000000000005F9
-          green                    0x00000000000009F9
-          yellow                   0x00000000000042F9
-          blue                     0x00000000000043F9
-      end codes
-
-end remote
-
-#
-# this config file was automatically generated
-# using lirc-0.7.0(dvico) on Sat Jun 18 00:56:01 2005
-#
-# contributed by anonymous
-#
-# brand:                       DVICO
-# model no. of remote control: MCE Remote
-#
-
-begin remote
-
-  name           DVICO_MCE
-  bits           32
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  pre_data_bits   8
-  pre_data       0x0
-  post_data_bits  8
-  post_data      0x0
-  gap          195956
-  toggle_bit      0
-
-
-      begin codes
-          ok                       0x0000000000FE5E00
-          dtv                      0x0000000000FE0200
-          mp3                      0x0000000000FE0E00
-          dvd                      0x0000000000FE1A00
-          cpf                      0x0000000000FE1E00
-          setup                    0x0000000000FE1600
-          tv_onoff                 0x0000000000FE4600
-          guide                    0x0000000000FE0A00
-          back                     0x0000000000FE4900
-          more                     0x0000000000FE5900
-          dvd_menu                 0x0000000000FE4D00
-          alt_tab                  0x0000000000FE5500
-          replay                   0x0000000000FE0F00
-          skip                     0x0000000000FE1200
-          up                       0x0000000000FE5100
-          down                     0x0000000000FE5300
-          left                     0x0000000000FE5B00
-          right                    0x0000000000FE5F00
-          start                    0x0000000000FE4200
-          vol_up                   0x0000000000FE1500
-          vol_down                 0x0000000000FE0500
-          ch_up                    0x0000000000FE1100
-          ch_down                  0x0000000000FE0900
-          snapshot                 0x0000000000FE5200
-          live                     0x0000000000FE5A00
-          folder_open              0x0000000000FE1900
-          1                        0x0000000000FE0B00
-          2                        0x0000000000FE1700
-          3                        0x0000000000FE1B00
-          4                        0x0000000000FE0700
-          5                        0x0000000000FE5000
-          6                        0x0000000000FE5400
-          7                        0x0000000000FE4800
-          8                        0x0000000000FE4C00
-          9                        0x0000000000FE5800
-          0                        0x0000000000FE0300
-          aspect                   0x0000000000FE1300
-          fullscreen               0x0000000000FE1F00
-          rewind                   0x0000000000FE4300
-          playpause                0x0000000000FE4700
-          fastforward              0x0000000000FE4F00
-          stop                     0x0000000000FE0D00
-          mute                     0x0000000000FE5700
-          record                   0x0000000000FE0100
-	  white_onoff              0x0000000000FE4E00
-      end codes
-
-end remote
-
-
-#
-# this config file was automatically generated
-# using lirc-0.7.3-CVS(dvico) on Thu Sep  1 21:36:06 2005
-#
-# contributed by: David Bussenschutt <buzz|oska.com>
-#
-# brand:     "DViCO"   
-# model no. of remote control:  "Fusion Remote MCE"     
-# devices being controlled by this remote: My MythTV install
-#
-
-begin remote
-
-  name  DVICO_MCE
-  bits            8
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  pre_data_bits   48
-  pre_data       0x100460000
-  post_data_bits  8
-  post_data      0xFE
-  gap          195843
-  toggle_bit      0
-
-
-      begin codes
-          ok                       0x5e
-          up                       0x51
-          down                     0x53
-          left                     0x5B
-          right                    0x5F
-          setup                    0x16
-          tv_onoff                 0x46
-          guide                    0x0A
-          dtv                      0x02
-          mp3                      0x0E
-          dvd                      0x1A
-          cpf                      0x1E
-          back                     0x49
-          more                     0x59
-          dvd_menu                 0x4D
-          alt_tab                  0x55
-          replay                   0x0F
-          skip                     0x12
-          start                    0x42
-          vol_up                   0x15
-          vol_down                 0x05
-          ch_up                    0x11
-          ch_down                  0x09
-          photo                    0x52
-          live                     0x5A
-          folder                   0x19
-          1                        0x0B
-          2                        0x17
-          3                        0x1B
-          4                        0x07
-          5                        0x50
-          6                        0x54
-          7                        0x48
-          8                        0x4C
-          9                        0x58
-          0                        0x03
-          ratio                    0x13
-          zoom                     0x1F
-          rew                      0x43
-          playpause                0x47
-          ff                       0x4F
-          mute                     0x57
-          stop                     0x0D
-          rec                      0x01
-          power_onoff              0x4e
-          phantom1                 0x7b
-          phantom2                 0x6b
-          phantom3                 0x77
-          phantom4                 0x4b
-          phantom5                 0x3b
-      end codes
-
-end remote
-
-
diff --git a/abs/core/system-templates/templates/remotes/other/dvico/lircrc.txt b/abs/core/system-templates/templates/remotes/other/dvico/lircrc.txt
deleted file mode 100644
index 283ac05..0000000
--- a/abs/core/system-templates/templates/remotes/other/dvico/lircrc.txt
+++ /dev/null
@@ -1,883 +0,0 @@
-# ~/.mythtv/lircrc
-#
-# MythTV native LIRC config file for
-# the Fustion
-#
-
-begin
-  #Jumppoint for DVD playback created in Mythweb
-  prog = mythtv
-  button = dvd
-  config = @
-end
-
-begin
-  #Jumppoint for MythWeater created in Mythweb
-  prog = mythtv
-  button = start
-  config = #
-end
-
-begin
-  #Jumppoint for MythVideo created in Mythweb
-  prog = mythtv
-  button = cpf
-  config = $
-end
-
-begin
-  prog = mythtv
-  #Jumppoint for LiveTV created in Mythweb
-  button = dtv
-  config = ^
-end
-
-begin
-  prog = mythtv
-  #Jumppoint for Music created in Mythweb
-  button = mp3
-  config = F8
-end
-
-begin
-  prog = mythtv
-  button = 1
-  config = 1
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 2
-  config = 2
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 3
-  config = 3
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 4
-  config = 4
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 5
-  config = 5
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 6
-  config = 6
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 7
-  config = 7
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 8
-  config = 8
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 9
-  config = 9
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = 0
-  config = 0
-  repeat = 5
-end
-
-begin
-  prog = mythtv
-  button = camera
-  config = A
-end
-
-begin
-  prog = mythtv
-  button = up
-  config = Up
-end
-
-begin
-  prog = mythtv
-  button = chup
-  config = Up
-  repeat = 2
-end
-
-begin
-  prog = mythtv
-  button = down
-  config = Down
-end
-
-begin
-  prog = mythtv
-  button = chdown
-  config = Down
-  repeat = 2
-end
-
-begin
-  prog = mythtv
-  button = left
-  config = Left
-end
-
-begin
-  prog = mythtv
-  button = voldown
-  config = Left
-  repeat = 2
-end
-
-begin
-  prog = mythtv
-  button = right
-  config = Right
-end
-
-begin
-  prog = mythtv
-  button = volup
-  config = Right
-  repeat = 2
-end
-
-begin
-  prog = mythtv
-  button = replay
-  config = Left
-end
-
-begin
-  prog = mythtv
-  button = skip
-  config = Right
-end
-
-begin
-  prog = mythtv
-  button = back
-  config = Esc
-end
-
-# Enter button
-begin
-  prog = mythtv
-  button = ok
-  config = Return
-end
-
-begin
-  prog = mythtv
-  button = playpause
-  config = Return
-end
-
-begin
-  prog = mythtv
-  button = tv_onoff
-  config = Esc
-end
-
-begin
-  prog = mythtv
-  button = power
-  config = Esc
-end
-
-begin
-  prog = mythtv
-  button = ch_up
-  config = Up
-end
-
-begin
-  prog = mythtv
-  button = ch_down
-  config = Down
-end
-
-begin
-  prog = mythtv
-  button = vol_down
-  repeat = 3
-  config = F10
-end
-
-begin
-  prog = mythtv
-  button = yellow
-  repeat = 3
-  config = F10
-end
-
-begin
-  prog = mythtv
-  button = vol_up
-  repeat = 3
-  config = F11
-end
-
-begin
-  prog = mythtv
-  button = blue
-  repeat = 3
-  config = F11
-end
-
-begin
-  prog = mythtv
-  button = more
-  config = I
-end
-
-begin
-  prog = mythtv
-  button = green
-  config = I
-end
-
-begin
-  prog = mythtv
-  button = red
-  config = D
-end
-
-begin
-  prog = mythtv
-  button = ff
-  config = >
-  repeat = 2
-end
-
-begin
-  prog = mythtv
-  button = rew
-  config = <
-  repeat = 2
-end
-
-begin
-  prog = mythtv
-  button = power_onoff
-  config = Y
-end
-
-begin
-  prog = mythtv
-  button = live
-  config = C
-end
-
-########### Start Of TV #############
-
-#Jumppoint for Program Guide created in Mythweb
-begin
-  prog = mythtv
-  button = guide
-  config = S
-end
-
-begin
-  prog = mythtv
-  button = epg
-  config = S
-end
-
-begin
-  prog = mythtv
-  button = dvd_menu
-  config = M
-end
-
-begin
-  prog = mythtv
-  button = menu
-  config = M
-end
-
-begin
-  prog = mythtv
-  button = ratio
-  config = W
-end
-
-begin
-  prog = mythtv
-  button = rec
-  config = R
-end
-
-begin
-  prog = mythtv
-  button = record
-  config = R
-end
-
-begin
-  prog = mythtv
-  button = alt_tab
-  # Use for forward commercial skip
-  config = Z
-end
-
-begin
-  prog = mythtv
-  button = folder
-  # Use for Teletext
-  config = T
-end
-
-########### Start Of Music #############
-
-begin
-  # Mute for MythMusic
-  prog = mythtv
-  button = mute
-  config = |
-end
-
-begin
-  prog = mythtv
-  button = DVD_ROOTMENU
-  config = M
-end
-
-begin
-  prog = mythtv
-  # Enter button
-  button = SETUP
-  config = Return
-end
-
-begin
-  prog = mythtv
-  button = A
-  config = S
-end
-
-begin
-  prog = mythtv
-  button = B
-  config = I
-end
-
-begin
-  prog = mythtv
-  button = C
-  config = T
-end
-
-begin
-  prog = mythtv
-  # Change focus for PiP (to change channel in the other window)
-  button = MAXAMIZE
-  config = B
-end
-
-begin
-  prog = mythtv
-  # Toggle PiP on/off
-  button = TV_ON_DEMAND
-  config = V
-end
-
-begin
-  prog = mythtv
-  button = BACK
-  config = <
-end
-
-begin
-  prog = mythtv
-  button = NEXT
-  config = >
-end
-
-begin
-  prog = mythtv
-  button = BACK
-  config = Left
-end
-
-
-begin
-  prog = mythtv
-  button = NEXT
-  config = Right
-end
-
-begin
-  prog = mythtv
-  button = RECCORD
-  config = R
-end
-
-begin
-  prog = mythtv
-  button = STOP
-  config = P
-end
-
-begin
-  prog = mythtv
-  button = PLAY
-  config = P
-end
-
-begin
-  prog = mythtv
-  button = PAUSE
-  config = P
-end
-
-#Page Up/Down
-begin
-  prog = mythtv
-  button = E
-  config = PgUp
-end
-
-begin
-  prog = mythtv
-  button = F
-  config = PgDown
-end
-
-begin
-  prog = mythtv
-  button = E
-  # Use for backwards commercial skip
-  config = Q
-end
-
-begin
-  prog = mythtv
-  button = F
-  # Use for forward commercial skip
-  config = Z
-end
-
-#Mplayer
-
-begin
-  prog = mplayer
-  button = PLAY
-  config = pause
-end
-
-begin
-  prog = mplayer
-  button = PAUSE
-  config = pause
-end
-
-begin
-  prog = mplayer
-  button = STOP
-  config = pause
-end
-
-begin
-  prog = mplayer
-  button = POWER
-  config = quit
-end
-
-begin
-  prog = mplayer
-  button = D
-  config = quit
-end
-
-begin
-  prog = mplayer
-  button = MOUSE_RIGHT_BTN
-  config = quit
-end
-
-begin
-  prog = mplayer
-  button = MUTE
-  config = mute
-end
-
-begin
-  prog = mplayer
-  button = E
-  repeat = 6
-  config = seek -10
-end
-
-begin
-  prog = mplayer
-  button = F
-  repeat = 6
-  config = seek 10
-end
-
-begin
-  prog = mplayer
-  button = Left
-  repeat = 6
-  config = seek -70
-end
-
-begin
-  prog = mplayer
-  button = chup
-  repeat = 6
-  config = seek -70
-end
-
-begin
-  prog = mplayer
-  button = Right
-  repeat = 6
-  config = seek 70
-end
-
-begin
-  prog = mplayer
-  button = chdown
-  repeat = 6
-  config = seek 70
-end
-
-begin
-  prog = mplayer
-  button = ch_up
-  config = seek 10
-end
-
-begin
-  prog = mplayer
-  button = volup
-  config = seek 10
-end
-
-begin
-  prog = mplayer
-  button = ch_down
-  config = seek -10
-end
-
-begin
-  prog = mplayer
-  button = voldown
-  config = seek -10
-end
-
-begin
-  prog = mplayer
-  button = vol_down
-  repeat = 6
-  config = volume -1
-end
-
-begin
-  prog = mplayer
-  button = yellow
-  repeat = 6
-  config = volume -1
-end
-
-begin
-  prog = mplayer
-  button = vol_up
-  repeat = 6
-  config = volume 1
-end
-
-begin
-  prog = mplayer
-  button = blue
-  repeat = 6
-  config = volume 1
-end
-
-begin
-  prog = mplayer
-  button = 1
-  config = 1
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 2
-  config = 2
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 3
-  config = 3
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 4
-  config = 4
-  repeat = 5
-end
-
-
-begin
-  prog = mplayer
-  button = 5
-  config = 5
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 6
-  config = 6
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 7
-  config = 7
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 8
-  config = 8
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 9
-  config = 9
-  repeat = 5
-end
-
-begin
-  prog = mplayer
-  button = 0
-  config = 0
-  repeat = 5
-end
-
-
-#Xine
-
-begin
-  prog = xine
-  button = PLAY
-  config = Play
-end
-
-begin
-  prog = xine
-  button = PAUSE
-  config = PAUSE
-end
-
-begin
-  prog = xine
-  button = STOP
-  config = Stop
-end
-
-begin
-  prog = xine
-  button = POWER
-  config = Quit
-end
-
-begin
-  prog = xine
-  button = D
-  config = quit
-end
-
-begin
-  prog = xine
-  button = MOUSE_RIGHT_BTN
-  config = quit
-end
-
-begin
-  prog = xine
-  button = ARROW_UP
-  repeat = 4
-  config = EventUp
-end
-
-begin
-  prog = xine
-  button = ARROW_DOWN
-  repeat = 4
-  config = EventDown
-end
-
-begin
-  prog = xine
-  button = ARROW_LEFT
-  repeat = 4
-  config = EventLeft
-end
-
-begin
-  prog = xine
-  button = ARROW_RIGHT
-  repeat = 4
-  config = EventRight
-end
-
-begin
-  prog = xine
-  button = OK
-  repeat = 0
-  config = EventSelect
-end
-
-begin
-  prog = xine
-  button = MOUSE_UP
-  repeat = 4
-  config = EventUp
-end
-
-begin
-  prog = xine
-  button = MOUSE_DOWN
-  repeat = 4
-  config = EventDown
-end
-
-begin
-  prog = xine
-  button = MOUSE_LEFT
-  repeat = 4
-  config = EventLeft
-end
-
-begin
-  prog = xine
-  button = MOUSE_RIGHT
-  repeat = 4
-  config = EventRight
-end
-
-begin
-  prog = xine
-  button = MOUSE_LEFT_BTN
-  repeat = 0
-  config = EventSelect
-end
-
-begin
-  prog = xine
-  button = DVD_ROOTMENU
-  repeat = 0
-  config = Menu
-end
-
-#vol down
-begin
-  prog = xine
-  button = VOL_DOWN
-  repeat = 1
-  config = Volume-
-end
-
-begin
-  prog = xine
-  button = yellow
-  repeat = 1
-  config = Volume-
-end
-
-#vol up
-begin
-  prog = xine
-  button = VOL_UP
-  repeat = 1
-  config = Volume+
-end
-
-begin
-  prog = xine
-  button = blue
-  repeat = 1
-  config = Volume+
-end
-
-begin
-  prog = xine
-  button = TV_ON_DEMAND
-  repeat = 1
-  config = ZoomIn
-end
-
-begin
-  prog = xine
-  button = MAXAMIZE
-  repeat = 1
-  config = ZoomOut
-end
-
-#skip chapter forward
-begin
-  prog = xine
-  button = NEXT
-  repeat = 1
-  config = EventNext
-end
-
-#skip chapter backward
-begin
-  prog = xine
-  button = BACK
-  repeat = 1
-  config = EventPrior
-end
-
-begin
-  prog = xine
-  button = F
-  repeat = 2
-  config = SeekRelative+45
-end
-
-begin
-  prog = xine
-  button = E
-  repeat = 2
-  config = SeekRelative-45
-end
diff --git a/abs/core/system-templates/templates/remotes/other/dvico/preview.jpg b/abs/core/system-templates/templates/remotes/other/dvico/preview.jpg
deleted file mode 100644
index 1ec179d..0000000
Binary files a/abs/core/system-templates/templates/remotes/other/dvico/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/other/dvico/remote.run b/abs/core/system-templates/templates/remotes/other/dvico/remote.run
deleted file mode 100644
index 7721acd..0000000
--- a/abs/core/system-templates/templates/remotes/other/dvico/remote.run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/usr/sbin/lircd -r -n -d /dev/remotes/dvicoIR --driver=dvico  --output /var/run/lirc/lircd
diff --git a/abs/core/system-templates/templates/remotes/other/no_remote/preview.jpg b/abs/core/system-templates/templates/remotes/other/no_remote/preview.jpg
deleted file mode 100644
index 1d887dd..0000000
Binary files a/abs/core/system-templates/templates/remotes/other/no_remote/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/other/unknown/preview.jpg b/abs/core/system-templates/templates/remotes/other/unknown/preview.jpg
deleted file mode 100644
index a034186..0000000
Binary files a/abs/core/system-templates/templates/remotes/other/unknown/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/receiver_usb.id b/abs/core/system-templates/templates/remotes/receiver_usb.id
index 8c54402..c47094e 100644
--- a/abs/core/system-templates/templates/remotes/receiver_usb.id
+++ b/abs/core/system-templates/templates/remotes/receiver_usb.id
@@ -1,34 +1,34 @@
-0bc7:0005|snapstream_firefly|    "X10 Wireless Technology, Inc."
-0bc7:0008|SnapStream_Firefly|    "SnapStream Firefly"
-0bc7:0004|ATI_Remote_Wonder|    " ATI Remote Wonder"
-0e9c:0000|streamzap|    "Streamzap Remote"
-0fe9:9010|dvico|   "DVICO Remote:"
-0fe9:db98|Dvico-Dual-Digital4-rev2| "Dvico Dual Digital4 rev2 0fe9/db98"
-6253:0100|Twinhan_USB|  "the VisionPlus is a Twinhan clone "
-1509:9242|mceusb|  "FIC eHome Infrared Transceiver 1509/9242"
-1934:0602|mceusb|  "Fintek eHome Infrared Transceiver 1934/0602"
-147a:e015|mceusb|  "Formosa eHome Infrared Transceiver 147a/e015"
-147a:e017|mceusb|  "Formosa aim / Trust MCE Infrared Receiver147a/e017"
-147a:e018|mceusb|  "Formosa Industrial Computing 147a/e018"
-107b:3009|mceusb|  "Gateway eHome Infrared Transceiver 107b/3009"
-195d:7002|mceusb|  "Itron ione Libra Q-11 195d/7002"
-043e:9803|mceusb|  "LG eHome Infrared Transceiver 043e/9803"
-045e:00a0|mceusb|  "Microsoft MCE Infrared Transceiver 045e/00a0"
-03ee:2501|mceusb|  "Mitsumi 03ee/2501"
-0471:060c|mceusb|  "Philips Infrared Transciever - HP branded 0471/060C"
-0471:060d|mceusb|  "Philips SRM5100 0471/060d"
-0471:0815|mceusb|  "Philips eHome Infrared Transciever 0471/0815"
-2304:0225|mceusb| "Pinnacle Systems, Inc. 2304/0225"
-179d:0010|mceusb|  "Ricavision internal Infrared Transceiver 179d/0010"
-1308:c001|mceusb|  "Shuttle eHome Infrared Transceiver 1308/c001"
-051c:c001|mceusb|  "Shuttle2 eHome Infrared Transceiver 051c/c001"
-0609:031d|mceusb|  "SMK/Toshiba G83C0004D410 0609/031d"
-0609:0322|mceusb|  "SMK eHome Infrared Transceiver (Sony VAIO)0609/0322"
-0609:0334|mceusb|  "SKM bundled with Hauppauge PVR-150 0609/0334"
-1460:9150|mceusb|  "Tatung eHome Infrared Transceiver 1460/9150"
-1784:0001|mceusb|  "Topseed eHome Infrared Transceiver 1784/0001"
-1784:0006|mceusb|  "Topseed HP eHome Infrared Transceiver 1784/0006"
-1784:0007|mceusb|  "Topseed HP eHome Infrared Transceiver 1784/0007"
-1784:0008|mceusb|  "Topseed eHome Infrared Transceiver 1784/0008"
-045e:006d|mceusb-old|  "USB Microsoft IR Transceiver Driver 045e/006d"
-0019:00b4|Jetway|  "Nuvoton w836x7hg Infrared Remote Transceiver"
+0bc7:0005|snapstream_firefly|    "X10 Wireless Technology, Inc."|ATI
+0bc7:0008|SnapStream_Firefly|    "SnapStream Firefly"|ATI
+0bc7:0004|ATI_Remote_Wonder|    " ATI Remote Wonder"|ATI
+0e9c:0000|streamzap|"Streamzap Remote"|favorites
+0fe9:9010|dvico|   "DVICO Remote:"|favorites
+0fe9:db98|Dvico-Dual-Digital4-rev2| "Dvico Dual Digital4 rev2 0fe9/db98"|other
+6253:0100|Twinhan_USB|  "the VisionPlus is a Twinhan clone "|other
+1509:9242|mce|  "FIC eHome Infrared Transceiver 1509/9242"|favorites
+1934:0602|mce|  "Fintek eHome Infrared Transceiver 1934/0602"|favorites
+147a:e015|mce|  "Formosa eHome Infrared Transceiver 147a/e015"|favorites
+147a:e017|mce|  "Formosa aim / Trust MCE Infrared Receiver147a/e017"|favorites
+147a:e018|mce|  "Formosa Industrial Computing 147a/e018"|favorites
+107b:3009|mce|  "Gateway eHome Infrared Transceiver 107b/3009"|favorites
+195d:7002|mce|  "Itron ione Libra Q-11 195d/7002"|favorites
+043e:9803|mce|  "LG eHome Infrared Transceiver 043e/9803|favorites"
+045e:00a0|mce|  "Microsoft MCE Infrared Transceiver 045e/00a0"|favorites
+03ee:2501|mce|  "Mitsumi 03ee/2501"|favorites
+0471:060c|mce|  "Philips Infrared Transciever - HP branded 0471/060C"|favorites
+0471:060d|mce|  "Philips SRM5100 0471/060d"|favorites
+0471:0815|mce|  "Philips eHome Infrared Transciever 0471/0815"|favorites
+2304:0225|mce| "Pinnacle Systems, Inc. 2304/0225"|favorites
+179d:0010|mce|  "Ricavision internal Infrared Transceiver 179d/0010"|favorites
+1308:c001|mce|  "Shuttle eHome Infrared Transceiver 1308/c001"|favorites
+051c:c001|mce|  "Shuttle2 eHome Infrared Transceiver 051c/c001"|favorites
+0609:031d|mce|  "SMK/Toshiba G83C0004D410 0609/031d"|favorites
+0609:0322|mce|  "SMK eHome Infrared Transceiver (Sony VAIO)0609/0322"|favorites
+0609:0334|mce|  "SKM bundled with Hauppauge PVR-150 0609/0334"|favorites
+1460:9150|mce|  "Tatung eHome Infrared Transceiver 1460/9150"|favorites
+1784:0001|mce|  "Topseed eHome Infrared Transceiver 1784/0001"|favorites
+1784:0006|mce|  "Topseed HP eHome Infrared Transceiver 1784/0006"|favorites
+1784:0007|mce|  "Topseed HP eHome Infrared Transceiver 1784/0007"|favorites
+1784:0008|mce|  "Topseed eHome Infrared Transceiver 1784/0008"|favorites
+045e:006d|mce-old|  "USB Microsoft IR Transceiver Driver 045e/006d"|favorites
+0019:00b4|Jetway|  "Nuvoton w836x7hg Infrared Remote Transceiver"|other
-- 
cgit v0.12

