diff --git a/16x9/Colors.xml b/16x9/Colors.xml
index fee182be..bd1d4c78 100644
--- a/16x9/Colors.xml
+++ b/16x9/Colors.xml
@@ -70,6 +70,9 @@
 	<variable name="Alpha_15">
 		<value>26</value>
 	</variable>
+	<variable name="Alpha_8">
+		<value>14</value>
+	</variable>
 	<variable name="Alpha_0">
 		<value>01</value>
 	</variable>
@@ -619,15 +622,19 @@
 		<value condition="Skin.String(Accent_Color_Contrast,dark) + !Skin.String(User_Defined_Accent_Color,copacetic_accent_color)">$VAR[Dark_Color]</value>
 		<value>$VAR[Light_Color]</value>
 	</variable>
+
 	<variable name="Scroll_Background_Color">
-		<value condition="$EXP[Background_IsVisible]">$VAR[Alpha_15]$VAR[Light_Hex]</value>
+		<value condition="$EXP[Background_IsVisible] | $EXP[PVR_IsVisible]">$VAR[Alpha_15]$VAR[Light_Hex]</value>
 		<value condition="Skin.String(Theme,Light)">$VAR[Alpha_15]$VAR[Dark_Hex]</value>
 		<value>$VAR[Alpha_15]$VAR[Light_Hex]</value>
 	</variable>
 	<variable name="Scroll_Focused_Color">
-		<value condition="$EXP[Background_IsVisible]">$VAR[Light_Color]</value>
+		<value condition="$EXP[Background_IsVisible] | $EXP[PVR_IsVisible]">$VAR[Light_Color]</value>
 		<value>$VAR[Primary_Color]</value>
 	</variable>
+	<variable name="PVR_Scroll_Background_Color">
+		<value>$VAR[Alpha_8]$VAR[Light_Hex]</value>
+	</variable>
 	
 	<variable name="Scroll_Widget_Background_Color">
 		<value condition="ControlGroup(3000).HasFocus + [Window.Is(movieinformation) | String.IsEqual(ListItem.DBType,artist)] + !Control.HasFocus(10)">$VAR[Alpha_15]$VAR[Light_Hex]</value>
@@ -978,4 +985,7 @@
 	<variable name="tvchannels_Progress_Color">
 		<value>$VAR[Alpha_50]$VAR[Dark_Hex]</value>
 	</variable>
+	<variable name="PVR_DetailedListView_Focus_Color">
+		<value>ff14191A</value><!-- 2% white on top of Dark grey color, but with no transparency -->
+	</variable>
 </includes>
\ No newline at end of file
diff --git a/16x9/Components_Dialogs.xml b/16x9/Components_Dialogs.xml
index d95d472e..e0e5e794 100644
--- a/16x9/Components_Dialogs.xml
+++ b/16x9/Components_Dialogs.xml
@@ -16,7 +16,7 @@
 				<right>$PARAM[right]</right>
 				<top>$PARAM[top]</top>
 				<bottom>$PARAM[bottom]</bottom>
-				<texture colordiffuse="$PARAM[colordiffuse]">views/white_100.png</texture>
+				<texture border="10" colordiffuse="$PARAM[colordiffuse]">$VAR[Panel_Texture]</texture>
 			</control>
 		</definition>
 	</include>
diff --git a/16x9/Components_PVR.xml b/16x9/Components_PVR.xml
index 5d799172..37e8937b 100644
--- a/16x9/Components_PVR.xml
+++ b/16x9/Components_PVR.xml
@@ -8,7 +8,7 @@
 			<control type="label">
 				<visible>$PARAM[visible]</visible>
 				<height>$PARAM[height]</height>
-				<font>Grid_Info_Small</font>
+				<font>PVR_Info</font>
 				<label>$PARAM[label]</label>
 				<textcolor>$VAR[Light_Color]</textcolor>
 				<nested />
@@ -64,24 +64,31 @@
 					<height>$PARAM[plot_height_max]</height>
 					<visible>!String.IsEmpty(ListItem.Plot)</visible>
 					<label>$INFO[ListItem.Plot]</label>
-					<aligny>top</aligny>
 					<font>PVR_Description</font>
 					<align>$PARAM[textalign]</align>
-					<aligny>center</aligny>
+					<aligny>top</aligny>
 				</control>
 			</control>
 		</definition>
 	</include>
 
 	<include name="PVR_Progress">
-		<control type="progress">
-			<visible>ListItem.HasEpg + Integer.IsGreater(ListItem.Progress,0)</visible>
-			<height>100%</height>
-			<width>100%</width>
-			<texturebg colordiffuse="$VAR[Blank_Color]">views/white_100.png</texturebg>
-			<midtexture colordiffuse="$VAR[tvchannels_Progress_Color]">views/white_100.png</midtexture>
-			<info>ListItem.Progress</info>
-		</control>
+		<param name="width" default="100%" />
+		<param name="height" default="100%" />
+		<param name="background_color" default="$VAR[Blank_Color]" />
+		<param name="focus_color" default="$VAR[tvchannels_Progress_Color]" />
+		<param name="texture" default="views/white_100.png" />
+		<definition>
+			<control type="progress">
+				<visible>ListItem.HasEpg + Integer.IsGreater(ListItem.Progress,0)</visible>
+				<width>$PARAM[width]</width>
+				<height>$PARAM[height]</height>
+				<texturebg colordiffuse="$PARAM[background_color]">$PARAM[texture]</texturebg>
+				<midtexture colordiffuse="$PARAM[focus_color]">$PARAM[texture]</midtexture>
+				<info>ListItem.Progress</info>
+				<nested />
+			</control>
+		</definition>
 	</include>
 
 	<include name="PVR_Recordings_List">
@@ -176,77 +183,12 @@
 		</definition>
 	</include>
 
