53 files changed, 891 insertions, 165 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 84a59897..0eaa082d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = countries fonts defaults extensions skin_default
+SUBDIRS = countries fonts defaults extensions keymaps skin_default
 
 dist_pkgdata_DATA = \
 	defaultsatlists.xml \
@@ -14,4 +14,5 @@ dist_pkgdata_DATA = \
 	skin_default.xml \
 	skin.xml \
 	startwizard.xml \
-	tutorialwizard.xml
+	tutorialwizard.xml \
+	unicable.xml
diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
index 113442c0..ee66c93a 100644
--- a/data/defaults/Dream/Makefile.am
+++ b/data/defaults/Dream/Makefile.am
@@ -1,13 +1,20 @@
+SUBDIRS = hdbouquets sdbouquets
+
 installdir = $(pkgdatadir)/defaults/Dream
 
 dist_install_DATA = \
 	bouquets.tv \
+	dm800se.info \
 	dm500hd.info \
+	dm7020hd.info \
 	dm7025.info \
 	dm8000.info \
 	dm800.info \
+	settings.800se \
 	settings.500hd \
+	settings.7020hd \
 	settings.7025 \
 	settings.800 \
 	settings.8000 \
-	userbouquet.favourites.tv
+	settings.c \
+	settings.t
diff --git a/data/defaults/Dream/dm500hd.info b/data/defaults/Dream/dm500hd.info
index fbf7888e..29d14b6a 100644
--- a/data/defaults/Dream/dm500hd.info
+++ b/data/defaults/Dream/dm500hd.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm7020hd.info b/data/defaults/Dream/dm7020hd.info
new file mode 100644
index 00000000..e0a1fbb5
--- /dev/null
+++ b/data/defaults/Dream/dm7020hd.info
@@ -0,0 +1,46 @@
+<default>
+	<prerequisites>
+		<!-- hardware can occur more than once -->
+		<hardware type="dm7020hd" />
+	</prerequisites>
+	
+	<info>
+		<author>Dream Multimedia GmbH</author>
+		<name>Dream Multimedia Default</name>
+	</info>
+
+		<!-- available types: "directories" -->
+	<files type="directories">
+		<!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
+		<file type="config" name="settings.7020hd" />
+		<!--file type="services" name="lamedb.192">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file-->
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
+		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
+	</files>
+</default>
diff --git a/data/defaults/Dream/dm7025.info b/data/defaults/Dream/dm7025.info
index 0461b686..0211199b 100644
--- a/data/defaults/Dream/dm7025.info
+++ b/data/defaults/Dream/dm7025.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm800.info b/data/defaults/Dream/dm800.info
index 8c68349f..39b0cb02 100644
--- a/data/defaults/Dream/dm800.info
+++ b/data/defaults/Dream/dm800.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm8000.info b/data/defaults/Dream/dm8000.info
index 8b11946f..f0522260 100644
--- a/data/defaults/Dream/dm8000.info
+++ b/data/defaults/Dream/dm8000.info
@@ -19,8 +19,28 @@
 				<satellite type="192" />
 			</prerequisites>
 		</file-->
-		<file type="favourites" directory="" name="bouquets.tv" />		
-		<file type="favourites" directory="" name="userbouquet.favourites.tv" />
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
 		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
 	</files>
 </default>
diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info
new file mode 100644
index 00000000..1685ede2
--- /dev/null
+++ b/data/defaults/Dream/dm800se.info
@@ -0,0 +1,46 @@
+<default>
+	<prerequisites>
+		<!-- hardware can occur more than once -->
+		<hardware type="dm800se" />
+	</prerequisites>
+	
+	<info>
+		<author>Dream Multimedia GmbH</author>
+		<name>Dream Multimedia Default</name>
+	</info>
+
+		<!-- available types: "directories" -->
+	<files type="directories">
+		<!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
+		<file type="config" name="settings.800se" />
+		<!--file type="services" name="lamedb.192">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<satellite type="192" />
+			</prerequisites>
+		</file-->
+		<file type="favourites" directory="" name="bouquets.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+			<prerequisites>
+				<bcastsystem type="DVB-S" />
+				<!--satellite type="192" /-->
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.c">
+			<prerequisites>
+				<bcastsystem type="DVB-C" />
+			</prerequisites>
+		</file>
+		<file type="config" name="settings.t">
+			<prerequisites>
+				<bcastsystem type="DVB-T" />
+			</prerequisites>
+		</file>
+		<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
+	</files>
+</default>
diff --git a/data/defaults/Dream/hdbouquets/Makefile.am b/data/defaults/Dream/hdbouquets/Makefile.am
new file mode 100644
index 00000000..843a07d6
--- /dev/null
+++ b/data/defaults/Dream/hdbouquets/Makefile.am
@@ -0,0 +1,4 @@
+installdir = $(pkgdatadir)/defaults/Dream/hdbouquets
+
+dist_install_DATA = \
+	userbouquet.favourites.tv
diff --git a/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv
new file mode 100644
index 00000000..b6bc62fc
--- /dev/null
+++ b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv
@@ -0,0 +1,130 @@
+#NAME Favourites (TV)
+#SERVICE 1:0:19:2B5C:3F3:1:C00000:0:0:0:
+#SERVICE 1:0:19:2B66:3F3:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DCC:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:2EE3:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:445C:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:2EF4:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:445D:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:445E:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:33:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:701:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:2F1C:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D6E:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:308:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:2FC:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:F98:454:1:C00000:0:0:0:
+#SERVICE 1:0:19:2B70:3F3:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D67:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:7031:41B:1:C00000:0:0:0:
+#SERVICE 1:0:1:7032:41B:1:C00000:0:0:0:
+#SERVICE 1:0:1:7033:41B:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E46:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DCE:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DD1:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DCF:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E42:431:1:C00000:0:0:0:
+#SERVICE 1:64:B:0:0:0:0:0:0:0::Doku/Wissen/Themen
+#DESCRIPTION Doku/Wissen/Themen
+#SERVICE 1:0:1:6F47:445:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D6B:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:2775:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:293:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:6D70:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:49:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:332D:45B:1:C00000:0:0:0:
+#SERVICE 1:0:1:3139:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:2F5A:454:1:C00000:0:0:0:
+#SERVICE 1:64:A:0:0:0:0:0:0:0::Sport
+#DESCRIPTION Sport
+#SERVICE 1:0:1:384:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:79E0:443:1:C00000:0:0:0:
+#SERVICE 1:64:1:0:0:0:0:0:0:0::Kinder
+#DESCRIPTION Kinder
+#SERVICE 1:0:1:2F08:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D68:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:7008:436:1:C00000:0:0:0:
+#SERVICE 1:0:1:6FE0:443:1:C00000:0:0:0:
+#SERVICE 1:64:2:0:0:0:0:0:0:0::Nachrichten
+#DESCRIPTION Nachrichten
+#SERVICE 1:0:1:2F3A:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:445F:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:79F4:443:1:C00000:0:0:0:
+#SERVICE 1:0:1:2753:402:1:C00000:0:0:0:
+#SERVICE 1:0:1:7035:41B:1:C00000:0:0:0:
+#SERVICE 1:64:3:0:0:0:0:0:0:0::Regional
+#DESCRIPTION Regional
+#SERVICE 1:0:1:3146:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:300:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:2778:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:277A:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:2779:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:2777:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:32D6:45D:1:C00000:0:0:0:
+#SERVICE 1:0:1:277D:444:1:C00000:0:0:0:
+#SERVICE 1:64:4:0:0:0:0:0:0:0::Musik
+#DESCRIPTION Musik
+#SERVICE 1:0:1:2774:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:7004:436:1:C00000:0:0:0:
+#SERVICE 1:0:1:7001:436:1:C00000:0:0:0:
+#SERVICE 1:0:1:6FE1:443:1:C00000:0:0:0:
+#SERVICE 1:0:1:2FD:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:32D5:45D:1:C00000:0:0:0:
+#SERVICE 1:0:1:332E:45B:1:C00000:0:0:0:
+#SERVICE 1:0:1:304:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:702:5:85:C00000:0:0:0:
+#SERVICE 1:64:5:0:0:0:0:0:0:0::Reisen
+#DESCRIPTION Reisen
+#SERVICE 1:0:1:20:21:85:C00000:0:0:0:
+#SERVICE 1:64:9:0:0:0:0:0:0:0::Beratung
+#DESCRIPTION Beratung
+#SERVICE 1:0:1:295:21:85:C00000:0:0:0:
+#SERVICE 1:64:6:0:0:0:0:0:0:0::Einkaufen
+#DESCRIPTION Einkaufen
+#SERVICE 1:0:1:301:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:28:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:79EA:443:1:C00000:0:0:0:
+#SERVICE 1:0:1:2F44:454:1:C00000:0:0:0:
+#SERVICE 1:0:1:3148:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:36:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:307:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:296:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:383:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:313C:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:3159:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:2E:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:381:21:85:C00000:0:0:0:
+#SERVICE 1:64:7:0:0:0:0:0:0:0::High Definition
+#DESCRIPTION High Definition
+#SERVICE 1:0:19:6EEC:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:19:EF12:421:1:C00000:0:0:0:
+#SERVICE 1:0:19:EF13:421:1:C00000:0:0:0:
+#SERVICE 1:64:0:0:0:0:0:0:0:0::Alternativen
+#DESCRIPTION Alternativen
+#SERVICE 1:0:1:6DCB:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E44:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E45:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E41:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E40:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E43:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6EE1:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E2D:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E2E:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F46:445:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E47:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F76:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E92:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E93:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F78:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F79:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E94:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F77:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6EEB:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E97:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E96:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E95:4B1:1:C00000:0:0:0:
+#SERVICE 1:64:8:0:0:0:0:0:0:0::Alternative SD services
+#DESCRIPTION Alternative SD services
+#SERVICE 1:0:1:6DCA:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D66:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:7034:41B:1:C00000:0:0:0:
diff --git a/data/defaults/Dream/sdbouquets/Makefile.am b/data/defaults/Dream/sdbouquets/Makefile.am
new file mode 100644
index 00000000..50328e55
--- /dev/null
+++ b/data/defaults/Dream/sdbouquets/Makefile.am
@@ -0,0 +1,4 @@
+installdir = $(pkgdatadir)/defaults/Dream/sdbouquets
+
+dist_install_DATA = \
+	userbouquet.favourites.tv
diff --git a/data/defaults/Dream/userbouquet.favourites.tv b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
index 5f89c48a..1cea3669 100644
--- a/data/defaults/Dream/userbouquet.favourites.tv
+++ b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
@@ -11,6 +11,7 @@
 #SERVICE 1:0:1:701:5:85:C00000:0:0:0:
 #SERVICE 1:0:1:2F1C:441:1:C00000:0:0:0:
 #SERVICE 1:0:1:6D6E:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:308:5:85:C00000:0:0:0:
 #SERVICE 1:0:1:2FC:5:85:C00000:0:0:0:
 #SERVICE 1:0:1:F98:454:1:C00000:0:0:0:
 #SERVICE 1:0:1:7034:41B:1:C00000:0:0:0:
