From 7c3cb9d712f45533962f42af76ccbabbc401f4ad Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 11 Dec 2014 15:24:31 +0000
Subject: system-templates: rename xbmc.xml files to Lircmap.xml and add 1 for
 dvico

---
 abs/core/system-templates/PKGBUILD                 |  4 +-
 .../remotes/ATI/snapstream_firefly_all/Lircmap.xml | 38 ++++++++++++++++
 .../remotes/ATI/snapstream_firefly_all/xbmc.xml    | 38 ----------------
 .../remotes/ATI/snapstream_firefly_ch1/Lircmap.xml | 38 ++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch1/xbmc.xml    | 38 ----------------
 .../remotes/ATI/snapstream_firefly_ch2/Lircmap.xml | 38 ++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch2/xbmc.xml    | 38 ----------------
 .../remotes/ATI/snapstream_firefly_ch3/Lircmap.xml | 38 ++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch3/xbmc.xml    | 38 ----------------
 .../remotes/ATI/snapstream_firefly_ch4/Lircmap.xml | 38 ++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch4/xbmc.xml    | 38 ----------------
 .../remotes/ATI/snapstream_firefly_ch5/Lircmap.xml | 38 ++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch5/xbmc.xml    | 38 ----------------
 .../remotes/ATI/snapstream_firefly_ch6/Lircmap.xml | 38 ++++++++++++++++
 .../remotes/ATI/snapstream_firefly_ch6/xbmc.xml    | 38 ----------------
 .../templates/remotes/favorites/dvico/Lircmap.xml  | 53 ++++++++++++++++++++++
 16 files changed, 321 insertions(+), 268 deletions(-)
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/Lircmap.xml
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/Lircmap.xml
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/Lircmap.xml
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/Lircmap.xml
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/Lircmap.xml
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/Lircmap.xml
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml
 create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/Lircmap.xml
 delete mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml
 create mode 100644 abs/core/system-templates/templates/remotes/favorites/dvico/Lircmap.xml

diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 40aeefb..66da77a 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=system-templates
-pkgver=8.2
-pkgrel=2
+pkgver=8.3
+pkgrel=1
 conflicts=( )
 pkgdesc="Templates used for system configuration"
 depends=()
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/Lircmap.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/Lircmap.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/Lircmap.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml
deleted file mode 100644
index 64dc7df..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<lircmap>
-<remote device="Snapstream_Firefly">
- <pause>PAUSE</pause>
- <stop>STOP</stop>
- <forward>FWD</forward>
- <reverse>REW</reverse>
- <left>LEFT</left>
- <right>RIGHT</right>
- <up>UP</up>
- <down>DOWN</down>
- <select>OK</select>
- <pageplus>CH+</pageplus>
- <pageminus>CH-</pageminus>
- <back>EXIT</back>
- <menu>MENU</menu>
- <title>PLAY</title>
- <info>INFO</info>
- <skipplus>NEXT</skipplus>
- <skipminus>PREV</skipminus>
- <display>MAXI</display>
- <start>FIREFLY</start>
- <record>REC</record>
- <volumeplus>VOL+</volumeplus>
- <volumeminus>VOL-</volumeminus>
- <mute>MUTE</mute>
- <power>CLOSE</power>
- <one>1</one>
- <two>2</two>
- <three>3</three>
- <four>4</four>
- <five>5</five>
- <six>6</six>
- <seven>7</seven>
- <eight>8</eight>
- <nine>9</nine>
- <zero>0</zero>
-</remote>
-</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/Lircmap.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/Lircmap.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/Lircmap.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml
deleted file mode 100644
index 64dc7df..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<lircmap>
-<remote device="Snapstream_Firefly">
- <pause>PAUSE</pause>
- <stop>STOP</stop>
- <forward>FWD</forward>
- <reverse>REW</reverse>
- <left>LEFT</left>
- <right>RIGHT</right>
- <up>UP</up>
- <down>DOWN</down>
- <select>OK</select>
- <pageplus>CH+</pageplus>
- <pageminus>CH-</pageminus>
- <back>EXIT</back>
- <menu>MENU</menu>
- <title>PLAY</title>
- <info>INFO</info>
- <skipplus>NEXT</skipplus>
- <skipminus>PREV</skipminus>
- <display>MAXI</display>
- <start>FIREFLY</start>
- <record>REC</record>
- <volumeplus>VOL+</volumeplus>
- <volumeminus>VOL-</volumeminus>
- <mute>MUTE</mute>
- <power>CLOSE</power>
- <one>1</one>
- <two>2</two>
- <three>3</three>
- <four>4</four>
- <five>5</five>
- <six>6</six>
- <seven>7</seven>
- <eight>8</eight>
- <nine>9</nine>
- <zero>0</zero>
-</remote>
-</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/Lircmap.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/Lircmap.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/Lircmap.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml
deleted file mode 100644
index 64dc7df..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<lircmap>
-<remote device="Snapstream_Firefly">
- <pause>PAUSE</pause>
- <stop>STOP</stop>
- <forward>FWD</forward>
- <reverse>REW</reverse>
- <left>LEFT</left>
- <right>RIGHT</right>
- <up>UP</up>
- <down>DOWN</down>
- <select>OK</select>
- <pageplus>CH+</pageplus>
- <pageminus>CH-</pageminus>
- <back>EXIT</back>
- <menu>MENU</menu>
- <title>PLAY</title>
- <info>INFO</info>
- <skipplus>NEXT</skipplus>
- <skipminus>PREV</skipminus>
- <display>MAXI</display>
- <start>FIREFLY</start>
- <record>REC</record>
- <volumeplus>VOL+</volumeplus>
- <volumeminus>VOL-</volumeminus>
- <mute>MUTE</mute>
- <power>CLOSE</power>
- <one>1</one>
- <two>2</two>
- <three>3</three>
- <four>4</four>
- <five>5</five>
- <six>6</six>
- <seven>7</seven>
- <eight>8</eight>
- <nine>9</nine>
- <zero>0</zero>
-</remote>
-</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/Lircmap.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/Lircmap.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/Lircmap.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml
deleted file mode 100644
index 64dc7df..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<lircmap>
-<remote device="Snapstream_Firefly">
- <pause>PAUSE</pause>
- <stop>STOP</stop>
- <forward>FWD</forward>
- <reverse>REW</reverse>
- <left>LEFT</left>
- <right>RIGHT</right>
- <up>UP</up>
- <down>DOWN</down>
- <select>OK</select>
- <pageplus>CH+</pageplus>
- <pageminus>CH-</pageminus>
- <back>EXIT</back>
- <menu>MENU</menu>
- <title>PLAY</title>
- <info>INFO</info>
- <skipplus>NEXT</skipplus>
- <skipminus>PREV</skipminus>
- <display>MAXI</display>
- <start>FIREFLY</start>
- <record>REC</record>
- <volumeplus>VOL+</volumeplus>
- <volumeminus>VOL-</volumeminus>
- <mute>MUTE</mute>
- <power>CLOSE</power>
- <one>1</one>
- <two>2</two>
- <three>3</three>
- <four>4</four>
- <five>5</five>
- <six>6</six>
- <seven>7</seven>
- <eight>8</eight>
- <nine>9</nine>
- <zero>0</zero>
-</remote>
-</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/Lircmap.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/Lircmap.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/Lircmap.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml
deleted file mode 100644
index 64dc7df..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<lircmap>
-<remote device="Snapstream_Firefly">
- <pause>PAUSE</pause>
- <stop>STOP</stop>
- <forward>FWD</forward>
- <reverse>REW</reverse>
- <left>LEFT</left>
- <right>RIGHT</right>
- <up>UP</up>
- <down>DOWN</down>
- <select>OK</select>
- <pageplus>CH+</pageplus>
- <pageminus>CH-</pageminus>
- <back>EXIT</back>
- <menu>MENU</menu>
- <title>PLAY</title>
- <info>INFO</info>
- <skipplus>NEXT</skipplus>
- <skipminus>PREV</skipminus>
- <display>MAXI</display>
- <start>FIREFLY</start>
- <record>REC</record>
- <volumeplus>VOL+</volumeplus>
- <volumeminus>VOL-</volumeminus>
- <mute>MUTE</mute>
- <power>CLOSE</power>
- <one>1</one>
- <two>2</two>
- <three>3</three>
- <four>4</four>
- <five>5</five>
- <six>6</six>
- <seven>7</seven>
- <eight>8</eight>
- <nine>9</nine>
- <zero>0</zero>
-</remote>
-</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/Lircmap.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/Lircmap.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/Lircmap.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml
deleted file mode 100644
index 64dc7df..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<lircmap>
-<remote device="Snapstream_Firefly">
- <pause>PAUSE</pause>
- <stop>STOP</stop>
- <forward>FWD</forward>
- <reverse>REW</reverse>
- <left>LEFT</left>
- <right>RIGHT</right>
- <up>UP</up>
- <down>DOWN</down>
- <select>OK</select>
- <pageplus>CH+</pageplus>
- <pageminus>CH-</pageminus>
- <back>EXIT</back>
- <menu>MENU</menu>
- <title>PLAY</title>
- <info>INFO</info>
- <skipplus>NEXT</skipplus>
- <skipminus>PREV</skipminus>
- <display>MAXI</display>
- <start>FIREFLY</start>
- <record>REC</record>
- <volumeplus>VOL+</volumeplus>
- <volumeminus>VOL-</volumeminus>
- <mute>MUTE</mute>
- <power>CLOSE</power>
- <one>1</one>
- <two>2</two>
- <three>3</three>
- <four>4</four>
- <five>5</five>
- <six>6</six>
- <seven>7</seven>
- <eight>8</eight>
- <nine>9</nine>
- <zero>0</zero>
-</remote>
-</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/Lircmap.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/Lircmap.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/Lircmap.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml
deleted file mode 100644
index 64dc7df..0000000
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<lircmap>
-<remote device="Snapstream_Firefly">
- <pause>PAUSE</pause>
- <stop>STOP</stop>
- <forward>FWD</forward>
- <reverse>REW</reverse>
- <left>LEFT</left>
- <right>RIGHT</right>
- <up>UP</up>
- <down>DOWN</down>
- <select>OK</select>
- <pageplus>CH+</pageplus>
- <pageminus>CH-</pageminus>
- <back>EXIT</back>
- <menu>MENU</menu>
- <title>PLAY</title>
- <info>INFO</info>
- <skipplus>NEXT</skipplus>
- <skipminus>PREV</skipminus>
- <display>MAXI</display>
- <start>FIREFLY</start>
- <record>REC</record>
- <volumeplus>VOL+</volumeplus>
- <volumeminus>VOL-</volumeminus>
- <mute>MUTE</mute>
- <power>CLOSE</power>
- <one>1</one>
- <two>2</two>
- <three>3</three>
- <four>4</four>
- <five>5</five>
- <six>6</six>
- <seven>7</seven>
- <eight>8</eight>
- <nine>9</nine>
- <zero>0</zero>
-</remote>
-</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/Lircmap.xml b/abs/core/system-templates/templates/remotes/favorites/dvico/Lircmap.xml
new file mode 100644
index 0000000..5c09546
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/favorites/dvico/Lircmap.xml
@@ -0,0 +1,53 @@
+<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
+<!--                                                                              -->
+<!-- How to add remotes                                                           -->
+<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
+<!--                                                                              -->
+<!-- For the commands the layout following layout is used                         -->
+<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND>                                  -->
+<!--                                                                              -->
+<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml   -->
+
+<lircmap>
+	<remote device="DVICO_MCE">
+		<play>playpause</play>
+		<pause>mute</pause>
+		<stop>stop</stop>
+		<forward>ff</forward>
+		<reverse>rew</reverse>
+		<left>left</left>
+		<right>right</right>
+		<up>up</up>
+		<down>down</down>
+		<select>ok</select>
+		<pageplus>ch_up</pageplus>
+		<pageminus>ch_down</pageminus>
+		<back>back</back>
+		<menu>dvd_menu</menu>
+		<title>guide</title>
+		<info>more</info>
+		<skipplus>skip</skipplus>
+		<skipminus>replay</skipminus>
+		<display>ratio</display>
+		<start>alt_tab</start>
+		<record>rec</record>
+		<volumeplus>vol_up</volumeplus>
+		<volumeminus>vol_down</volumeminus>
+		<power>power_onoff</power>
+		<myvideo>cfp</myvideo>
+		<mymusic>mp3</mymusic>
+		<mypictures>photo</mypictures>
+		<mytv>dtv</mytv>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+		<star>start</star>
+    </remote>
+</lircmap>
-- 
cgit v0.12