-	<include name="PVR_ChannelList_Item">
-		<param name="visible" default="true" />
-		<param name="progress" default="true" />
-		<param name="channel_number" default="true" />
-		<param name="icon" default="true" />
-		<param name="logo" default="true" />
-		<param name="title_label" default="$VAR[PVR_List_Title_Label]" />
-		<param name="title_scroll" default="false" />
-		<param name="info_label" default="$VAR[PVR_List_Info_Label]" />
-		<param name="color" default="$VAR[Unfocused_Color]" />
-		<definition>
-			<control type="group">
-				<visible>$PARAM[visible]</visible>
-				<include content="PVR_Progress" condition="$PARAM[progress]" />
-				<include content="PVR_Channel_Number_Label" condition="$PARAM[channel_number]">
-					<param name="color" value="$PARAM[color]" />
-				</include>
-				<include content="Timer_unfocused" condition="$PARAM[timer]">
-					<param name="visible" value="!String.Contains(ListItem.Comment,$LOCALIZE[1223])" />
-					<param name="color" value="$PARAM[color]" />
-					<width>90</width>
-				</include>
-				<control type="group">
-					<animation effect="slide" end="-105" time="0" condition="Window.Is(tvrecordings) | Window.Is(radiorecordings) | Window.Is(tvtimers) | Window.Is(radiotimers) | Window.is(tvtimerrules) | Window.Is(radiotimerrules)">Conditional</animation>
-					<control type="group">
-						<top>10</top>
-						<bottom>10</bottom>
-						<left>90</left>
-						<right>240</right>
-						<control type="label">
-							<height>40</height>
-							<label>$PARAM[title_label]</label>
-							<font>PVR_Channel</font>
-							<textcolor>$PARAM[color]</textcolor>
-							<scroll>$PARAM[title_scroll]</scroll>
-							<selectedcolor>$PARAM[color]</selectedcolor>
-						</control>
-						<control type="label">
-							<height>30</height>
-							<bottom>0</bottom>
-							<label>[UPPERCASE]$PARAM[info_label][/UPPERCASE]</label>
-							<font>PVR_Info</font>
-							<textcolor>$PARAM[color]</textcolor>
-							<selectedcolor>$PARAM[color]</selectedcolor>
-						</control>
-					</control>
-				</control>
-				<include content="PVR_icon">
-					<param name="visible" value="$PARAM[icon]" />
-					<param name="texture" value="$VAR[tvchannels_Icon_Texture]" />
-					<param name="color" value="$VAR[tvchannels_Icon_Color]" />
-					<right>15</right>
-					<centertop>50%</centertop>
-				</include>
-				<include content="PVR_logo" condition="$PARAM[logo]">
-					<param name="color" value="ffffffff" />
-					<param name="right" value="60" />
-					<param name="top" value="15" />
-					<param name="width" value="120" />
-					<param name="aligny" value="center" />
-				</include>
-				<nested />
-			</control>
-		</definition>
-	</include>
-
 	<include name="PVR_Now_Playing_Label">
 		<param name="visible" default="true" />
 		<param name="label" default="[UPPERCASE]$INFO[VideoPlayer.ChannelNumberLabel,$LOCALIZE[31634] ][/UPPERCASE]" />
 		<param name="top" default="180" />
 		<param name="height" default="90" />
+		<param name="line_visible" default="true" />
 		<param name="label_width" default="570" />
 		<param name="label_align" default="center" />
 		<param name="line_bottom" default="0" />
@@ -271,8 +213,7 @@
 						<width>$PARAM[label_width]</width>
 						<label>$PARAM[label]</label>
 						<align>$PARAM[label_align]</align>
-						<aligny>center</aligny>
-						<font>Grid_Info_Small</font>
+						<font>PVR_Info</font>
 						<textcolor>$VAR[Light_Color]</textcolor>
 					</control>
 					<include content="PVR_logo" condition="$PARAM[logo]">
@@ -283,6 +224,7 @@
 					</include>
 				</control>
 				<control type="image">
+					<visible>$PARAM[line_visible]</visible>
 					<height>1</height>
 					<bottom>$PARAM[line_bottom]</bottom>
 					<texture colordiffuse="$VAR[Unfocused_Color]">views/white_100.png</texture>
diff --git a/16x9/Content_Viewtype_Options.xml b/16x9/Content_Viewtype_Options.xml
index 0af0c643..5ad688b3 100644
--- a/16x9/Content_Viewtype_Options.xml
+++ b/16x9/Content_Viewtype_Options.xml
@@ -286,6 +286,24 @@
 	</include>
 
 	<include name="tvcommon_Menu_Options">
+		<item id="1">
+			<description>Change view</description>
+			<onclick>SetFocus(50)</onclick>
+			<label>$VAR[Copacetic_Chevron_Left] $VAR[tvchannels_Viewtype_Label] $VAR[Copacetic_Chevron_Right]</label>
+			<label2>$LOCALIZE[31005] $VAR[Copacetic_Divider_Bold] $VAR[tvchannels_Viewtype_Label]</label2>
+			<property name="ActionLeft">Container.PreviousViewMode</property>
+			<property name="ActionRight">Container.NextViewMode</property>
+			<visible>Integer.IsGreater(Container.ViewCount,1) + Control.HasFocus(3700)</visible>
+		</item>
+		<item id="1">
+			<description>Change view</description>
+			<onclick>SetFocus(50)</onclick>
+			<label>$LOCALIZE[31005] $VAR[Copacetic_Divider_Bold] $VAR[tvchannels_Viewtype_Label]</label>
+			<label2>$LOCALIZE[31005] $VAR[Copacetic_Divider_Bold] $VAR[tvchannels_Viewtype_Label]</label2>
+			<property name="ActionLeft">Container.PreviousViewMode</property>
+			<property name="ActionRight">Container.NextViewMode</property>
+			<visible>Integer.IsGreater(Container.ViewCount,1) + !Control.HasFocus(3700)</visible>
+		</item>
 		<item>
 			<description>Channel Groups</description>
 			<label>$INFO[Control.GetLabel(28)]</label>
diff --git a/16x9/Includes.xml b/16x9/Includes.xml
index 29e941ca..00330e19 100644
--- a/16x9/Includes.xml
+++ b/16x9/Includes.xml
@@ -51,6 +51,7 @@
 	<include file="Templates_script-upnext.xml" />
 	<include file="Templates_MyPVR.xml" />
 	<include file="Templates_MyWindows.xml" />
+	<include file="Templates_Viewtypes_PVR.xml" />
 	<include file="Templates_Viewtypes.xml" />
 	<include file="Templates_Widgets.xml" />
 	<include file="Viewtype_50_List.xml" />
diff --git a/16x9/MyPVRChannels.xml b/16x9/MyPVRChannels.xml
index dabfd451..1dc874de 100644
--- a/16x9/MyPVRChannels.xml
+++ b/16x9/MyPVRChannels.xml
@@ -4,7 +4,7 @@
 	<defaultcontrol always="true">50</defaultcontrol>
 	<menucontrol>3700</menucontrol>
 	<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
-	<views>50</views>
+	<views>50,51</views>
 	<controls>
 		<include content="Common_Controls" />
 		<include content="tvchannels_Controls" />
diff --git a/16x9/Templates_MyPVR.xml b/16x9/Templates_MyPVR.xml
index a290c8b9..60a1a59c 100644
--- a/16x9/Templates_MyPVR.xml
+++ b/16x9/Templates_MyPVR.xml
@@ -82,6 +82,7 @@
 
 	<include name="tvguide_Views">
 		<definition>
+			<include content="PVR_Background" />
 			<include content="PVR_Layout_Template">
 				<param name="visible" value="$PARAM[visible]" />
 				<param name="panel_edge_top" value="165" />
