Index: ipk/source/swapskins_light3d_1_0/var/swap/skins/light_3D/skin.xml
===================================================================
--- ipk/source/swapskins_light3d_1_0/var/swap/skins/light_3D/skin.xml	(revision 3109)
+++ ipk/source/swapskins_light3d_1_0/var/swap/skins/light_3D/skin.xml	(revision 4369)
@@ -110,13 +110,13 @@
 		</widget>
 
-		<widget backgroundColor="#000000" font="Regular;26" foregroundColor="white" halign="center" position="315,390" render="Label" size="67,30" source="session.CurrentService" transparent="1">
+		<widget backgroundColor="#000000" font="Regular;26" foregroundColor="white" halign="center" position="310,390" render="Label" size="67,30" source="session.CurrentService" transparent="1">
 			<convert type="MaxServiceInfo">ServiceNumber</convert>
 		</widget>
 		
-		<widget backgroundColor="#000000" font="Regular;26" foregroundColor="white" halign="center" position="385,390" render="Label" size="237,30" source="session.CurrentService" transparent="1">
+		<widget backgroundColor="#000000" font="Regular;26" foregroundColor="white" halign="center" position="377,390" render="Label" size="304,30" source="session.CurrentService" transparent="1">
 			<convert type="ServiceName">Name</convert>
 		</widget>
 		
-		<widget backgroundColor="#000000" font="Regular;16" foregroundColor="yellow" halign="left" position="760,420" render="Label" size="42,22" source="session.CurrentService" transparent="1" zPosition="2">
+		<widget backgroundColor="#000000" font="Regular;16" foregroundColor="yellow" halign="left" position="745,420" render="Label" size="42,22" source="session.CurrentService" transparent="1" zPosition="2">
 			<convert type="MaxServiceInfo">OrbitalPosition</convert>
 		</widget>
@@ -175,16 +175,18 @@
 		</widget>
 		<!-- Tuner Anzeige 2 Grüne Buttons links "A" rechts "B" -->
-		<!-- <ePixmap alphatest="on" pixmap="light_3D/buttons/button_grey.png" position="795,525" size="16,17" zPosition="2"/>
-	      <widget alphatest="on" pixmap="light_3D/buttons/button_green.png" position="795,525" render="Pixmap" size="16,17" source="session.TunerInfo" transparent="1" zPosition="3">
+		 <ePixmap alphatest="on" pixmap="light_3D/nim.png" position="795,422" size="16,17" zPosition="2"/>
+	    <!--  <widget alphatest="on" pixmap="light_3D/buttons/button_green.png" position="795,525" render="Pixmap" size="16,17" source="session.TunerInfo" transparent="1" zPosition="3">  -->
+	      <widget backgroundColor="black" font="Regular;14" foregroundColor="#0094FF" position="815,422" render="FixedLabel" size="15,20" source="session.TunerInfo" text="A" transparent="1" zPosition="3">
 			<convert type="TunerInfo">TunerUseMask</convert>
 			<convert type="ValueBitTest">1</convert>
 			<convert type="ConditionalShowHide"/>
 		</widget>
-       <ePixmap alphatest="on" pixmap="light_3D/buttons/button_grey.png" position="820,525" size="16,17" zPosition="2"/>
-       <widget alphatest="on" pixmap="light_3D/buttons/button_green.png" position="820,525" render="Pixmap" size="16,17" source="session.TunerInfo" transparent="1" zPosition="3">
-			<convert type="TunerInfo">TunerUseMask</convert>
+    <!-- <ePixmap alphatest="on" pixmap="light_3D/buttons/button_grey.png" position="820,525" size="16,17" zPosition="2"/>
+       <widget alphatest="on" pixmap="light_3D/buttons/button_green.png" position="820,525" render="Pixmap" size="16,17" source="session.TunerInfo" transparent="1" zPosition="3"> -->
+			 <widget backgroundColor="black" font="Regular;14" foregroundColor="#0094FF" position="840,422" render="FixedLabel" size="15,20" source="session.TunerInfo" text="B" transparent="1" zPosition="3">
+      <convert type="TunerInfo">TunerUseMask</convert>
 			<convert type="ValueBitTest">2</convert>
 			<convert type="ConditionalShowHide"/>
