From 2b261e406c480c7c54b1d68b6019ddbf6faedb3c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 19 Nov 2012 17:33:00 -0600
Subject: system-templates: add support for firefly using unique id's.  Only
 includeing 1 -6 because that should be enough for most people and I don't
 want to clutter the remote selector. If needed expanding it out to all 16 ids
 will be a trivial process

refs #854
---
 abs/core/system-templates/PKGBUILD                 |   2 +-
 .../ATI/snapstream_firefly/lircd.snapstrm.conf     | 127 -----
 .../ATI/snapstream_firefly/lircrc-snapstrm.txt     | 590 ---------------------
 .../remotes/ATI/snapstream_firefly/preview.jpg     | Bin 63750 -> 0 bytes
 .../remotes/ATI/snapstream_firefly_all/ir.conf.ff1 |   7 +
 .../ATI/snapstream_firefly_all/lircd.snapstrm.conf | 127 +++++
 .../ATI/snapstream_firefly_all/lircrc-snapstrm.txt | 590 +++++++++++++++++++++
 .../remotes/ATI/snapstream_firefly_all/preview.jpg | Bin 0 -> 63750 bytes
 .../remotes/ATI/snapstream_firefly_ch1/ir.conf.ff1 |   7 +
 .../ATI/snapstream_firefly_ch1/lircd.conf.ff1      | 111 ++++
 .../ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt | 590 +++++++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch1/preview.jpg | Bin 0 -> 63750 bytes
 .../remotes/ATI/snapstream_firefly_ch2/ir.conf.ff2 |   7 +
 .../ATI/snapstream_firefly_ch2/lircd.conf.ff2      | 111 ++++
 .../ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt | 590 +++++++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch2/preview.jpg | Bin 0 -> 63750 bytes
 .../remotes/ATI/snapstream_firefly_ch3/ir.conf.ff3 |   7 +
 .../ATI/snapstream_firefly_ch3/lircd.conf.ff2      | 111 ++++
 .../ATI/snapstream_firefly_ch3/lircd.conf.ff3      | 111 ++++
 .../ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt | 590 +++++++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch3/preview.jpg | Bin 0 -> 63750 bytes
 .../remotes/ATI/snapstream_firefly_ch4/ir.conf.ff4 |   7 +
 .../ATI/snapstream_firefly_ch4/lircd.conf.ff4      | 111 ++++
 .../ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt | 590 +++++++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch4/preview.jpg | Bin 0 -> 63750 bytes
 .../remotes/ATI/snapstream_firefly_ch5/ir.conf.ff5 |   7 +
 .../ATI/snapstream_firefly_ch5/lircd.conf.ff5      | 111 ++++
 .../ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt | 590 +++++++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch5/preview.jpg | Bin 0 -> 63750 bytes
 .../remotes/ATI/snapstream_firefly_ch6/ir.conf.ff6 |   7 +
 .../ATI/snapstream_firefly_ch6/lircd.conf.ff6      | 111 ++++
 .../ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt | 590 +++++++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch6/preview.jpg | Bin 0 -> 63750 bytes
 33 files changed, 5084 insertions(+), 718 deletions(-)
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/ir.conf.ff1
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircd.snapstrm.conf
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/ir.conf.ff1
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircd.conf.ff1
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/ir.conf.ff2
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircd.conf.ff2
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/ir.conf.ff3
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff3
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/ir.conf.ff4
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircd.conf.ff4
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/ir.conf.ff5
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircd.conf.ff5
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/preview.jpg
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/ir.conf.ff6
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircd.conf.ff6
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/preview.jpg

diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 0efc451..04589a1 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
 pkgver=2.0