@@ -93,119 +94,7 @@
 					<param name="title_label" value="$VAR[tvguide_Group_Label]" />
 					<param name="textcolor" value="$VAR[Light_Color]" />
 				</include>
-				<control type="list" id="11">
-					<visible allowhiddenfocus="true">false</visible>
-					<orientation>horizontal</orientation>
-					<onup>SetFocus(3600,0,absolute)</onup>
-					<ondown>10</ondown>
-					<itemlayout width="100" height="100" />
-					<focusedlayout width="100" height="100" />
-				</control>
-				<control type="epggrid" id="10">
-					<description>EPG Grid</description>
-					<top>180</top>
-					<height>630</height>
-					<width>1680</width>
-					<centerleft>50%</centerleft>
-					<orientation>vertical</orientation>
-					<scrolltime tween="sine" easing="inout">180</scrolltime>
-					<timeblocks>27</timeblocks><!-- each 1 = 5 mins, so 12 = 1h, 24 = 2h, etf-->
-					<rulerunit>6</rulerunit><!-- how frequent to show times in ruler, 1 = 5m, 6 = 30m etc-->
-					<!-- <progresstexture border="0,92,3,0" colordiffuse="$VAR[Accent_Color]">pvr/tvguide_progress_indicator.png</progresstexture> -->
-					<onup>11</onup>
-					<onleft>SetFocus(3600,0,absolute)</onleft>
-					<ondown>11</ondown>
-					<pagecontrol>60</pagecontrol>
-					<rulerlayout width="210" height="90">
-						<control type="label" id="2">
-							<label>$INFO[ListItem.Label]</label>
-							<font>PVR_Time</font>
-							<width>1020</width>
-							<centertop>50%</centertop>
-							<height>30</height>
-							<textcolor>$VAR[Light_Color]</textcolor>
-							<textoffsetx>10</textoffsetx>
-						</control>
-						<control type="image">
-							<centertop>50%</centertop>
-							<height>30</height>
-							<texture colordiffuse="$VAR[Accent_Color]" border="4">pvr/tvguide_focusedlayout_border_left.png</texture>
-						</control>
-					</rulerlayout>
-					<channellayout width="540" height="90">
-						<control type="image">
-							<height>90</height>
-							<width>90</width>
-							<texture>$INFO[ListItem.Art(thumb)]</texture>
-							<aspectratio>keep</aspectratio>
-						</control>
-						<control type="label" id="1">
-							<label>$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label]</label>
-							<font>PVR_Guide</font>
-							<width>450</width>
-							<left>90</left>
-							<textoffsetx>30</textoffsetx>
-							<scroll>false</scroll>
-						</control>
-					</channellayout>
-					<focusedchannellayout width="540" height="90">
-						<control type="image" id="1">
-							<bottom>0</bottom>
-							<height>1</height>
-							<texture colordiffuse="$VAR[Unfocused_Color]">views/white_100.png</texture>
-							<animation effect="zoom" end="311,100" time="0" condition="true">Conditional</animation>
-						</control>
-						<control type="image">
-							<height>90</height>
-							<width>90</width>
-							<texture>$INFO[ListItem.Art(thumb)]</texture>
-							<aspectratio>keep</aspectratio>
-						</control>
-						<control type="label" id="1">
-							<label>$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label]</label>
-							<font>PVR_Guide</font>
-							<textcolor>$VAR[tvguide_Focused_Color]</textcolor>
-							<left>90</left>
-							<width>450</width>
-							<textoffsetx>30</textoffsetx>
-							<scroll>false</scroll>
-						</control>
-					</focusedchannellayout>
-					<itemlayout width="95" height="90">
-						<include content="PVR_icon">
-							<param name="texture" value="$VAR[tvguide_Icon_Texture]" />
-							<param name="color" value="$VAR[tvguide_Icon_Unfocused_Color]" />
-						</include>
-						<control type="label" id="1">
-							<label>$INFO[ListItem.Label]</label>
-							<font>PVR_Guide</font>
-							<textoffsetx>15</textoffsetx>
-							<scroll>false</scroll>
-						</control>
-					</itemlayout>
-					<focusedlayout width="95" height="90">
-						<include content="PVR_Channel_Icon_Button">
-							<param name="path" value="$INFO[Container(10).ListItem.Icon]" />
-						</include>
-						<control type="image" id="14">
-							<visible>Control.HasFocus(10)</visible>
-							<texture colordiffuse="$VAR[tvchannels_Progress_Color]">views/white_100.png</texture>
-							<bottom>1</bottom>
-						</control>
-						<include content="PVR_icon">
-							<param name="texture" value="$VAR[tvguide_Icon_Texture]" />
-							<param name="color" value="$VAR[tvguide_Icon_Focused_Color]" />
-						</include>
-						<control type="label" id="1">
-							<textcolor>$VAR[tvguide_Focused_Color]</textcolor>
-							<label>$INFO[ListItem.Label]</label>
-							<font>PVR_Guide</font>
-							<textoffsetx>15</textoffsetx>
-							<scroll>true</scroll>
-							<scrollsuffix> / </scrollsuffix>
-						</control>
-					</focusedlayout>
-				</control>
+				<include content="PVR_EPGGrid_View" />
 				<include content="Dialog_Divider_With_Scrollbar">
 					<param name="scrollbarvisible" value="true" />
 					<param name="id" value="60" />
@@ -235,123 +124,9 @@
 		</definition>
 	</include>
 