-		</widget>    -->
+		</widget>    
 	
 		<widget backgroundColor="#C0C0C0" font="Regular;22" foregroundColor="black" halign="right" position="145,450" render="Label" size="65,25" source="session.Event_Now" transparent="1" zPosition="2">
@@ -226,9 +228,9 @@
 			<convert type="ClockToText">InMinutes</convert>
 		</widget>
-    	 <widget backgroundColor="#000000" font="Regular;16" foregroundColor="#2AFE39" halign="right" position="840,420" render="Label" size="70,22" source="session.CurrentService" transparent="1">
+    	 <widget backgroundColor="#000000" font="Regular;16" foregroundColor="#2AFE39" halign="right" position="880,420" render="Label" size="50,22" source="session.CurrentService" transparent="1">
 			<convert type="ServiceInfo">VideoWidth</convert>
 		</widget>
-		<eLabel backgroundColor="#000000" font="Regular;16" foregroundColor="#2AFE39" halign="center" position="910,420" size="16,22" text="x" transparent="1"/>
-		<widget backgroundColor="#000000" font="Regular;16" foregroundColor="#2AFE39" halign="left" position="925,420" render="Label" size="70,22" source="session.CurrentService" transparent="1">
+		<eLabel backgroundColor="#000000" font="Regular;16" foregroundColor="#2AFE39" halign="center" position="930,420" size="16,22" text="x" transparent="1"/>
+		<widget backgroundColor="#000000" font="Regular;16" foregroundColor="#2AFE39" halign="left" position="945,420" render="Label" size="52,22" source="session.CurrentService" transparent="1">
 			<convert type="ServiceInfo">VideoHeight</convert>
 		</widget>	
@@ -254,17 +256,17 @@
 			<convert type="ClockToText">Format:%A %B %d, %H:%M</convert>
 		</widget>
-		 <eLabel backgroundColor="#FFD800" font="Regular;22" foregroundColor="#000000" halign="center" position="705,95" size="101,32" text="Taste-Gelb" transparent="0" zPosition="1"/>
-		  <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="center" position="815,95" size="164,32" text="Pause" transparent="1" zPosition="1"/>
+		 <eLabel backgroundColor="#FFD800" font="Regular;22" foregroundColor="#000000" halign="center" position="670,95" size="136,32" text="Taste-Gelb" transparent="0" zPosition="1"/>
+		  <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="left" position="815,95" size="192,32" text="Pause" transparent="1" zPosition="1"/>
 		<eLabel backgroundColor="#505555" position="268,98" size="394,304"/>