@@ -25,12 +26,12 @@
 #SERVICE 1:0:1:6E42:431:1:C00000:0:0:0:
 #SERVICE 1:64:B:0:0:0:0:0:0:0::Doku/Wissen/Themen
 #DESCRIPTION Doku/Wissen/Themen
-#SERVICE 1:0:1:6DD0:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F47:445:1:C00000:0:0:0:
 #SERVICE 1:0:1:6D6B:437:1:C00000:0:0:0:
 #SERVICE 1:0:1:2775:444:1:C00000:0:0:0:
 #SERVICE 1:0:1:293:5:85:C00000:0:0:0:
 #SERVICE 1:0:1:6D70:437:1:C00000:0:0:0:
-#SERVICE 1:0:1:277B:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:49:5:85:C00000:0:0:0:
 #SERVICE 1:0:1:332D:45B:1:C00000:0:0:0:
 #SERVICE 1:0:1:3139:459:1:C00000:0:0:0:
 #SERVICE 1:0:1:2F5A:454:1:C00000:0:0:0:
diff --git a/data/defaults/Dream/settings.7020hd b/data/defaults/Dream/settings.7020hd
new file mode 100644
index 00000000..ae2963bb
--- /dev/null
+++ b/data/defaults/Dream/settings.7020hd
@@ -0,0 +1 @@
+config.misc.rcused=1
+\ No newline at end of file
diff --git a/data/defaults/Dream/settings.800se b/data/defaults/Dream/settings.800se
new file mode 100644
index 00000000..ae2963bb
--- /dev/null
+++ b/data/defaults/Dream/settings.800se
@@ -0,0 +1 @@
+config.misc.rcused=1
+\ No newline at end of file
diff --git a/data/defaults/Dream/settings.c b/data/defaults/Dream/settings.c
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.c
@@ -0,0 +1 @@
+config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/data/defaults/Dream/settings.t b/data/defaults/Dream/settings.t
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.t
@@ -0,0 +1 @@
+config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/data/defaultsatlists.xml b/data/defaultsatlists.xml
index 132b427c..ff0ae8b7 100644
--- a/data/defaultsatlists.xml
+++ b/data/defaultsatlists.xml
@@ -12,11 +12,14 @@ self.condition = self.runWizard
 self.disableKeys = True
 		</code>
 	</step>
-	<step id="nopackages" nextstep="finisheddefaultsatlists">
+
+	<!--step id="nopackages" nextstep="finisheddefaultsatlists"-->
+	<step id="nopackages" nextstep="scanquestion">
 		<text value="There are no default services lists in your image." />
 	</step>
 	
-	<step id="nothingtoinstall" nextstep="finisheddefaultsatlists">
+	<!--step id="nothingtoinstall" nextstep="finisheddefaultsatlists"-->
+	<step id="nothingtoinstall" nextstep="scanquestion">
 		<condition>
 if self.runWizard:
 	self.condition = True
diff --git a/data/encoding.conf b/data/encoding.conf
index 3f09b564..36f619d6 100644..100755
--- a/data/encoding.conf
+++ b/data/encoding.conf
@@ -6,6 +6,11 @@ gre ISO8859-7
 pol ISO8859-2
 rus ISO8859-5
 bul ISO8859-5
+tha ISO8859-11
+cze ISO6397
+ces ISO6397
+slo ISO6397
+slk ISO6397
 #Sorry for that.. in DVB Spec this is the default behavior 
 #when no other encoding is given in dvb-texts..
 #but this breaks too much providers yet.. 
@@ -27,25 +32,32 @@ bul ISO8859-5
 0xc95 0x3 # Astra 23.5�E 12.109 H - SkyLink
 0xbc6 0x3 # Astra 23.5�E 12.525 V - CS Link / SkyLink
 0xbc7 0x3 # Astra 23.5�E 12.565 H - SkyLink
+200 318 #Hotbird Eutelsat (Eurosport)
+300 318 #Hotbird Eutelsat (Eurosport, Animal Pl.HD)
 400 318 #Hotbird 13.0 Cyfra+
 1000 318 #Hotbird 13.0 Grupa ITI
 1500 318 #Hotbird 13.0 Cyfra+
 1600 318 #Hotbird 13.0 Cyfra+
+2800 318 #Hotbird 13.0 MTV Networks (Comedy Central)
 7400 113 #Hotbird 13.0 Cyfrowy Polsat
 7800 113 #Hotbird 13.0 Cyfrowy Polsat
 7900 113 #Hotbird 13.0 Cyfrowy Polsat
 8100 113 #Hotbird 13.0 Universal (Cyfra+)
+8100 318 #Hotbird 13.0 Eutelsat (Universal)
 11000 318 #Hotbird 13.0 Cyfra+
 11400 318 #Hotbird 13.0 Cyfra+
+11600 318 #Hotbird 13.0 BBC HD, ITI
+11700 318 #Hotbird 13.0 Eurosport2
 11900 318 #Hotbird 13.0 Cyfra+
 12200 318 #Hotbird 13.0 Disney Channel Polska and other
 12800 318 #Hotbird 13.0 Viacom ... MTV / VH1 Polska
 13000 318 #Hotbird 13.0 BBC Polska and other
+13100 318 #Hotbird 13.0 Crime and Investigation
 13200 113 #Hotbird 13.0 Cyfrowy Polsat
 #Fallback encoding table for single transponders
 #ISO6397 also enables two byte char encoding
 #TSID ONID ISO8859-X
-12800 318 ISO6397 #Viacom ... MTV / VH1 Polska
+#12800 318 ISO6397 #Viacom ... MTV / VH1 Polska
 21100 126 ISO8859-9 # Digital Platform 7�E 10.928 H 30.000 2/3 8PSK
 41200 126 ISO8859-9 # Digital Platform 7�E 11.451 V 25.066 2/3
 50100 126 ISO8859-9 # Digital Platform 7�E 11.471 H 30.000 3/4
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index f743b8ce..2f7e7c7f 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -1,7 +1,8 @@
-installdir = $(FONTDIR)
+installdir = $(datadir)/fonts
 
 dist_install_DATA = \
 	ae_AlMateen.ttf \
 	lcd.ttf \
 	md_khmurabi_10.ttf \
-	nmsbd.ttf
+	nmsbd.ttf \
+	tuxtxt.ttf
diff --git a/data/fonts/tuxtxt.ttf b/data/fonts/tuxtxt.ttf
new file mode 100644
index 00000000..9be6547e
--- /dev/null
+++ b/data/fonts/tuxtxt.ttf
diff --git a/data/keymap.xml b/data/keymap.xml
index 9461d509..f167024e 100755
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -130,6 +130,9 @@
 		<device name="Console">
 			<key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
 		</device>
+		<device name="SDL">
+			<key id="KEY_ASCII" mapto="gotAsciiCode" flags="mr" />
+		</device>
 	</map>
 
 	<map context="InputBoxActions">
@@ -174,10 +177,12 @@
 	
 	<map context="InfobarMenuActions">
 		<key id="KEY_MENU" mapto="mainMenu" flags="mr" />
+		<key id="KEY_SPACE" mapto="mainMenu" flags="mr" />
 	</map>
 	
 	<map context="MenuActions">
 		<key id="KEY_MENU" mapto="menu" flags="mr" />
+		<key id="KEY_SPACE" mapto="menu" flags="mr" />
 	</map>
 	
 	<map context="InfobarShowHideActions">