-	<include name="PVR_ListView">
-		<param name="visible" default="true" />
-		<param name="simple_label" default="false" />
-		<param name="title_padding" default="25" />
-		<param name="info_box_bottom" default="300" />
-		<param name="info_box_height" default="480" />
-		<param name="plot_height_max" default="135" />
-		<definition>
-			<include content="PVR_Layout_Template">
-				<param name="visible" value="$PARAM[visible]" />
-				<param name="panel_edge_top" value="120" />
-				<param name="panel_edge_bottom" value="120" />
-				<control type="list" id="50">
-					<viewtype label="List">list</viewtype>
-					<left>120</left>
-					<width>1080</width>
-					<height>720</height>
-					<centertop>50%</centertop>
-					<preloaditems>2</preloaditems>
-					<pagecontrol>60</pagecontrol>
-					<orientation>vertical</orientation>
-					<onleft>SetFocus(3600,0,absolute)</onleft>
-					<onright condition="Integer.IsGreater(Container(50).NumItems,8)">60</onright>
-					<onright condition="!Integer.IsGreater(Container(50).NumItems,8)">SetFocus(3600,0,absolute)</onright>
-					<scrolltime tween="sine" easing="inout">360</scrolltime>
-					<itemlayout width="1080" height="90" infoupdate="5000">
-						<include content="PVR_ChannelList_Item">
-							<param name="visible" value="!$PARAM[simple_label]" />
-							<param name="progress" value="$PARAM[progress]" />
-							<param name="channel_number" value="$PARAM[channel_number]" />
-							<param name="icon" value="$PARAM[icon]" />
-							<param name="logo" value="$PARAM[logo]" />
-							<param name="timer" value="$PARAM[timer]" />
-							<param name="title_label" value="$PARAM[title_label]" />
-							<param name="info_label" value="$PARAM[info_label]" />
-							<param name="color" value="$VAR[Unfocused_Color]" />
-						</include>
-						<control type="label">
-							<visible>$PARAM[simple_label]</visible>
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-					</itemlayout>
-					<focusedlayout width="1080" height="90" infoupdate="5000">
-						<include content="PVR_Channel_Icon_Button" condition="Window.Is(tvchannels) | Window.Is(radiochannels)">
-							<param name="path" value="$INFO[ListItem.Icon]" />
-						</include>
-						<include content="PVR_ChannelList_Item">
-							<param name="visible" value="!$PARAM[simple_label]" />
-							<param name="progress" value="$PARAM[progress]" />
-							<param name="channel_number" value="$PARAM[channel_number]" />
-							<param name="icon" value="$PARAM[icon]" />
-							<param name="logo" value="$PARAM[logo]" />
-							<param name="timer" value="$PARAM[timer]" />
-							<param name="title_label" value="$PARAM[title_label]" />
-							<param name="info_label" value="$PARAM[info_label]" />
-							<param name="color" value="$VAR[Light_Color]" />
-						</include>
-						<control type="button">
-							<visible allowhiddenfocus="true">false</visible>
-							<onfocus>SetProperty(PVR_Channel_Icon,$INFO[ListItem.Icon],home)</onfocus>
-						</control>
-						<control type="label">
-							<visible>$PARAM[simple_label]</visible>
-							<label>$INFO[ListItem.Label]</label>
-							<textcolor>$VAR[Light_Color]</textcolor>
-						</control>
-						<control type="image">
-							<bottom>0</bottom>
-							<height>1</height>
-							<texture colordiffuse="$VAR[Unfocused_Color]">views/white_100.png</texture>
-						</control>
-					</focusedlayout>
-				</control>
-				<include content="PVR_Info_Box">
-					<param name="visible" value="!$PARAM[simple_label]" />
-					<param name="bottom" value="$PARAM[info_box_bottom]" />
-					<param name="height" value="$PARAM[info_box_height]" />
-					<param name="title_padding" value="$PARAM[title_padding]" />
-					<param name="plot_padding" value="25" />
-					<param name="plot_height_max" value="$PARAM[plot_height_max]" />
-					<control type="grouplist">
-						<height>180</height>
-						<orientation>horizontal</orientation>
-						<align>center</align>
-						<include content="Simple_ListIcon">
-							<param name="visible" value="!$PARAM[simple_label]" />
-							<param name="width" value="320" />
-							<param name="height" value="180" />
-							<param name="texture" value="$VAR[PVR_Icon_Texture]" />
-							<param name="align" value="center" />
-							<param name="aligny" value="center" />
-							<param name="aspectratio" value="keep" />
-							<param name="fadetime" value="5" />
-						</include>
-					</control>
-				</include>
-				<include content="PVR_Now_Playing_Label">
-					<param name="visible" value="true" />
-					<param name="top" value="810" />
-					<param name="label" value="$VAR[PVR_Next_Up_Label]" />
-					<param name="line_bottom" value="90" />
-				</include>
-				<nested />
-				<include content="Dialog_Divider_With_Scrollbar">
-					<param name="scrollbarvisible" value="Integer.IsGreater(Container(50).NumItems,8)" />
-					<param name="id" value="60" />
-					<param name="left" value="1200" />
-					<param name="height" value="720" />
-					<param name="onleft" value="50" />
-					<param name="onright" value="3600" />
-				</include>
-			</include>
-		</definition>
-	</include>
-
 	<include name="tvchannels_Views">
 		<definition>
+			<include content="PVR_Background" />
 			<include content="PVR_ListView">
 				<param name="simple_label" value="false" />
 				<include content="PVR_Now_Playing_Label">
@@ -360,11 +135,15 @@
 					<param name="logo" value="true" />
 				</include>
 			</include>
+			<include content="PVR_DetailedListView">
+				<param name="visible" value="Control.IsVisible(51) + Integer.IsGreater(Container(51).NumItems,0)" />
+			</include>
 		</definition>
 	</include>
 
 	<include name="tvrecordings_Views">
 		<definition>
+			<include content="PVR_Background" />
 			<include content="PVR_ListView">
 				<param name="simple_label" value="ListItem.IsFolder" />
 				<param name="channel_number" value="false" />
@@ -386,6 +165,7 @@
 
 	<include name="tvsearch_Views">
 		<definition>
+			<include content="PVR_Background" />
 			<include content="PVR_ListView">
 				<param name="visible" value="!Window.IsVisible(pvrguidesearch)" />
 				<param name="simple_label" value="String.IsEmpty(ListItem.ChannelName)" />
@@ -407,6 +187,7 @@
 
 	<include name="tvtimers_Views">
 		<definition>
+			<include content="PVR_Background" />
 			<include content="PVR_ListView">
 				<param name="visible" value="!Window.IsVisible(pvrguidesearch)" />
 				<param name="simple_label" value="String.IsEmpty(ListItem.Date)" />
diff --git a/16x9/Templates_Viewtypes.xml b/16x9/Templates_Viewtypes.xml
index 9d1d3f78..f36bd2ac 100644
--- a/16x9/Templates_Viewtypes.xml
+++ b/16x9/Templates_Viewtypes.xml
@@ -134,29 +134,4 @@
 		</definition>
 	</include>
 
-	<include name="PVR_Layout_Template">
-		<param name="visible" default="true" />
-		<definition>
-			<!-- Background -->
-			<include content="Background_Multiart_Global">
-				<param name="visible" value="!VideoPlayer.Content(livetv)" />
-				<param name="fadein_animation_condition" value="!$EXP[Background_FadeIn_Exceptions]" />
-				<param name="fadeout_animation_condition" value="!$EXP[Background_FadeOut_Exceptions]" />
-			</include>
-			<include content="Embedded_VideoPlayer">
-				<param name="visible" value="VideoPlayer.Content(livetv)" />
-			</include>
-			<!-- Content -->
-			<include content="Default_Dialog_Panel_Layout">
-				<param name="visible" value="!$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible] + $PARAM[visible]" />
-				<param name="panel_edge_top" value="$PARAM[panel_edge_top]" />
-				<param name="panel_edge_bottom" value="$PARAM[panel_edge_bottom]" />
-				<param name="panel_edge_left" value="$PARAM[panel_edge_left]" />
-				<param name="panel_edge_right" value="$PARAM[panel_edge_right]" />
-				<param name="panel_colordiffuse" value="$VAR[PVR_Panel_Mask]" />
-				<nested />
-			</include>
-		</definition>
-	</include>
-
 </includes>