-		<eLabel backgroundColor="#00FF21" font="Regular;22" foregroundColor="#000000" halign="center" position="705,130" size="101,32" text="Taste-Grün" transparent="0" zPosition="1"/>
-		<eLabel backgroundColor="#FF0000" font="Regular;22" foregroundColor="#000000" halign="center" position="705,165" size="101,32" text="Taste-Rot" transparent="0" zPosition="1"/>
-     <eLabel backgroundColor="#0026FF" font="Regular;22" foregroundColor="#000000" halign="center" position="705,200" size="102,32" text="Taste-Blau" transparent="0" zPosition="1"/>
-     <eLabel backgroundColor="#ffffff" font="Regular;22" foregroundColor="#000000" halign="center" position="705,250" size="101,32" text="Taste-OK" transparent="0" zPosition="1"/>
-     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="center" position="815,130" size="164,32" text="Play (unPause)" transparent="1" zPosition="1"/>
-		<eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="center" position="815,165" size="195,32" text="Zurückspulen (seekBack)" transparent="1" zPosition="1"/>
-     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="center" position="815,200" size="164,32" text="Vorspulen (seekFwd)" transparent="1" zPosition="1"/>
-     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="center" position="815,250" size="164,32" text=" Schneiden-Menü" transparent="1" zPosition="1"/>
-     <eLabel backgroundColor="#ffffff" font="Regular;22" foregroundColor="#000000" halign="center" position="705,295" size="101,32" text="Taste-Exit" transparent="0" zPosition="1"/>
-     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="center" position="815,295" size="166,32" text="Haupt-Menü" transparent="1" zPosition="1"/>
+		<eLabel backgroundColor="#00FF21" font="Regular;22" foregroundColor="#000000" halign="center" position="670,130" size="136,32" text="Taste-Grün" transparent="0" zPosition="1"/>
+		<eLabel backgroundColor="#FF0000" font="Regular;22" foregroundColor="#000000" halign="center" position="670,165" size="136,32" text="Taste-Rot" transparent="0" zPosition="1"/>
+     <eLabel backgroundColor="#0026FF" font="Regular;22" foregroundColor="#000000" halign="center" position="670,200" size="137,32" text="Taste-Blau" transparent="0" zPosition="1"/>
+     <eLabel backgroundColor="#ffffff" font="Regular;22" foregroundColor="#000000" halign="center" position="672,250" size="134,32" text="Taste-OK" transparent="0" zPosition="1"/>
+     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="left" position="815,130" size="192,32" text="Play (unPause)" transparent="1" zPosition="1"/>
+		<eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="left" position="815,165" size="195,32" text="Zurückspulen (seekBack)" transparent="1" zPosition="1"/>
+     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="left" position="815,200" size="192,32" text="Vorspulen (seekFwd)" transparent="1" zPosition="1"/>
+     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="left" position="815,250" size="164,32" text=" Schneiden-Menü" transparent="1" zPosition="1"/>
+     <eLabel backgroundColor="#ffffff" font="Regular;22" foregroundColor="#000000" halign="center" position="671,295" size="135,32" text="Taste-Exit" transparent="0" zPosition="1"/>
+     <eLabel backgroundColor="#000000" font="Regular;18" foregroundColor="#ffffff" halign="left" position="815,295" size="166,32" text="Haupt-Menü" transparent="1" zPosition="1"/>
     <widget backgroundColor="transparent" name="Video" position="270,100" size="390,300" zPosition="1"/>
 		<widget font="Regular;22" halign="center" position="135,405" render="Label" size="450,50" source="session.CurrentService" valign="center">
@@ -289,7 +291,26 @@
 		</widget>
 		<widget backgroundColor="#505555" foregroundColor="black" name="Timeline" pointer="skin_default/position_arrow.png:3,5" position="50,485" size="615,20"/>