@@ -370,6 +375,7 @@
 
 	<map context="MovieSelectionActions">
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+		<key id="KEY_SPACE" mapto="contextMenu" flags="m" />
 		<key id="KEY_INFO" mapto="showEventInfo" flags="m" />
 	</map>
 
@@ -463,6 +469,7 @@
 
 	<map context="ChannelSelectEditActions">
 		<key id="KEY_MENU" mapto="contextMenu" flags="m" />
+		<key id="KEY_SPACE" mapto="contextMenu" flags="m" />
 	</map>
 
 	<map context="TvRadioActions">
@@ -643,6 +650,7 @@
 		</device>
 		
 		<key id="KEY_MENU" mapto="menu" flags="m" />
+		<key id="KEY_SPACE" mapto="menu" flags="m" />
 
 		<key id="KEY_2" mapto="skipListbegin" flags="m" />
 		<key id="KEY_8" mapto="skipListend" flags="m" />
diff --git a/data/keymaps/Makefile.am b/data/keymaps/Makefile.am
new file mode 100644
index 00000000..8499d992
--- /dev/null
+++ b/data/keymaps/Makefile.am
@@ -0,0 +1,6 @@
+keymapsdir = $(datadir)/keymaps
+keymaps_DATA = \
+	dream-de.info \
+	dream-de.kmap \
+	eng.info \
+	eng.kmap
diff --git a/data/keymaps/dream-de.info b/data/keymaps/dream-de.info
new file mode 100644
index 00000000..d7f5b074
--- /dev/null
+++ b/data/keymaps/dream-de.info
@@ -0,0 +1,2 @@
+kmap=dream-de.kmap
+name=Dreambox Keyboard Deutsch
diff --git a/data/keymaps/dream-de.kmap b/data/keymaps/dream-de.kmap
new file mode 100644
index 00000000..693317a7
--- /dev/null
+++ b/data/keymaps/dream-de.kmap
diff --git a/data/keymaps/eng.info b/data/keymaps/eng.info
new file mode 100644
index 00000000..d73372c6
--- /dev/null
+++ b/data/keymaps/eng.info
@@ -0,0 +1,2 @@
+kmap=eng.kmap
+name=Keyboard English
diff --git a/data/keymaps/eng.kmap b/data/keymaps/eng.kmap
new file mode 100644
index 00000000..15a722f1
--- /dev/null
+++ b/data/keymaps/eng.kmap
diff --git a/data/menu.xml b/data/menu.xml
index fbc52957..6e103542 100755
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -17,7 +17,6 @@
 		<item text="Network setup" entryID="network_setup">self.openSetup("network")</item>-->
 		<!--<item text="CI"><screen module="Ci" screen="CiSelection" /></item>-->
 		<!--<item text="Radio"><code>print "radio mode"</code></item>-->
-		<item level="0" text="Subtitles" entryID="subtitle_selection" weight="40"><screen module="Subtitles" screen="Subtitles" /></item>
 		<item level="0" text="Timer" entryID="timer_edit"><screen module="TimerEdit" screen="TimerEditList" /></item>
 		<item level="1" text="VCR scart" entryID="scart_switch" requires="ScartSwitch"><code>self.session.scart.VCRSbChanged(3)</code></item>
 
@@ -62,8 +61,9 @@
 				</menu>
 				<!--<item text="Remote Control"><setup id="rc" /></item>-->
 				<!--<item text="OSD"><setup id="osd" /></item>-->
-				<item requires="Display"><setup level="1" id="lcd" /></item>
 				<item level="0" text="Network" entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
+				<item level="1" text="Input devices" entryID="input_device_setup"><screen module="InputDeviceSetup" screen="InputDeviceSelection" /></item>
+				<item requires="Display"><setup level="1" id="lcd" /></item>
 				<item text="Keyboard"><setup id="keyboard" /></item>
 				<!--<menu level="1" text="Network..." entryID="network_setup">
 					<id val="network" />
@@ -75,12 +75,6 @@
 			<item weight="10" level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
 			<item weight="15" level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
 			<!--item level="0" text="Startwizard" entryID="startwizzard"><screen module="StartWizard" screen="StartWizard" /></item-->
-			<item weight="20" level="0" text="Default settings" entryID="default_wizard">
-				<code>
-from Screens.DefaultWizard import DefaultWizard
-self.session.open(DefaultWizard, silent = False)
-</code>
-			</item>
 			<item weight="25" level="0" text="Factory reset" entryID="factory_reset">
 				<code>
 from Screens.FactoryReset import FactoryReset
diff --git a/data/setup.xml b/data/setup.xml
index 93549fa8..86207094 100644..100755
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -32,8 +32,11 @@
 			<item level="1" text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
 			<item level="1" text="Alternative radio mode">config.usage.e1like_radio_mode</item>
 			<item level="1" text="Action on long powerbutton press">config.usage.on_long_powerpress</item>
+			<item level="1" text="Action on short powerbutton press">config.usage.on_short_powerpress</item>
+			<item level="1" text="Position of finished Timers in Timerlist">config.usage.timerlist_finished_timer_position</item>
 			<item level="0" text="Infobar timeout">config.usage.infobar_timeout</item>
 			<item level="1" text="12V output" requires="12V_Output">config.usage.output_12V</item>
+			<item level="0" text="Show event-progress in channel selection">config.usage.show_event_progress_in_servicelist</item>
 			<item level="2" text="Show infobar on channel change">config.usage.show_infobar_on_zap</item>
 			<item level="2" text="Show infobar on skip forward/backward">config.usage.show_infobar_on_skip</item>
 			<item level="2" text="Show infobar on event change">config.usage.show_infobar_on_event_change</item>
@@ -46,31 +49,15 @@
 			<item level="2" text="Fast Forward speeds">config.seek.speeds_forward</item>
 			<item level="2" text="Rewind speeds">config.seek.speeds_backward</item>
 			<item level="2" text="Slow Motion speeds">config.seek.speeds_slowmotion</item>
-<!-- TRANSLATORS: Note that "Enter" in the two strings below should *not*
-     be interpreted as "Give speed as input". The intended meaning is
-     instead "Initial speed when starting winding", i.e. the speed at
-     which "winding mode" is entered when first pressing "rewind" or
-     "fast forward". -->  
-			<item level="2" text="Enter Fast Forward at speed">config.seek.enter_forward</item>
-			<item level="2" text="Enter Rewind at speed">config.seek.enter_backward</item>
-<!-- TRANSLATORS: The effect of "Non-smooth winding" is that rather
-     than using ordinary "continuous" or "smooth" winding, a fast
-     sequence of stills is shown when winding at high speeds. This
-     makes it much easier too follow when almost each frame comes from
-     a new scene. The effect is achieved by repeating each shown frame
-     a couple of times. The settings control both at which speed this
-     winding mode sets in, and how many times each frame should be
-     repeated. This was previously called "Discontinuous playback"
-     which was incomprehensible. "Non-smooth winding" may be a better
-     term, but note that there is nothing irregular about it. Synonyms
-     better suited for translation to other languages may be "stepwise
-     winding/playback", or "winding/playback using stills". -->
-			<item level="2" text="Use non-smooth winding at speeds above">config.seek.stepwise_minspeed</item>
-			<item level="2" text="Frame repeat count during non-smooth winding">config.seek.stepwise_repeat</item>
+<!-- TRANSLATORS: The following is the speed you get on the first press on fast-forward.
+     It was previously called "enter fast forward at speed" which was easily misunderstood. -->  
+			<item level="2" text="Initial Fast Forward speed">config.seek.enter_forward</item>
+			<item level="2" text="Initial Rewind speed">config.seek.enter_backward</item>
 			<item level="2" text="Behavior of 'pause' when paused">config.seek.on_pause</item>
 			<item level="2" text="Behavior of 0 key in PiP-mode">config.usage.pip_zero_button</item>
 			<item level="2" text="Alternative services tuner priority">config.usage.alternatives_priority</item>
 			<item level="2" text="Limited character set for recording filenames">config.recording.ascii_filenames</item>
+			<item level="2" text="Composition of the recording filenames">config.recording.filename_composition</item>
 		</setup>
 		<setup key="harddisk" title="Harddisk setup" >
 			<item level="0" text="Harddisk standby after">config.usage.hdd_standby</item>
diff --git a/data/skin.xml b/data/skin.xml
index d5fe01e6..b4b6cbcd 100755
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -46,21 +46,6 @@
 			<pixmap pos="bpBottomRight" filename="skin_default/b_br.png" />
 		</borderset>
 	</windowstyle>
-	<!-- Main screen colors (id=1 LCD) -->
-	<windowstyle type="skinned" id="1">
-		<color name="Background" color="#000000" />
-		<color name="LabelForeground" color="#ffffff" />
-		<color name="ListboxBackground" color="#000000" />
-		<color name="ListboxForeground" color="#ffffff" />
-		<color name="ListboxSelectedBackground" color="#000000" />
-		<color name="ListboxSelectedForeground" color="#ffffff" />
-		<color name="ListboxMarkedBackground" color="#000000" />
-		<color name="ListboxMarkedForeground" color="#ffffff" />
-		<color name="ListboxMarkedAndSelectedBackground" color="#000000" />
-		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
-		<color name="WindowTitleForeground" color="#ffffff" />
-		<color name="WindowTitleBackground" color="#000000" />
-	</windowstyle>
 	<!-- Fonts -->
 	<fonts>
 		<!-- <font filename="md_khmurabi_10.ttf" name="Regular" scale="90" /> -->