\ No newline at end of file
diff --git a/16x9/Templates_Viewtypes_PVR.xml b/16x9/Templates_Viewtypes_PVR.xml
new file mode 100644
index 00000000..1c028423
--- /dev/null
+++ b/16x9/Templates_Viewtypes_PVR.xml
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+
+	<include name="PVR_Background">
+		<include content="Background_Multiart_Global">
+			<param name="visible" value="!VideoPlayer.Content(livetv)" />
+			<param name="fadein_animation_condition" value="!$EXP[Background_FadeIn_Exceptions]" />
+			<param name="fadeout_animation_condition" value="!$EXP[Background_FadeOut_Exceptions]" />
+		</include>
+		<include content="Embedded_VideoPlayer">
+			<param name="visible" value="VideoPlayer.Content(livetv)" />
+		</include>
+	</include>
+
+	<include name="PVR_Layout_Template">
+		<param name="visible" default="true" />
+		<definition>
+			<include content="Default_Dialog_Panel_Layout">
+				<param name="visible" value="!$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible] + !Window.IsVisible(busydialog) + $PARAM[visible]" />
+				<param name="panel_edge_top" value="$PARAM[panel_edge_top]" />
+				<param name="panel_edge_bottom" value="$PARAM[panel_edge_bottom]" />
+				<param name="panel_edge_left" value="$PARAM[panel_edge_left]" />
+				<param name="panel_edge_right" value="$PARAM[panel_edge_right]" />
+				<param name="panel_colordiffuse" value="$VAR[PVR_Panel_Mask]" />
+				<nested />
+			</include>
+		</definition>
+	</include>
+
+	<include name="PVR_Channel_Icon_Button">
+		<control type="button">
+			<visible allowhiddenfocus="true">false</visible>
+			<onfocus>SetProperty(PVR_Channel_Icon,$PARAM[path],home)</onfocus>
+		</control>
+	</include>
+
+	<include name="PVR_EPGGrid_View">
+		<control type="list" id="11">
+			<visible allowhiddenfocus="true">false</visible>
+			<orientation>horizontal</orientation>
+			<onup>SetFocus(3600,0,absolute)</onup>
+			<ondown>10</ondown>
+			<itemlayout width="100" height="100" />
+			<focusedlayout width="100" height="100" />
+		</control>
+		<control type="epggrid" id="10">
+			<description>EPG Grid</description>
+			<top>180</top>
+			<height>630</height>
+			<width>1680</width>
+			<centerleft>50%</centerleft>
+			<orientation>vertical</orientation>
+			<scrolltime tween="sine" easing="inout">180</scrolltime>
+			<timeblocks>27</timeblocks><!-- each 1 = 5 mins, so 12 = 1h, 24 = 2h, etf-->
+			<rulerunit>6</rulerunit><!-- how frequent to show times in ruler, 1 = 5m, 6 = 30m etc-->
+			<!-- <progresstexture border="0,92,3,0" colordiffuse="$VAR[Accent_Color]">pvr/tvguide_progress_indicator.png</progresstexture> -->
+			<onup>11</onup>
+			<onleft>SetFocus(3600,0,absolute)</onleft>
+			<ondown>11</ondown>
+			<pagecontrol>60</pagecontrol>
+			<rulerlayout width="210" height="90">
+				<control type="label" id="2">
+					<label>$INFO[ListItem.Label]</label>
+					<font>PVR_Time</font>
+					<width>1020</width>
+					<centertop>50%</centertop>
+					<height>30</height>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<textoffsetx>10</textoffsetx>
+				</control>
+				<control type="image">
+					<centertop>50%</centertop>
+					<height>30</height>
+					<texture colordiffuse="$VAR[Accent_Color]" border="4">pvr/tvguide_focusedlayout_border_left.png</texture>
+				</control>
+			</rulerlayout>
+			<channellayout width="540" height="90">
+				<control type="image">
+					<height>90</height>
+					<width>90</width>
+					<texture>$INFO[ListItem.Art(thumb)]</texture>
+					<aspectratio>keep</aspectratio>
+				</control>
+				<control type="label" id="1">
+					<label>$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label]</label>
+					<font>PVR_Guide</font>
+					<width>450</width>
+					<left>90</left>
+					<textoffsetx>30</textoffsetx>
+					<scroll>false</scroll>
+				</control>
+			</channellayout>
+			<focusedchannellayout width="540" height="90">
+				<control type="image" id="1">
+					<bottom>0</bottom>
+					<height>1</height>
+					<texture colordiffuse="$VAR[Unfocused_Color]">views/white_100.png</texture>
+					<animation effect="zoom" end="311,100" time="0" condition="true">Conditional</animation>
+				</control>
+				<control type="image">
+					<height>90</height>
+					<width>90</width>
+					<texture>$INFO[ListItem.Art(thumb)]</texture>
+					<aspectratio>keep</aspectratio>
+				</control>
+				<control type="label" id="1">
+					<label>$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label]</label>
+					<font>PVR_Guide</font>
+					<textcolor>$VAR[tvguide_Focused_Color]</textcolor>
+					<left>90</left>
+					<width>450</width>
+					<textoffsetx>30</textoffsetx>
+					<scroll>false</scroll>
+				</control>
+			</focusedchannellayout>
+			<itemlayout width="95" height="90">
+				<include content="PVR_icon">
+					<param name="texture" value="$VAR[tvguide_Icon_Texture]" />
+					<param name="color" value="$VAR[tvguide_Icon_Unfocused_Color]" />
+				</include>
+				<control type="label" id="1">
+					<label>$INFO[ListItem.Label]</label>
+					<font>PVR_Guide</font>
+					<textoffsetx>15</textoffsetx>
+					<scroll>false</scroll>
+				</control>
+			</itemlayout>
+			<focusedlayout width="95" height="90">
+				<include content="PVR_Channel_Icon_Button">
+					<param name="path" value="$INFO[Container(10).ListItem.Icon]" />
+				</include>
+				<control type="image" id="14">
+					<visible>Control.HasFocus(10)</visible>
+					<texture colordiffuse="$VAR[tvchannels_Progress_Color]">views/white_100.png</texture>
+					<bottom>1</bottom>
+				</control>
+				<include content="PVR_icon">
+					<param name="texture" value="$VAR[tvguide_Icon_Texture]" />
+					<param name="color" value="$VAR[tvguide_Icon_Focused_Color]" />
+				</include>
+				<control type="label" id="1">
+					<textcolor>$VAR[tvguide_Focused_Color]</textcolor>
+					<label>$INFO[ListItem.Label]</label>
+					<font>PVR_Guide</font>
+					<textoffsetx>15</textoffsetx>
+					<scroll>true</scroll>
+					<scrollsuffix> / </scrollsuffix>
+				</control>
+			</focusedlayout>
+		</control>
+	</include>
+
+	<include name="PVR_ListView_itemlayout">
+		<param name="visible" default="true" />
+		<param name="progress" default="true" />
+		<param name="channel_number" default="true" />
+		<param name="icon" default="true" />
+		<param name="logo" default="true" />
+		<param name="title_label" default="$VAR[PVR_List_Title_Label]" />
+		<param name="title_scroll" default="false" />
+		<param name="info_label" default="$VAR[PVR_List_Info_Label]" />
+		<param name="color" default="$VAR[Unfocused_Color]" />
+		<definition>
+			<control type="group">
+				<visible>$PARAM[visible]</visible>
+				<include content="PVR_Progress" condition="$PARAM[progress]" />
+				<include content="PVR_Channel_Number_Label" condition="$PARAM[channel_number]">
+					<param name="color" value="$PARAM[color]" />
+				</include>
+				<include content="Timer_unfocused" condition="$PARAM[timer]">
+					<param name="visible" value="!String.Contains(ListItem.Comment,$LOCALIZE[1223])" />
+					<param name="color" value="$PARAM[color]" />
+					<width>90</width>
+				</include>
+				<control type="group">
+					<animation effect="slide" end="-105" time="0" condition="Window.Is(tvrecordings) | Window.Is(radiorecordings) | Window.Is(tvtimers) | Window.Is(radiotimers) | Window.is(tvtimerrules) | Window.Is(radiotimerrules)">Conditional</animation>
+					<control type="group">
+						<top>10</top>
+						<bottom>10</bottom>
+						<left>90</left>
+						<right>240</right>
+						<control type="label">
+							<height>40</height>
+							<label>$PARAM[title_label]</label>
+							<font>PVR_Channel</font>
+							<textcolor>$PARAM[color]</textcolor>
+							<scroll>$PARAM[title_scroll]</scroll>
+							<selectedcolor>$PARAM[color]</selectedcolor>
+						</control>
+						<control type="label">
+							<height>30</height>
+							<bottom>0</bottom>
+							<label>[UPPERCASE]$PARAM[info_label][/UPPERCASE]</label>
+							<font>PVR_Info</font>
+							<textcolor>$PARAM[color]</textcolor>
+							<selectedcolor>$PARAM[color]</selectedcolor>
+						</control>
+					</control>
+				</control>
+				<include content="PVR_icon">
+					<param name="visible" value="$PARAM[icon]" />
+					<param name="texture" value="$VAR[tvchannels_Icon_Texture]" />
+					<param name="color" value="$VAR[tvchannels_Icon_Color]" />
+					<right>15</right>
+					<centertop>50%</centertop>
+				</include>
+				<include content="PVR_logo" condition="$PARAM[logo]">
+					<param name="color" value="ffffffff" />
+					<param name="right" value="60" />
+					<param name="top" value="15" />
+					<param name="width" value="120" />
+					<param name="aligny" value="center" />
+				</include>
+				<nested />
+			</control>
+		</definition>
+	</include>
+
+	<include name="PVR_DetailedListView_itemlayout">
+		<param name="textcolor" default="$VAR[Light_Color]" />
+		<param name="selectedcolor" default="$VAR[Light_Color]" />
+		<definition>
+			<include content="Simple_ListIcon">
+				<param name="left" value="30" />
+				<param name="width" value="320" />
+				<param name="top" value="20" />
+				<param name="height" value="180" />
+				<param name="texture" value="$VAR[PVR_Icon_Texture]" />
+				<param name="align" value="center" />
+				<param name="aligny" value="center" />
+				<param name="aspectratio" value="keep" />
+				<param name="fadetime" value="5" />
+			</include>
+			<include content="PVR_Progress">
+				<param name="width" value="320" />
+				<param name="height" value="6" />
+				<param name="background_color" value="$VAR[Progress_Light_Background_Color]" />
+				<param name="focus_color" value="$VAR[Progress_Light_Focused_Color]" />
+				<left>30</left>
+				<bottom>20</bottom>
+			</include>
+			<control type="group">
+				<top>30</top>
+				<bottom>30</bottom>
+				<left>380</left>
+				<right>30</right>
+				<control type="label">
+					<height>45</height>
+					<width>100%</width>
+					<label>$VAR[PVR_List_Title_Label]</label>
+					<font>Grid_Title_Medium</font>
+					<textcolor>$PARAM[textcolor]</textcolor>
+					<selectedcolor>$PARAM[selectedcolor]</selectedcolor>
+					<scroll>false</scroll>
+				</control>
+				<control type="label">
+					<top>45</top>
+					<height>30</height>
+					<width>100%</width>
+					<label>[UPPERCASE]$INFO[ListItem.ChannelName]$VAR[ListItem_Date_Divider, ]$INFO[ListItem.StartTime, ]$INFO[ListItem.EndTime,-]$INFO[ListItem.Duration(mins), (, $LOCALIZE[31114])][/UPPERCASE]</label>
+					<font>PVR_Info</font>
+					<textcolor>$PARAM[textcolor]</textcolor>
+					<selectedcolor>$PARAM[selectedcolor]</selectedcolor>
+				</control>
+				<control type="textbox">
+					<top>75</top>
+					<height>80</height>
+					<width>100%</width>
+					<label>$INFO[ListItem.Plot]</label>
+					<aligny>top</aligny>
+					<font>PVR_Description</font>
+					<autoscroll>false</autoscroll>
+					<textcolor>$PARAM[textcolor]</textcolor>
+					<selectedcolor>$PARAM[selectedcolor]</selectedcolor>
+				</control>
+				<control type="label">
+					<bottom>0</bottom>
+					<height>30</height>
+					<width>100%</width>
+					<label>$VAR[PVR_Next_Up_Label]</label>
+					<font>PVR_Info</font>
+					<textcolor>$PARAM[textcolor]</textcolor>
+					<selectedcolor>$PARAM[selectedcolor]</selectedcolor>
+				</control>
+				<include content="PVR_logo">
+					<param name="color" value="ffffffff" />
+					<param name="right" value="0" />
+					<param name="top" value="0" />
+					<param name="width" value="90" />
+					<param name="aligny" value="top" />
+				</include>
+			</control>
+		</definition>
+	</include>
+
+	<include name="PVR_ListView">
+		<param name="id" default="50" />
+		<param name="visible" default="true" />
+		<param name="simple_label" default="false" />
+		<param name="title_padding" default="25" />
+		<param name="info_box_bottom" default="300" />
+		<param name="info_box_height" default="480" />
+		<param name="plot_height_max" default="135" />
+		<definition>
+			<include content="PVR_Layout_Template">
+				<param name="visible" value="Control.IsVisible($PARAM[id]) + Integer.IsGreater(Container($PARAM[id]).NumItems,0) + $PARAM[visible]" />
+				<param name="panel_edge_top" value="120" />
+				<param name="panel_edge_bottom" value="120" />
+				<control type="list" id="$PARAM[id]">
+					<viewtype label="List">list</viewtype>
+					<left>120</left>
+					<width>1080</width>
+					<height>720</height>
+					<centertop>50%</centertop>
+					<preloaditems>2</preloaditems>
+					<pagecontrol>60</pagecontrol>
+					<orientation>vertical</orientation>
+					<onleft>SetFocus(3600,0,absolute)</onleft>
+					<onright condition="Integer.IsGreater(Container($PARAM[id]).NumItems,8)">60</onright>
+					<onright condition="!Integer.IsGreater(Container($PARAM[id]).NumItems,8)">SetFocus(3600,0,absolute)</onright>
+					<scrolltime tween="sine" easing="inout">360</scrolltime>
+					<itemlayout width="1080" height="90" infoupdate="5000">
+						<include content="PVR_ListView_itemlayout">
+							<param name="visible" value="!$PARAM[simple_label]" />
+							<param name="progress" value="$PARAM[progress]" />
+							<param name="channel_number" value="$PARAM[channel_number]" />
+							<param name="icon" value="$PARAM[icon]" />
+							<param name="logo" value="$PARAM[logo]" />
+							<param name="timer" value="$PARAM[timer]" />
+							<param name="title_label" value="$PARAM[title_label]" />
+							<param name="info_label" value="$PARAM[info_label]" />
+							<param name="color" value="$VAR[Unfocused_Color]" />
+						</include>
+						<control type="label">
+							<visible>$PARAM[simple_label]</visible>
+							<label>$INFO[ListItem.Label]</label>
+						</control>
+					</itemlayout>
+					<focusedlayout width="1080" height="90" infoupdate="5000">
+						<include content="PVR_Channel_Icon_Button" condition="Window.Is(tvchannels) | Window.Is(radiochannels)">
+							<param name="path" value="$INFO[ListItem.Icon]" />
+						</include>
+						<include content="PVR_ListView_itemlayout">
+							<param name="visible" value="!$PARAM[simple_label]" />
+							<param name="progress" value="$PARAM[progress]" />
+							<param name="channel_number" value="$PARAM[channel_number]" />
+							<param name="icon" value="$PARAM[icon]" />
+							<param name="logo" value="$PARAM[logo]" />
+							<param name="timer" value="$PARAM[timer]" />
+							<param name="title_label" value="$PARAM[title_label]" />
+							<param name="info_label" value="$PARAM[info_label]" />
+							<param name="color" value="$VAR[Light_Color]" />
+						</include>
+						<control type="label">
+							<visible>$PARAM[simple_label]</visible>
+							<label>$INFO[ListItem.Label]</label>
+							<textcolor>$VAR[Light_Color]</textcolor>
+						</control>
+						<control type="image">
+							<bottom>0</bottom>
+							<height>1</height>
+							<texture colordiffuse="$VAR[Unfocused_Color]">views/white_100.png</texture>
+						</control>
+					</focusedlayout>
+				</control>
+				<include content="PVR_Info_Box">
+					<param name="visible" value="!$PARAM[simple_label]" />
+					<param name="bottom" value="$PARAM[info_box_bottom]" />
+					<param name="height" value="$PARAM[info_box_height]" />
+					<param name="title_padding" value="$PARAM[title_padding]" />
+					<param name="plot_padding" value="25" />
+					<param name="plot_height_max" value="$PARAM[plot_height_max]" />
+					<control type="grouplist">
+						<height>180</height>
+						<orientation>horizontal</orientation>
+						<align>center</align>
+						<include content="Simple_ListIcon">
+							<param name="visible" value="!$PARAM[simple_label]" />
+							<param name="width" value="320" />
+							<param name="height" value="180" />
+							<param name="texture" value="$VAR[PVR_Icon_Texture]" />
+							<param name="align" value="center" />
+							<param name="aligny" value="center" />
+							<param name="aspectratio" value="keep" />
+							<param name="fadetime" value="5" />
+						</include>
+					</control>
+				</include>
+				<include content="PVR_Now_Playing_Label">
+					<param name="top" value="810" />
+					<param name="label" value="$VAR[PVR_Next_Up_Label]" />
+					<param name="line_bottom" value="90" />
+				</include>
+				<nested />
+				<include content="Dialog_Divider_With_Scrollbar">
+					<param name="scrollbarvisible" value="Integer.IsGreater(Container($PARAM[id]).NumItems,8)" />
+					<param name="id" value="60" />
+					<param name="left" value="1200" />
+					<param name="height" value="720" />
+					<param name="onleft" value="$PARAM[id]" />
+					<param name="onright" value="3600" />
+				</include>
+			</include>
+		</definition>
+	</include>
+
+	<include name="PVR_DetailedListView">
+		<param name="id" default="51" />
+		<param name="visible" default="true" />
+		<definition>
+			<include content="PVR_Layout_Template">
+				<param name="visible" value="Control.IsVisible($PARAM[id]) + Integer.IsGreater(Container($PARAM[id]).NumItems,0) + $PARAM[visible]" />
+				<param name="panel_edge_top" value="120" />
+				<param name="panel_edge_bottom" value="0" />
+				<control type="fixedlist" id="$PARAM[id]">
+					<viewtype label="DetailedList">list</viewtype>
+					<left>120</left>
+					<right>120</right>
+					<top>240</top>
+					<bottom>0</bottom>
+					<focusposition>1</focusposition>
+					<movement>1</movement>
+					<preloaditems>2</preloaditems>
+					<pagecontrol>60</pagecontrol>
+					<orientation>vertical</orientation>
+					<onleft>SetFocus(3600,0,absolute)</onleft>
+					<onright condition="Integer.IsGreater(Container($PARAM[id]).NumItems,3)">60</onright>
+					<onright condition="!Integer.IsGreater(Container($PARAM[id]).NumItems,3)">SetFocus(3600,0,absolute)</onright>
+					<scrolltime tween="sine" easing="inout">360</scrolltime>
+					<itemlayout width="1680" height="240" infoupdate="5000">
+						<include content="PVR_DetailedListView_itemlayout" />
+					</itemlayout>
+					<focusedlayout width="1680" height="240" infoupdate="5000">
+						<include content="PVR_Channel_Icon_Button" condition="Window.Is(tvchannels) | Window.Is(radiochannels)">
+							<param name="path" value="$INFO[ListItem.Icon]" />
+						</include>
+						<control type="image">
+							<texture border="10" colordiffuse="$VAR[PVR_DetailedListView_Focus_Color]">views/white_100_rounded10.png</texture>
+						</control>
+						<include content="PVR_DetailedListView_itemlayout" />
+					</focusedlayout>
+				</control>
+				<control type="scrollbar" id="60">
+					<visible allowhiddenfocus="true">Container.Scrolling | Control.HasFocus(60)</visible>
+					<include content="Scrollbar_Fade_Animation" />
+					<right>87</right>
+					<width>6</width>
+					<top>240</top>
+					<height>720</height>
+					<onleft>$PARAM[id]</onleft>
+					<onright>SetFocus(3600,0,absolute)</onright>
+					<showonepage>false</showonepage>
+					<texturesliderbackground colordiffuse="$VAR[PVR_Scroll_Background_Color]">views/white_100.png</texturesliderbackground>
+					<texturesliderbar colordiffuse="$VAR[PVR_Scroll_Background_Color]">views/white_100.png</texturesliderbar>
+					<texturesliderbarfocus colordiffuse="$VAR[Scroll_Focused_Color]">views/white_100.png</texturesliderbarfocus>
+					<textureslidernib />
+					<textureslidernibfocus />
+				</control>
+			</include>
+		</definition>
+	</include>
+
+</includes>
\ No newline at end of file
diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml
index 50421483..3eb1cd1b 100644
--- a/16x9/Variables_Labels_Media.xml
+++ b/16x9/Variables_Labels_Media.xml
@@ -641,6 +641,7 @@
 	<variable name="PVR_Next_Up_Label">
 		<value condition="Window.Is(tvsearch) | Window.Is(radiosearch)">$VAR[PVR_Info_Box_Info_Label2]</value>
 		<value condition="!String.IsEmpty(ListItem.TimerType)">[UPPERCASE]$INFO[ListItem.TimerType][/UPPERCASE]</value>