-		<ePixmap alphatest="on" pixmap="skin_default/icons/mp_buttons.png" position="285,515" size="129,31"/>
-	</screen>
-
+		<ePixmap alphatest="on" pixmap="skin_default/icons/mp_buttons.png" position="285,515" size="161,31"/>
+	</screen>
+    <!--Merlin.... -->
+   <!--  <screen flags="wfNoBorder" name="Merlin_PGII" position="0,0" size="1024,576" title="Merlin Program Guide">
+			<widget enableWrapAround="0" itemHeight="25" name="prg_list" position="-200,-200" scrollbarMode="showNever" size="50,100"/>
+			<widget font="Regular;18" halign="center" name="currCh1" position="50,40" size="231,24" transparent="1" zPosition="2"/>
+			<widget font="Regular;18" halign="center" name="currCh2" position="281,40" size="231,24" transparent="1" zPosition="2"/>
+			<widget font="Regular;18" halign="center" name="currCh3" position="512,40" size="231,24" transparent="1" zPosition="2"/>
+			<widget font="Regular;18" halign="center" name="currCh4" position="743,40" size="231,24" transparent="1" zPosition="2"/>
+			<widget backgroundColor="#ff4A3C" name="Active1" position="50,80" size="231,3" transparent="0" zPosition="3"/>
+			<widget backgroundColor="#ff4A3C" name="Active2" position="281,80" size="231,3" transparent="0" zPosition="3"/>
+			<widget backgroundColor="#ff4A3C" name="Active3" position="512,80" size="231,3" transparent="0" zPosition="3"/>
+			<widget backgroundColor="#ff4A3C" name="Active4" position="743,80" size="231,3" transparent="0" zPosition="3"/>
+			<widget itemHeight="70" name="epg_list1" position="50,90" scrollbarMode="showOnDemand" size="225,420" transparent="1" zPosition="4"/>
+			<widget itemHeight="70" name="epg_list2" position="281,90" scrollbarMode="showOnDemand" size="225,420" transparent="1" zPosition="4"/>
+			<widget itemHeight="70" name="epg_list3" position="512,90" scrollbarMode="showOnDemand" size="225,420" transparent="1" zPosition="4"/>
+			<widget itemHeight="70" name="epg_list4" position="743,90" scrollbarMode="showOnDemand" size="225,420" transparent="1" zPosition="4"/>
+		  <widget backgroundColor="#000000" font="Regular;22" foregroundColor="white" halign="center" position="95,515" render="Label" size="838,28" source="global.CurrentTime" transparent="1" valign="top">
+			<convert type="ClockToText">Format %H:%M:%S</convert>
+		</widget>
+    </screen> -->
+    
 	  <screen backgroundColor="#000000" name="EventView" position="72,78" size="880,420" title=" ">	
 		<eLabel backgroundColor="transpBlack" position="0,0" size="880,420" zPosition="-1"/>
@@ -413,6 +434,6 @@
 </screen>
 
-   	<screen backgroundColor="transparent" flags="wfNoBorder" name="MoviePlayer" position="0,420" size="1024,145" title="InfoBar">
-		<eLabel backgroundColor="#f0000000" position="0,39" size="1024,3" zPosition="-1"/>
+   	<screen backgroundColor="transparent" flags="wfNoBorder" name="MoviePlayer" position="0,445" size="1024,120" title="InfoBar">
+<!--		<eLabel backgroundColor="#f0000000" position="0,39" size="1024,3" zPosition="-1"/>
 		<eLabel backgroundColor="#e0000000" position="0,42" size="1024,3" zPosition="-1"/>
 		<eLabel backgroundColor="#d0000000" position="0,45" size="1024,3" zPosition="-1"/>
@@ -430,13 +451,13 @@
 		<eLabel backgroundColor="#32000000" position="0,79" size="1024,3" zPosition="-1"/>
 		<eLabel backgroundColor="#31000000" position="0,82" size="1024,3" zPosition="-1"/>
-		<eLabel backgroundColor="#30000000" position="0,85" size="1024,60" zPosition="-1"/>
-		
-		<widget backgroundColor="#333333" font="Regular;24" halign="right" position="888,67" render="Label" size="80,25" source="global.CurrentTime" transparent="1" valign="top">
+		<eLabel backgroundColor="#30000000" position="0,85" size="1024,60" zPosition="-1"/>     -->
+		 	<ePixmap pixmap="light_3D/moviebar-fs8.png" position="20,0" size="980,120" zPosition="-1"/>
+		<widget backgroundColor="#333333" font="Regular;24" halign="right" position="860,10" render="Label" size="80,25" source="global.CurrentTime" transparent="1" valign="top">
 			<convert type="ClockToText">Default</convert>
 		</widget>
-		<widget backgroundColor="#333333" font="Regular;18" halign="left" position="970,72" render="Label" size="30,30" source="global.CurrentTime" transparent="1" valign="top">
+		<widget backgroundColor="#333333" font="Regular;18" halign="left" position="940,15" render="Label" size="30,30" source="global.CurrentTime" transparent="1" valign="top">
 			<convert type="ClockToText">Format::%S</convert>
 		</widget>
-		<widget backgroundColor="transpBlack" font="Regular;16" foregroundColor="grey" halign="right" position="860,115" render="Label" size="110,18" source="global.CurrentTime" transparent="1">
+		<widget backgroundColor="#C2C2C2" font="Regular;16" foregroundColor="black" halign="right" position="855,50" render="Label" size="110,18" source="global.CurrentTime" transparent="1">
 			<convert type="ClockToText">Format:%d.%m.%Y</convert>
 		</widget>
