166 files changed, 796 insertions, 1307 deletions

diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 25c83f2..f5314f5 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,10 +1,10 @@
 pkgname=system-templates
 pkgver=2.0
-pkgrel=13
+pkgrel=17
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
-arch=('i686')
+arch=('i686' 'x86_64')
 
 source=()
 build() {
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
diff --git a/abs/core/system-templates/templates/vnc.service b/abs/core/system-templates/templates/vnc.service
new file mode 100644
index 0000000..bea7e11
--- /dev/null
+++ b/abs/core/system-templates/templates/vnc.service
@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+  <name replace-wildcards="yes">%h</name>
+  <service>
+    <type>_rfb._tcp</type>
+    <port>5901</port>
+  </service>
+</service-group>
diff --git a/abs/core/system-templates/templates/xorg/173_supported.txt b/abs/core/system-templates/templates/xorg/173_supported.txt
deleted file mode 100644
index 95c3370..0000000
--- a/abs/core/system-templates/templates/xorg/173_supported.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-GeForce PCX 5750    0x00FA
-GeForce PCX 5900    0x00FB
-Quadro FX 330/GeForce PCX 5300  0x00FC
-Quadro FX 330/Quadro NVS 280 PCI-E  0x00FD
-Quadro FX 1300  0x00FE
-GeForce FX 5800 Ultra   0x0301
-GeForce FX 5800 0x0302
-Quadro FX 2000  0x0308
-Quadro FX 1000  0x0309
-GeForce FX 5600 Ultra   0x0311
-GeForce FX 5600 0x0312
-GeForce FX 5600XT   0x0314
-GeForce FX Go5600   0x031A
-GeForce FX Go5650   0x031B
-Quadro FX Go700 0x031C
-GeForce FX 5200 0x0320
-GeForce FX 5200 Ultra   0x0321
-GeForce FX 5200 0x0322
-GeForce FX 5200LE   0x0323
-GeForce FX Go5200   0x0324
-GeForce FX Go5250   0x0325
-GeForce FX 5500 0x0326
-GeForce FX 5100 0x0327
-GeForce FX Go5200 32M/64M   0x0328
-Quadro NVS 55/280 PCI   0x032A
-Quadro FX 500/FX 600    0x032B
-GeForce FX Go53xx   0x032C
-GeForce FX Go5100   0x032D
-GeForce FX 5900 Ultra   0x0330
-GeForce FX 5900 0x0331
-GeForce FX 5900XT   0x0332
-GeForce FX 5950 Ultra   0x0333
-GeForce FX 5900ZT   0x0334
-Quadro FX 3000  0x0338
-Quadro FX 700   0x033F
-GeForce FX 5700 Ultra   0x0341
-GeForce FX 5700 0x0342
-GeForce FX 5700LE   0x0343
-GeForce FX 5700VE   0x0344
-GeForce FX Go5700   0x0347
-GeForce FX Go5700   0x0348
-Quadro FX Go1000    0x034C
-Quadro FX 1100  0x034E
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/xorg/96xx_supported.txt b/abs/core/system-templates/templates/xorg/96xx_supported.txt
deleted file mode 100644
index f7818ce..0000000
--- a/abs/core/system-templates/templates/xorg/96xx_supported.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-GeForce2 MX/MX 400  0x0110
-GeForce2 MX 100/200 0x0111
-GeForce2 Go 0x0112
-Quadro2 MXR/EX/Go   0x0113
-GeForce4 MX 460 0x0170
-GeForce4 MX 440 0x0171
-GeForce4 MX 420 0x0172
-GeForce4 MX 440-SE  0x0173
-GeForce4 440 Go 0x0174
-GeForce4 420 Go 0x0175
-GeForce4 420 Go 32M 0x0176
-GeForce4 460 Go 0x0177
-Quadro4 550 XGL 0x0178
-GeForce4 440 Go 64M 0x0179
-Quadro NVS 400  0x017A
-Quadro4 500 GoGL    0x017C
-GeForce4 410 Go 16M 0x017D
-GeForce4 MX 440 with AGP8X  0x0181
-GeForce4 MX 440SE with AGP8X    0x0182
-GeForce4 MX 420 with AGP8X  0x0183
-GeForce4 MX 4000    0x0185
-Quadro4 580 XGL 0x0188
-Quadro NVS 280 SD   0x018A
-Quadro4 380 XGL 0x018B
-Quadro NVS 50 PCI   0x018C
-GeForce2 Integrated GPU 0x01A0
-GeForce4 MX Integrated GPU  0x01F0
-GeForce3    0x0200
-GeForce3 Ti 200 0x0201
-GeForce3 Ti 500 0x0202
-Quadro DCC  0x0203
-GeForce4 Ti 4600    0x0250
-GeForce4 Ti 4400    0x0251
-GeForce4 Ti 4200    0x0253
-Quadro4 900 XGL 0x0258
-Quadro4 750 XGL 0x0259
-Quadro4 700 XGL 0x025B
-GeForce4 Ti 4800    0x0280
-GeForce4 Ti 4200 with AGP8X 0x0281
-GeForce4 Ti 4800 SE 0x0282
-GeForce4 4200 Go    0x0286
-Quadro4 980 XGL 0x0288
-Quadro4 780 XGL 0x0289
-Quadro4 700 GoGL    0x028C
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/xorg/modeline.ATSC b/abs/core/system-templates/templates/xorg/modeline.ATSC
deleted file mode 100644
index a4e1a6b..0000000
--- a/abs/core/system-templates/templates/xorg/modeline.ATSC
+++ /dev/null
@@ -1,33 +0,0 @@
-ModeLine "ATSC-720p60Hz" 74.160 1280 1352 1392 1648 720 725 730 750
-
-ModeLine "My480p" 28.6 720 744 768 900 480 484 492 525
-
-ModeLine "My540p" 37.26 960 976 1008 1104 540 542 548 563 +hsync +vsync
-
-ModeLine "My720p"  73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync 
-
-ModeLine "My720p2" 73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync 
-
-ModeLine "My1080i" 79.84 1920 2040 2200 2368 1080 1090 1106 1125 +vsync -hsync interlace
-
-ModeLine "My1080i2" 74.52 1920 1952 2016 2208 1080 1084 1096 1126 -hsync -vsync interlace
-
-Modeline "My1920x1080_i" 74.52 1920 1952 2016 2208 1080 1084 1096 1126 -HSync -VSync Interlace
-
-Modeline "in1080_i" 74.52 1760 1888 2096 2208 960 1012 1028 1126 -HSync -VSync Interlace
-
-Modeline "1920x1080_59i" 76.11 1920 1952 2240 2272 1080 1104 1110 1135 interlace
-
-Modeline "1920x1080_60i" 77.60 1920 1952 2240 2272 1080 1104 1110 1135 interlace
-
-Modeline "1920x1080_61i" 79.08 1920 1952 2248 2280 1080 1104 1110 1135 interlace
-
-Modeline "1776x1000_60i" 65.91 1776 1808 2056 2088 1000 1023 1028 1051 interlace
-
-Modeline "1920x1080_30" 77.60 1920 1952 2240 2272 1080 1104 1110 1135
-
-Modeline "1760x960_60i" 62.39 1760 1792 2024 2056 960 982 987 1009 interlace
-
-Modeline "1280x720_60.00" 74.25 1280 1352 1432 1648 720 725 730 750 -hsync -vsync
-
-Modeline "1280x720_50.00" 74.25 1280 1360 1400 1984 720 725 730 750 -hsync -vsync
diff --git a/abs/core/system-templates/templates/xorg/modeline.DVD b/abs/core/system-templates/templates/xorg/modeline.DVD
deleted file mode 100644
index 9e846d0..0000000
--- a/abs/core/system-templates/templates/xorg/modeline.DVD
+++ /dev/null
@@ -1,9 +0,0 @@
-#DVD-NativeModes
-ModeLine "NTSC-DVD-59.94i" 13.5 720 736 800 858 480 484 492 525 Interlace
-ModeLine "NTSC-DVD-60i" 13.514 720 736 800 858 480 484 492 525 Interlace
-ModeLine "NTSC-DVD-59.94p" 27.0 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-60p" 27.027 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-71.93p" 32.4 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-72p" 32.432 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-119.88p" 54.0 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-120p" 54.054 720 736 800 858 480 484 492 525
diff --git a/abs/core/system-templates/templates/xorg/modeline.NTSC b/abs/core/system-templates/templates/xorg/modeline.NTSC
deleted file mode 100644
index 5536c1b..0000000
--- a/abs/core/system-templates/templates/xorg/modeline.NTSC
+++ /dev/null
@@ -1,10 +0,0 @@
-#Analog-RegularModes
-ModeLine "NTSCspec-59.94i" 14.318 768 784 848 910 483 484 492 525 Interlace
-ModeLine "NTSCspec-59.94p" 28.636 768 784 848 910 483 484 492 525
-ModeLine "Laserdisk-59.94i" 567 583 647 684 483 484 492 525 Interlace
-ModeLine "Laserdisk-59.94p" 567 583 647 684 483 484 492 525
-ModeLine "Broadcast-59.94i" 483 484 492 525 Interlace
-ModeLine "Broadcast-59.94p" 483 484 492 525
-ModeLine "VHS-59.94i" 483 484 492 525 Interlace
-ModeLine "VHS-59.94p" 483 484 492 525
-
diff --git a/abs/core/system-templates/templates/xorg/modeline.VESA b/abs/core/system-templates/templates/xorg/modeline.VESA
deleted file mode 100644
index a026f64..0000000
--- a/abs/core/system-templates/templates/xorg/modeline.VESA
+++ /dev/null
@@ -1,163 +0,0 @@
-# 640x350 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "640x350"    31.5  640  672  736  832    350  382  385  445 +hsync -vsync
-
-# 640x400 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "640x400"    31.5  640  672  736  832    400  401  404  445 -hsync +vsync
-
-# 720x400 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "720x400"    35.5  720  756  828  936    400  401  404  446 -hsync +vsync
-
-# 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
-ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
-
-# 640x480 @ 72Hz (VESA) hsync: 37.9kHz
-ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
-
-# 640x480 @ 75Hz (VESA) hsync: 37.5kHz
-ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
-
-# 640x480 @ 85Hz (VESA) hsync: 43.3kHz
-ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
-
-# 800x600 @ 56Hz (VESA) hsync: 35.2kHz
-ModeLine "800x600"    36.0  800  824  896 1024    600  601  603  625 +hsync +vsync
-
-# 800x600 @ 60Hz (VESA) hsync: 37.9kHz
-ModeLine "800x600"    40.0  800  840  968 1056    600  601  605  628 +hsync +vsync
-
-# 800x600 @ 72Hz (VESA) hsync: 48.1kHz
-ModeLine "800x600"    50.0  800  856  976 1040    600  637  643  666 +hsync +vsync
-
-# 800x600 @ 75Hz (VESA) hsync: 46.9kHz
-ModeLine "800x600"    49.5  800  816  896 1056    600  601  604  625 +hsync +vsync
-
-# 800x600 @ 85Hz (VESA) hsync: 53.7kHz
-ModeLine "800x600"    56.3  800  832  896 1048    600  601  604  631 +hsync +vsync
-
-# 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
-ModeLine "1024x768"   44.9 1024 1032 1208 1264    768  768  776  817 +hsync +vsync Interlace
-
-# 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
-ModeLine "1024x768"   65.0 1024 1048 1184 1344    768  771  777  806 -hsync -vsync
-
-# 1024x768 @ 70Hz (VESA) hsync: 56.5kHz
-ModeLine "1024x768"   75.0 1024 1048 1184 1328    768  771  777  806 -hsync -vsync
-
-# 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
-ModeLine "1024x768"   78.8 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
-
-# 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
-ModeLine "1024x768"   94.5 1024 1072 1168 1376    768  769  772  808 +hsync +vsync
-
-# 1152x864 @ 75Hz (VESA) hsync: 67.5kHz
-ModeLine "1152x864"  108.0 1152 1216 1344 1600    864  865  868  900 +hsync +vsync
-
-# 1280x960 @ 60Hz (VESA) hsync: 60.0kHz
-ModeLine "1280x960"  108.0 1280 1376 1488 1800    960  961  964 1000 +hsync +vsync
-
-# 1280x960 @ 85Hz (VESA) hsync: 85.9kHz
-ModeLine "1280x960"  148.5 1280 1344 1504 1728    960  961  964 1011 +hsync +vsync
-
-# 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz
-ModeLine "1280x1024" 108.0 1280 1328 1440 1688   1024 1025 1028 1066 +hsync +vsync
-
-# 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz
-ModeLine "1280x1024" 135.0 1280 1296 1440 1688   1024 1025 1028 1066 +hsync +vsync
-
-# 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
-ModeLine "1280x1024" 157.5 1280 1344 1504 1728   1024 1025 1028 1072 +hsync +vsync
-
-# 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
-ModeLine "1600x1200" 162.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-# 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz
-ModeLine "1600x1200" 175.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz
-ModeLine "1600x1200" 189.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz
-ModeLine "1600x1200" 202.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz
-ModeLine "1600x1200" 229.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz
-ModeLine "1792x1344" 204.8 1792 1920 2120 2448   1344 1345 1348 1394 -hsync +vsync
-
-# 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz
-ModeLine "1792x1344" 261.0 1792 1888 2104 2456   1344 1345 1348 1417 -hsync +vsync
-
-# 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz
-ModeLine "1856x1392" 218.3 1856 1952 2176 2528   1392 1393 1396 1439 -hsync +vsync
-
-# 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz
-ModeLine "1856x1392" 288.0 1856 1984 2208 2560   1392 1393 1396 1500 -hsync +vsync
-
-# 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz
-ModeLine "1920x1440" 234.0 1920 2048 2256 2600   1440 1441 1444 1500 -hsync +vsync
-
-# 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz
-ModeLine "1920x1440" 297.0 1920 2064 2288 2640   1440 1441 1444 1500 -hsync +vsync
-
-# 640x480 @ 100.00 Hz (GTF) hsync: 50.90 kHz; pclk: 43.16 MHz
-ModeLine "640x480"  43.16  640 680 744 848  480 481 484 509  -HSync +Vsync
-
-# 768x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 34.96 MHz
-ModeLine "768x576"  34.96  768 792 872 976  576 577 580 597  -HSync +Vsync
-
-# 768x576 @ 72.00 Hz (GTF) hsync: 43.27 kHz; pclk: 42.93 MHz
-ModeLine "768x576"  42.93  768 800 880 992  576 577 580 601  -HSync +Vsync
-
-# 768x576 @ 75.00 Hz (GTF) hsync: 45.15 kHz; pclk: 45.51 MHz
-ModeLine "768x576"  45.51  768 808 888 1008  576 577 580 602  -HSync +Vsync
-
-# 768x576 @ 85.00 Hz (GTF) hsync: 51.42 kHz; pclk: 51.84 MHz
-ModeLine "768x576"  51.84  768 808 888 1008  576 577 580 605  -HSync +Vsync
-
-# 768x576 @ 100.00 Hz (GTF) hsync: 61.10 kHz; pclk: 62.57 MHz
-ModeLine "768x576"  62.57  768 816 896 1024  576 577 580 611  -HSync +Vsync
-
-# 800x600 @ 100.00 Hz (GTF) hsync: 63.60 kHz; pclk: 68.18 MHz
-ModeLine "800x600"  68.18  800 848 936 1072  600 601 604 636  -HSync +Vsync
-
-# 1024x768 @ 100.00 Hz (GTF) hsync: 81.40 kHz; pclk: 113.31 MHz
-ModeLine "1024x768"  113.31  1024 1096 1208 1392  768 769 772 814  -HSync +Vsync
-
-# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
-ModeLine "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
-
-# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
-ModeLine "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
-
-# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
-ModeLine "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -HSync +Vsync
-
-# 1280x960 @ 72.00 Hz (GTF) hsync: 72.07 kHz; pclk: 124.54 MHz
-ModeLine "1280x960"  124.54  1280 1368 1504 1728  960 961 964 1001  -HSync +Vsync
-
-# 1280x960 @ 75.00 Hz (GTF) hsync: 75.15 kHz; pclk: 129.86 MHz
-ModeLine "1280x960"  129.86  1280 1368 1504 1728  960 961 964 1002  -HSync +Vsync
-
-# 1280x960 @ 100.00 Hz (GTF) hsync: 101.70 kHz; pclk: 178.99 MHz
-ModeLine "1280x960"  178.99  1280 1376 1520 1760  960 961 964 1017  -HSync +Vsync
-
-# 1280x1024 @ 100.00 Hz (GTF) hsync: 108.50 kHz; pclk: 190.96 MHz
-ModeLine "1280x1024"  190.96  1280 1376 1520 1760  1024 1025 1028 1085  -HSync +Vsync
-
-# 1400x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 122.61 MHz
-ModeLine "1400x1050"  122.61  1400 1488 1640 1880  1050 1051 1054 1087  -HSync +Vsync
-
-# 1400x1050 @ 72.00 Hz (GTF) hsync: 78.77 kHz; pclk: 149.34 MHz
-ModeLine "1400x1050"  149.34  1400 1496 1648 1896  1050 1051 1054 1094  -HSync +Vsync
-
-# 1400x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 155.85 MHz
-ModeLine "1400x1050"  155.85  1400 1496 1648 1896  1050 1051 1054 1096  -HSync +Vsync
-
-# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
-ModeLine "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
-
-# 1400x1050 @ 100.00 Hz (GTF) hsync: 111.20 kHz; pclk: 214.39 MHz
-ModeLine "1400x1050"  214.39  1400 1512 1664 1928  1050 1051 1054 1112  -HSync +Vsync
-
-# 1600x1200 @ 100.00 Hz (GTF) hsync: 127.10 kHz; pclk: 280.64 MHz
-ModeLine "1600x1200"  280.64  1600 1728 1904 2208  1200 1201 1204 1271  -HSync +Vsync
diff --git a/abs/core/system-templates/templates/xorg/modeline.custom b/abs/core/system-templates/templates/xorg/modeline.custom
deleted file mode 100644
index ca6d678..0000000
--- a/abs/core/system-templates/templates/xorg/modeline.custom
+++ /dev/null
@@ -1 +0,0 @@
-ModeLine "CustomModeline" 14.318 768 784 848 910 483 484 492 525 Interlace
diff --git a/abs/core/system-templates/templates/xorg/nvidia_supported.txt b/abs/core/system-templates/templates/xorg/nvidia_supported.txt
deleted file mode 100644
index 6d0fc16..0000000
--- a/abs/core/system-templates/templates/xorg/nvidia_supported.txt
+++ /dev/null
@@ -1,441 +0,0 @@
-#http://us.download.nvidia.com/XFree86/Linux-x86/285.05.09/README/supportedchips.html
-
-GeForce 6800 Ultra  0x0040  -
-GeForce 6800    0x0041  -
-GeForce 6800 LE 0x0042  -
-GeForce 6800 XE 0x0043  -
-GeForce 6800 XT 0x0044  -
-GeForce 6800 GT 0x0045  -
-GeForce 6800 GT 0x0046  -
-GeForce 6800 GS 0x0047  -
-GeForce 6800 XT 0x0048  -
-GeForce 7800 GTX    0x0090  -
-GeForce 7800 GTX    0x0091  -
-GeForce 7800 GT 0x0092  -
-GeForce 7800 GS 0x0093  -
-GeForce 7800 SLI    0x0095  -
-GeForce Go 7800 0x0098  -
-GeForce Go 7800 GTX 0x0099  -
-GeForce 6800 GS 0x00C0  -
-GeForce 6800    0x00C1  -
-GeForce 6800 LE 0x00C2  -
-GeForce 6800 XT 0x00C3  -
-GeForce Go 6800 0x00C8  -
-GeForce Go 6800 Ultra   0x00C9  -
-GeForce 6600 GT 0x00F1  -
-GeForce 6600    0x00F2  -
-GeForce 6200    0x00F3  -
-GeForce 6600 LE 0x00F4  -
-GeForce 7800 GS 0x00F5  -
-GeForce 6800 GS 0x00F6  -
-GeForce 6800 Ultra  0x00F9  -
-GeForce 6600 GT 0x0140  -
-GeForce 6600    0x0141  -
-GeForce 6600 LE 0x0142  -
-GeForce 6600 VE 0x0143  -
-GeForce Go 6600 0x0144  -
-GeForce 6610 XL 0x0145  -
-GeForce Go 6600 TE/6200 TE  0x0146  -
-GeForce 6700 XL 0x0147  -
-GeForce Go 6600 0x0148  -
-GeForce Go 6600 GT  0x0149  -
-GeForce 6200    0x014F  -
-GeForce 6500    0x0160  -
-GeForce 6200 TurboCache(TM) 0x0161  -
-GeForce 6200SE TurboCache(TM)   0x0162  -
-GeForce 6200 LE 0x0163  -
-GeForce Go 6200 0x0164  -
-GeForce Go 6400 0x0166  -
-GeForce Go 6200 0x0167  -
-GeForce Go 6400 0x0168  -
-GeForce 6250    0x0169  -
-GeForce 7100 GS 0x016A  -
-GeForce 8800 GTX    0x0191  -
-GeForce 8800 GTS    0x0193  -
-GeForce 8800 Ultra  0x0194  -
-Tesla C870  0x0197  -
-GeForce 7350 LE 0x01D0  -
-GeForce 7300 LE 0x01D1  -
-GeForce 7550 LE 0x01D2  -
-GeForce 7300 SE/7200 GS 0x01D3  -
-GeForce Go 7200 0x01D6  -
-GeForce Go 7300 0x01D7  -
-GeForce Go 7400 0x01D8  -
-GeForce 7500 LE 0x01DD  -
-GeForce 7300 GS 0x01DF  -
-GeForce 6200    0x0221  -
-GeForce 6200 A-LE   0x0222  -
-GeForce 6150    0x0240  -
-GeForce 6150 LE 0x0241  -
-GeForce 6100    0x0242  -
-GeForce Go 6150 0x0244  -
-GeForce Go 6100 0x0247  -
-GeForce 7900 GTX    0x0290  -
-GeForce 7900 GT/GTO 0x0291  -
-GeForce 7900 GS 0x0292  -
-GeForce 7950 GX2    0x0293  -
-GeForce 7950 GX2    0x0294  -
-GeForce 7950 GT 0x0295  -
-GeForce Go 7950 GTX 0x0297  -
-GeForce Go 7900 GS  0x0298  -
-GeForce 7600 GT 0x02E0  -
-GeForce 7600 GS 0x02E1  -
-GeForce 7300 GT 0x02E2  -
-GeForce 7900 GS 0x02E3  -
-GeForce 7950 GT 0x02E4  -
-GeForce 7650 GS 0x038B  -
-GeForce 7650 GS 0x0390  -
-GeForce 7600 GT 0x0391  -
-GeForce 7600 GS 0x0392  -
-GeForce 7300 GT 0x0393  -
-GeForce 7600 LE 0x0394  -
-GeForce 7300 GT 0x0395  -
-GeForce Go 7700 0x0397  -
-GeForce Go 7600 0x0398  -
-GeForce Go 7600 GT  0x0399  -
-GeForce 6150SE nForce 430   0x03D0  -
-GeForce 6100 nForce 405 0x03D1  -
-GeForce 6100 nForce 400 0x03D2  -
-GeForce 6100 nForce 420 0x03D5  -
-GeForce 7025 / nForce 630a  0x03D6  -
-GeForce 8600 GTS    0x0400  A
-GeForce 8600 GT 0x0401  A
-GeForce 8600 GT 0x0402  A
-GeForce 8600 GS 0x0403  A
-GeForce 8400 GS 0x0404  A
-GeForce 9500M GS    0x0405  A
-GeForce 8300 GS 0x0406  -
-GeForce 8600M GT    0x0407  A
-GeForce 9650M GS    0x0408  A
-GeForce 8700M GT    0x0409  A
-GeForce GT 330  0x0410  A
-GeForce 8400 SE 0x0420  -
-GeForce 8500 GT 0x0421  A
-GeForce 8400 GS 0x0422  A
-GeForce 8300 GS 0x0423  -
-GeForce 8400 GS 0x0424  A
-GeForce 8600M GS    0x0425  A
-GeForce 8400M GT    0x0426  A
-GeForce 8400M GS    0x0427  A
-GeForce 8400M G 0x0428  A
-GeForce 9400 GT 0x042C  A
-GeForce 9300M G 0x042E  A
-GeForce 7150M / nForce 630M 0x0531  -
-GeForce 7000M / nForce 610M 0x0533  -
-GeForce 7050 PV / nForce 630a   0x053A  -
-GeForce 7050 PV / nForce 630a   0x053B  -
-GeForce 7025 / nForce 630a  0x053E  -
-GeForce GTX 295 0x05E0  A
-GeForce GTX 280 0x05E1  A
-GeForce GTX 260 0x05E2  A
-GeForce GTX 285 0x05E3  A
-GeForce GTX 275 0x05E6  A
-Tesla C1060 0x05E7  A
-Tesla T10 Processor 0x05E7 0x0595   A
-Tesla T10 Processor 0x05E7 0x068F   A
-Tesla M1060 0x05E7 0x0697   A
-Tesla M1060 0x05E7 0x0743   A
-GeForce GTX 260 0x05EA  A
-GeForce GTX 295 0x05EB  A
-GeForce 8800 GTS 512    0x0600  A
-GeForce 9800 GT 0x0601  A
-GeForce 8800 GT 0x0602  A
-GeForce GT 230  0x0603  A
-GeForce 9800 GX2    0x0604  A
-GeForce 9800 GT 0x0605  A
-GeForce 8800 GS 0x0606  A
-GeForce GTS 240 0x0607  A
-GeForce 9800M GTX   0x0608  A
-GeForce 8800M GTS   0x0609  A
-GeForce GTX 280M    0x060A  A
-GeForce 9800M GT    0x060B  A
-GeForce 8800M GTX   0x060C  A
-GeForce 8800 GS 0x060D  A
-GeForce GTX 285M    0x060F  A
-GeForce 9600 GSO    0x0610  A
-GeForce 8800 GT 0x0611  A
-GeForce 9800 GTX/9800 GTX+  0x0612  A
-GeForce 9800 GTX+   0x0613  A
-GeForce 9800 GT 0x0614  A
-GeForce GTS 250 0x0615  A
-GeForce 9800M GTX   0x0617  A
-GeForce GTX 260M    0x0618  A
-GeForce 9600 GT 0x0622  A
-GeForce 9600 GS 0x0623  A
-GeForce 9600 GSO 512    0x0625  A
-GeForce GT 130  0x0626  A
-GeForce GT 140  0x0627  A
-GeForce 9800M GTS   0x0628  A
-GeForce 9700M GTS   0x062A  A
-GeForce 9800M GS    0x062B  A
-GeForce 9800M GTS   0x062C  A
-GeForce 9600 GT 0x062D  A
-GeForce 9600 GT 0x062E  A
-GeForce GTS 160M    0x0631  A
-GeForce GTS 150M    0x0632  A
-GeForce 9600 GSO    0x0635  A
-GeForce 9600 GT 0x0637  A
-GeForce 9500 GT 0x0640  A
-GeForce 9400 GT 0x0641  A
-GeForce 9500 GT 0x0643  A
-GeForce 9500 GS 0x0644  A
-GeForce 9500 GS 0x0645  A
-GeForce GT 120  0x0646  A
-GeForce 9600M GT    0x0647  A
-GeForce 9600M GS    0x0648  A
-GeForce 9600M GT    0x0649  A
-GeForce 9700M GT    0x064A  A
-GeForce 9500M G 0x064B  A
-GeForce 9650M GT    0x064C  A
-GeForce G 110M  0x0651  A
-GeForce GT 130M 0x0652  A
-GeForce GT 120M 0x0653  A
-GeForce GT 220M 0x0654  A
-GeForce 9650 S  0x0656  A
-GeForce 9400 GT 0x065B  A
-GeForce GTX 480 0x06C0  C
-GeForce GTX 465 0x06C4  C
-GeForce GTX 480M    0x06CA  C
-GeForce GTX 470 0x06CD  C
-Tesla C2050 / C2070 0x06D1  C
-Tesla C2070 0x06D1 0x0772   C
-Tesla M2070 0x06D2  C
-Tesla T20 Processor 0x06DE  C
-Tesla M2050 0x06DE 0x082F   C
-Tesla M2050 0x06DE 0x0846   C
-Tesla M2070-Q   0x06DF  C
-GeForce 9300 GE 0x06E0  B 1
-GeForce 9300 GS 0x06E1  B 1
-GeForce 8400    0x06E2  B 1
-GeForce 8400 SE 0x06E3  -
-GeForce 8400 GS 0x06E4  A 1
-GeForce 9300M GS    0x06E5  B 1
-GeForce G100    0x06E6  B 1
-GeForce 9300 SE 0x06E7  -
-GeForce 9200M GS    0x06E8  B 1
-GeForce 9300M GS    0x06E9  B 1
-GeForce G 105M  0x06EC  B 1
-GeForce G 103M  0x06EF  B 1
-GeForce G105M   0x06F1  B 1
-GeForce 7150 / nForce 630i  0x07E0  -
-GeForce 7100 / nForce 630i  0x07E1  -
-GeForce 7050 / nForce 630i  0x07E2  -
-GeForce 7050 / nForce 610i  0x07E3  -
-GeForce 7050 / nForce 620i  0x07E5  -
-GeForce 9100M G 0x0844  B 1
-GeForce 8200M G 0x0845  B 1
-GeForce 9200    0x0846  B 1
-GeForce 9100    0x0847  B 1
-GeForce 8300    0x0848  B 1
-GeForce 8200    0x0849  B 1
-nForce 730a 0x084A  B 1
-GeForce 9200    0x084B  B 1
-nForce 980a/780a SLI    0x084C  B 1
-nForce 750a SLI 0x084D  B 1
-GeForce 8100 / nForce 720a  0x084F  -
-GeForce 9400    0x0860  B 1
-GeForce 9400    0x0861  B 1
-GeForce 9400M G 0x0862  B 1
-GeForce 9400M   0x0863  B 1
-GeForce 9300    0x0864  B 1
-ION 0x0865  B 1
-GeForce 9400M G 0x0866  B 1
-GeForce 9400    0x0867  B 1
-nForce 760i SLI 0x0868  B 1
-GeForce 9400    0x086A  B 1
-GeForce 9300 / nForce 730i  0x086C  B 1
-GeForce 9200    0x086D  B 1
-GeForce 9100M G 0x086E  B 1
-GeForce 8200M G 0x086F  B 1
-GeForce 9400M   0x0870  B 1
-GeForce 9200    0x0871  B 1
-GeForce G102M   0x0872  B 1
-GeForce G102M   0x0873  B 1
-ION 0x0874  B 1
-ION 0x0876  B 1
-GeForce 9400    0x087A  B 1
-ION 0x087D  B 1
-ION LE  0x087E  B 1
-ION LE  0x087F  B 1
-GeForce 320M    0x08A5  C
-GeForce GT 220  0x0A20  C
-GeForce 315 0x0A22  -
-GeForce 210 0x0A23  C
-GeForce 405 0x0A26  C
-GeForce 405 0x0A27  C
-GeForce GT 230M 0x0A28  C
-GeForce GT 330M 0x0A29  C
-GeForce GT 230M 0x0A2A  C
-GeForce GT 330M 0x0A2B  C
-GeForce GT 320M 0x0A2D  C
-GeForce GT 240M 0x0A34  C
-GeForce GT 325M 0x0A35  C
-GeForce G210    0x0A60  C
-GeForce 205 0x0A62  C
-GeForce 310 0x0A63  C
-Second Generation ION   0x0A64  C
-GeForce 210 0x0A65  C
-GeForce 310 0x0A66  C
-GeForce 315 0x0A67  -
-GeForce G105M   0x0A68  B
-GeForce G105M   0x0A69  B
-GeForce 305M    0x0A6E  C
-Second Generation ION   0x0A6F  C
-GeForce 310M    0x0A70  C
-GeForce 305M    0x0A71  C
-GeForce 310M    0x0A72  C
-GeForce 305M    0x0A73  C
-GeForce G210M   0x0A74  C
-GeForce 310M    0x0A75  C
-GeForce 315M    0x0A7A  C
-GeForce GT 330  0x0CA0  A
-GeForce GT 320  0x0CA2  C
-GeForce GT 240  0x0CA3  C
-GeForce GT 340  0x0CA4  C
-GeForce GT 330  0x0CA7  A
-GeForce GTS 260M    0x0CA8  C
-GeForce GTS 250M    0x0CA9  C
-GeForce GT 220  0x0CAC  -
-GeForce GT 335M 0x0CAF  C
-GeForce GTS 350M    0x0CB0  C
-GeForce GTS 360M    0x0CB1  C
-GeForce GT 440  0x0DC0  C
-GeForce GTS 450 0x0DC4  C
-GeForce GT 555M 0x0DCD  C
-GeForce GT 555M 0x0DCE  C
-GeForce GTX 460M    0x0DD1  C
-GeForce GT 445M 0x0DD2  C
-GeForce GT 550M 0x0DD6  C
-GeForce GT 440  0x0DE0  C
-GeForce GT 430  0x0DE1  C
-GeForce GT 420  0x0DE2  C
-GeForce GT 530  0x0DE5  C
-GeForce GT 525M 0x0DEC  C
-GeForce GT 415M 0x0DEE  C
-GeForce GT 425M 0x0DF0  C
-GeForce GT 420M 0x0DF1  C
-GeForce GT 435M 0x0DF2  C
-GeForce GT 420M 0x0DF3  C
-GeForce GT 540M 0x0DF4  C
-GeForce GT 525M 0x0DF5  C
-GeForce GT 550M 0x0DF6  C
-GeForce GT 520M 0x0DF7  C
-GeForce GTX 460 0x0E22  C
-GeForce GTX 460 SE  0x0E23  C
-GeForce GTX 460 0x0E24  C
-GeForce GTX 470M    0x0E30  C
-GeForce GTX 485M    0x0E31  C
-GeForce GT 520  0x1040  D
-GeForce GT 520M 0x1050  C
-GeForce GT 520MX    0x1051  D
-GeForce GTX 580 0x1080  C
-GeForce GTX 570 0x1081  C
-GeForce GTX 560 Ti  0x1082  C
-GeForce GTX 590 0x1088  C
-Tesla M2090 0x1091  C
-Tesla M2075 0x1094  C
-Tesla C2075 0x1096  C
-GeForce 8400GS  0x10C3  A
-GeForce 405 0x10C5  C
-GeForce GTX 560 Ti  0x1200  C
-GeForce GTX 560 0x1201  C
-GeForce GTX 570M    0x1210  C
-GeForce GTX 580M    0x1211  C
-GeForce GT 545  0x1241  C
-GeForce GTX 550 Ti  0x1244  C
-GeForce GTS 450 0x1245  C
-GeForce GTX 560M    0x1251  C
-
-#NVIDIA Quadro GPUs
-
-Quadro FX 4000  0x004E  -
-Quadro FX 4500  0x009D  -
-Quadro FX Go1400    0x00CC  -
-Quadro FX 3450/4000 SDI 0x00CD  -
-Quadro FX 1400  0x00CE  -
-Quadro FX 3400/Quadro FX 4000   0x00F8  -
-Quadro NVS 440  0x014A  -
-Quadro FX 540M  0x014C  -
-Quadro FX 550   0x014D  -
-Quadro FX 540   0x014E  -
-Quadro NVS 285  0x0165  -
-Quadro FX 5600  0x019D  -
-Quadro FX 4600  0x019E  -
-Quadro NVS 110M 0x01DA  -
-Quadro NVS 120M 0x01DB  -
-Quadro FX 350M  0x01DC  -
-Quadro FX 350   0x01DE  -
-Quadro NVS 210S / GeForce 6150LE    0x0245  -
-Quadro NVS 510M 0x0299  -
-Quadro FX 2500M 0x029A  -
-Quadro FX 1500M 0x029B  -
-Quadro FX 5500  0x029C  -
-Quadro FX 3500  0x029D  -
-Quadro FX 1500  0x029E  -
-Quadro FX 4500 X2   0x029F  -
-Quadro FX 560M  0x039C  -
-Quadro FX 560   0x039E  -
-Quadro FX 370   0x040A  A
-Quadro NVS 320M 0x040B  A
-Quadro FX 570M  0x040C  A
-Quadro FX 1600M 0x040D  A
-Quadro FX 570   0x040E  A
-Quadro FX 1700  0x040F  A
-Quadro NVS 140M 0x0429  A
-Quadro NVS 130M 0x042A  A
-Quadro NVS 135M 0x042B  A
-Quadro FX 360M  0x042D  A
-Quadro NVS 290  0x042F  A
-Quadroplex 2200 D2  0x05ED  A
-Quadroplex 2200 S4  0x05F8  A
-Quadro CX   0x05F9  A
-Quadro FX 5800  0x05FD  A
-Quadro FX 4800  0x05FE  A
-Quadro FX 3800  0x05FF  A
-Quadro FX 4700 X2   0x0619  A
-Quadro FX 3700  0x061A  A
-Quadro VX 200   0x061B  A
-Quadro FX 3600M 0x061C  A
-Quadro FX 2800M 0x061D  A
-Quadro FX 3700M 0x061E  A
-Quadro FX 3800M 0x061F  A
-Quadro FX 1800  0x0638  A
-Quadro FX 2700M 0x063A  A
-Quadro FX 380   0x0658  A
-Quadro FX 580   0x0659  A
-Quadro FX 1700M 0x065A  A
-Quadro FX 770M  0x065C  A
-Quadro 6000 0x06D8  C
-Quadro 5000 0x06D9  C
-Quadro 5000M    0x06DA  C
-Quadro 6000 0x06DC  C
-Quadro 4000 0x06DD  C
-Quadro NVS 150M 0x06EA  B 1
-Quadro NVS 160M 0x06EB  B 1
-Quadro NVS 420  0x06F8  B 1
-Quadro FX 370 LP    0x06F9  B 1
-Quadro NVS 450  0x06FA  B 1
-Quadro FX 370M  0x06FB  B 1
-Quadro NVS 295  0x06FD  B 1
-HICx16 + Graphics   0x06FF  B 1
-NVS 5100M   0x0A2C  C
-Quadro 400  0x0A38  C
-Quadro FX 880M  0x0A3C  C
-NVS 2100M   0x0A6A  C
-NVS 3100M   0x0A6C  C
-Quadro FX 380 LP    0x0A78  C
-Quadro FX 380M  0x0A7C  C
-Quadro FX 1800M 0x0CBC  C
-Quadro 2000 0x0DD8  C
-Quadro 2000D    0x0DD8 0x0914   C
-Quadro 2000M    0x0DDA  C
-Quadro 600  0x0DF8  C
-Quadro 1000M    0x0DFA  C
-Quadro 3000M    0x0E3A  C
-Quadro 4000M    0x0E3B  C
-GeForce 410M    0x1055  D
-NVS 4200M   0x1056  D
-Quadro 5010M    0x109A  C
-Quadro 7000 0x109B  C
-NVS 300 0x10D8  C
-
diff --git a/abs/core/system-templates/templates/xorg/xorg.conf.ati b/abs/core/system-templates/templates/xorg/xorg.conf.ati
deleted file mode 100644
index ce2c25f..0000000
--- a/abs/core/system-templates/templates/xorg/xorg.conf.ati
+++ /dev/null
@@ -1,98 +0,0 @@
-#Section "ServerFlags"
-#	Option "AutoAddDevices" "False"
-#EndSection
-
-Section "ServerLayout"
-	Identifier     "X.org Configured"
-	Screen      0  "aticonfig-Screen[0]" 0 0
-#	InputDevice    "Mouse0" "CorePointer"
-#	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
-#	RgbPath      "/usr/share/X11/rgb"
-	ModulePath   "/usr/lib/xorg/modules"
-	FontPath     "/usr/share/fonts/misc"
-	FontPath     "/usr/share/fonts/75dpi"
-	FontPath     "/usr/share/fonts/100dpi"
-	FontPath     "/usr/share/fonts/TTF"
-	FontPath     "/usr/share/fonts/Type1"
-EndSection
-
-Section "Module"
-	Load  "xtrap"
-	Load  "dbe"
-	Load  "record"
-	Load  "extmod"
-	Load  "dri"
-#	Load  "type1"
-	Load  "freetype"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard0"
-	Driver      "kbd"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Mouse0"
-	Driver      "mouse"
-	Option	    "Protocol" "auto"
-	Option	    "Device" "/dev/input/mice"
-	Option	    "ZAxisMapping" "4 5 6 7"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor0"
-	VendorName   "Monitor Vendor"
-	ModelName    "Monitor Model"
-EndSection
-
-Section "Monitor"
-	Identifier   "aticonfig-Monitor[0]"
-#	HorizSync    
-#	VertRefresh 
-	Option	    "VendorName" "ATI Proprietary Driver"
-	Option	    "ModelName" "Generic Autodetecting Monitor"
-	Option	    "DPMS" "true"
-EndSection
-
-Section "Device"
-
-        ### Available Driver options are:-
-        ### Values: <i>: integer, <f>: float, <bool>: "True"/"False",
-        ### <string>: "String", <freq>: "<f> Hz/kHz/MHz"
-        ### [arg]: arg optional
-        #Option     "ShadowFB"           	# [<bool>]
-        #Option     "DefaultRefresh"     	# [<bool>]
-        #Option     "ModeSetClearScreen" 	# [<bool>]
-	Identifier  "Card0"
-	Driver      "vesa"
-	VendorName  "ATI Technologies Inc"
-	BoardName   "RV370 5B60 [Radeon X300 (PCIE)]"
-	BusID       "PCI:1:0:0"
-EndSection
-
-Section "Device"
-	Identifier  "aticonfig-Device[0]"
-	Driver      "fglrx"
-#INSERT HERE
-
-#	Option	    "ForceMonitors" "tv,nocrt1,notmds1"
-#	Option	    "TVStandard" "SCART"
-#	Option	    "TVFormat" "PAL-B"
-EndSection
-
-
-Section "Screen"
-	Identifier "aticonfig-Screen[0]"
-	Device     "aticonfig-Device[0]"
-	Monitor    "aticonfig-Monitor[0]"
-	DefaultDepth     24
-	SubSection "Display"
-		Viewport   0 0
-		Depth     24
-		Modes    "640x480"
-	EndSubSection
-EndSection
-
diff --git a/abs/core/system-templates/templates/xorg/xorg.conf.intel b/abs/core/system-templates/templates/xorg/xorg.conf.intel
deleted file mode 100644
index 6f695d3..0000000
--- a/abs/core/system-templates/templates/xorg/xorg.conf.intel
+++ /dev/null
@@ -1,152 +0,0 @@
-#Section "ServerFlags"
-#        Option "AutoAddDevices" "False"
-#EndSection
-
-Section "ServerLayout"
-	Identifier     "Xorg Configured"
-	Screen      0  "Screen0" 0 0
-#	InputDevice    "Keyboard0" "CoreKeyboard"
-#	InputDevice    "PS/2 Mouse" "CorePointer"
-# Serial Mouse not detected
-# USB Mouse not detected
-EndSection
-
-Section "ServerFlags"
-	Option "AllowMouseOpenFail"  "true"
-	
-EndSection
-
-Section "Files"
-#	RgbPath      "/usr/share/X11/rgb"
-	ModulePath   "/usr/lib/xorg/modules"
-	FontPath     "/usr/share/fonts/misc:unscaled"
-	FontPath     "/usr/share/fonts/misc"
-	FontPath     "/usr/share/fonts/75dpi:unscaled"
-	FontPath     "/usr/share/fonts/75dpi"
-	FontPath     "/usr/share/fonts/100dpi:unscaled"
-	FontPath     "/usr/share/fonts/100dpi"
-	FontPath     "/usr/share/fonts/PEX"
-# Additional fonts: Locale, Gimp, TTF...
-	FontPath     "/usr/share/fonts/cyrillic"
-#	FontPath     "/usr/share/lib/X11/fonts/latin2/75dpi"
-#	FontPath     "/usr/share/lib/X11/fonts/latin2/100dpi"
-# True type and type1 fonts are also handled via xftlib, see /etc/X11/XftConfig!
-	FontPath     "/usr/share/fonts/Type1"
-	FontPath     "/usr/share/fonts/ttf/western"
-	FontPath     "/usr/share/fonts/ttf/decoratives"
-	FontPath     "/usr/share/fonts/truetype"
-	FontPath     "/usr/share/fonts/truetype/openoffice"
-	FontPath     "/usr/share/fonts/truetype/ttf-bitstream-vera"
-	FontPath     "/usr/share/fonts/latex-ttf-fonts"
-	FontPath     "/usr/share/fonts/defoma/CID"
-	FontPath     "/usr/share/fonts/defoma/TrueType"
-EndSection
-
-Section "Module"
-        Load  "ddc"  # ddc probing of monitor
-	Load  "dbe"
-	Load  "dri"
-	Load  "extmod"
-	Load  "glx"
-        Load  "bitmap" # bitmap-fonts
-#	Load  "type1"
-	Load  "freetype"
-	Load  "record"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard0"
-	Driver      "keyboard"
-        Option      "CoreKeyboard"
-	Option "XkbRules" "xorg"
-	Option "XkbModel" "pc105"
-	Option "XkbLayout" ""
-	Option "XkbVariant" ""
-EndSection
-
-Section "InputDevice"
-	Identifier  "Serial Mouse"
-	Driver      "mouse"
-	Option      "Protocol" "Microsoft"
-	Option      "Device" "/dev/ttyS0"
-	Option      "Emulate3Buttons" "true"
-	Option      "Emulate3Timeout" "70"
-	Option	    "SendCoreEvents"  "true"
-EndSection
-
-Section "InputDevice"
-	Identifier  "PS/2 Mouse"
-	Driver      "mouse"
-	Option      "Protocol" "auto"
-	Option          "ZAxisMapping"          "4 5"
-	Option      "Device" "/dev/psaux"
-	Option      "Emulate3Buttons" "true"
-	Option      "Emulate3Timeout" "70"
-	Option	    "SendCoreEvents"  "true"
-EndSection
-
-Section "InputDevice"
-        Identifier      "USB Mouse"
-        Driver          "mouse"
-        Option          "Device"                "/dev/input/mice"
-	Option		"SendCoreEvents"	"true"
-        Option          "Protocol"              "IMPS/2"
-        Option          "ZAxisMapping"          "4 5"
-        Option          "Buttons"               "5"
-EndSection
-
-# Auto-generated by Archie mkxcfg
-
-Section "Monitor"
-	Identifier "Monitor0"
-		Option "DPMS" "true"
-EndSection
-
-# Auto-generated by Archie mkxcfg
-
-Section "Device"
-	Identifier  "Card0"
-	Driver      "intel"
-	VendorName  "All"
-	BoardName   "All"
-EndSection
-
-Section "Screen"
-	Identifier "Screen0"
-	Device     "Card0"
-	Monitor    "Monitor0"
-	DefaultColorDepth 16
-	SubSection "Display"
-		Depth     1
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     4
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     8
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     15
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     16
-		Modes  "800x600" 
-		virtual 800 600 
-	EndSubSection
-	SubSection "Display"
-		Depth     24
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     32
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-EndSection
-
-Section "DRI"
-	Mode 0666
-EndSection
diff --git a/abs/core/system-templates/templates/xorg/xorg.conf.nvidia b/abs/core/system-templates/templates/xorg/xorg.conf.nvidia
deleted file mode 100755
index 610bbe0..0000000
--- a/abs/core/system-templates/templates/xorg/xorg.conf.nvidia
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-#    HorizSync
-#    VertRefresh
-    Option         "DPMS" "false"
-#    DisplaySize  203 153
-#INSERT MODELINE
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "nvidia"
-    VendorName     "NVIDIA Corporation"
-    Option "DPI" "100 x 100"
-    Option "NoLogo" "1"
-
-#INSERT HERE
-
-#END OPTIONS
-
-#    Option "ConnectedMonitor" "DFP"
-#    Option "FlatPanelProperties" "Scaling = centered, Dithering = enabled"
-#    Option "DigitalVibrance" "0"
-#    Option "TransparentIndex" "0"
-#    Option  "CursorShadowAlpha" "64"
-#    Option  "CursorShadowXOffset"  "4"
-#    Option  "UseEdidFreqs" "True"
-#    Option  "NvAGP" "1"
-
-
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    24
-    SubSection     "Display"
-        Depth       24
-        Modes     "1280x720"
-    EndSubSection
-EndSection
-
diff --git a/abs/core/system-templates/templates/xorg/xorg.conf.vesa b/abs/core/system-templates/templates/xorg/xorg.conf.vesa
deleted file mode 100755
index 5ea0ef8..0000000
--- a/abs/core/system-templates/templates/xorg/xorg.conf.vesa
+++ /dev/null
@@ -1,70 +0,0 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-#Section "ServerFlags"
-#        Option "AutoAddDevices" "False"
-#EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-#    InputDevice    "Keyboard0" "CoreKeyboard"
-#    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "extmod"
-#    Load           "type1"
-    Load           "freetype"
-  
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-    HorizSync       30.0 - 110.0
-    VertRefresh     50.0 - 150.0
-    Option         "DPMS" "false"
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "vesa"
-    VendorName     "Generic Corporation"
-    Option "DPI" "100 x 100"
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    24
-    SubSection     "Display"
-        Depth       24
-        Modes     "1280x720" 
-    EndSubSection
-EndSection
-
diff --git a/abs/core/system-templates/templates/xorg/xorg.conf.via b/abs/core/system-templates/templates/xorg/xorg.conf.via
deleted file mode 100644
index 85919c6..0000000
--- a/abs/core/system-templates/templates/xorg/xorg.conf.via
+++ /dev/null
@@ -1,75 +0,0 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-#Section "ServerFlags"
-#        Option "AutoAddDevices" "False"
-#EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-#    InputDevice    "Keyboard0" "CoreKeyboard"
-#    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "glx"
-    Load           "extmod"
-#    Load           "type1"
-    Load           "freetype"
-    Load           "dri"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-    HorizSync       30.0 - 110.0
-    VertRefresh     50.0 - 150.0
-    Option         "DPMS" "false"
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "openchrome"
-    VendorName     "via"
-    Option "DPI" "100 x 100"
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    16
-    SubSection     "Display"
-        Depth       16
-	 Modes "800x600"
-    EndSubSection
-EndSection
-
-Section "DRI"
-	  Group   "video"
-	    Mode    0666
-    EndSection
diff --git a/abs/core/system-templates/templates/xorg/xorg.conf.vmware b/abs/core/system-templates/templates/xorg/xorg.conf.vmware
deleted file mode 100755
index ae8f34d..0000000
--- a/abs/core/system-templates/templates/xorg/xorg.conf.vmware
+++ /dev/null
@@ -1,70 +0,0 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-#Section "ServerFlags"
-#        Option "AutoAddDevices" "False"
-#EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-#    InputDevice    "Keyboard0" "CoreKeyboard"
-#    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "extmod"
-#    Load           "type1"
-    Load           "freetype"
-    Load           "glx"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-    HorizSync       30.0 - 110.0
-    VertRefresh     50.0 - 150.0
-    Option         "DPMS" "false"
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "vmware"
-    VendorName     "NVIDIA Corporation"
-    Option "DPI" "100 x 100"
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    24
-    SubSection     "Display"
-        Depth       24
-        Modes     "1280x720" 
-    EndSubSection
-EndSection
-
diff --git a/abs/core/system-templates/templates/xorg/xorg.intel b/abs/core/system-templates/templates/xorg/xorg.intel
new file mode 100644
index 0000000..dcd1d90
--- /dev/null
+++ b/abs/core/system-templates/templates/xorg/xorg.intel
@@ -0,0 +1,7 @@
+Section "Device"
+   Identifier  "Intel Graphics"
+   Driver      "intel"
+   #Option      "AccelMethod"  "sna"
+   Option      "AccelMethod"  "uxa"
+   #Option      "AccelMethod"  "xaa"
+EndSection
diff --git a/abs/core/system-templates/templates/xorg/xorg.nvidia b/abs/core/system-templates/templates/xorg/xorg.nvidia
new file mode 100644
index 0000000..75a90cd
--- /dev/null
+++ b/abs/core/system-templates/templates/xorg/xorg.nvidia
@@ -0,0 +1,7 @@
+Section "Device"
+    Identifier     "Device0"
+    Driver         "nvidia"
+    VendorName     "NVIDIA Corporation"
+    Option "DPI" "100 x 100"
+    Option "NoLogo" "1"
+EndSection
diff --git a/abs/core/system-templates/templates/xorg/xorg.vesa b/abs/core/system-templates/templates/xorg/xorg.vesa
new file mode 100644
index 0000000..52097c0
--- /dev/null
+++ b/abs/core/system-templates/templates/xorg/xorg.vesa
@@ -0,0 +1,4 @@
+Section "Device"
+    Identifier             "Device0"
+    Driver                 "vesa" 
+EndSection
diff --git a/abs/core/system-templates/templates/xorg/xorg.vmware b/abs/core/system-templates/templates/xorg/xorg.vmware
new file mode 100755
index 0000000..139a187
--- /dev/null
+++ b/abs/core/system-templates/templates/xorg/xorg.vmware
@@ -0,0 +1,4 @@
+ Section "Device"
+        Identifier "Card0"
+        Driver     "vmware"
+ EndSection