+		<value condition="!String.IsEmpty(ListItem.NextStartTime) + !String.IsEmpty(ListItem.NextTitle) + Control.IsVisible(51)">[UPPERCASE]$LOCALIZE[31201]$VAR[Copacetic_Divider_Bold, ]$INFO[ListItem.NextStartTime, ]$INFO[ListItem.NextEndTime,-]$VAR[Copacetic_Divider_Bold, ]$INFO[ListItem.NextTitle, ][/UPPERCASE]</value>
 		<value condition="!String.IsEmpty(ListItem.NextStartTime) + !String.IsEmpty(ListItem.NextTitle)">[UPPERCASE]$INFO[ListItem.NextStartTime]$INFO[ListItem.NextEndTime,-]$VAR[Copacetic_Divider_Bold, ]$INFO[ListItem.NextTitle, ][/UPPERCASE]</value>
 		<value condition="!String.IsEmpty(ListItem.NextTitle)">[UPPERCASE]$LOCALIZE[31201]$VAR[Copacetic_Divider_Bold, ]$INFO[ListItem.NextTitle][/UPPERCASE]</value>
 	</variable>
diff --git a/16x9/Variables_Labels_Windows.xml b/16x9/Variables_Labels_Windows.xml
index 9ddd826f..c11caa47 100644
--- a/16x9/Variables_Labels_Windows.xml
+++ b/16x9/Variables_Labels_Windows.xml
@@ -320,6 +320,11 @@
 		<value>$INFO[ListItem.Label]$VAR[ListItem_Label2_Divider_Bold, , ]$INFO[ListItem.Label2]</value>
 	</variable>
 