@@ -457,26 +478,26 @@
 			<convert type="ConditionalShowHide"/>
 		</widget>   -->
-		<widget backgroundColor="transpBlack" font="Regular;18" foregroundColor="#e5b243" halign="right" position="840,97" render="Label" size="55,18" source="session.CurrentService" transparent="1">
+		<widget backgroundColor="transpBlack" font="Regular;18" foregroundColor="#e5b243" halign="right" position="765,20" render="Label" size="55,18" source="session.CurrentService" transparent="1">
 			<convert type="ServiceInfo">VideoWidth</convert>
 		</widget>
-		<eLabel backgroundColor="transpBlack" font="Regular;18" foregroundColor="#e5b243" halign="center" position="895,97" size="15,18" text="x" transparent="1"/>
-		<widget backgroundColor="transpBlack" font="Regular;18" foregroundColor="#e5b243" halign="left" position="910,97" render="Label" size="55,18" source="session.CurrentService" transparent="1">
+		<eLabel backgroundColor="transpBlack" font="Regular;18" foregroundColor="#e5b243" halign="center" position="820,20" size="15,18" text="x" transparent="1"/>
+		<widget backgroundColor="transpBlack" font="Regular;18" foregroundColor="#e5b243" halign="left" position="835,20" render="Label" size="55,18" source="session.CurrentService" transparent="1">
 			<convert type="ServiceInfo">VideoHeight</convert>
 		</widget>				
-		<widget backgroundColor="transpBlack" font="Regular;24" foregroundColor="#bab329" halign="center" position="60,65" render="Label" size="600,28" source="session.CurrentService" transparent="1">
+		<widget backgroundColor="transpBlack" font="Regular;24" foregroundColor="#bab329" halign="center" position="57,10" render="Label" size="707,28" source="session.CurrentService" transparent="1">
 			<convert type="ServiceName">Name</convert>
 		</widget>		
-		<widget backgroundColor="transpBlack" font="Regular;22" halign="right" position="10,95" render="Label" size="62,25" source="session.CurrentService" transparent="1" valign="center">
+		<widget backgroundColor="#C2C2C2" font="Regular;22" foregroundColor="black" halign="right" position="35,80" render="Label" size="91,25" source="session.CurrentService" transparent="1" valign="center">
 			<convert type="ServicePosition">Position</convert>
 		</widget>
-		<ePixmap alphatest="blend" pixmap="light_3D/mpslider.png" position="80,99" size="600,16" zPosition="3"/>
-		<widget pointer="light_3D/pointer.png:13,3" position="105,100" render="PositionGauge" size="560,14" source="session.CurrentService" zPosition="2">
+		<ePixmap alphatest="blend" pixmap="light_3D/mpslider.png" position="140,85" size="600,16" zPosition="3"/>
+		<widget pointer="light_3D/pointer.png:13,3" position="160,85" render="PositionGauge" size="560,14" source="session.CurrentService" zPosition="2">
 			<convert type="ServicePosition">Gauge</convert>
 		</widget>
-		<widget backgroundColor="transpBlack" font="Regular;22" halign="left" position="685,95" render="Label" size="66,25" source="session.CurrentService" transparent="1" valign="center">
+		<widget backgroundColor="#C2C2C2" font="Regular;22" foregroundColor="black" halign="left" position="755,80" render="Label" size="86,25" source="session.CurrentService" transparent="1" valign="center">
 			<convert type="ServicePosition">Remaining</convert>
 		</widget>
