146 files changed, 763 insertions, 48 deletions

diff --git a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder/lircd.conf b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircd.conf
index 087b9ad..087b9ad 100644
--- a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder/lircd.conf
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircd.conf
diff --git a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder/lircrc b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircrc
index 01519a8..01519a8 100644
--- a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder/lircrc
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/lircrc
diff --git a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/preview.jpg
index 351a111..351a111 100644
--- a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/lircd.conf b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircd.conf
index 6b1172a..6b1172a 100644
--- a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/lircd.conf
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircd.conf
diff --git a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/lircrc b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircrc
index 85365c4..85365c4 100644
--- a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/lircrc
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/lircrc
diff --git a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/preview.jpg
index 36612e5..36612e5 100644
--- a/abs/core/system-templates/templates/remotes/ATI_Remote_Wonder_Plus/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/ATI/ATI_Remote_Wonder_Plus/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/snapstream_firefly/lircd.snapstrm.conf b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
index 288bb51..288bb51 100644
--- a/abs/core/system-templates/templates/remotes/snapstream_firefly/lircd.snapstrm.conf
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
diff --git a/abs/core/system-templates/templates/remotes/snapstream_firefly/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
index e918011..e918011 100644
--- a/abs/core/system-templates/templates/remotes/snapstream_firefly/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
diff --git a/abs/core/system-templates/templates/remotes/snapstream_firefly/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg
index a1fbc6e..a1fbc6e 100644
--- a/abs/core/system-templates/templates/remotes/snapstream_firefly/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Leadtek_PVR/preview.jpg b/abs/core/system-templates/templates/remotes/Leadtek_PVR/preview.jpg
deleted file mode 100644
index a034186..0000000
--- a/abs/core/system-templates/templates/remotes/Leadtek_PVR/preview.jpg
+++ /dev/null
diff --git a/abs/core/system-templates/templates/remotes/MX-500-jams/lircd.conf.MX-500-JAMS b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircd.conf.MX-500-JAMS
index b76d32c..b76d32c 100644
--- a/abs/core/system-templates/templates/remotes/MX-500-jams/lircd.conf.MX-500-JAMS
+++ b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircd.conf.MX-500-JAMS
diff --git a/abs/core/system-templates/templates/remotes/streamzap/lircrc b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircrc
index 5e668b5..5e668b5 100755..100644
--- a/abs/core/system-templates/templates/remotes/streamzap/lircrc
+++ b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/lircrc
diff --git a/abs/core/system-templates/templates/remotes/MX-500-jams/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/preview.jpg
index 38857f9..38857f9 100644
--- a/abs/core/system-templates/templates/remotes/MX-500-jams/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/favorites/MX-500-jams/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/dvico/lircd.conf.fusionHDTV b/abs/core/system-templates/templates/remotes/favorites/dvico/lircd.conf.fusionHDTV
index 7f03ba1..7f03ba1 100644
--- a/abs/core/system-templates/templates/remotes/dvico/lircd.conf.fusionHDTV
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/lircd.conf.fusionHDTV
diff --git a/abs/core/system-templates/templates/remotes/dvico/lircrc.txt b/abs/core/system-templates/templates/remotes/favorites/dvico/lircrc.txt
index 283ac05..283ac05 100644
--- a/abs/core/system-templates/templates/remotes/dvico/lircrc.txt
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/lircrc.txt
diff --git a/abs/core/system-templates/templates/remotes/dvico/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/dvico/preview.jpg
index 1ec179d..1ec179d 100644
--- a/abs/core/system-templates/templates/remotes/dvico/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/dvico/remote.run b/abs/core/system-templates/templates/remotes/favorites/dvico/remote.run
index 7721acd..7721acd 100644
--- a/abs/core/system-templates/templates/remotes/dvico/remote.run
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/remote.run
diff --git a/abs/core/system-templates/templates/remotes/mceusb/lircd.conf.mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/lircd.conf.mceusb
index b1c26b6..b1c26b6 100644
--- a/abs/core/system-templates/templates/remotes/mceusb/lircd.conf.mceusb
+++ b/abs/core/system-templates/templates/remotes/favorites/mce/lircd.conf.mceusb
diff --git a/abs/core/system-templates/templates/remotes/mceusb/lircrc-mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/lircrc-mceusb
index a6a8c48..a6a8c48 100644
--- a/abs/core/system-templates/templates/remotes/mceusb/lircrc-mceusb
+++ b/abs/core/system-templates/templates/remotes/favorites/mce/lircrc-mceusb
diff --git a/abs/core/system-templates/templates/remotes/mceusb/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/mce/preview.jpg
index 0aa6a4a..0aa6a4a 100644
--- a/abs/core/system-templates/templates/remotes/mceusb/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/favorites/mce/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/no_remote/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/no_remote/preview.jpg
index 1d887dd..1d887dd 100644
--- a/abs/core/system-templates/templates/remotes/no_remote/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/favorites/no_remote/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/streamzap/lircd.conf.streamzap b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap
index 36b52fa..36b52fa 100644
--- a/abs/core/system-templates/templates/remotes/streamzap/lircd.conf.streamzap
+++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircd.conf.streamzap
diff --git a/abs/core/system-templates/templates/remotes/MX-500-jams/lircrc b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc
index 5e668b5..5e668b5 100644..100755
--- a/abs/core/system-templates/templates/remotes/MX-500-jams/lircrc
+++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/lircrc
diff --git a/abs/core/system-templates/templates/remotes/streamzap/preview.jpg b/abs/core/system-templates/templates/remotes/favorites/streamzap/preview.jpg
index 4d1a5fe..4d1a5fe 100644
--- a/abs/core/system-templates/templates/remotes/streamzap/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-black/lircd-haupblack.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircd-haupblack.conf
index 1733bc1..1733bc1 100755
--- a/abs/core/system-templates/templates/remotes/hauppauge-black/lircd-haupblack.conf
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircd-haupblack.conf
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-black/lircrc-haupblack.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircrc-haupblack.conf
index 312208b..312208b 100755
--- a/abs/core/system-templates/templates/remotes/hauppauge-black/lircrc-haupblack.conf
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/lircrc-haupblack.conf
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-black/preview.jpg b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/preview.jpg
index 94ffddf..94ffddf 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-black/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-black/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-blaster/lircd.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/lircd.conf
index 76e74a1..76e74a1 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-blaster/lircd.conf
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/lircd.conf
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-blaster/lircrc-haupgrey-g3.txt b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/lircrc-haupgrey-g3.txt
index f12e4eb..f12e4eb 100755
--- a/abs/core/system-templates/templates/remotes/hauppauge-blaster/lircrc-haupgrey-g3.txt
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/lircrc-haupgrey-g3.txt
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-silver/preview.jpg b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/preview.jpg
index a40a1e8..a40a1e8 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-silver/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-blaster/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-grey-alt/lircd-haupgrey-alt.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey-alt/lircd-haupgrey-alt.conf
index c0849ef..c0849ef 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-grey-alt/lircd-haupgrey-alt.conf
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey-alt/lircd-haupgrey-alt.conf
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-grey-alt/lircrc-haupgrey-alt b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey-alt/lircrc-haupgrey-alt
index f86246a..f86246a 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-grey-alt/lircrc-haupgrey-alt
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey-alt/lircrc-haupgrey-alt
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-grey/preview.jpg b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey-alt/preview.jpg
index 19acba3..19acba3 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-grey/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey-alt/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-grey/lircd-haupgrey.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey/lircd-haupgrey.conf
index c0849ef..c0849ef 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-grey/lircd-haupgrey.conf
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey/lircd-haupgrey.conf
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-grey/lircrc-haupgrey.txt b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey/lircrc-haupgrey.txt
index 2f1e514..2f1e514 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-grey/lircrc-haupgrey.txt
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey/lircrc-haupgrey.txt
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-grey-alt/preview.jpg b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey/preview.jpg
index 19acba3..19acba3 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-grey-alt/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-grey/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey-g3.conf b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-silver/lircd-haupgrey-g3.conf
index 7269fc2..7269fc2 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-silver/lircd-haupgrey-g3.conf
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-silver/lircd-haupgrey-g3.conf
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey-g3.txt b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-silver/lircrc-haupgrey-g3.txt
index 3868261..3868261 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-silver/lircrc-haupgrey-g3.txt
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-silver/lircrc-haupgrey-g3.txt
diff --git a/abs/core/system-templates/templates/remotes/hauppauge-blaster/preview.jpg b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-silver/preview.jpg
index a40a1e8..a40a1e8 100644
--- a/abs/core/system-templates/templates/remotes/hauppauge-blaster/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/hauppauge/hauppauge-silver/preview.jpg
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/AOpen-EA65/lircd.conf.ea65 b/abs/core/system-templates/templates/remotes/other/AOpen-EA65/lircd.conf.ea65
index a10181d..a10181d 100644
--- a/abs/core/system-templates/templates/remotes/AOpen-EA65/lircd.conf.ea65
+++ b/abs/core/system-templates/templates/remotes/other/AOpen-EA65/lircd.conf.ea65
diff --git a/abs/core/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65 b/abs/core/system-templates/templates/remotes/other/AOpen-EA65/lircrc.ea65
index fd96d42..fd96d42 100644
--- a/abs/core/system-templates/templates/remotes/AOpen-EA65/lircrc.ea65
+++ b/abs/core/system-templates/templates/remotes/other/AOpen-EA65/lircrc.ea65
diff --git a/abs/core/system-templates/templates/remotes/AOpen-EA65/preview.jpg b/abs/core/system-templates/templates/remotes/other/AOpen-EA65/preview.jpg
index 2fc223c..2fc223c 100644
--- a/abs/core/system-templates/templates/remotes/AOpen-EA65/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/AOpen-EA65/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus b/abs/core/system-templates/templates/remotes/other/ASUS-DiGiMatrix/lircd.conf.asus
index ceadbf0..ceadbf0 100644
--- a/abs/core/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.asus
+++ b/abs/core/system-templates/templates/remotes/other/ASUS-DiGiMatrix/lircd.conf.asus
diff --git a/abs/core/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix b/abs/core/system-templates/templates/remotes/other/ASUS-DiGiMatrix/lircd.conf.digimatrix
index a6e9abd..a6e9abd 100644
--- a/abs/core/system-templates/templates/remotes/ASUS-DiGiMatrix/lircd.conf.digimatrix
+++ b/abs/core/system-templates/templates/remotes/other/ASUS-DiGiMatrix/lircd.conf.digimatrix
diff --git a/abs/core/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg b/abs/core/system-templates/templates/remotes/other/ASUS-DiGiMatrix/preview.jpg
index 250d6a1..250d6a1 100644
--- a/abs/core/system-templates/templates/remotes/ASUS-DiGiMatrix/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/ASUS-DiGiMatrix/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4 b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4
index 2d2b9ac..2d2b9ac 100644
--- a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4
+++ b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/lircd.conf.dvico-dual-digital4
diff --git a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4 b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4
index 7c75f01..7c75f01 100644
--- a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4
+++ b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/lircrc.dvico-dual-digital4
diff --git a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/preview.jpg
index f3956fa..f3956fa 100644
--- a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/remote.run b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/remote.run
index 1168696..1168696 100644
--- a/abs/core/system-templates/templates/remotes/Dvico-Dual-Digital4-rev2/remote.run
+++ b/abs/core/system-templates/templates/remotes/other/Dvico-Dual-Digital4-rev2/remote.run
diff --git a/abs/core/system-templates/templates/remotes/Jetway/lircd.conf b/abs/core/system-templates/templates/remotes/other/Jetway/lircd.conf
index 9a4b31b..9a4b31b 100644
--- a/abs/core/system-templates/templates/remotes/Jetway/lircd.conf
+++ b/abs/core/system-templates/templates/remotes/other/Jetway/lircd.conf
diff --git a/abs/core/system-templates/templates/remotes/Jetway/lircrc b/abs/core/system-templates/templates/remotes/other/Jetway/lircrc
index b96f907..b96f907 100644
--- a/abs/core/system-templates/templates/remotes/Jetway/lircrc
+++ b/abs/core/system-templates/templates/remotes/other/Jetway/lircrc
diff --git a/abs/core/system-templates/templates/remotes/Jetway/preview.jpg b/abs/core/system-templates/templates/remotes/other/Jetway/preview.jpg
index 38f8740..38f8740 100644
--- a/abs/core/system-templates/templates/remotes/Jetway/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Jetway/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Kworld_110/lircd-kworld110.conf b/abs/core/system-templates/templates/remotes/other/Kworld_110/lircd-kworld110.conf
index eab7fa2..eab7fa2 100755
--- a/abs/core/system-templates/templates/remotes/Kworld_110/lircd-kworld110.conf
+++ b/abs/core/system-templates/templates/remotes/other/Kworld_110/lircd-kworld110.conf
diff --git a/abs/core/system-templates/templates/remotes/Kworld_110/lircrc-kworld110.txt b/abs/core/system-templates/templates/remotes/other/Kworld_110/lircrc-kworld110.txt
index 7447a46..7447a46 100755
--- a/abs/core/system-templates/templates/remotes/Kworld_110/lircrc-kworld110.txt
+++ b/abs/core/system-templates/templates/remotes/other/Kworld_110/lircrc-kworld110.txt
diff --git a/abs/core/system-templates/templates/remotes/Kworld_110/preview.jpg b/abs/core/system-templates/templates/remotes/other/Kworld_110/preview.jpg
index f83f474..f83f474 100644
--- a/abs/core/system-templates/templates/remotes/Kworld_110/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Kworld_110/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Kworld_310/lircd-kworld310.conf b/abs/core/system-templates/templates/remotes/other/Kworld_310/lircd-kworld310.conf
index 7ee4bdd..7ee4bdd 100755
--- a/abs/core/system-templates/templates/remotes/Kworld_310/lircd-kworld310.conf
+++ b/abs/core/system-templates/templates/remotes/other/Kworld_310/lircd-kworld310.conf
diff --git a/abs/core/system-templates/templates/remotes/Kworld_310/lircrc-kworld310.txt b/abs/core/system-templates/templates/remotes/other/Kworld_310/lircrc-kworld310.txt
index 702d238..702d238 100755
--- a/abs/core/system-templates/templates/remotes/Kworld_310/lircrc-kworld310.txt
+++ b/abs/core/system-templates/templates/remotes/other/Kworld_310/lircrc-kworld310.txt
diff --git a/abs/core/system-templates/templates/remotes/Kworld_310/preview.jpg b/abs/core/system-templates/templates/remotes/other/Kworld_310/preview.jpg
index f024370..f024370 100644
--- a/abs/core/system-templates/templates/remotes/Kworld_310/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Kworld_310/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Leadtek_2000XP/lircd-leadtek2000xp.conf b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircd-leadtek2000xp.conf
index 4238a02..4238a02 100755
--- a/abs/core/system-templates/templates/remotes/Leadtek_2000XP/lircd-leadtek2000xp.conf
+++ b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircd-leadtek2000xp.conf
diff --git a/abs/core/system-templates/templates/remotes/Leadtek_2000XP/lircrc-leadtek2000xp.txt b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircrc-leadtek2000xp.txt
index f16beb3..f16beb3 100755
--- a/abs/core/system-templates/templates/remotes/Leadtek_2000XP/lircrc-leadtek2000xp.txt
+++ b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/lircrc-leadtek2000xp.txt
diff --git a/abs/core/system-templates/templates/remotes/Leadtek_2000XP/preview.jpg b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/preview.jpg
index aeecf95..aeecf95 100644
--- a/abs/core/system-templates/templates/remotes/Leadtek_2000XP/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Leadtek_2000XP/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Leadtek_PVR/lircd-leadtekPVR.conf b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircd-leadtekPVR.conf
index 460ddcf..460ddcf 100755
--- a/abs/core/system-templates/templates/remotes/Leadtek_PVR/lircd-leadtekPVR.conf
+++ b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircd-leadtekPVR.conf
diff --git a/abs/core/system-templates/templates/remotes/Leadtek_PVR/lircrc-leadtekPVR.txt b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircrc-leadtekPVR.txt
index a15ee21..a15ee21 100755
--- a/abs/core/system-templates/templates/remotes/Leadtek_PVR/lircrc-leadtekPVR.txt
+++ b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/lircrc-leadtekPVR.txt
diff --git a/abs/core/system-templates/templates/remotes/unknown/preview.jpg b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/unknown/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Leadtek_PVR/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Medion_RF/lircd-medion-rf.conf b/abs/core/system-templates/templates/remotes/other/Medion_RF/lircd-medion-rf.conf
index 8793475..8793475 100755
--- a/abs/core/system-templates/templates/remotes/Medion_RF/lircd-medion-rf.conf
+++ b/abs/core/system-templates/templates/remotes/other/Medion_RF/lircd-medion-rf.conf
diff --git a/abs/core/system-templates/templates/remotes/Medion_RF/lircrc-medion-rf.txt b/abs/core/system-templates/templates/remotes/other/Medion_RF/lircrc-medion-rf.txt
index cc69f96..cc69f96 100755
--- a/abs/core/system-templates/templates/remotes/Medion_RF/lircrc-medion-rf.txt
+++ b/abs/core/system-templates/templates/remotes/other/Medion_RF/lircrc-medion-rf.txt
diff --git a/abs/core/system-templates/templates/remotes/avermedia/preview.jpg b/abs/core/system-templates/templates/remotes/other/Medion_RF/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/avermedia/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Medion_RF/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Medion_X10_8080/lircd-medionx10-8080.conf b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircd-medionx10-8080.conf
index 68c9179..68c9179 100755
--- a/abs/core/system-templates/templates/remotes/Medion_X10_8080/lircd-medionx10-8080.conf
+++ b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircd-medionx10-8080.conf
diff --git a/abs/core/system-templates/templates/remotes/Medion_X10_8080/lircrc-medionx10-8080.txt b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircrc-medionx10-8080.txt
index 2476f76..2476f76 100755
--- a/abs/core/system-templates/templates/remotes/Medion_X10_8080/lircrc-medionx10-8080.txt
+++ b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/lircrc-medionx10-8080.txt
diff --git a/abs/core/system-templates/templates/remotes/Nvidia_X10/preview.jpg b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/Nvidia_X10/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Medion_X10_8080/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Nebula/lircd-nebula.conf b/abs/core/system-templates/templates/remotes/other/Nebula/lircd-nebula.conf
index 611c804..611c804 100755
--- a/abs/core/system-templates/templates/remotes/Nebula/lircd-nebula.conf
+++ b/abs/core/system-templates/templates/remotes/other/Nebula/lircd-nebula.conf
diff --git a/abs/core/system-templates/templates/remotes/Nebula/lircrc-nebula.txt b/abs/core/system-templates/templates/remotes/other/Nebula/lircrc-nebula.txt
index c3d70b0..c3d70b0 100755
--- a/abs/core/system-templates/templates/remotes/Nebula/lircrc-nebula.txt
+++ b/abs/core/system-templates/templates/remotes/other/Nebula/lircrc-nebula.txt
diff --git a/abs/core/system-templates/templates/remotes/Nebula/preview.jpg b/abs/core/system-templates/templates/remotes/other/Nebula/preview.jpg
index e4e979f..e4e979f 100644
--- a/abs/core/system-templates/templates/remotes/Nebula/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Nebula/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Nova_500/lircd-nova500.conf b/abs/core/system-templates/templates/remotes/other/Nova_500/lircd-nova500.conf
index c66c9e5..c66c9e5 100755
--- a/abs/core/system-templates/templates/remotes/Nova_500/lircd-nova500.conf
+++ b/abs/core/system-templates/templates/remotes/other/Nova_500/lircd-nova500.conf
diff --git a/abs/core/system-templates/templates/remotes/Nova_500/lircrc-nova500.txt b/abs/core/system-templates/templates/remotes/other/Nova_500/lircrc-nova500.txt
index 2d74c3d..2d74c3d 100755
--- a/abs/core/system-templates/templates/remotes/Nova_500/lircrc-nova500.txt
+++ b/abs/core/system-templates/templates/remotes/other/Nova_500/lircrc-nova500.txt
diff --git a/abs/core/system-templates/templates/remotes/Nvidia/preview.jpg b/abs/core/system-templates/templates/remotes/other/Nova_500/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/Nvidia/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Nova_500/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Nova_T/lircd-novat.conf b/abs/core/system-templates/templates/remotes/other/Nova_T/lircd-novat.conf
index 27a575d..27a575d 100755
--- a/abs/core/system-templates/templates/remotes/Nova_T/lircd-novat.conf
+++ b/abs/core/system-templates/templates/remotes/other/Nova_T/lircd-novat.conf
diff --git a/abs/core/system-templates/templates/remotes/Nova_T/lircrc-novat.txt b/abs/core/system-templates/templates/remotes/other/Nova_T/lircrc-novat.txt
index f075729..f075729 100755
--- a/abs/core/system-templates/templates/remotes/Nova_T/lircrc-novat.txt
+++ b/abs/core/system-templates/templates/remotes/other/Nova_T/lircrc-novat.txt
diff --git a/abs/core/system-templates/templates/remotes/Nova_T_USB2/preview.jpg b/abs/core/system-templates/templates/remotes/other/Nova_T/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/Nova_T_USB2/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Nova_T/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Nova_T_USB2/lircd-novatusb2.conf b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircd-novatusb2.conf
index d2bbee6..d2bbee6 100755
--- a/abs/core/system-templates/templates/remotes/Nova_T_USB2/lircd-novatusb2.conf
+++ b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircd-novatusb2.conf
diff --git a/abs/core/system-templates/templates/remotes/Nova_T_USB2/lircrc-novatusb2.txt b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircrc-novatusb2.txt
index fad1483..fad1483 100755
--- a/abs/core/system-templates/templates/remotes/Nova_T_USB2/lircrc-novatusb2.txt
+++ b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/lircrc-novatusb2.txt
diff --git a/abs/core/system-templates/templates/remotes/Nova_T/preview.jpg b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/Nova_T/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Nova_T_USB2/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Nvidia/lircd-nvidia.conf b/abs/core/system-templates/templates/remotes/other/Nvidia/lircd-nvidia.conf
index 133ac00..133ac00 100755
--- a/abs/core/system-templates/templates/remotes/Nvidia/lircd-nvidia.conf
+++ b/abs/core/system-templates/templates/remotes/other/Nvidia/lircd-nvidia.conf
diff --git a/abs/core/system-templates/templates/remotes/Nvidia/lircrc-nvidia.txt b/abs/core/system-templates/templates/remotes/other/Nvidia/lircrc-nvidia.txt
index 53c133b..53c133b 100755
--- a/abs/core/system-templates/templates/remotes/Nvidia/lircrc-nvidia.txt
+++ b/abs/core/system-templates/templates/remotes/other/Nvidia/lircrc-nvidia.txt
diff --git a/abs/core/system-templates/templates/remotes/Nova_500/preview.jpg b/abs/core/system-templates/templates/remotes/other/Nvidia/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/Nova_500/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Nvidia/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Nvidia_X10/lircd-nvidiax10.conf b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircd-nvidiax10.conf
index 1c06639..1c06639 100755
--- a/abs/core/system-templates/templates/remotes/Nvidia_X10/lircd-nvidiax10.conf
+++ b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircd-nvidiax10.conf
diff --git a/abs/core/system-templates/templates/remotes/Nvidia_X10/lircrc-nvidiax10.txt b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircrc-nvidiax10.txt
index 0774c10..0774c10 100755
--- a/abs/core/system-templates/templates/remotes/Nvidia_X10/lircrc-nvidiax10.txt
+++ b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/lircrc-nvidiax10.txt
diff --git a/abs/core/system-templates/templates/remotes/Medion_X10_8080/preview.jpg b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/Medion_X10_8080/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Nvidia_X10/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/One4All/lircd-one4all.conf b/abs/core/system-templates/templates/remotes/other/One4All/lircd-one4all.conf
index 00060fd..00060fd 100755
--- a/abs/core/system-templates/templates/remotes/One4All/lircd-one4all.conf
+++ b/abs/core/system-templates/templates/remotes/other/One4All/lircd-one4all.conf
diff --git a/abs/core/system-templates/templates/remotes/One4All/lircrc-one4all.txt b/abs/core/system-templates/templates/remotes/other/One4All/lircrc-one4all.txt
index 0b67174..0b67174 100755
--- a/abs/core/system-templates/templates/remotes/One4All/lircrc-one4all.txt
+++ b/abs/core/system-templates/templates/remotes/other/One4All/lircrc-one4all.txt
diff --git a/abs/core/system-templates/templates/remotes/One4All/preview.jpg b/abs/core/system-templates/templates/remotes/other/One4All/preview.jpg
index 770d54b..770d54b 100644
--- a/abs/core/system-templates/templates/remotes/One4All/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/One4All/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/One4All_6131/lircd-one4all6131.conf b/abs/core/system-templates/templates/remotes/other/One4All_6131/lircd-one4all6131.conf
index 9562f79..9562f79 100755
--- a/abs/core/system-templates/templates/remotes/One4All_6131/lircd-one4all6131.conf
+++ b/abs/core/system-templates/templates/remotes/other/One4All_6131/lircd-one4all6131.conf
diff --git a/abs/core/system-templates/templates/remotes/One4All_6131/lircrc-one4all6131.txt b/abs/core/system-templates/templates/remotes/other/One4All_6131/lircrc-one4all6131.txt
index 728c046..728c046 100755
--- a/abs/core/system-templates/templates/remotes/One4All_6131/lircrc-one4all6131.txt
+++ b/abs/core/system-templates/templates/remotes/other/One4All_6131/lircrc-one4all6131.txt
diff --git a/abs/core/system-templates/templates/remotes/One4All_6131/preview.jpg b/abs/core/system-templates/templates/remotes/other/One4All_6131/preview.jpg
index cc0751e..cc0751e 100644
--- a/abs/core/system-templates/templates/remotes/One4All_6131/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/One4All_6131/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/One4All_7544/lircd-one4all7544.conf b/abs/core/system-templates/templates/remotes/other/One4All_7544/lircd-one4all7544.conf
index c1787ef..c1787ef 100755
--- a/abs/core/system-templates/templates/remotes/One4All_7544/lircd-one4all7544.conf
+++ b/abs/core/system-templates/templates/remotes/other/One4All_7544/lircd-one4all7544.conf
diff --git a/abs/core/system-templates/templates/remotes/One4All_7544/lircrc-one4all7544.txt b/abs/core/system-templates/templates/remotes/other/One4All_7544/lircrc-one4all7544.txt
index 57e702a..57e702a 100755
--- a/abs/core/system-templates/templates/remotes/One4All_7544/lircrc-one4all7544.txt
+++ b/abs/core/system-templates/templates/remotes/other/One4All_7544/lircrc-one4all7544.txt
diff --git a/abs/core/system-templates/templates/remotes/One4All_7544/preview.jpg b/abs/core/system-templates/templates/remotes/other/One4All_7544/preview.jpg
index cb75f0b..cb75f0b 100644
--- a/abs/core/system-templates/templates/remotes/One4All_7544/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/One4All_7544/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Packard_bell/lircd-packard.conf b/abs/core/system-templates/templates/remotes/other/Packard_bell/lircd-packard.conf
index 9e0e783..9e0e783 100755
--- a/abs/core/system-templates/templates/remotes/Packard_bell/lircd-packard.conf
+++ b/abs/core/system-templates/templates/remotes/other/Packard_bell/lircd-packard.conf
diff --git a/abs/core/system-templates/templates/remotes/Packard_bell/lircrc-packard.txt b/abs/core/system-templates/templates/remotes/other/Packard_bell/lircrc-packard.txt
index 5e54f7a..5e54f7a 100755
--- a/abs/core/system-templates/templates/remotes/Packard_bell/lircrc-packard.txt
+++ b/abs/core/system-templates/templates/remotes/other/Packard_bell/lircrc-packard.txt
diff --git a/abs/core/system-templates/templates/remotes/Packard_bell/preview.jpg b/abs/core/system-templates/templates/remotes/other/Packard_bell/preview.jpg
index 76453bb..76453bb 100644
--- a/abs/core/system-templates/templates/remotes/Packard_bell/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Packard_bell/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Pinnacle/lircd-pinnacle.conf b/abs/core/system-templates/templates/remotes/other/Pinnacle/lircd-pinnacle.conf
index ebc04d9..ebc04d9 100755
--- a/abs/core/system-templates/templates/remotes/Pinnacle/lircd-pinnacle.conf
+++ b/abs/core/system-templates/templates/remotes/other/Pinnacle/lircd-pinnacle.conf
diff --git a/abs/core/system-templates/templates/remotes/Pinnacle/lircrc-pinnacle.txt b/abs/core/system-templates/templates/remotes/other/Pinnacle/lircrc-pinnacle.txt
index d3b9261..d3b9261 100755
--- a/abs/core/system-templates/templates/remotes/Pinnacle/lircrc-pinnacle.txt
+++ b/abs/core/system-templates/templates/remotes/other/Pinnacle/lircrc-pinnacle.txt
diff --git a/abs/core/system-templates/templates/remotes/Pinnacle/preview.jpg b/abs/core/system-templates/templates/remotes/other/Pinnacle/preview.jpg
index bd8e19e..bd8e19e 100644
--- a/abs/core/system-templates/templates/remotes/Pinnacle/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Pinnacle/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf b/abs/core/system-templates/templates/remotes/other/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf
index f8175f3..f8175f3 100644
--- a/abs/core/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf
+++ b/abs/core/system-templates/templates/remotes/other/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf
diff --git a/abs/core/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircrc-rs b/abs/core/system-templates/templates/remotes/other/RadioShack_15-2116-Jarod_Wilson/lircrc-rs
index 91c0de5..91c0de5 100644
--- a/abs/core/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircrc-rs
+++ b/abs/core/system-templates/templates/remotes/other/RadioShack_15-2116-Jarod_Wilson/lircrc-rs
diff --git a/abs/core/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/preview.jpg b/abs/core/system-templates/templates/remotes/other/RadioShack_15-2116-Jarod_Wilson/preview.jpg
index d465839..d465839 100644
--- a/abs/core/system-templates/templates/remotes/RadioShack_15-2116-Jarod_Wilson/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/RadioShack_15-2116-Jarod_Wilson/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Technisat/lircd-technisat.conf b/abs/core/system-templates/templates/remotes/other/Technisat/lircd-technisat.conf
index 3f0f3d4..3f0f3d4 100755
--- a/abs/core/system-templates/templates/remotes/Technisat/lircd-technisat.conf
+++ b/abs/core/system-templates/templates/remotes/other/Technisat/lircd-technisat.conf
diff --git a/abs/core/system-templates/templates/remotes/Technisat/lircrc-technisat.txt b/abs/core/system-templates/templates/remotes/other/Technisat/lircrc-technisat.txt
index 8baa6b9..8baa6b9 100755
--- a/abs/core/system-templates/templates/remotes/Technisat/lircrc-technisat.txt
+++ b/abs/core/system-templates/templates/remotes/other/Technisat/lircrc-technisat.txt
diff --git a/abs/core/system-templates/templates/remotes/Technisat/preview.jpg b/abs/core/system-templates/templates/remotes/other/Technisat/preview.jpg
index 25ecd0d..25ecd0d 100644
--- a/abs/core/system-templates/templates/remotes/Technisat/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Technisat/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/Twinhan/lircd-twinhan.conf b/abs/core/system-templates/templates/remotes/other/Twinhan/lircd-twinhan.conf
index 3fb3652..3fb3652 100755
--- a/abs/core/system-templates/templates/remotes/Twinhan/lircd-twinhan.conf
+++ b/abs/core/system-templates/templates/remotes/other/Twinhan/lircd-twinhan.conf
diff --git a/abs/core/system-templates/templates/remotes/Twinhan/lircrc-twinhan.txt b/abs/core/system-templates/templates/remotes/other/Twinhan/lircrc-twinhan.txt
index 296876c..296876c 100755
--- a/abs/core/system-templates/templates/remotes/Twinhan/lircrc-twinhan.txt
+++ b/abs/core/system-templates/templates/remotes/other/Twinhan/lircrc-twinhan.txt
diff --git a/abs/core/system-templates/templates/remotes/Twinhan/preview.jpg b/abs/core/system-templates/templates/remotes/other/Twinhan/preview.jpg
index 65345c8..65345c8 100644
--- a/abs/core/system-templates/templates/remotes/Twinhan/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/Twinhan/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/X10_Lola/lircd-x10lola.conf b/abs/core/system-templates/templates/remotes/other/X10_Lola/lircd-x10lola.conf
index 7bfad44..7bfad44 100755
--- a/abs/core/system-templates/templates/remotes/X10_Lola/lircd-x10lola.conf
+++ b/abs/core/system-templates/templates/remotes/other/X10_Lola/lircd-x10lola.conf
diff --git a/abs/core/system-templates/templates/remotes/X10_Lola/lircrc-x10lola.txt b/abs/core/system-templates/templates/remotes/other/X10_Lola/lircrc-x10lola.txt
index 5fc949e..5fc949e 100755
--- a/abs/core/system-templates/templates/remotes/X10_Lola/lircrc-x10lola.txt
+++ b/abs/core/system-templates/templates/remotes/other/X10_Lola/lircrc-x10lola.txt
diff --git a/abs/core/system-templates/templates/remotes/X10_Lola/preview.jpg b/abs/core/system-templates/templates/remotes/other/X10_Lola/preview.jpg
index 915a3b2..915a3b2 100644
--- a/abs/core/system-templates/templates/remotes/X10_Lola/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/X10_Lola/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/avermedia/lircd.conf.avermedia b/abs/core/system-templates/templates/remotes/other/avermedia/lircd.conf.avermedia
index 7091aa4..7091aa4 100644
--- a/abs/core/system-templates/templates/remotes/avermedia/lircd.conf.avermedia
+++ b/abs/core/system-templates/templates/remotes/other/avermedia/lircd.conf.avermedia
diff --git a/abs/core/system-templates/templates/remotes/avermedia/lircd.conf.avermedia98 b/abs/core/system-templates/templates/remotes/other/avermedia/lircd.conf.avermedia98
index f60ee50..f60ee50 100644
--- a/abs/core/system-templates/templates/remotes/avermedia/lircd.conf.avermedia98
+++ b/abs/core/system-templates/templates/remotes/other/avermedia/lircd.conf.avermedia98
diff --git a/abs/core/system-templates/templates/remotes/avermedia/lircd.conf.vdomate b/abs/core/system-templates/templates/remotes/other/avermedia/lircd.conf.vdomate
index 36b1c6b..36b1c6b 100644
--- a/abs/core/system-templates/templates/remotes/avermedia/lircd.conf.vdomate
+++ b/abs/core/system-templates/templates/remotes/other/avermedia/lircd.conf.vdomate
diff --git a/abs/core/system-templates/templates/remotes/avermedia/lircmd.conf.avermedia b/abs/core/system-templates/templates/remotes/other/avermedia/lircmd.conf.avermedia
index e950862..e950862 100644
--- a/abs/core/system-templates/templates/remotes/avermedia/lircmd.conf.avermedia
+++ b/abs/core/system-templates/templates/remotes/other/avermedia/lircmd.conf.avermedia
diff --git a/abs/core/system-templates/templates/remotes/avermedia/lircmd.conf.avermedia98 b/abs/core/system-templates/templates/remotes/other/avermedia/lircmd.conf.avermedia98
index 2885372..2885372 100644
--- a/abs/core/system-templates/templates/remotes/avermedia/lircmd.conf.avermedia98
+++ b/abs/core/system-templates/templates/remotes/other/avermedia/lircmd.conf.avermedia98
diff --git a/abs/core/system-templates/templates/remotes/Medion_RF/preview.jpg b/abs/core/system-templates/templates/remotes/other/avermedia/preview.jpg
index a034186..a034186 100644
--- a/abs/core/system-templates/templates/remotes/Medion_RF/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/avermedia/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/generic/DENON.conf b/abs/core/system-templates/templates/remotes/other/generic/DENON.conf
index e645cba..e645cba 100644
--- a/abs/core/system-templates/templates/remotes/generic/DENON.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/DENON.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/MOTOROLA.conf b/abs/core/system-templates/templates/remotes/other/generic/MOTOROLA.conf
index e786f2b..e786f2b 100644
--- a/abs/core/system-templates/templates/remotes/generic/MOTOROLA.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/MOTOROLA.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/NEC-pulse.conf b/abs/core/system-templates/templates/remotes/other/generic/NEC-pulse.conf
index 51c31d9..51c31d9 100644
--- a/abs/core/system-templates/templates/remotes/generic/NEC-pulse.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/NEC-pulse.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/NEC-short-pulse.conf b/abs/core/system-templates/templates/remotes/other/generic/NEC-short-pulse.conf
index 068c253..068c253 100644
--- a/abs/core/system-templates/templates/remotes/generic/NEC-short-pulse.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/NEC-short-pulse.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/NEC.conf b/abs/core/system-templates/templates/remotes/other/generic/NEC.conf
index 18ee327..18ee327 100644
--- a/abs/core/system-templates/templates/remotes/generic/NEC.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/NEC.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/RC-5.conf b/abs/core/system-templates/templates/remotes/other/generic/RC-5.conf
index f62e3f9..f62e3f9 100644
--- a/abs/core/system-templates/templates/remotes/generic/RC-5.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/RC-5.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/RC-6.conf b/abs/core/system-templates/templates/remotes/other/generic/RC-6.conf
index 9565707..9565707 100644
--- a/abs/core/system-templates/templates/remotes/generic/RC-6.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/RC-6.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/RCMM-32.conf b/abs/core/system-templates/templates/remotes/other/generic/RCMM-32.conf
index 89f847a..89f847a 100644
--- a/abs/core/system-templates/templates/remotes/generic/RCMM-32.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/RCMM-32.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/RECS80.conf b/abs/core/system-templates/templates/remotes/other/generic/RECS80.conf
index b9702ea..b9702ea 100644
--- a/abs/core/system-templates/templates/remotes/generic/RECS80.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/RECS80.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/SANYO.conf b/abs/core/system-templates/templates/remotes/other/generic/SANYO.conf
index fbcf8dc..fbcf8dc 100644
--- a/abs/core/system-templates/templates/remotes/generic/SANYO.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/SANYO.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/SONY12.conf b/abs/core/system-templates/templates/remotes/other/generic/SONY12.conf
index d62d12c..d62d12c 100644
--- a/abs/core/system-templates/templates/remotes/generic/SONY12.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/SONY12.conf
diff --git a/abs/core/system-templates/templates/remotes/generic/SONY20.conf b/abs/core/system-templates/templates/remotes/other/generic/SONY20.conf
index 4a64ca7..4a64ca7 100644
--- a/abs/core/system-templates/templates/remotes/generic/SONY20.conf
+++ b/abs/core/system-templates/templates/remotes/other/generic/SONY20.conf
diff --git a/abs/core/system-templates/templates/remotes/imon/lircd.conf.imon b/abs/core/system-templates/templates/remotes/other/imon-mce/lircd.conf.imon
index 9b97ab1..9b97ab1 100644..100755
--- a/abs/core/system-templates/templates/remotes/imon/lircd.conf.imon
+++ b/abs/core/system-templates/templates/remotes/other/imon-mce/lircd.conf.imon
diff --git a/abs/core/system-templates/templates/remotes/imon/lircrc b/abs/core/system-templates/templates/remotes/other/imon-mce/lircrc
index f16bfc3..f16bfc3 100644..100755
--- a/abs/core/system-templates/templates/remotes/imon/lircrc
+++ b/abs/core/system-templates/templates/remotes/other/imon-mce/lircrc
diff --git a/abs/core/system-templates/templates/remotes/imon-mce/preview.jpg b/abs/core/system-templates/templates/remotes/other/imon-mce/preview.jpg
index a2e46a3..a2e46a3 100644
--- a/abs/core/system-templates/templates/remotes/imon-mce/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/imon-mce/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/imon-mce/remote.run b/abs/core/system-templates/templates/remotes/other/imon-mce/remote.run
index b6052db..b6052db 100755
--- a/abs/core/system-templates/templates/remotes/imon-mce/remote.run
+++ b/abs/core/system-templates/templates/remotes/other/imon-mce/remote.run
diff --git a/abs/core/system-templates/templates/remotes/imon-mce/lircd.conf.imon b/abs/core/system-templates/templates/remotes/other/imon/lircd.conf.imon
index 9b97ab1..9b97ab1 100755..100644
--- a/abs/core/system-templates/templates/remotes/imon-mce/lircd.conf.imon
+++ b/abs/core/system-templates/templates/remotes/other/imon/lircd.conf.imon
diff --git a/abs/core/system-templates/templates/remotes/imon-mce/lircrc b/abs/core/system-templates/templates/remotes/other/imon/lircrc
index f16bfc3..f16bfc3 100755..100644
--- a/abs/core/system-templates/templates/remotes/imon-mce/lircrc
+++ b/abs/core/system-templates/templates/remotes/other/imon/lircrc
diff --git a/abs/core/system-templates/templates/remotes/imon/preview.jpg b/abs/core/system-templates/templates/remotes/other/imon/preview.jpg
index 0829118..0829118 100644
--- a/abs/core/system-templates/templates/remotes/imon/preview.jpg
+++ b/abs/core/system-templates/templates/remotes/other/imon/preview.jpg
diff --git a/abs/core/system-templates/templates/remotes/imon/remote.run b/abs/core/system-templates/templates/remotes/other/imon/remote.run
index 9d0ab2e..9d0ab2e 100755
--- a/abs/core/system-templates/templates/remotes/imon/remote.run
+++ b/abs/core/system-templates/templates/remotes/other/imon/remote.run
diff --git a/abs/core/system-templates/templates/remotes/other/snapstream_firefly/lircd.snapstrm.conf b/abs/core/system-templates/templates/remotes/other/snapstream_firefly/lircd.snapstrm.conf
new file mode 100644
index 0000000..288bb51
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/other/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/other/snapstream_firefly/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/other/snapstream_firefly/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/other/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/other/snapstream_firefly/preview.jpg b/abs/core/system-templates/templates/remotes/other/snapstream_firefly/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/other/snapstream_firefly/preview.jpg
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