+	<variable name="tvchannels_Viewtype_Label">
+		<value condition="Control.IsVisible(51)">$LOCALIZE[31033]</value>
+		<value>$LOCALIZE[31032]</value>
+	</variable>
+
 	<variable name="tvguide_Group_Label">
 		<value condition="Control.HasFocus(11)">$VAR[Copacetic_Chevron_Left] $INFO[Container(11).ListItem.Label] $VAR[Copacetic_Chevron_Right]</value>
 		<value>$INFO[Container(11).ListItem.Label]</value>
diff --git a/16x9/Variables_Textures_Icons.xml b/16x9/Variables_Textures_Icons.xml
index 42f28bed..536726c2 100644
--- a/16x9/Variables_Textures_Icons.xml
+++ b/16x9/Variables_Textures_Icons.xml
@@ -20,6 +20,11 @@
 		<value>icons/icon_repeat_50%_unfocused_60.png</value>
 	</variable>
 
+	<variable name="Panel_Texture">
+		<value condition="Window.Is(radioguide) | Window.Is(tvguide) | [[Window.Is(radiochannels) | Window.Is(tvchannels)] + Control.IsVisible(51)]">views/white_100_toprounded10.png</value>
+		<value>views/white_100_rounded10.png</value>
+	</variable>
+
 	<variable name="PVR_Icon_Texture">
 		<value condition="!String.IsEmpty(ListItem.EpgEventIcon)">$INFO[ListItem.EpgEventIcon]</value>
 		<value>$INFO[ListItem.Icon]</value>