-pkgrel=21
+pkgrel=22
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
deleted file mode 100644
index 288bb51..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircd.snapstrm.conf
+++ /dev/null
@@ -1,127 +0,0 @@
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0(any) on Fri Mar 11 08:51:45 2005
-#
-# contributed by
-#
-# brand: Snapstream Firefly Remote
-# model no. of remote control:
-# devices being controlled by this remote:
-#
-
-begin remote
-
-name Snapstream_Firefly
-bits 40
-eps 30
-aeps 100
-
-one 0 0
-zero 0 0
-gap 219964
-toggle_bit 0
-
-
-begin codes
-MAXI 0x0000001481AC0000
-MAXI 0x00000014012C0000
-CLOSE 0x00000014D7020000
-CLOSE 0x0000001457820000
-1 0x00000014628D0000
-1 0x00000014E20D0000
-2 0x00000014E30E0000
-2 0x00000014638E0000
-3 0x00000014648F0000
-3 0x00000014E40F0000
-4 0x00000014E5100000
-4 0x0000001465900000
-5 0x0000001466910000
-5 0x00000014E6110000
-6 0x00000014E7120000
-6 0x0000001467920000
-7 0x0000001468930000
-7 0x00000014E8130000
-8 0x00000014E9140000
-8 0x0000001469940000
-9 0x000000146A950000
-9 0x00000014EA150000
-0 0x00000014EC170000
-0 0x000000146C970000
-BACK 0x000000146B960000
-BACK 0x00000014EB160000
-ENT 0x00000014ED180000
-ENT 0x000000146D980000
-VOL+ 0x000000145E890000
-VOL+ 0x00000014DE090000
-VOL- 0x000000145D880000
-VOL- 0x00000014DD080000
-MUTE 0x000000145F8A0000
-MUTE 0x00000014DF0A0000
-FIREFLY 0x0000001455800000
-FIREFLY 0x00000014D5000000
-CH+ 0x00000014608B0000
-CH+ 0x00000014E00B0000
-CH- 0x00000014618C0000
-CH- 0x00000014E10C0000
-INFO 0x0000001483AE0000
-INFO 0x00000014032E0000
-OPTION 0x0000001484AF0000
-OPTION 0x00000014042F0000
-UP 0x000000146F9A0000
-UP 0x00000014EF1A0000
-LEFT 0x00000014729D0000
-LEFT 0x00000014F21D0000
-DOWN 0x0000001477A20000
-DOWN 0x00000014F7220000
-RIGHT 0x00000014749F0000
-RIGHT 0x00000014F41F0000
-OK 0x00000014739E0000
-OK 0x00000014F31E0000
-MENU 0x00000014719C0000
-MENU 0x00000014F11C0000
-EXIT 0x0000001475A00000
-EXIT 0x00000014F5200000
-REC 0x00000014FC270000
-REC 0x000000147CA70000
-PLAY 0x00000014FA250000
-PLAY 0x000000147AA50000
-STOP 0x00000014FD280000
-STOP 0x000000147DA80000
-REW 0x00000014F9240000
-REW 0x0000001479A40000
-FWD 0x00000014FB260000
-FWD 0x000000147BA60000
-PREV 0x00000014002B0000
-PREV 0x0000001480AB0000
-PAUSE 0x00000014FE290000
-PAUSE 0x000000147EA90000
-NEXT 0x00000014FF2A0000
-NEXT 0x000000147FAA0000
-MUSIC 0x00000014DB060000
-MUSIC 0x000000145B860000
-PHOTOS 0x00000014DA050000
-PHOTOS 0x000000145A850000
-DVD 0x00000014D9040000
-DVD 0x0000001459840000
-TV 0x00000014D8030000
-TV 0x0000001458830000
-VIDEO 0x00000014DC070000
-VIDEO 0x000000145C870000
-HELP 0x00000014D6010000
-HELP 0x0000001456810000
-MOUSE 0x00000014022D0000
-MOUSE 0x0000001482AD0000
-A 0x00000014EE190000
-A 0x000000146E990000
-B 0x00000014F01B0000
-B 0x00000014709B0000
-C 0x00000014F6210000
-C 0x0000001476A10000
-D 0x00000014F8230000
-D 0x0000001478A30000
-
-end codes
-
-end remote
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
deleted file mode 100644
index e918011..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/lircrc-snapstrm.txt
+++ /dev/null
@@ -1,590 +0,0 @@
-# ~/.mythtv/lircrc
-#
-# MythTV native LIRC config file for
-# the new grey Hauppauge remote
-#
-# Modified from Jarod Wilson's which came from Jeff Campbell's
-# By Brad Templeton
-
-
-# Here we have the jump point commands.  They only work if you have
-# defined function keys for these jump points.  For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
-
-begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
-end
-
-begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
-end
-
-# Not yet defined
-begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
-end
-
-# Given another function for now, I don't use mythgallery
-begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
-end
-
-begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
-end
-
-# I stuck the "todo" list on here as Myth has no radio function
-begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
-end
-
-begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
-end
-
-begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
-end
-
-# Channel Up
-begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
-end
-
-# Channel Down
-begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
-end
-
-# OK/Select
-begin
-prog = mythtv
-button = Ok
-config = Space
-end
-
-# Play
-begin
-prog = mythtv
-button = Play
-config = Return
-end
-
-# Stop
-begin
-prog = mythtv
-button = Stop
-config = I
-end
-
-# Escape/Exit/Back
-begin
-prog = mythtv
-button = BACK
-config = Esc
-end
-
-# Power Off/Exit
-begin
-prog = mythtv
-button = POWER
-config = Esc
-end
-
-
-# Pause
-begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
-end
-
-# Mute
-begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
-end
-
-# Fast forward (30 sec default)
-begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
-end
-
-# Rewind (10 sec default)
-begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
-end
-
-# Skip forward (10 min default)
-begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
-end
-
-# Skip backward (10 min default)
-begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
-end
-
-# Record
-begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
-end
-
-# Delete
-begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
-end
-
-# Decrease play speed
-begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
-end
-
-# Display EPG while in live TV,
-# View selected show while in EPG
-begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
-end
-
-# Scroll up
-begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
-end
-
-# Scroll down
-begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
-end
-
-# Bring up OSD info
-begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
-end
-
-# Change display aspect ratio
-begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
-end
-
-# double speed watch
-begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
-end
-
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
-begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
-end
-
-# Numbers 0-9
-
-begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
-end
-
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
-begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
-end
-
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-
-# Quit
-begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
-end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg
deleted file mode 100644
index a1fbc6e..0000000
Binary files a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly/preview.jpg and /dev/null differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/ir.conf.ff1 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/ir.conf.ff1
new file mode 100644
index 0000000..5bb394f
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/ir.conf.ff1
@@ -0,0 +1,7 @@
+#Snapstream Firefly Channel all
+#placed here by mv_ir.py
+blacklist ati_remote
+install ati_remote /bin/false
+
+alias char-major-61 lirc_atiusb
+options lirc_atiusb 
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircd.snapstrm.conf b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircd.snapstrm.conf
new file mode 100644
index 0000000..288bb51
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircd.snapstrm.conf
@@ -0,0 +1,127 @@
+# Please make this file available to others
+# by sending it to <lirc@bartelmus.de>
+#
+# this config file was automatically generated
+# using lirc-0.7.0(any) on Fri Mar 11 08:51:45 2005
+#
+# contributed by
+#
+# brand: Snapstream Firefly Remote
+# model no. of remote control:
+# devices being controlled by this remote:
+#
+
+begin remote
+
+name Snapstream_Firefly
+bits 40
+eps 30
+aeps 100
+
+one 0 0
+zero 0 0
+gap 219964
+toggle_bit 0
+
+
+begin codes
+MAXI 0x0000001481AC0000
+MAXI 0x00000014012C0000
+CLOSE 0x00000014D7020000
+CLOSE 0x0000001457820000
+1 0x00000014628D0000
+1 0x00000014E20D0000
+2 0x00000014E30E0000
+2 0x00000014638E0000
+3 0x00000014648F0000
+3 0x00000014E40F0000
+4 0x00000014E5100000
+4 0x0000001465900000
+5 0x0000001466910000
+5 0x00000014E6110000
+6 0x00000014E7120000
+6 0x0000001467920000
+7 0x0000001468930000
+7 0x00000014E8130000
+8 0x00000014E9140000
+8 0x0000001469940000
+9 0x000000146A950000
+9 0x00000014EA150000
+0 0x00000014EC170000
+0 0x000000146C970000
+BACK 0x000000146B960000
+BACK 0x00000014EB160000
+ENT 0x00000014ED180000
+ENT 0x000000146D980000
+VOL+ 0x000000145E890000
+VOL+ 0x00000014DE090000
+VOL- 0x000000145D880000
+VOL- 0x00000014DD080000
+MUTE 0x000000145F8A0000
+MUTE 0x00000014DF0A0000
+FIREFLY 0x0000001455800000
+FIREFLY 0x00000014D5000000
+CH+ 0x00000014608B0000
+CH+ 0x00000014E00B0000
+CH- 0x00000014618C0000
+CH- 0x00000014E10C0000
+INFO 0x0000001483AE0000
+INFO 0x00000014032E0000
+OPTION 0x0000001484AF0000
+OPTION 0x00000014042F0000
+UP 0x000000146F9A0000
+UP 0x00000014EF1A0000
+LEFT 0x00000014729D0000
+LEFT 0x00000014F21D0000
+DOWN 0x0000001477A20000
+DOWN 0x00000014F7220000
+RIGHT 0x00000014749F0000
+RIGHT 0x00000014F41F0000
+OK 0x00000014739E0000
+OK 0x00000014F31E0000
+MENU 0x00000014719C0000
+MENU 0x00000014F11C0000
+EXIT 0x0000001475A00000
+EXIT 0x00000014F5200000
+REC 0x00000014FC270000
+REC 0x000000147CA70000
+PLAY 0x00000014FA250000
+PLAY 0x000000147AA50000
+STOP 0x00000014FD280000
+STOP 0x000000147DA80000
+REW 0x00000014F9240000
+REW 0x0000001479A40000
+FWD 0x00000014FB260000
+FWD 0x000000147BA60000
+PREV 0x00000014002B0000
+PREV 0x0000001480AB0000
+PAUSE 0x00000014FE290000
+PAUSE 0x000000147EA90000
+NEXT 0x00000014FF2A0000
+NEXT 0x000000147FAA0000
+MUSIC 0x00000014DB060000
+MUSIC 0x000000145B860000
+PHOTOS 0x00000014DA050000
+PHOTOS 0x000000145A850000
+DVD 0x00000014D9040000
+DVD 0x0000001459840000
+TV 0x00000014D8030000
+TV 0x0000001458830000
+VIDEO 0x00000014DC070000
+VIDEO 0x000000145C870000
+HELP 0x00000014D6010000
+HELP 0x0000001456810000
+MOUSE 0x00000014022D0000
+MOUSE 0x0000001482AD0000
+A 0x00000014EE190000
+A 0x000000146E990000
+B 0x00000014F01B0000
+B 0x00000014709B0000
+C 0x00000014F6210000
+C 0x0000001476A10000
+D 0x00000014F8230000
+D 0x0000001478A30000
+
+end codes
+
+end remote
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/ir.conf.ff1 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/ir.conf.ff1
new file mode 100644
index 0000000..272b877
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/ir.conf.ff1
@@ -0,0 +1,7 @@
+#Snapstream Firefly Channel 1
+#placed here by mv_ir.py
+blacklist ati_remote
+install ati_remote /bin/false
+
+alias char-major-61 lirc_atiusb
+options lirc_atiusb unique=1 mask=0x0001
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircd.conf.ff1 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircd.conf.ff1
new file mode 100644
index 0000000..fc48b9d
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircd.conf.ff1
@@ -0,0 +1,111 @@
+#Snapstream Firefly Default Channel 1
+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
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/ir.conf.ff2 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/ir.conf.ff2
new file mode 100644
index 0000000..22852233
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/ir.conf.ff2
@@ -0,0 +1,7 @@
+#Snapstream Firefly Channel 2
+#placed here by mv_ir.py
+blacklist ati_remote
+install ati_remote /bin/false
+
+alias char-major-61 lirc_atiusb
+options lirc_atiusb unique=1 mask=0x0002
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircd.conf.ff2 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircd.conf.ff2
new file mode 100644
index 0000000..6218b7f
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircd.conf.ff2
@@ -0,0 +1,111 @@
+#Snapstream Firefly Channel 2
+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		0x0000001491AC1000
+    MAXI		0x00000014112C1000
+    CLOSE		0x00000014E7021000
+    CLOSE		0x0000001467821000
+    1		0x00000014728D1000
+    1		0x00000014F20D1000
+    2		0x00000014F30E1000
+    2		0x00000014738E1000
+    3		0x00000014748F1000
+    3		0x00000014F40F1000
+    4		0x00000014F5101000
+    4		0x0000001475901000
+    5		0x0000001476911000
+    5		0x00000014F6111000
+    6		0x00000014F7121000
+    6		0x0000001477921000
+    7		0x0000001478931000
+    7		0x00000014F8131000
+    8		0x00000014F9141000
+    8		0x0000001479941000
+    9		0x000000147A951000
+    9		0x00000014FA151000
+    0		0x00000014FC171000
+    0		0x000000147C971000
+    BACK		0x000000147B961000
+    BACK		0x00000014FB161000
+    ENT		0x00000014FD181000
+    ENT		0x000000147D981000
+    VOL+		0x000000146E891000
+    VOL+		0x00000014EE091000
+    VOL-		0x000000146D881000
+    VOL-		0x00000014ED081000
+    MUTE		0x000000146F8A1000
+    MUTE		0x00000014EF0A1000
+    FIREFLY		0x0000001465801000
+    FIREFLY		0x00000014E5001000
+    CH+		0x00000014708B1000
+    CH+		0x00000014F00B1000
+    CH-		0x00000014718C1000
+    CH-		0x00000014F10C1000
+    INFO		0x0000001493AE1000
+    INFO		0x00000014132E1000
+    OPTION		0x0000001494AF1000
+    OPTION		0x00000014142F1000
+    UP		0x000000147F9A1000
+    UP		0x00000014FF1A1000
+    LEFT		0x00000014829D1000
+    LEFT		0x00000014021D1000
+    DOWN		0x0000001487A21000
+    DOWN		0x0000001407221000
+    RIGHT		0x00000014849F1000
+    RIGHT		0x00000014041F1000
+    OK		0x00000014839E1000
+    OK		0x00000014031E1000
+    MENU		0x00000014819C1000
+    MENU		0x00000014011C1000
+    EXIT		0x0000001485A01000
+    EXIT		0x0000001405201000
+    REC		0x000000140C271000
+    REC		0x000000148CA71000
+    PLAY		0x000000140A251000
+    PLAY		0x000000148AA51000
+    STOP		0x000000140D281000
+    STOP		0x000000148DA81000
+    REW		0x0000001409241000
+    REW		0x0000001489A41000
+    FWD		0x000000140B261000
+    FWD		0x000000148BA61000
+    PREV		0x00000014102B1000
+    PREV		0x0000001490AB1000
+    PAUSE		0x000000140E291000
+    PAUSE		0x000000148EA91000
+    NEXT		0x000000140F2A1000
+    NEXT		0x000000148FAA1000
+    MUSIC		0x00000014EB061000
+    MUSIC		0x000000146B861000
+    PHOTOS		0x00000014EA051000
+    PHOTOS		0x000000146A851000
+    DVD		0x00000014E9041000
+    DVD		0x0000001469841000
+    TV		0x00000014E8031000
+    TV		0x0000001468831000
+    VIDEO		0x00000014EC071000
+    VIDEO		0x000000146C871000
+    HELP		0x00000014E6011000
+    HELP		0x0000001466811000
+    MOUSE		0x00000014122D1000
+    MOUSE		0x0000001492AD1000
+    A		0x00000014FE191000
+    A		0x000000147E991000
+    B		0x00000014001B1000
+    B		0x00000014809B1000
+    C		0x0000001406211000
+    C		0x0000001486A11000
+    D		0x0000001408231000
+    D		0x0000001488A31000
+
+ end codes
+
+end remote
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/ir.conf.ff3 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/ir.conf.ff3
new file mode 100644
index 0000000..7a42baa
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/ir.conf.ff3
@@ -0,0 +1,7 @@
+#Snapstream Firefly Channel 3
+#placed here by mv_ir.py
+blacklist ati_remote
+install ati_remote /bin/false
+
+alias char-major-61 lirc_atiusb
+options lirc_atiusb unique=1 mask=0x0004
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2
new file mode 100644
index 0000000..6218b7f
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff2
@@ -0,0 +1,111 @@
+#Snapstream Firefly Channel 2
+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		0x0000001491AC1000
+    MAXI		0x00000014112C1000
+    CLOSE		0x00000014E7021000
+    CLOSE		0x0000001467821000
+    1		0x00000014728D1000
+    1		0x00000014F20D1000
+    2		0x00000014F30E1000
+    2		0x00000014738E1000
+    3		0x00000014748F1000
+    3		0x00000014F40F1000
+    4		0x00000014F5101000
+    4		0x0000001475901000
+    5		0x0000001476911000
+    5		0x00000014F6111000
+    6		0x00000014F7121000
+    6		0x0000001477921000
+    7		0x0000001478931000
+    7		0x00000014F8131000
+    8		0x00000014F9141000
+    8		0x0000001479941000
+    9		0x000000147A951000
+    9		0x00000014FA151000
+    0		0x00000014FC171000
+    0		0x000000147C971000
+    BACK		0x000000147B961000
+    BACK		0x00000014FB161000
+    ENT		0x00000014FD181000
+    ENT		0x000000147D981000
+    VOL+		0x000000146E891000
+    VOL+		0x00000014EE091000
+    VOL-		0x000000146D881000
+    VOL-		0x00000014ED081000
+    MUTE		0x000000146F8A1000
+    MUTE		0x00000014EF0A1000
+    FIREFLY		0x0000001465801000
+    FIREFLY		0x00000014E5001000
+    CH+		0x00000014708B1000
+    CH+		0x00000014F00B1000
+    CH-		0x00000014718C1000
+    CH-		0x00000014F10C1000
+    INFO		0x0000001493AE1000
+    INFO		0x00000014132E1000
+    OPTION		0x0000001494AF1000
+    OPTION		0x00000014142F1000
+    UP		0x000000147F9A1000
+    UP		0x00000014FF1A1000
+    LEFT		0x00000014829D1000
+    LEFT		0x00000014021D1000
+    DOWN		0x0000001487A21000
+    DOWN		0x0000001407221000
+    RIGHT		0x00000014849F1000
+    RIGHT		0x00000014041F1000
+    OK		0x00000014839E1000
+    OK		0x00000014031E1000
+    MENU		0x00000014819C1000
+    MENU		0x00000014011C1000
+    EXIT		0x0000001485A01000
+    EXIT		0x0000001405201000
+    REC		0x000000140C271000
+    REC		0x000000148CA71000
+    PLAY		0x000000140A251000
+    PLAY		0x000000148AA51000
+    STOP		0x000000140D281000
+    STOP		0x000000148DA81000
+    REW		0x0000001409241000
+    REW		0x0000001489A41000
+    FWD		0x000000140B261000
+    FWD		0x000000148BA61000
+    PREV		0x00000014102B1000
+    PREV		0x0000001490AB1000
+    PAUSE		0x000000140E291000
+    PAUSE		0x000000148EA91000
+    NEXT		0x000000140F2A1000
+    NEXT		0x000000148FAA1000
+    MUSIC		0x00000014EB061000
+    MUSIC		0x000000146B861000
+    PHOTOS		0x00000014EA051000
+    PHOTOS		0x000000146A851000
+    DVD		0x00000014E9041000
+    DVD		0x0000001469841000
+    TV		0x00000014E8031000
+    TV		0x0000001468831000
+    VIDEO		0x00000014EC071000
+    VIDEO		0x000000146C871000
+    HELP		0x00000014E6011000
+    HELP		0x0000001466811000
+    MOUSE		0x00000014122D1000
+    MOUSE		0x0000001492AD1000
+    A		0x00000014FE191000
+    A		0x000000147E991000
+    B		0x00000014001B1000
+    B		0x00000014809B1000
+    C		0x0000001406211000
+    C		0x0000001486A11000
+    D		0x0000001408231000
+    D		0x0000001488A31000
+
+ end codes
+
+end remote
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff3 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff3
new file mode 100644
index 0000000..bd9d03f
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircd.conf.ff3
@@ -0,0 +1,111 @@
+#Snapstream Firefly Channel 3
+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		0x00000014A1AC2000
+    MAXI		0x00000014212C2000
+    CLOSE		0x00000014F7022000
+    CLOSE		0x0000001477822000
+    1		0x00000014828D2000
+    1		0x00000014020D2000
+    2		0x00000014030E2000
+    2		0x00000014838E2000
+    3		0x00000014848F2000
+    3		0x00000014040F2000
+    4		0x0000001405102000
+    4		0x0000001485902000
+    5		0x0000001486912000
+    5		0x0000001406112000
+    6		0x0000001407122000
+    6		0x0000001487922000
+    7		0x0000001488932000
+    7		0x0000001408132000
+    8		0x0000001409142000
+    8		0x0000001489942000
+    9		0x000000148A952000
+    9		0x000000140A152000
+    0		0x000000140C172000
+    0		0x000000148C972000
+    BACK		0x000000148B962000
+    BACK		0x000000140B162000
+    ENT		0x000000140D182000
+    ENT		0x000000148D982000
+    VOL+		0x000000147E892000
+    VOL+		0x00000014FE092000
+    VOL-		0x000000147D882000
+    VOL-		0x00000014FD082000
+    MUTE		0x000000147F8A2000
+    MUTE		0x00000014FF0A2000
+    FIREFLY		0x0000001475802000
+    FIREFLY		0x00000014F5002000
+    CH+		0x00000014808B2000
+    CH+		0x00000014000B2000
+    CH-		0x00000014818C2000
+    CH-		0x00000014010C2000
+    INFO		0x00000014A3AE2000
+    INFO		0x00000014232E2000
+    OPTION		0x00000014A4AF2000
+    OPTION		0x00000014242F2000
+    UP		0x000000148F9A2000
+    UP		0x000000140F1A2000
+    LEFT		0x00000014929D2000
+    LEFT		0x00000014121D2000
+    DOWN		0x0000001497A22000
+    DOWN		0x0000001417222000
+    RIGHT		0x00000014949F2000
+    RIGHT		0x00000014141F2000
+    OK		0x00000014939E2000
+    OK		0x00000014131E2000
+    MENU		0x00000014919C2000
+    MENU		0x00000014111C2000
+    EXIT		0x0000001495A02000
+    EXIT		0x0000001415202000
+    REC		0x000000141C272000
+    REC		0x000000149CA72000
+    PLAY		0x000000141A252000
+    PLAY		0x000000149AA52000
+    STOP		0x000000141D282000
+    STOP		0x000000149DA82000
+    REW		0x0000001419242000
+    REW		0x0000001499A42000
+    FWD		0x000000141B262000
+    FWD		0x000000149BA62000
+    PREV		0x00000014202B2000
+    PREV		0x00000014A0AB2000
+    PAUSE		0x000000141E292000
+    PAUSE		0x000000149EA92000
+    NEXT		0x000000141F2A2000
+    NEXT		0x000000149FAA2000
+    MUSIC		0x00000014FB062000
+    MUSIC		0x000000147B862000
+    PHOTOS		0x00000014FA052000
+    PHOTOS		0x000000147A852000
+    DVD		0x00000014F9042000
+    DVD		0x0000001479842000
+    TV		0x00000014F8032000
+    TV		0x0000001478832000
+    VIDEO		0x00000014FC072000
+    VIDEO		0x000000147C872000
+    HELP		0x00000014F6012000
+    HELP		0x0000001476812000
+    MOUSE		0x00000014222D2000
+    MOUSE		0x00000014A2AD2000
+    A		0x000000140E192000
+    A		0x000000148E992000
+    B		0x00000014101B2000
+    B		0x00000014909B2000
+    C		0x0000001416212000
+    C		0x0000001496A12000
+    D		0x0000001418232000
+    D		0x0000001498A32000
+
+ end codes
+
+end remote
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/ir.conf.ff4 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/ir.conf.ff4
new file mode 100644
index 0000000..ba1fa1c
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/ir.conf.ff4
@@ -0,0 +1,7 @@
+#Snapstream Firefly Channel 4
+#placed here by mv_ir.py
+blacklist ati_remote
+install ati_remote /bin/false
+
+alias char-major-61 lirc_atiusb
+options lirc_atiusb unique=1 mask=0x0008
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircd.conf.ff4 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircd.conf.ff4
new file mode 100644
index 0000000..79b0370
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircd.conf.ff4
@@ -0,0 +1,111 @@
+#Snapstream Firefly Channel 4
+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		0x00000014B1AC3000
+    MAXI		0x00000014312C3000
+    CLOSE		0x0000001407023000
+    CLOSE		0x0000001487823000
+    1		0x00000014928D3000
+    1		0x00000014120D3000
+    2		0x00000014130E3000
+    2		0x00000014938E3000
+    3		0x00000014948F3000
+    3		0x00000014140F3000
+    4		0x0000001415103000
+    4		0x0000001495903000
+    5		0x0000001496913000
+    5		0x0000001416113000
+    6		0x0000001417123000
+    6		0x0000001497923000
+    7		0x0000001498933000
+    7		0x0000001418133000
+    8		0x0000001419143000
+    8		0x0000001499943000
+    9		0x000000149A953000
+    9		0x000000141A153000
+    0		0x000000141C173000
+    0		0x000000149C973000
+    BACK		0x000000149B963000
+    BACK		0x000000141B163000
+    ENT		0x000000141D183000
+    ENT		0x000000149D983000
+    VOL+		0x000000148E893000
+    VOL+		0x000000140E093000
+    VOL-		0x000000148D883000
+    VOL-		0x000000140D083000
+    MUTE		0x000000148F8A3000
+    MUTE		0x000000140F0A3000
+    FIREFLY		0x0000001485803000
+    FIREFLY		0x0000001405003000
+    CH+		0x00000014908B3000
+    CH+		0x00000014100B3000
+    CH-		0x00000014918C3000
+    CH-		0x00000014110C3000
+    INFO		0x00000014B3AE3000
+    INFO		0x00000014332E3000
+    OPTION		0x00000014B4AF3000
+    OPTION		0x00000014342F3000
+    UP		0x000000149F9A3000
+    UP		0x000000141F1A3000
+    LEFT		0x00000014A29D3000
+    LEFT		0x00000014221D3000
+    DOWN		0x00000014A7A23000
+    DOWN		0x0000001427223000
+    RIGHT		0x00000014A49F3000
+    RIGHT		0x00000014241F3000
+    OK		0x00000014A39E3000
+    OK		0x00000014231E3000
+    MENU		0x00000014A19C3000
+    MENU		0x00000014211C3000
+    EXIT		0x00000014A5A03000
+    EXIT		0x0000001425203000
+    REC		0x000000142C273000
+    REC		0x00000014ACA73000
+    PLAY		0x000000142A253000
+    PLAY		0x00000014AAA53000
+    STOP		0x000000142D283000
+    STOP		0x00000014ADA83000
+    REW		0x0000001429243000
+    REW		0x00000014A9A43000
+    FWD		0x000000142B263000
+    FWD		0x00000014ABA63000
+    PREV		0x00000014302B3000
+    PREV		0x00000014B0AB3000
+    PAUSE		0x000000142E293000
+    PAUSE		0x00000014AEA93000
+    NEXT		0x000000142F2A3000
+    NEXT		0x00000014AFAA3000
+    MUSIC		0x000000140B063000
+    MUSIC		0x000000148B863000
+    PHOTOS		0x000000140A053000
+    PHOTOS		0x000000148A853000
+    DVD		0x0000001409043000
+    DVD		0x0000001489843000
+    TV		0x0000001408033000
+    TV		0x0000001488833000
+    VIDEO		0x000000140C073000
+    VIDEO		0x000000148C873000
+    HELP		0x0000001406013000
+    HELP		0x0000001486813000
+    MOUSE		0x00000014322D3000
+    MOUSE		0x00000014B2AD3000
+    A		0x000000141E193000
+    A		0x000000149E993000
+    B		0x00000014201B3000
+    B		0x00000014A09B3000
+    C		0x0000001426213000
+    C		0x00000014A6A13000
+    D		0x0000001428233000
+    D		0x00000014A8A33000
+
+ end codes
+
+end remote
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/ir.conf.ff5 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/ir.conf.ff5
new file mode 100644
index 0000000..65723b8
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/ir.conf.ff5
@@ -0,0 +1,7 @@
+#Snapstream Firefly Channel 5
+#placed here by mv_ir.py
+blacklist ati_remote
+install ati_remote /bin/false
+
+alias char-major-61 lirc_atiusb
+options lirc_atiusb unique=1 mask=0x0010
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircd.conf.ff5 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircd.conf.ff5
new file mode 100644
index 0000000..d1f2a60
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircd.conf.ff5
@@ -0,0 +1,111 @@
+#Snapstream Firefly Channel 5
+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		0x00000014C1AC4000
+    MAXI		0x00000014412C4000
+    CLOSE		0x0000001417024000
+    CLOSE		0x0000001497824000
+    1		0x00000014A28D4000
+    1		0x00000014220D4000
+    2		0x00000014230E4000
+    2		0x00000014A38E4000
+    3		0x00000014A48F4000
+    3		0x00000014240F4000
+    4		0x0000001425104000
+    4		0x00000014A5904000
+    5		0x00000014A6914000
+    5		0x0000001426114000
+    6		0x0000001427124000
+    6		0x00000014A7924000
+    7		0x00000014A8934000
+    7		0x0000001428134000
+    8		0x0000001429144000
+    8		0x00000014A9944000
+    9		0x00000014AA954000
+    9		0x000000142A154000
+    0		0x000000142C174000
+    0		0x00000014AC974000
+    BACK		0x00000014AB964000
+    BACK		0x000000142B164000
+    ENT		0x000000142D184000
+    ENT		0x00000014AD984000
+    VOL+		0x000000149E894000
+    VOL+		0x000000141E094000
+    VOL-		0x000000149D884000
+    VOL-		0x000000141D084000
+    MUTE		0x000000149F8A4000
+    MUTE		0x000000141F0A4000
+    FIREFLY		0x0000001495804000
+    FIREFLY		0x0000001415004000
+    CH+		0x00000014A08B4000
+    CH+		0x00000014200B4000
+    CH-		0x00000014A18C4000
+    CH-		0x00000014210C4000
+    INFO		0x00000014C3AE4000
+    INFO		0x00000014432E4000
+    OPTION		0x00000014C4AF4000
+    OPTION		0x00000014442F4000
+    UP		0x00000014AF9A4000
+    UP		0x000000142F1A4000
+    LEFT		0x00000014B29D4000
+    LEFT		0x00000014321D4000
+    DOWN		0x00000014B7A24000
+    DOWN		0x0000001437224000
+    RIGHT		0x00000014B49F4000
+    RIGHT		0x00000014341F4000
+    OK		0x00000014B39E4000
+    OK		0x00000014331E4000
+    MENU		0x00000014B19C4000
+    MENU		0x00000014311C4000
+    EXIT		0x00000014B5A04000
+    EXIT		0x0000001435204000
+    REC		0x000000143C274000
+    REC		0x00000014BCA74000
+    PLAY		0x000000143A254000
+    PLAY		0x00000014BAA54000
+    STOP		0x000000143D284000
+    STOP		0x00000014BDA84000
+    REW		0x0000001439244000
+    REW		0x00000014B9A44000
+    FWD		0x000000143B264000
+    FWD		0x00000014BBA64000
+    PREV		0x00000014402B4000
+    PREV		0x00000014C0AB4000
+    PAUSE		0x000000143E294000
+    PAUSE		0x00000014BEA94000
+    NEXT		0x000000143F2A4000
+    NEXT		0x00000014BFAA4000
+    MUSIC		0x000000141B064000
+    MUSIC		0x000000149B864000
+    PHOTOS		0x000000141A054000
+    PHOTOS		0x000000149A854000
+    DVD		0x0000001419044000
+    DVD		0x0000001499844000
+    TV		0x0000001418034000
+    TV		0x0000001498834000
+    VIDEO		0x000000141C074000
+    VIDEO		0x000000149C874000
+    HELP		0x0000001416014000
+    HELP		0x0000001496814000
+    MOUSE		0x00000014422D4000
+    MOUSE		0x00000014C2AD4000
+    A		0x000000142E194000
+    A		0x00000014AE994000
+    B		0x00000014301B4000
+    B		0x00000014B09B4000
+    C		0x0000001436214000
+    C		0x00000014B6A14000
+    D		0x0000001438234000
+    D		0x00000014B8A34000
+
+ end codes
+
+end remote
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/preview.jpg differ
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/ir.conf.ff6 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/ir.conf.ff6
new file mode 100644
index 0000000..e85b777
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/ir.conf.ff6
@@ -0,0 +1,7 @@
+#Snapstream Firefly Channel 6
+#placed here by mv_ir.py
+blacklist ati_remote
+install ati_remote /bin/false
+
+alias char-major-61 lirc_atiusb
+options lirc_atiusb unique=1 mask=0x0020
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircd.conf.ff6 b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircd.conf.ff6
new file mode 100644
index 0000000..df060b4
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircd.conf.ff6
@@ -0,0 +1,111 @@
+#Snapstream Firefly Channel 6
+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		0x00000014D1AC5000
+    MAXI		0x00000014512C5000
+    CLOSE		0x0000001427025000
+    CLOSE		0x00000014A7825000
+    1		0x00000014B28D5000
+    1		0x00000014320D5000
+    2		0x00000014330E5000
+    2		0x00000014B38E5000
+    3		0x00000014B48F5000
+    3		0x00000014340F5000
+    4		0x0000001435105000
+    4		0x00000014B5905000
+    5		0x00000014B6915000
+    5		0x0000001436115000
+    6		0x0000001437125000
+    6		0x00000014B7925000
+    7		0x00000014B8935000
+    7		0x0000001438135000
+    8		0x0000001439145000
+    8		0x00000014B9945000
+    9		0x00000014BA955000
+    9		0x000000143A155000
+    0		0x000000143C175000
+    0		0x00000014BC975000
+    BACK		0x00000014BB965000
+    BACK		0x000000143B165000
+    ENT		0x000000143D185000
+    ENT		0x00000014BD985000
+    VOL+		0x00000014AE895000
+    VOL+		0x000000142E095000
+    VOL-		0x00000014AD885000
+    VOL-		0x000000142D085000
+    MUTE		0x00000014AF8A5000
+    MUTE		0x000000142F0A5000
+    FIREFLY		0x00000014A5805000
+    FIREFLY		0x0000001425005000
+    CH+		0x00000014B08B5000
+    CH+		0x00000014300B5000
+    CH-		0x00000014B18C5000
+    CH-		0x00000014310C5000
+    INFO		0x00000014D3AE5000
+    INFO		0x00000014532E5000
+    OPTION		0x00000014D4AF5000
+    OPTION		0x00000014542F5000
+    UP		0x00000014BF9A5000
+    UP		0x000000143F1A5000
+    LEFT		0x00000014C29D5000
+    LEFT		0x00000014421D5000
+    DOWN		0x00000014C7A25000
+    DOWN		0x0000001447225000
+    RIGHT		0x00000014C49F5000
+    RIGHT		0x00000014441F5000
+    OK		0x00000014C39E5000
+    OK		0x00000014431E5000
+    MENU		0x00000014C19C5000
+    MENU		0x00000014411C5000
+    EXIT		0x00000014C5A05000
+    EXIT		0x0000001445205000
+    REC		0x000000144C275000
+    REC		0x00000014CCA75000
+    PLAY		0x000000144A255000
+    PLAY		0x00000014CAA55000
+    STOP		0x000000144D285000
+    STOP		0x00000014CDA85000
+    REW		0x0000001449245000
+    REW		0x00000014C9A45000
+    FWD		0x000000144B265000
+    FWD		0x00000014CBA65000
+    PREV		0x00000014502B5000
+    PREV		0x00000014D0AB5000
+    PAUSE		0x000000144E295000
+    PAUSE		0x00000014CEA95000
+    NEXT		0x000000144F2A5000
+    NEXT		0x00000014CFAA5000
+    MUSIC		0x000000142B065000
+    MUSIC		0x00000014AB865000
+    PHOTOS		0x000000142A055000
+    PHOTOS		0x00000014AA855000
+    DVD		0x0000001429045000
+    DVD		0x00000014A9845000
+    TV		0x0000001428035000
+    TV		0x00000014A8835000
+    VIDEO		0x000000142C075000
+    VIDEO		0x00000014AC875000
+    HELP		0x0000001426015000
+    HELP		0x00000014A6815000
+    MOUSE		0x00000014522D5000
+    MOUSE		0x00000014D2AD5000
+    A		0x000000143E195000
+    A		0x00000014BE995000
+    B		0x00000014401B5000
+    B		0x00000014C09B5000
+    C		0x0000001446215000
+    C		0x00000014C6A15000
+    D		0x0000001448235000
+    D		0x00000014C8A35000
+
+ end codes
+
+end remote
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt
new file mode 100644
index 0000000..e918011
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt
@@ -0,0 +1,590 @@
+# ~/.mythtv/lircrc
+#
+# MythTV native LIRC config file for
+# the new grey Hauppauge remote
+#
+# Modified from Jarod Wilson's which came from Jeff Campbell's
+# By Brad Templeton
+
+
+# Here we have the jump point commands.  They only work if you have
+# defined function keys for these jump points.  For me the most
+# common command is the menu of recordings, so I put that on "videos"
+# even though that's counter-intuitive
+
+begin
+prog = mythtv
+button = TV
+repeat = 3
+config = F5
+end
+
+begin
+prog = mythtv
+button = Videos
+repeat = 3
+config = F2
+end
+
+# Not yet defined
+begin
+prog = mythtv
+button = Music
+repeat = 3
+config = Up
+end
+
+# Given another function for now, I don't use mythgallery
+begin
+prog = mythtv
+button = Pictures
+repeat = 3
+config = F
+end
+
+begin
+prog = mythtv
+button = Guide
+repeat = 3
+config = F3
+end
+
+# I stuck the "todo" list on here as Myth has no radio function
+begin
+prog = mythtv
+button = Radio
+repeat = 3
+config = F4
+end
+
+begin
+prog = mythtv
+button = UP
+repeat = 3
+config = Up
+end
+
+begin
+prog = mythtv
+button = DOWN
+repeat = 3
+config = Down
+end
+
+begin
+prog = mythtv
+button = LEFT
+repeat = 3
+config = Left
+end
+
+begin
+prog = mythtv
+button = RIGHT
+repeat = 3
+config = Right
+end
+
+# Channel Up
+begin
+prog = mythtv
+button = Channel-UP
+repeat = 3
+config = Up
+end
+
+# Channel Down
+begin
+prog = mythtv
+button = Channel-DOWN
+repeat = 3
+config = Down
+end
+
+# OK/Select
+begin
+prog = mythtv
+button = Ok
+config = Space
+end
+
+# Play
+begin
+prog = mythtv
+button = Play
+config = Return
+end
+
+# Stop
+begin
+prog = mythtv
+button = Stop
+config = I
+end
+
+# Escape/Exit/Back
+begin
+prog = mythtv
+button = BACK
+config = Esc
+end
+
+# Power Off/Exit
+begin
+prog = mythtv
+button = POWER
+config = Esc
+end
+
+
+# Pause
+begin
+prog = mythtv
+button = Pause
+repeat = 3
+config = P
+end
+
+# Mute
+begin
+prog = mythtv
+button = Mute
+repeat = 3
+config = |
+end
+
+# Fast forward (30 sec default)
+begin
+prog = mythtv
+button = Rewind
+repeat = 3
+config = PgUp
+end
+
+# Rewind (10 sec default)
+begin
+prog = mythtv
+button = Forward
+repeat = 3
+config = PgDown
+end
+
+# Skip forward (10 min default)
+begin
+prog = mythtv
+button = Next
+repeat = 3
+config = End
+end
+
+# Skip backward (10 min default)
+begin
+prog = mythtv
+button = Previous
+repeat = 3
+config = Home
+end
+
+# Record
+begin
+prog = mythtv
+button = Record
+repeat = 3
+config = R
+end
+
+# Delete
+begin
+prog = mythtv
+button = Red
+repeat = 3
+config = D
+end
+
+# Decrease play speed
+begin
+prog = mythtv
+button = Green
+repeat = 3
+config = J
+end
+
+# Display EPG while in live TV,
+# View selected show while in EPG
+begin
+prog = mythtv
+button = Menu
+repeat = 3
+config = M
+end
+
+# Scroll up
+begin
+prog = mythtv
+button = Volume-UP
+repeat = 3
+config = F11
+end
+
+# Scroll down
+begin
+prog = mythtv
+button = Volume-DOWN
+repeat = 3
+config = F10
+end
+
+# Bring up OSD info
+begin
+prog = mythtv
+button = Go
+repeat = 3
+config = I
+end
+
+# Change display aspect ratio
+begin
+prog = mythtv
+button = Prev-Channel
+repeat = 3
+config = W
+end
+
+# double speed watch
+begin
+prog = mythtv
+button = Yellow
+repeat = 3
+config = J
+end
+
+# change tuners
+#begin
+#prog = mythtv
+#button = hash
+#repeat = 3
+#config = Y
+#end
+
+# Bring up Time stretch
+begin
+prog = mythtv
+button = Blue
+repeat = 3
+config = Y
+end
+
+# Numbers 0-9
+
+begin
+prog = mythtv
+button = 0
+repeat = 3
+config = 0
+end
+
+begin
+prog = mythtv
+button = 1
+repeat = 3
+config = 1
+end
+
+begin
+prog = mythtv
+button = 2
+repeat = 3
+config = 2
+end
+
+begin
+prog = mythtv
+button = 3
+repeat = 3
+config = 3
+end
+
+begin
+prog = mythtv
+button = 4
+repeat = 3
+config = 4
+end
+
+begin
+prog = mythtv
+button = 5
+repeat = 3
+config = 5
+end
+
+begin
+prog = mythtv
+button = 6
+repeat = 3
+config = 6
+end
+
+begin
+prog = mythtv
+button = 7
+repeat = 3
+config = 7
+end
+
+begin
+prog = mythtv
+button = 8
+repeat = 3
+config = 8
+end
+
+begin
+prog = mythtv
+button = 9
+repeat = 3
+config = 9
+end
+
+
+### MPlayer lirc setup
+
+# Show OSD
+begin
+prog = mplayer
+button = MENU
+repeat = 3
+config = osd
+end
+
+# Pause playback
+begin
+prog = mplayer
+button = PAUSE
+repeat = 3
+config = pause
+end
+
+# Skip ahead a minute if playing
+# If paused, resume playing
+begin
+prog = mplayer
+button = PLAY
+repeat = 3
+config = seek +1
+end
+
+# Stop playback and exit
+begin
+prog = mplayer
+button = Back
+repeat = 3
+config = quit
+end
+
+# Mute
+begin
+prog = mplayer
+button = MUTE
+repeat = 3
+config = mute
+end
+
+# Seek back 10 seconds
+begin
+prog = mplayer
+button = LEFT
+repeat = 3
+config = seek -7
+end
+
+# Seek forward 30 seconds
+begin
+prog = mplayer
+button = RIGHT
+repeat = 3
+config = seek +30
+end
+
+# Quit
+begin
+prog = mplayer
+button = EXIT
+repeat = 3
+config = quit
+end
+
+# Seek forward 10 minutes
+begin
+prog = mplayer
+button = SKIP
+repeat = 3
+config = seek +600
+end
+
+# Seek backward 10 minutes
+begin
+prog = mplayer
+button = REPLAY
+repeat = 3
+config = seek -600
+end
+
+# Toggle full-screen
+begin
+prog = mplayer
+button = FULL
+repeat = 3
+config = vo_fullscreen
+end
+
+### Xine lirc setup
+
+begin
+prog = xine
+button = PLAY
+repeat = 3
+config = Play
+end
+
+begin
+prog = xine
+button = STOP
+repeat = 3
+config = Stop
+end
+
+begin
+prog = xine
+button = OFF
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = PAUSE
+repeat = 3
+config = Pause
+end
+
+begin
+prog = xine
+button = CH+
+repeat = 3
+config = EventUp
+end
+
+begin
+prog = xine
+button = CH-
+repeat = 3
+config = EventDown
+end
+
+begin
+prog = xine
+button = VOL-
+repeat = 3
+config = EventLeft
+end
+
+begin
+prog = xine
+button = VOL+
+repeat = 3
+config = EventRight
+end
+
+begin
+prog = xine
+button = OK
+repeat = 3
+config = EventSelect
+end
+
+begin
+prog = xine
+button = BACK
+repeat = 3
+config = Menu
+end
+
+begin
+prog = xine
+button = FFW
+repeat = 3
+#config = SpeedFaster
+config = SeekRelative+60
+end
+
+begin
+prog = xine
+button = REW
+repeat = 3
+#config = SpeedSlower
+config = SeekRelative-60
+end
+
+begin
+prog = xine
+button = FULL
+repeat = 3
+config = Volume+
+end
+
+begin
+prog = xine
+button = BLANK
+repeat = 3
+config = Volume-
+end
+
+begin
+prog = xine
+button = MUTE
+repeat = 3
+config = Mute
+end
+
+begin
+prog = xine
+button = MENU
+repeat = 3
+config = RootMenu
+end
+
+begin
+prog = xine
+button = SKIP
+repeat = 3
+config = EventNext
+end
+
+begin
+prog = xine
+button = REPLAY
+repeat = 3
+config = EventPrior
+end
+
+begin
+prog = xine
+button = GO
+repeat = 3
+config = OSDStreamInfos
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
+
+begin
+prog = xine
+button = RED
+repeat = 3
+config = Quit
+end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/preview.jpg b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/preview.jpg
new file mode 100644
index 0000000..a1fbc6e
Binary files /dev/null and b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/preview.jpg differ
-- 
cgit v0.12