@@ -323,7 +308,7 @@
 		</widget>
 		<!-- Remaining time -->
 		<widget source="session.CurrentService" render="Label" position="576,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
-			<convert type="ServicePosition">Remaining</convert>
+			<convert type="ServicePosition">Remaining,Negate</convert>
 		</widget>
 	</screen>
 </skin>
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 56d53dc3..2dee1dbc 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1,4 +1,37 @@
 <skin>
+	<!-- Main screen colors (id=1 LCD) -->
+	<windowstyle type="skinned" id="1">
+		<color name="Background" color="#000000" />
+		<color name="LabelForeground" color="#ffffff" />
+		<color name="ListboxBackground" color="#000000" />
+		<color name="ListboxForeground" color="#ffffff" />
+		<color name="ListboxSelectedBackground" color="#000000" />
+		<color name="ListboxSelectedForeground" color="#ffffff" />
+		<color name="ListboxMarkedBackground" color="#000000" />
+		<color name="ListboxMarkedForeground" color="#ffffff" />
+		<color name="ListboxMarkedAndSelectedBackground" color="#000000" />
+		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
+		<color name="WindowTitleForeground" color="#ffffff" />
+		<color name="WindowTitleBackground" color="#000000" />
+	</windowstyle>
+	<!-- Main screen colors (id=2 Color OLED (dm800se)) -->
+	<windowstyle type="skinned" id="2">
+		<color name="Background" color="#000000" />
+		<color name="LabelForeground" color="#ffffff" />
+		<color name="ListboxBackground" color="#000000" />
+		<color name="ListboxForeground" color="#ffffff" />
+		<color name="ListboxSelectedBackground" color="#000000" />
+		<color name="ListboxSelectedForeground" color="#ffffff" />
+		<color name="ListboxMarkedBackground" color="#000000" />
+		<color name="ListboxMarkedForeground" color="#ffffff" />
+		<color name="ListboxMarkedAndSelectedBackground" color="#000000" />
+		<color name="ListboxMarkedAndSelectedForeground" color="#ffffff" />
+		<color name="WindowTitleForeground" color="#ffffff" />
+		<color name="WindowTitleBackground" color="#000000" />
+	</windowstyle>
+	<fonts>
+		<font filename="nmsbd.ttf" name="Display" scale="90"/>
+	</fonts>
 	<!-- Screwed Stone II skin (skin_default.xml) /Nemesis -->
 	<!-- About screen -->
 	<screen name="About" position="center,center" size="420,350" title="About">
@@ -62,8 +95,47 @@
 		<widget name="statuspic" pixmaps="skin_default/buttons/button_green.png,skin_default/buttons/button_green_off.png" position="130,380" zPosition="10" size="15,16" transparent="1" alphatest="on"/>
 	</screen>
 	<!-- Audio selection -->