-		<eLabel backgroundColor="transpBlack" font="Regular;22" halign="center" position="746,95" size="11,24" text="/" transparent="1"/>
-		<widget backgroundColor="transpBlack" font="Regular;22" halign="center" position="750,95" render="Label" size="89,25" source="session.CurrentService" transparent="1" valign="center">
+		<eLabel backgroundColor="#C2C2C2" font="Regular;22" foregroundColor="black" halign="center" position="850,80" size="16,24" text="/" transparent="1"/>
+		<widget backgroundColor="#C2C2C2" font="Regular;22" foregroundColor="black" halign="center" position="875,80" render="Label" size="89,25" source="session.CurrentService" transparent="1" valign="center">
 			<convert type="ServicePosition">Length</convert>
 		</widget>
@@ -484,13 +505,13 @@
 <!-- Audio selection -->
 	<screen name="AudioSelection" position="362,203" size="300,170" title="Audio">
-		<widget name="tracks" position="20,10" scrollbarMode="showOnDemand" size="260,150"/>
+		<widget name="tracks" position="20,10" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="260,150"/>
 	</screen>
 	<!-- Bouquet selector -->
-	<screen name="BouquetSelector" position="362,160" size="300,240" title="Choose bouquet">
-		<widget name="menu" position="10,10" scrollbarMode="showOnDemand" size="290,225"/>
+	<screen name="BouquetSelector" position="362,160" size="370,270" title="Choose bouquet">
+		<widget name="menu" position="5,10" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="357,252"/>
 	</screen>
 	<!-- Channel context menu -->
-	<screen name="ChannelContextMenu" position="362,163" size="300,255" title="Channellist menu">
-		<widget name="menu" position="10,10" scrollbarMode="showOnDemand" size="290,230"/>
+	<screen name="ChannelContextMenu" position="362,163" size="370,270" title="Channellist menu">
+		<widget name="menu" position="5,5" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="362,262"/>
 	</screen>
 
@@ -535,5 +556,5 @@
 	<screen name="ChoiceBox" position="237,100" size="550,400" title="Input">
 		<widget font="Regular;20" name="text" position="10,10" size="550,25"/>
-		<widget name="list" position="0,30" scrollbarMode="showOnDemand" size="550,335"/>
+		<widget name="list" position="0,30" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="550,335"/>
 		<applet type="onLayoutFinish">
 # this should be factored out into some helper code, but currently demonstrates applets.
@@ -800,5 +821,5 @@
 
     	<screen flags="wfBorder" name="EPGSelection" position="67,60" size="890,480" title="EPG Selection" zPosition="10">
-		<widget name="list" position="5,20" scrollbarMode="showOnDemand" size="890,431"/>
+		<widget name="list" position="5,20" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="890,431"/>
 		<widget font="Regular;24" foregroundColor="red" halign="center" name="key_red" position="5,450" size="182,32" valign="center"/>
 		<widget font="Regular;24" foregroundColor="green" halign="center" name="key_green" position="160,450" size="207,30" valign="center"/>
@@ -813,6 +834,6 @@
 		<widget backgroundColor="transpBlack" font="Regular;20" halign="center" name="next_text" position="282,7" size="250,25" text="NEXT" transparent="1" zPosition="4"/>
 		<widget backgroundColor="transpBlack" font="Regular;20" halign="center" name="more_text" position="532,7" size="250,25" text="MORE" transparent="1" zPosition="4"/>
-		<widget backgroundColor="transpBlack" font="Regular;23" halign="right" name="date" position="730,10" size="150,28" transparent="1" valign="center"/>
-		<widget name="list" position="4,55" scrollbarMode="showOnDemand" size="870,400"/>
+		<widget backgroundColor="transpBlack" font="Regular;22" halign="right" name="date" position="730,10" size="150,28" transparent="1" valign="center"/>
+		<widget name="list" position="4,55" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="870,400"/>
 		
 		<widget font="Regular;24" foregroundColor="red" halign="center" name="key_red" position="0,455" size="250,30" valign="center"/>
@@ -1046,6 +1067,24 @@
 	</screen>
   