diff --git a/README.md b/README.md
index 2f8dd152..34f039fa 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,11 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 - Added a workaround for the focus glitch on homescreen when globalsearch icon is clicked and focus temporarily returns to home menu before keyboard loads. This is required to ensure that after keyboard or global search is exited, the homescreen is properly focused on the main menu. Added a window property to hide main menu during this transition.
 
 Still to do:
+- nowplaying for detailed channels view
+- swap ids for channels views
+- check over simple lists
+- nowplaying label in detailed
+- detailed list as new view for Media?
 - pvrchannelmanager
 - pvrgroupmanager
 - labels always white on pvr screens when on light theme
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 502cb56b..122cc1c7 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -94,6 +94,18 @@ msgctxt "#31031"
 msgid "Spotlight"
 msgstr ""
 
+#: NEW
+#Common
+msgctxt "#31032"
+msgid "Simple"
+msgstr ""
+
+#: NEW
+#Common
+msgctxt "#31033"
+msgid "Detailed"
+msgstr ""
+
 
 
 
diff --git a/media/views/white_100_rightrounded10.png b/media/views/white_100_rightrounded10.png
new file mode 100644
index 00000000..1b36fa41
Binary files /dev/null and b/media/views/white_100_rightrounded10.png differ
diff --git a/media/views/white_100_rounded10.png b/media/views/white_100_rounded10.png
new file mode 100644
index 00000000..23e87505
Binary files /dev/null and b/media/views/white_100_rounded10.png differ
diff --git a/media/views/white_100_toprounded10.png b/media/views/white_100_toprounded10.png
new file mode 100644
index 00000000..d88d7d7b
Binary files /dev/null and b/media/views/white_100_toprounded10.png differ