-	<screen name="AudioSelection" position="center,center" size="300,170" title="Audio">
-		<widget name="tracks" position="20,10" size="260,150" scrollbarMode="showOnDemand" />
+	<screen name="AudioSelection" position="center,center" size="560,330" title="Audio">
+		<widget name="config" position="50,10" size="500,110" scrollbarMode="showOnDemand" />
+		
+		<widget source="key_red" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="10,10" size="35,25" alphatest="on">
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="key_green" render="Pixmap" pixmap="skin_default/buttons/key_green.png" position="10,35" size="35,25" alphatest="on">
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="key_yellow" render="Pixmap" pixmap="skin_default/buttons/key_yellow.png" position="10,60" size="35,25" alphatest="on">
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="key_blue" render="Pixmap" pixmap="skin_default/buttons/key_blue.png" position="10,85" size="35,25" alphatest="on">
+			<convert type="ConditionalShowHide" />
+		</widget>
+		
+		<ePixmap pixmap="skin_default/div-h.png" position="10,112" zPosition="10" size="540,2" />
+
+		<widget source="streams" render="Listbox" scrollbarMode="showOnDemand" position="10,120" size="540,200" zPosition="3" transparent="1" >
+			<convert type="TemplatedMultiContent">
+				{"templates":
+					{"default": (25, [ 
+						MultiContentEntryText(pos = (0, 0),   size = (35, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 1), # key,
+						MultiContentEntryText(pos = (40, 0),  size = (60, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 2), # number,
+						MultiContentEntryText(pos = (110, 0), size = (120, 25), font = 0, flags = RT_HALIGN_LEFT,  text = 3), # description,
+						MultiContentEntryText(pos = (240, 0), size = (200, 25), font = 0, flags = RT_HALIGN_LEFT,  text = 4), # language,
+						MultiContentEntryText(pos = (450, 4), size = (90, 25),  font = 1, flags = RT_HALIGN_RIGHT, text = 5), # selection,
+					], True, "showNever"),
+					"notselected": (25, [ 
+						MultiContentEntryText(pos = (0, 0),   size = (35, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 1), # key,
+						MultiContentEntryText(pos = (40, 0),  size = (60, 25),  font = 0, flags = RT_HALIGN_LEFT,  text = 2), # number,
+						MultiContentEntryText(pos = (110, 0), size = (120, 25), font = 0, flags = RT_HALIGN_LEFT,  text = 3), # description,
+						MultiContentEntryText(pos = (240, 0), size = (200, 25), font = 0, flags = RT_HALIGN_LEFT,  text = 4), # language,
+						MultiContentEntryText(pos = (450, 4), size = (90, 25),  font = 1, flags = RT_HALIGN_RIGHT, text = 5), # selection,
+					], False, "showNever")
+					},
+				"fonts": [gFont("Regular", 20), gFont("Regular", 16)],
+				"itemHeight": 25
+				}
+			</convert>
+		</widget>
 	</screen>
 	<!-- Bouquet selector -->
 	<screen name="BouquetSelector" position="center,center" size="300,240" title="Choose bouquet">
@@ -164,9 +236,7 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count &gt; 7 and 2 or 3)
 
 		</applet>
 	</screen>
-	<screen name="ChoiceBox_summary" position="0,0" size="132,64">
-		<widget source="parent.summary_list" render="Label" position="6,0" size="126,64" font="Regular;11" />
-	</screen>	
+
 	<!-- Common interface -->
 	<screen name="MMIDialog" position="center,center" size="450,270">
 		<widget name="title" position="10,10" size="430,25" font="Regular;23" />
@@ -511,10 +581,6 @@ newwidth = wsize[0]
 self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		</applet>
 	</screen>
-	<screen name="MessageBox_summary" position="0,0" size="132,64">
-		<widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Regular;11" halign="center" valign="center" />
-		<widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Regular;14" halign="center" valign="center" />
-	</screen>
 	<!-- Minute input -->
 	<screen name="MinuteInput" position="center,center" size="280,60" title="Seek">
 		<widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" />
@@ -577,7 +643,19 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
 		<widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
 		<widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-		<widget name="list" position="5,50" size="550,280" scrollbarMode="showOnDemand" zPosition="10"/>
+		<widget source="list" render="Listbox" position="5,50" size="550,280" zPosition="10" scrollbarMode="showOnDemand">
+			<convert type="TemplatedMultiContent"> <!--  iface, name, description, interfacepng, defaultpng, activepng, divpng  -->
+				{"template": [
+						MultiContentEntryText(pos = (85, 6), size = (440, 28), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_TOP, text = 1), # index 1 is the interfacename
+						MultiContentEntryText(pos = (85, 43), size = (440, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_BOTTOM, text = 2), # index 2 is the description
+						MultiContentEntryPixmapAlphaTest(pos = (2, 8), size = (54, 54), png = 3), # index 3 is the interface pixmap
+						MultiContentEntryPixmapAlphaTest(pos = (63, 46), size = (15, 16), png = 4), # index 4 is the default pixmap
+					],
+				"fonts": [gFont("Regular", 28),gFont("Regular", 20)],
+				"itemHeight": 70
+				}
+			</convert>
+		</widget>
 		<ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2" />
 		<widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
 	</screen>
@@ -625,15 +703,15 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<widget name="menu" position="10,10" size="440,310" />
 	</screen>
 	<!-- Nim selection -->
-	<screen name="NimSelection" position="center,center" size="400,330" title="Choose Tuner">
-		<widget source="nimlist" render="Listbox" position="0,0" size="380,300" scrollbarMode="showOnDemand">
+	<screen name="NimSelection" position="center,center" size="490,330" title="Choose Tuner">
+		<widget source="nimlist" render="Listbox" position="0,0" size="460,360" scrollbarMode="showOnDemand">
 			<convert type="TemplatedMultiContent">
 				{"template": [
-						MultiContentEntryText(pos = (10, 5), size = (360, 30), flags = RT_HALIGN_LEFT, text = 1), # index 1 is the nim name,
-						MultiContentEntryText(pos = (50, 30), size = (320, 30), font = 1, flags = RT_HALIGN_LEFT, text = 2), # index 2 is a description of the nim settings,
+						MultiContentEntryText(pos = (10, 5), size = (440, 30), flags = RT_HALIGN_LEFT, text = 1), # index 1 is the nim name,
+						MultiContentEntryText(pos = (50, 30), size = (400, 50), font = 1, flags = RT_HALIGN_LEFT, text = 2), # index 2 is a description of the nim settings,
 					],
 				 "fonts": [gFont("Regular", 20), gFont("Regular", 15)],
-				 "itemHeight": 70
+				 "itemHeight": 80
 				}
 			</convert>
 		</widget>
@@ -650,18 +728,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 	<!-- Numerical help dialog -->
 	<screen name="NumericalTextInputHelpDialog" position="190,400" zPosition="2" size="394,124" backgroundColor="#202020" flags="wfNoBorder">
 		<eLabel position="0,0" size="392,122" backgroundColor="#c0c0c0" zPosition="-1" />
-		<widget name="key1" position="2,2" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key2" position="132,2" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key3" position="262,2" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key4" position="2,32" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key5" position="132,32" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key6" position="262,32" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key7" position="2,62" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key8" position="132,62" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key9" position="262,62" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="help1" position="2,92" size="130,30" font="Console;16" halign="center" valign="center" />
-		<widget name="key0" position="132,92" size="130,30" font="Console;12" halign="center" valign="center" />
-		<widget name="help2" position="262,92" size="130,30" font="Console;16" halign="center" valign="center" />
+		<widget name="key1" position="2,2" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key2" position="132,2" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key3" position="262,2" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key4" position="2,32" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key5" position="132,32" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key6" position="262,32" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key7" position="2,62" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key8" position="132,62" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key9" position="262,62" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="help1" position="2,92" size="130,30" font="Regular;18" halign="center" valign="center" />
+		<widget name="key0" position="132,92" size="130,30" font="Regular;14" halign="center" valign="center" />
+		<widget name="help2" position="262,92" size="130,30" font="Regular;18" halign="center" valign="center" />
 	</screen>
 	<!-- Parental control - editor -->
 	<screen name="ParentalControlEditor" position="center,center" size="520,400" title="Parental control services Editor">
@@ -935,9 +1013,9 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		</widget>
 	</screen>
 	<!-- Subtitle selection -->
-	<screen name="Subtitles" position="center,center" size="380,285" title="Subtitle selection">
+<!--	<screen name="Subtitles" position="center,center" size="380,285" title="Subtitle selection">
 		<widget name="config" position="10,10" zPosition="1" size="360,275" scrollbarMode="showOnDemand" />
-	</screen>
+	</screen>-->
 	<!-- Subtitle area -->
 	<screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />
 	<!-- TextBox -->
@@ -1042,59 +1120,127 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 		<ePixmap pixmap="skin_default/volume.png" position="0,0" size="214,21" />
 		<widget name="Volume" pixmap="skin_default/progress_small.png" position="31,7" zPosition="1" size="168,7" transparent="1" />
 	</screen>
+	<!-- JobView -->
+	<screen name="JobView" position="center,center" size="520,350" title="Job View">
+		<widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" />
+		<widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" />
+		<widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497" />
+		<widget source="job_progress" render="Label" position="120,166" size="280,32" font="Regular;28" foregroundColor="#000000" zPosition="2" halign="center" transparent="1"  >
+			<convert type="ProgressToText" />
+		</widget>
+		<widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23" />
+		<widget name="config" position="20,254" size="480,20" />
+		<widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+		<widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b" >
+			<convert type="ConditionalShowHide" />
+		</widget>
+	</screen>
+	<!-- VirtualKeyBoard -->
+	<screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual KeyBoard">
+		<ePixmap pixmap="skin_default/vkey_text.png" position="9,45" zPosition="-4" size="542,52" alphatest="on" />
+		<widget source="country" render="Pixmap" position="490,0" size="60,40" alphatest="on" borderWidth="2" borderColor="yellow" >
+			<convert type="ValueToPixmap">LanguageCode</convert>
+		</widget>
+		<widget name="header" position="10,20" size="500,20" font="Regular;20" transparent="1" noWrap="1" />
+		<widget name="text" position="12,45" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right" />
+		<widget name="list" position="10,110" size="540,225" selectionDisabled="1" transparent="1" />
+	</screen>
+	<!-- FileBrowser -->
+	<screen name="FileBrowser" position="center,center" size="520,430" title="DVD File Browser" >
+		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+		<ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+		<widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+		<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+		<widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" />
+	</screen>
 
 	<!-- LCD/OLED Screens -->
 
 	<!-- LCD screen (channelselection) -->
-	<screen name="ChannelSelection_summary" position="0,0" size="132,64">
-		<widget source="parent.ServiceEvent" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" >
+	<screen name="ChannelSelection_summary" position="0,0" size="132,64" id="1">
+		<widget source="parent.ServiceEvent" render="Label" position="6,0" size="120,25" font="Display;14" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="parent.ServiceEvent" render="Progress" position="16,27" size="100,5" borderWidth="1">
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Regular;32" halign="right" valign="top">
+		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Display;32" halign="right" valign="top">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top">
+		<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Display;16" valign="top">
 			<convert type="ClockToText">Format:%S</convert>
 		</widget>
+	</screen> 
+	<!-- Color OLED screen (ChannelSelection) -->
+	<screen name="ChannelSelection_summary" position="0,0" size="96,64" id="2">
+		<widget source="parent.ServiceEvent" render="Label" position="0,0" size="96,28" font="Display;16" halign="center" valign="center" >
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="session.Event_Now" render="Progress" position="0,30" size="96,8" borderWidth="1" backgroundColor="dark">
+			<convert type="EventTime">Progress</convert>
+		</widget>
+		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Display;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
+			<convert type="ClockToText">Format:%H:%M</convert>
+		</widget>
 	</screen>
 	<!-- LCD screen (main) -->
-	<screen name="InfoBarSummary" position="0,0" size="132,64">
-		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" >
+	<screen name="InfoBarSummary" position="0,0" size="132,64" id="1">
+		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Display;14" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="session.Event_Now" render="Progress" position="16,27" size="100,5" borderWidth="1">
 			<convert type="EventTime">Progress</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Regular;32" halign="right" valign="top">
+		<widget source="global.CurrentTime" render="Label" position="6,32" size="90,32" font="Display;32" halign="right" valign="top">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top">
+		<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Display;16" valign="top">
 			<convert type="ClockToText">Format:%S</convert>
 		</widget>
-		<widget source="session.RecordState" render="FixedLabel" text=" " position="6,30" zPosition="1" size="120,34">
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="6,32" zPosition="1" size="126,32">
 			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
-	<!-- LCD screen (menus) -->
-	<screen name="MenuSummary" position="0,0" size="132,64">
-		<widget source="parent.title" render="Label" position="6,0" size="120,32" font="Regular;14" halign="center" valign="center"/>
-		<widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Regular;16" halign="center" valign="center">
-			<convert type="StringListSelection" />
+	<!-- Color OLED screen (main) -->
+	<screen name="InfoBarSummary" position="0,0" size="96,64" id="2">
+		<widget source="session.CurrentService" render="Label" position="0,0" size="96,28" font="Display;16" halign="center" valign="center" >
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="session.Event_Now" render="Progress" position="0,30" size="96,8" borderWidth="1" backgroundColor="dark">
+			<convert type="EventTime">Progress</convert>
+		</widget>
+		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Display;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
+			<convert type="ClockToText">Format:%H:%M</convert>
+		</widget>
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
+			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
+			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
 	<!-- LCD screen (movieplayer) -->
-	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="132,64">
-		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Regular;14" halign="center" valign="center" >
+	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="132,64" id="1">
+		<widget source="session.CurrentService" render="Label" position="6,0" size="120,25" font="Display;14" halign="center" valign="center" >
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		<widget source="session.CurrentService" render="Progress" position="16,27" size="100,5" borderWidth="1">
 			<convert type="ServicePosition">Position</convert>
 		</widget>
-		<widget source="global.CurrentTime" render="Label" position="6,32" size="120,32" font="Regular;32" halign="center" valign="center">
+		<widget source="global.CurrentTime" render="Label" position="6,32" size="120,32" font="Display;32" halign="center" valign="center">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
 		<widget source="session.RecordState" render="FixedLabel" text=" " position="6,32" zPosition="1" size="120,32">
@@ -1102,19 +1248,89 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
+	<!-- Color OLED screen (movieplayer) -->
+	<screen name="InfoBarMoviePlayerSummary" position="0,0" size="96,64" id="2">
+		<widget source="session.CurrentService" render="Label" position="0,0" size="96,28" font="Display;16" halign="center" valign="center" >
+			<convert type="ServiceName">Name</convert>
+		</widget>
+		<widget source="session.Event_Now" render="Progress" position="0,30" size="96,8" borderWidth="1" backgroundColor="dark">
+			<convert type="EventTime">Progress</convert>
+		</widget>
+		<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Display;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
+			<convert type="ClockToText">Format:%H:%M</convert>
+		</widget>
+		<widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
+			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
+			<convert type="ConditionalShowHide">Blink</convert>
+		</widget>
+	</screen>
+	<!-- LCD screen (ChoiceBox) -->
+	<screen name="ChoiceBox_summary" position="0,0" size="132,64" id="1">
+		<widget source="parent.summary_list" render="Label" position="6,0" size="126,64" font="Display;11" />
+	</screen>
+	<!-- Color OLED screen (ChoiceBox) -->
+	<screen name="ChoiceBox_summary" position="0,0" size="96,64" id="2">
+		<widget source="parent.summary_list" render="Label" position="0,0" size="96,64" font="Display;10" />
+	</screen>	
+	<!-- LCD screen (MessageBox) -->
+	<screen name="MessageBox_summary" position="0,0" size="132,64" id="1">
+		<widget source="parent.Text" render="Label" position="0,0" size="132,52" font="Display;11" halign="center" valign="center" />
+		<widget source="parent.selectedChoice" render="Label" position="6,50" size="120,14" font="Display;14" halign="center" valign="center" />
+	</screen>
+	<!-- Color OLED screen (MessageBox) -->
+	<screen name="MessageBox_summary" position="0,0" size="96,64" id="2">
+		<widget source="parent.Text" render="Label" position="0,0" size="96,52" font="Display;10" halign="center" valign="center" />
+		<widget source="parent.selectedChoice" render="Label" position="0,50" size="96,14" font="Display;12" halign="center" valign="center" />
+	</screen>
+	<!-- LCD screen (menus) -->
+	<screen name="MenuSummary" position="0,0" size="132,64" id="1">
+		<widget source="parent.title" render="Label" position="6,0" size="120,32" font="Display;14" halign="center" valign="center"/>
+		<widget source="parent.menu" render="Label" position="6,32" size="120,32" font="Display;16" halign="center" valign="center">
+			<convert type="StringListSelection" />
+		</widget>
+	</screen> 
+	<!-- Color OLED screen (menus) -->
+	<screen name="MenuSummary" position="0,0" size="96,64" id="2">
+		<widget source="parent.title" render="Label" position="0,0" size="96,32" font="Display;15" halign="center" valign="center"/>
+		<widget source="parent.menu" render="Label" position="0,32" size="96,32" font="Display;16" halign="center" valign="top">
+			<convert type="StringListSelection" />
+		</widget>
+	</screen>	
+	<!-- LCD screen (ServiceScan) -->
+	<screen name="ServiceScanSummary" position="0,0" size="132,64" id="1">
+		<widget name="Title" position="6,4" size="120,42" font="Display;16" transparent="1" />
+		<widget name="Service" position="6,22" size="120,26" font="Display;12" transparent="1" />
+		<widget name="scan_progress" position="6,50" zPosition="1" borderWidth="1" size="56,12" backgroundColor="dark" />
+	</screen>
+	<!-- Color OLED screen (ServiceScan) -->
+	<screen name="ServiceScanSummary" position="0,0" size="96,64" id="2">
+		<widget name="Title" position="0,0" size="96,30" font="Display;14" transparent="1" />
+		<widget name="Service" position="0,30" size="96,20" font="Display;10" transparent="1" />
+		<widget name="scan_progress" position="0,50" zPosition="1" borderWidth="1" size="96,12" backgroundColor="dark" />
+	</screen>
 	<!-- LCD screen (setup) -->
-	<screen name="SetupSummary" position="0,0" size="132,64">
-		<widget source="SetupTitle" render="Label" position="6,0" size="120,16" font="Regular;12" />
-		<widget source="SetupEntry" render="Label" position="6,16" size="120,32" font="Regular;12" />
-		<widget source="SetupValue" render="Label" position="6,48" size="120,16" font="Regular;12" />
+	<screen name="SetupSummary" position="0,0" size="132,64" id="1">
+		<widget source="SetupTitle" render="Label" position="6,0" size="120,24" halign="left" font="Display;12" />
+		<widget source="SetupEntry" render="Label" position="6,24" size="120,24" halign="center" font="Display;12" />
+		<widget source="SetupValue" render="Label" position="6,48" size="120,16" halign="right" font="Display;12" />
+	</screen>
+	<!-- Color OLED screen (setup) -->
+	<screen name="SetupSummary" position="0,0" size="96,64" id="2">
+		<widget source="SetupTitle" render="Label" position="0,0" size="96,24" halign="left" font="Display;10" />
+		<widget source="SetupEntry" render="Label" position="0,24" size="96,24" halign="center" font="Display;10" />
+		<widget source="SetupValue" render="Label" position="0,48" size="96,16" halign="right" font="Display;10" />
 	</screen>
 	<!-- LCD screen (misc) -->
-	<screen name="SimpleSummary" position="0,0" size="132,64">
-		<widget source="parent.Title" render="Label" position="6,0" size="120,64" font="Regular;16" halign="center" valign="center" />
+	<screen name="SimpleSummary" position="0,0" size="132,64" id="1">
+		<widget source="parent.Title" render="Label" position="6,0" size="120,64" font="Display;16" halign="center" valign="center" />
+	</screen>
+	<!-- Color OLED screen (misc) -->
+	<screen name="SimpleSummary" position="0,0" size="96,64" id="2">
+		<widget source="parent.Title" render="Label" position="0,0" size="96,64" font="Display;14" halign="center" valign="center" />
 	</screen>
 	<!-- LCD screen (standby) -->
-	<screen name="StandbySummary" position="0,0" size="132,64">
-		<widget source="global.CurrentTime" render="Label" position="6,0" size="120,64" font="Regular;40" halign="center" valign="center">
+	<screen name="StandbySummary" position="0,0" size="132,64" id="1">
+		<widget source="global.CurrentTime" render="Label" position="6,0" size="120,64" font="Display;40" halign="center" valign="center">
 			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
 		<widget source="session.RecordState" render="FixedLabel" position="6,0" zPosition="1" size="120,64" text=" ">
@@ -1122,57 +1338,47 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
 			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
-	<!-- JobView -->
-	<screen name="JobView" position="center,center" size="520,350" title="Job View">
-		<widget source="job_name" render="Label" position="20,12" size="480,60" font="Regular;28" />
-		<widget source="job_task" render="Label" position="20,90" size="480,50" font="Regular;23" />
-		<widget source="job_progress" render="Progress" position="20,162" size="480,36" borderWidth="2" backgroundColor="#254f7497" />
-		<widget source="job_progress" render="Label" position="120,166" size="280,32" font="Regular;28" foregroundColor="#000000" zPosition="2" halign="center" transparent="1"  >
-			<convert type="ProgressToText" />
-		</widget>
-		<widget source="job_status" render="Label" position="20,212" size="480,26" font="Regular;23" />
-		<widget name="config" position="20,254" size="480,20" />
-		<widget source="cancelable" render="Pixmap" pixmap="skin_default/buttons/red.png" position="20,300" size="140,40" alphatest="on" >
-			<convert type="ConditionalShowHide" />
-		</widget>
-		<widget source="cancelable" render="FixedLabel" text="Cancel" position="20,300" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" >
-			<convert type="ConditionalShowHide" />
-		</widget>
-		<widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="190,300" size="140,40" alphatest="on" >
-			<convert type="ConditionalShowHide" />
-		</widget>
-		<widget source="finished" render="FixedLabel" text="OK" font="Regular;20" halign="center" valign="center" position="190,300" size="140,40" transparent="1" backgroundColor="#1f771f" >
-			<convert type="ConditionalShowHide" />
-		</widget>
-		<widget source="backgroundable" render="Pixmap" pixmap="skin_default/buttons/blue.png" position="360,300" size="140,40" alphatest="on" >
-			<convert type="ConditionalShowHide" />
+	<!-- Color OLED screen (standby) -->
+	<screen name="StandbySummary" position="0,0" size="96,64" id="2">
+		<widget source="global.CurrentTime" render="Label" position="0,0" size="96,64" font="Display;38" halign="center" valign="center">
+			<convert type="ClockToText">Format:%H:%M</convert>
 		</widget>
-		<widget source="backgroundable" render="FixedLabel" text="Continue in background" font="Regular;20" halign="center" valign="center" position="360,300" size="140,40" transparent="1" backgroundColor="#18188b" >
-			<convert type="ConditionalShowHide" />
+		<widget source="session.RecordState" render="FixedLabel" position="0,0" zPosition="1" size="96,64" text=" ">
+			<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
+			<convert type="ConditionalShowHide">Blink</convert>
 		</widget>
 	</screen>
-	<!-- JobView Summary -->
-	<screen name="JobView_summary" position="0,0" size="132,64">
-		<widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Regular;16" />
-		<widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Regular;12" />
+	<!-- LCD screen (JobView) -->
+	<screen name="JobView_summary" position="0,0" size="132,64" id="1">
+		<widget source="parent.summary_job_name" render="Label" position="6,4" size="120,42" font="Display;16" />
+		<widget source="parent.summary_job_task" render="Label" position="6,22" size="120,26" font="Display;12" />
 		<widget source="parent.summary_job_progress" render="Progress" position="6,50" size="60,12" borderWidth="1" zPosition="1" />
-		<widget source="parent.summary_job_progress" render="Label" position="66,50" size="50,12" font="Regular;12" zPosition="2" halign="center" transparent="1"  >
+		<widget source="parent.summary_job_progress" render="Label" position="66,50" size="50,12" font="Display;12" zPosition="2" halign="center" transparent="1"  >
 			<convert type="ProgressToText" />
 		</widget>
 	</screen>
-	<!-- VirtualKeyBoard -->
-	<screen name="VirtualKeyBoard" position="center,center" size="560,350" zPosition="99" title="Virtual KeyBoard">
-		<ePixmap pixmap="skin_default/vkey_text.png" position="9,35" zPosition="-4" size="542,52" alphatest="on" />
-		<widget name="header" position="10,10" size="500,20" font="Regular;20" transparent="1" noWrap="1" />
-		<widget name="text" position="12,35" size="536,46" font="Regular;46" transparent="1" noWrap="1" halign="right" />
-		<widget name="list" position="10,100" size="540,225" selectionDisabled="1" transparent="1" />
+	<!-- Color OLED screen (JobView) -->
+	<screen name="JobView_summary" position="0,0" size="96,64" id="2">
+		<widget source="parent.summary_job_name" render="Label" position="0,4" size="96,42" font="Display;14" />
+		<widget source="parent.summary_job_task" render="Label" position="0,22" size="96,26" font="Display;10" />
+		<widget source="parent.summary_job_progress" render="Progress" position="0,50" size="60,12" borderWidth="1" zPosition="1" />
+		<widget source="parent.summary_job_progress" render="Label" position="60,50" size="36,12" font="Display;10" zPosition="2" halign="center" transparent="1"  >
+			<convert type="ProgressToText" />
+		</widget>
 	</screen>
-	<!-- FileBrowser -->
-	<screen name="FileBrowser" position="center,center" size="520,430" title="DVD File Browser" >
-		<ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-		<ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-		<widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-		<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-		<widget name="filelist" position="5,50" size="510,370" scrollbarMode="showOnDemand" />
+	<!-- LCD screen (Wizard) -->
+	<screen name="WizardSummary" position="0,0" size="132,64" id="1">
+		<widget source="text" render="Label" position="6,0" size="120,16" font="Display;16" transparent="1" />
+		<widget source="parent.list" render="Label" position="6,18" size="120,46" font="Display;12">
+			<convert type="StringListSelection" />
+		</widget>
 	</screen>
+	<!-- Color OLED screen (Wizard) -->
+	<screen name="WizardSummary" position="0,0" size="96,64" id="2">
+		<widget source="text" render="Label" position="0,0" size="96,16" font="Display;14" transparent="1" />
+		<widget source="parent.list" render="Label" position="0,18" size="96,46" font="Display;12">
+			<convert type="StringListSelection" />
+		</widget>
+	</screen>
+
 </skin>
diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am
index 9e9b7cd4..30b04f91 100755
--- a/data/skin_default/Makefile.am
+++ b/data/skin_default/Makefile.am
@@ -23,6 +23,7 @@ dist_install_DATA = \
 	b_tl.png \
 	b_t.png \
 	b_tr.png \
+	celserviceeventprogressbar.png \
 	div-h.png \
 	div-v.png \
 	epg_more.png \
diff --git a/data/skin_default/celserviceeventprogressbar.png b/data/skin_default/celserviceeventprogressbar.png
new file mode 100644
index 00000000..7bf5c658
--- /dev/null
+++ b/data/skin_default/celserviceeventprogressbar.png
diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am
index 8e2052b0..7a709b04 100644..100755
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@ -27,13 +27,28 @@ dist_install_DATA = \
 	icon_view.png \
 	input_error.png \
 	input_info.png \
+	input_keyboard-configured.png \
+	input_keyboard.png \
+	input_mouse-configured.png \
+	input_mouse.png \
 	input_question.png \
+	input_rcnew-configured.png \
+	input_rcnew.png \
+	input_rcold-configured.png \
+	input_rcold.png \
 	lock_error.png \
 	lock_off.png \
 	lock_on.png \
 	lock.png \
+	lockBouquet.png \
 	marker.png \
 	mp_buttons.png \
+	network_wired.png \
+	network_wired-active.png \
+	network_wired-inactive.png \
+	network_wireless.png \
+	network_wireless-active.png \
+	network_wireless-inactive.png \
 	plugin.png \
 	rass_logo.png \
 	rass_page1.png \
@@ -47,4 +62,7 @@ dist_install_DATA = \
 	scan-c.png \
 	scan-s.png \
 	scan-t.png \
-	selectioncross.png
+	selectioncross.png \
+	unlock.png \
+	unlockBouquet.png
+
diff --git a/data/skin_default/icons/input_keyboard-configured.png b/data/skin_default/icons/input_keyboard-configured.png
new file mode 100644
index 00000000..c6623a5c
--- /dev/null
+++ b/data/skin_default/icons/input_keyboard-configured.png
diff --git a/data/skin_default/icons/input_keyboard.png b/data/skin_default/icons/input_keyboard.png
new file mode 100644
index 00000000..a922c896
--- /dev/null
+++ b/data/skin_default/icons/input_keyboard.png
diff --git a/data/skin_default/icons/input_mouse-configured.png b/data/skin_default/icons/input_mouse-configured.png
new file mode 100644
index 00000000..3db9447c
--- /dev/null
+++ b/data/skin_default/icons/input_mouse-configured.png
diff --git a/data/skin_default/icons/input_mouse.png b/data/skin_default/icons/input_mouse.png
new file mode 100644
index 00000000..f70c84e2
--- /dev/null
+++ b/data/skin_default/icons/input_mouse.png
diff --git a/data/skin_default/icons/input_rcnew-configured.png b/data/skin_default/icons/input_rcnew-configured.png
new file mode 100644
index 00000000..6b16d393
--- /dev/null
+++ b/data/skin_default/icons/input_rcnew-configured.png
diff --git a/data/skin_default/icons/input_rcnew.png b/data/skin_default/icons/input_rcnew.png
new file mode 100644
index 00000000..19cdeea5
--- /dev/null
+++ b/data/skin_default/icons/input_rcnew.png
diff --git a/data/skin_default/icons/input_rcold-configured.png b/data/skin_default/icons/input_rcold-configured.png
new file mode 100644
index 00000000..8d626851
--- /dev/null
+++ b/data/skin_default/icons/input_rcold-configured.png
diff --git a/data/skin_default/icons/input_rcold.png b/data/skin_default/icons/input_rcold.png
new file mode 100644
index 00000000..ef8680b5
--- /dev/null
+++ b/data/skin_default/icons/input_rcold.png
diff --git a/data/skin_default/icons/lock.png b/data/skin_default/icons/lock.png
index cfee1ba8..d0ae7f64 100644
--- a/data/skin_default/icons/lock.png
+++ b/data/skin_default/icons/lock.png
diff --git a/data/skin_default/icons/lockBouquet.png b/data/skin_default/icons/lockBouquet.png
new file mode 100644
index 00000000..d503dd2b
--- /dev/null
+++ b/data/skin_default/icons/lockBouquet.png
diff --git a/data/skin_default/icons/network_wired-active.png b/data/skin_default/icons/network_wired-active.png
new file mode 100755
index 00000000..d8efc9c8
--- /dev/null
+++ b/data/skin_default/icons/network_wired-active.png
diff --git a/data/skin_default/icons/network_wired-inactive.png b/data/skin_default/icons/network_wired-inactive.png
new file mode 100755
index 00000000..18f2c70f
--- /dev/null
+++ b/data/skin_default/icons/network_wired-inactive.png
diff --git a/data/skin_default/icons/network_wired.png b/data/skin_default/icons/network_wired.png
new file mode 100755
index 00000000..db695ad5
--- /dev/null
+++ b/data/skin_default/icons/network_wired.png
diff --git a/data/skin_default/icons/network_wireless-active.png b/data/skin_default/icons/network_wireless-active.png
new file mode 100755
index 00000000..07a21874
--- /dev/null
+++ b/data/skin_default/icons/network_wireless-active.png
diff --git a/data/skin_default/icons/network_wireless-inactive.png b/data/skin_default/icons/network_wireless-inactive.png
new file mode 100755
index 00000000..5bd69f9d
--- /dev/null
+++ b/data/skin_default/icons/network_wireless-inactive.png
diff --git a/data/skin_default/icons/network_wireless.png b/data/skin_default/icons/network_wireless.png
new file mode 100755
index 00000000..629a05a6
--- /dev/null
+++ b/data/skin_default/icons/network_wireless.png
diff --git a/data/skin_default/icons/unlock.png b/data/skin_default/icons/unlock.png
new file mode 100644
index 00000000..bd4486e9
--- /dev/null
+++ b/data/skin_default/icons/unlock.png
diff --git a/data/skin_default/icons/unlockBouquet.png b/data/skin_default/icons/unlockBouquet.png
new file mode 100644
index 00000000..c5d146d7
--- /dev/null
+++ b/data/skin_default/icons/unlockBouquet.png
diff --git a/data/startwizard.xml b/data/startwizard.xml
index 70a6e0dc..a6b773e1 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -142,10 +142,10 @@ config.ParentalControl.configured.save()
 			</code>
 		</step>
 		<step id="parentalsetup">
-			<text value="You need to set a pin code and hide it from your children.\n\nDo you want to set the pin now?" />
+			<text value="You need to set a PIN code and hide it from your children.\n\nDo you want to set the pin now?" />
 			<list>
 				<listentry caption="Yes" step="finishparentalsetup" />
-				<listentry caption="No" step="finishparentalsetup" />
+				<listentry caption="No" step="warnpin" />
 			</list>
 			<code pos="after">
 from ParentalControlSetup import ParentalControlChangePin
@@ -153,9 +153,15 @@ if self["list"].index == 0:
 	self.session.open(ParentalControlChangePin, config.ParentalControl.servicepin[0], _("parental control pin"))
 			</code>
 		</step>
+		<step id="warnpin">
+			<text value="Please be aware, that anyone can disable the parental control, if you have not set a PIN." />
+		</step>
 		<step id="finishparentalsetup">
 			<code>
-config.ParentalControl.setuppinactive.value = True
+if config.ParentalControl.setuppin.value == "aaaa":
+	config.ParentalControl.setuppinactive.value = False
+else:
+	config.ParentalControl.setuppinactive.value = True
 config.ParentalControl.setuppinactive.save()
 config.ParentalControl.servicepinactive.value = True
 config.ParentalControl.servicepinactive.save()
diff --git a/data/unicable.xml b/data/unicable.xml
new file mode 100644
index 00000000..33951d7f
--- /dev/null
+++ b/data/unicable.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<unicable version="20100522">
+<!--
+structur of tree
+unicable (version)
+  |
+  |\
+  | \
+  | lnb
+  |  |
+  |  |\
+  |  | \
+  |  | manufacturer (name)
+  |  |  |\
+  |  |  | \
+  |  |  | product (name, position, sc11-scr8. lofl, lofh, loft)
+  |  |  |
+  |  |  |\
+  |  |  | \
+  |  |  | product
+  |  |  
+  |  |\
+  |  | \
+  |  | manufacturer
+  |  |  |\
+  |  |  | \
+  |  |  | product
+  |  |  |
+  |  |  |\
+  |  |  | \
+  |  |  | product
+  |
+   \
+    \
+    matrix
+     |
+     |\
+     | \
+     | manufacturer
+     |  |\
+     |  | \
+     |  | product
+     |  |
+     |  |\
+     |  | \
+     |  | product
+     |  
+     |\
+     | \
+     | manufacturer
+     |  |\
+     |  | \
+     |  | product
+     |  |
+     |  |\
+     |  | \
+     |  | product
+
+-->
+
+	<lnb>
+		<manufacturer name="DUR-line">
+			<product name="Unicable LNB" scr1="1210" scr2="1420" scr3="1680" scr4="2040"/>
+		</manufacturer>
+		<manufacturer name="G-STAR">
+			<product name="GS-404-L1" scr1="1280" scr2="1382" scr3="1484"/>
+			<product name="GS-406-L1" scr1="1280" scr2="1382" scr3="1484" scr4="1586" scr5="1688" scr6="1790"/>
+		</manufacturer>
+		<manufacturer name="Humax">
+			<product name="150 SCR" scr1="1210" scr2="1420" scr3="1680" scr4="2040"/>
+		</manufacturer>
+		<manufacturer name="Inverto">
+			<product name="IDLP-40UNIQD+S" scr1="1680" scr2="1420" scr3="2040" scr4="1210"/>
+			<product name="IDLB-QUDL-UNI2L-OPP" scr1="1210" scr2="1420" scr3="1680" scr4="2040"/>
+		</manufacturer>
+		<manufacturer name="Kathrein">
+			<product name="UAS481"  lofl="10200" lofh="10200" scr1="1400" scr2="1516" scr3="1632" scr4="1748"/>
+		</manufacturer>
+		<manufacturer name="Kreiling">
+			<product name="KR1440" scr1="1680" scr2="1420" scr3="2040" scr4="1210"/>
+		</manufacturer>
+		<manufacturer name="Radix">
+			<product name="Unicable LNB" scr1="1680" scr2="1420" scr3="2040" scr4="1210"/>
+		</manufacturer>
+		<manufacturer name="Wisi">
+			<product name="OC 05" scr1="1210" scr2="1420" scr3="1680" scr4="2040"/>
+		</manufacturer>
+	</lnb>
+	<matrix>
+		<manufacturer name="Ankaro">
+			<product name="UCS 51440" scr1="1400" scr2="1632" scr3="1284" scr4="1516"/>
+			<product name="UCS 51820" scr1="1400" scr2="1632" scr3="1284" scr4="1516" scr5="1864" scr6="2096" scr7="1748" scr8="1980"/>
+			<product name="UCS 51840" scr1="1400" scr2="1632" scr3="1284" scr4="1516" scr5="1864" scr6="2096" scr7="1748" scr8="1980"/>
+			<product name="UCS 52240" scr1="1400" scr2="1632"/>
+			<product name="UCS 52420" scr1="1400" scr2="1632" scr3="1284" scr4="1516"/>
+			<product name="UCS 52440" scr1="1400" scr2="1632" scr3="1284" scr4="1516"/>
+			<product name="UCS 91440" positions="2" scr1="1400" scr2="1632" scr3="1284" scr4="1516"/>
+			<product name="UCS 91820" positions="2" scr1="1400" scr2="1632" scr3="1284" scr4="1516" scr5="1864" scr6="2096" scr7="1748" scr8="1980"/>
+			<product name="UCS 91840" positions="2" scr1="1400" scr2="1632" scr3="1284" scr4="1516" scr5="1864" scr6="2096" scr7="1748" scr8="1980"/>
+			<product name="UCS 92240" positions="2" scr1="1400" scr2="1632"/>
+			<product name="UCS 92420" positions="2" scr1="1400" scr2="1632" scr3="1284" scr4="1516"/>
+			<product name="UCS 92440" positions="2" scr1="1400" scr2="1632" scr3="1284" scr4="1516"/>
+		</manufacturer>
+		<manufacturer name="DCT Delta">
+			<product name="SUM518" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="SUM918" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="SUM928" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+		</manufacturer>
+		<manufacturer name="Dura-Sat">
+			<product name="UCP18" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="VDU543NT" scr1="1280" scr2="1382" scr3="1484"/>
+			<product name="VDU563NT" scr1="1280" scr2="1382" scr3="1484"/>
+			<product name="VDU583NT" scr1="1280" scr2="1382" scr3="1484"/>
+			<product name="VDU586NT" scr1="1280" scr2="1382" scr3="1484" scr4="1586" scr5="1688" scr6="1790"/>
+			<product name="VDU983NT" positions="2" scr1="1280" scr2="1382" scr3="1484"/>
+		</manufacturer>
+		<manufacturer name="G-STAR">
+			<product name="GS-506-S1" scr1="1280" scr2="1382" scr3="1484"/>
+			<product name="GS-516-S1" scr1="1280" scr2="1382" scr3="1484" scr4="1586" scr5="1688" scr6="1790"/>
+		</manufacturer>
+		<manufacturer name="Inverto">
+			<product name="IDLP-UST11O-CUO1O-8PP" scr1="1076" scr2="1178" scr3="1280" scr4="1382" scr5="1484" scr6="1586" scr7="1688" scr8="1790"/>
+		</manufacturer>
+		<manufacturer name="JULTEC">
+			<product name="JPS0501-6" scr1="1280" scr2="1382" scr3="1484" scr4="1586" scr5="1688" scr6="1790"/>
+			<product name="JPS0502-3" scr1="1280" scr2="1382" scr3="1484"/>
+			<product name="JPS0502-6" scr1="1280" scr2="1382" scr3="1484" scr4="1586" scr5="1688" scr6="1790"/>
+			<product name="JPS0504-3" scr1="1280" scr2="1382" scr3="1484"/>
+		</manufacturer>
+		<manufacturer name="Kathrein">
+			<product name="EXR501" scr1="1400" scr2="1516" scr3="1632" scr4="1748"/>
+			<product name="EXR551" scr1="1400" scr2="1516" scr3="1632" scr4="1748"/>
+			<product name="EXR552" scr1="1400" scr2="1516"/>
+			<product name="EXR1541" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="EXR1542" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="EXR1581" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="EXR1942" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="EXR1981" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="EXR2541" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="EXR2542" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="EXR2581" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="EXR2942" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="EXR2981" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="EXU908" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+		</manufacturer>
+		<manufacturer name="ROTEK">
+			<product name="EKL2/1" scr1="1400" scr2="1516"/>
+			<product name="EKL2/1E" scr3="1632" scr4="1748"/>
+		</manufacturer>
+		<manufacturer name="Smart">
+			<product name="DPA 51" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+		</manufacturer>
+		<manufacturer name="Technisat">
+			<product name="TechniRouter 5/1x8" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="TechniRouter 9/1x8" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="TechniRouter 5/2x4" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="TechniRouter 9/2x4" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+		</manufacturer>
+		<manufacturer name="Telstar">
+			<product name="SCR 5/1x8" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="SCR 9/1x8" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632" scr5="1748" scr6="1864" scr7="1980" scr8="2096"/>
+			<product name="SCR 5/2x4" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+			<product name="SCR 9/2x4" positions="2" scr1="1284" scr2="1400" scr3="1516" scr4="1632"/>
+		</manufacturer>
+		<manufacturer name="Wisi">
+			<product name="DY 64 1810" scr1="1178" scr2="1280" scr3="1382" scr4="1484" scr5="1586" scr6="1688" scr7="1790" scr8="1892"/>
+			<product name="DY 64 2410" scr1="1178" scr2="1280" scr3="1382" scr4="1484"/>
+			<product name="DY 68 1810" positions="2" scr1="1178" scr2="1280" scr3="1382" scr4="1484" scr5="1586" scr6="1688" scr7="1790" scr8="1892"/>
+			<product name="DY 68 2410" positions="2" scr1="1178" scr2="1280" scr3="1382" scr4="1484"/>
+		</manufacturer>
+	</matrix>
+</unicable>