+ <screen backgroundColor="background" name="PluginBrowser" position="187,60" size="650,476" title="Plugin browser">
+<!--	<eLabel backgroundColor="#32000000" position="0,0" size="650,100" zPosition="0"/>
+	<eLabel backgroundColor="#56C856" position="0,100" size="650,1" zPosition="2"/>
+	<eLabel backgroundColor="#32000000" font="Regular;22" foregroundColor="#56C856" halign="left" position="120,40" size="290,47" text="Plugin browser" transparent="1" valign="center" zPosition="3"/>   -->
+	<widget name="list" position="30,10" scrollbarMode="showOnDemand" size="590,400"/>
+	<eLabel backgroundColor="red" position="50,455" size="170,3" zPosition="2"/>
+	<eLabel backgroundColor="green" position="230,455" size="170,3" zPosition="2"/>
+	<eLabel backgroundColor="blue" position="410,455" size="170,3" zPosition="2"/>
+	<widget backgroundColor="background" font="Regular;16" halign="center" name="red" position="50,430" size="170,20" transparent="1" zPosition="2"/>
+	<widget backgroundColor="background" font="Regular;16" halign="center" name="green" position="230,430" size="170,20" transparent="1" zPosition="2"/>
+	<widget backgroundColor="background" font="Regular;16" halign="center" name="blue" position="410,430" size="170,20" transparent="1" zPosition="2"/>
+</screen>
+<!-- Plugin downloads -->
+<screen name="PluginDownloadBrowser" position="center,center" size="820,476" title="Downloadable plugins">
+	<widget font="Regular;20" halign="center" name="text" position="0,0" size="820,436" valign="center" zPosition="1"/>
+	<widget name="list" position="10,10" scrollbarMode="showOnDemand" size="800,461" zPosition="2"/>
+</screen> 
+  
   <!-- Plugin browser -->
-	<screen name="PluginBrowser" position="312,95" size="400,405" title="Plugin browser">
+<!--	<screen name="PluginBrowser" position="312,95" size="400,405" title="Plugin browser">
 		<ePixmap alphatest="on" pixmap="light_3D/buttons/red-big.png" position="0,0" size="200,40"/>
 		<ePixmap alphatest="on" pixmap="light_3D/buttons/green-big.png" position="200,0" size="200,40"/>
@@ -1053,10 +1092,10 @@
 		<widget backgroundColor="#1f771f" font="Regular;20" halign="center" name="green" position="200,0" size="200,40" transparent="1" valign="center" zPosition="1"/>
 		<widget enableWrapAround="1" name="list" position="0,45" scrollbarMode="showOnDemand" size="400,355"/>
-	</screen>
+	</screen>  -->
 	<!-- Plugin downloads -->
-	<screen name="PluginDownloadBrowser" position="232,100" size="560,420" title="Downloadable plugins">
+<!--	<screen name="PluginDownloadBrowser" position="232,100" size="560,420" title="Downloadable plugins">
 		<widget font="Regular;20" halign="center" name="text" position="0,0" size="560,430" valign="center" zPosition="1"/>
 		<widget name="list" position="10,10" scrollbarMode="showOnDemand" size="540,405" zPosition="2"/>
-	</screen>
+	</screen>   -->
 <!-- Radio infobar -->
 	<screen name="RadioInfoBar" position="232,404" size="560,120" title="Radio" zPosition="-1">
@@ -1198,12 +1237,12 @@
 	<!-- Setup -->
 	<screen name="Setup" position="232,95" size="560,430" title="Setup">
-		<widget alphatest="on" pixmap="light_3D/buttons/red.png" position="0,0" size="140,40"/>
-		<widget alphatest="on" pixmap="light_3D/buttons/green.png" position="140,0" size="140,40"/>
-		<ePixmap alphatest="on" pixmap="light_3D/buttons/red.png" position="35,0" size="140,40"/>
-		<ePixmap alphatest="on" pixmap="light_3D/buttons/green.png" position="185,0" size="140,40"/>
-	<widget backgroundColor="#9f1313" font="Regular;20" halign="center" position="0,0" render="Label" size="140,40" source="key_red" transparent="1" valign="center" zPosition="1"/>
-		<widget backgroundColor="#1f771f" font="Regular;20" halign="center" position="140,0" render="Label" size="140,40" source="key_green" transparent="1" valign="center" zPosition="1"/>
+	<!--	<widget alphatest="on" pixmap="light_3D/buttons/red.png" position="0,0" size="140,40"/>
+		<widget alphatest="on" pixmap="light_3D/buttons/green.png" position="140,0" size="140,40"/>  -->
+	<ePixmap alphatest="on" pixmap="light_3D/buttons/red.png" position="5,5" size="40,40" zPosition="1"/>
+		<ePixmap alphatest="on" pixmap="light_3D/buttons/green.png" position="190,5" size="40,40" zPosition="1"/>  
+	<widget backgroundColor="#9f1313" font="Regular;20" halign="center" position="15,0" render="Label" size="140,40" source="key_red" transparent="1" valign="center" zPosition="1"/>
+		<widget backgroundColor="#1f771f" font="Regular;20" halign="center" position="195,0" render="Label" size="140,40" source="key_green" transparent="1" valign="center" zPosition="1"/>
 	<!--		<widget font="Regular;23" name="title" position="10,45" size="280,35"/>       -->
-		<widget name="config" position="10,95" scrollbarMode="showOnDemand" size="540,325"/>
+		<widget name="config" position="10,95" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="540,325"/>
 	</screen>
 	<!-- Simple channelselection -->
@@ -1221,5 +1260,5 @@
 	<!-- Skin Selector -->
 	<screen name="SkinSelector" position="212,138" size="600,320" title="Choose your Skin">
-		<widget name="SkinList" position="10,10" scrollbarMode="showOnDemand" size="275,300"/>
+		<widget name="SkinList" position="10,10" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="275,300" zPosition="2"/>
 		<widget alphatest="on" name="Preview" position="305,45" size="280,210"/>
 	</screen>
@@ -1287,5 +1326,5 @@
 		<widget backgroundColor="#a08500" font="Regular;20" halign="center" name="key_yellow" position="280,0" size="140,40" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="#18188b" font="Regular;20" halign="center" name="key_blue" position="420,0" size="140,40" transparent="1" valign="center" zPosition="1"/>
-		<widget name="timerlist" position="0,60" scrollbarMode="showOnDemand" size="560,350"/>
+		<widget name="timerlist" position="0,60" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="560,350"/>
 	</screen>
 	<!-- Timer entry -->
@@ -1297,5 +1336,5 @@
 		<widget backgroundColor="#9f1313" font="Regular;21" halign="center" name="canceltext" position="0,0" size="140,40" transparent="1" valign="center" zPosition="2"/>
 		<widget backgroundColor="#1f771f" font="Regular;21" halign="center" name="oktext" position="140,0" size="140,40" transparent="1" valign="center" zPosition="2"/>
-		<widget name="config" position="10,45" scrollbarMode="showOnDemand" size="540,385"/>
+		<widget name="config" position="10,45" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="540,385"/>
 	</screen>
 	<!-- Timer log -->
@@ -1309,5 +1348,5 @@
 		<widget backgroundColor="#a08500" font="Regular;20" halign="center" name="key_yellow" position="280,0" size="140,40" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="#18188b" font="Regular;20" halign="center" name="key_blue" position="420,0" size="140,40" transparent="1" valign="center" zPosition="1"/>
-		<widget name="loglist" position="0,45" scrollbarMode="showOnDemand" size="560,250"/>
+		<widget name="loglist" position="0,45" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="560,250"/>
 		<widget font="Regular;20" name="logentry" position="0,300" size="560,130"/>
 	</screen>
@@ -1328,5 +1367,5 @@
 	<!-- Timer Selection -->
 	<screen name="TimerSelection" position="232,95" size="560,430" title="Timer selection">
-		<widget name="timerlist" position="0,45" scrollbarMode="showOnDemand" size="560,350"/>
+		<widget name="timerlist" position="0,45" scrollbarMode="showOnDemand" selectionPixmap="light_3D/selectbl-26.png" size="560,350"/>
 	</screen>
 	<!-- Timeshift state -->