diff --git a/1080i/DialogAlbumInfo.xml b/1080i/DialogAlbumInfo.xml
index 78fff1d..138f6a7 100644
--- a/1080i/DialogAlbumInfo.xml
+++ b/1080i/DialogAlbumInfo.xml
@@ -108,7 +108,7 @@
                 <align>left</align>
                 <textcolor>textActive</textcolor>
                 <height>17-row</height>
-                <label>$INFO[ListItem.Property(Artist_Description)]</label>
+                <label fallback="31205">$INFO[ListItem.Property(Artist_Description)]</label>
                 <autoscroll delay="15000" time="1500" repeat="10000"/>
             </control>
             <!--dialog controls-->
@@ -296,7 +296,7 @@
                     <align>left</align>
                     <textcolor>textActive</textcolor>
                     <height>15-row</height>
-                    <label>$INFO[ListItem.Property(Album_Description)]</label>
+                    <label fallback="31205">$INFO[ListItem.Property(Album_Description)]</label>
                     <autoscroll delay="10000" time="1000" repeat="10000"/>
                     <shadowcolor>-</shadowcolor>
                 </control>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index a0394ab..03b42c4 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -173,7 +173,7 @@
                     <align>left</align>
                     <textcolor>textActive</textcolor>
                     <height>350</height>
-                    <label>$INFO[ListItem.plot]</label>
+                    <label fallback="31205">$INFO[ListItem.plot]</label>
                     <autoscroll delay="10000" time="1000" repeat="10000"/>
                     <shadowcolor>-</shadowcolor>
                 </control>
@@ -388,7 +388,7 @@
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <height>200</height>
-                    <label>$INFO[ListItem.plot]</label>
+                    <label fallback="31205">$INFO[ListItem.plot]</label>
                     <autoscroll delay="10000" time="1000" repeat="10000"/>
                 </control>
                 <!--dialog controls-->
diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml
index 3390f74..0971db4 100644
--- a/1080i/DialogYesNo.xml
+++ b/1080i/DialogYesNo.xml
@@ -49,6 +49,10 @@
                 <aspectratio>stretch</aspectratio>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
+                <animation type="conditional" condition="control.hasfocus(10)" loop="false" reversible="false">
+                    <effect type="fade" time="500"/>
+                    <effect type="rotatey" end="180" center="708" tween="back" easing="out" time="1000"/>
+                </animation>
             </control>
             <control type="label">
                 <posx>col-9-begin</posx>
@@ -78,7 +82,10 @@
                 <aspectratio>stretch</aspectratio>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
-                <include>spinFocusIcon</include>
+                <animation type="conditional" condition="control.hasfocus(11)" loop="false" reversible="false">
+                    <effect type="fade" time="500"/>
+                    <effect type="rotatey" end="180" center="996" tween="back" easing="out" time="1000"/>
+                </animation>
             </control>
             <control type="label">
                 <posx>col-13-begin</posx>
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index 8c3aa90..4e2247b 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -50,7 +50,7 @@
                 <posy>0</posy>
                 <width>12-col</width>
                 <label>-</label>
-                <font>medium</font>
+                <font>mediumStrong</font>
                 <shadowcolor>-</shadowcolor>
             </control>
             <control type="image">
@@ -128,7 +128,7 @@
                 <posy>0</posy>
                 <width>12-col</width>
                 <label>-</label>
-                <font>medium</font>
+                <font>mediumStrong</font>
             </control>
             <control type="image">
                 <posx>0</posx>
@@ -170,7 +170,7 @@
                         <width>12-col-gutter</width>
                         <height>2-row</height>
                         <texture>colors/white.png</texture>
-                        <animation effect="fade" start="100" end="50" condition="!Control.HasFocus(20)">Conditional</animation>
+                        <animation effect="fade" start="100" end="50" condition="Control.HasFocus(20)">Conditional</animation>
                     </control>
                     <control type="label">
                         <posx>12</posx>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 4823e49..1189e28 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -22,8 +22,7 @@
     <include file="View_Albums.xml"/>
     <include file="View_Songs.xml"/>
     <include file="View_MusicFiles.xml"/>
-
-    <include file="ViewsMusic.xml"/>
+    <include file="View_MusicPlaylist.xml"/>
 
     <!--modal dialogs-->
     <include name="modalDialog">
diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml
index ec14179..898efd0 100644
--- a/1080i/Includes_hubMenuItems.xml
+++ b/1080i/Includes_hubMenuItems.xml
@@ -179,6 +179,12 @@
                 <label2/>
                 <onclick>activateWindow(5001)</onclick>
             </item>
+            <item>
+                <visible>MusicPlayer.Offset(0).Exists</visible>
+                <label>31123</label>
+                <label2/>
+                <onclick>activateWindow(musicplaylist)</onclick>
+            </item>
             <!--CD / DVD handling-->
             <item>
                 <visible>System.HasMediaDVD</visible>
diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml
index 99d8198..bc6c2dc 100644
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@@ -166,22 +166,6 @@
 
     <!--music submenu items-->
     <include name="musicSideMenu">
-        <control type="button" id="501">
-            <description>current music playlist (if available)</description>
-            <visible>MusicPlayer.Offset(0).Exists</visible>
-            <height>2-row</height>
-            <width>col-7-begin</width>
-            <font>menuTitle</font>
-            <textcolor>textActive</textcolor>
-            <focusedcolor>highlight</focusedcolor>
-            <disabledcolor>menuDisabled</disabledcolor>
-            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
-            <texturenofocus>-</texturenofocus>
-            <textoffsetx>col-1-begin</textoffsetx>
-            <label>31123</label>
-            <onclick>right</onclick>
-            <onclick>activateWindow(musicplaylist)</onclick>
-        </control>
         <control type="button" id="502">
             <description>Search (music)</description>
             <visible>System.HasAddon(script.globalsearch)</visible>
diff --git a/1080i/MusicOverlay.xml b/1080i/MusicOverlay.xml
index e68d458..a0f73ae 100644
--- a/1080i/MusicOverlay.xml
+++ b/1080i/MusicOverlay.xml
@@ -4,29 +4,41 @@
     <allowoverlay>yes</allowoverlay>
     <controls>
         <control type="group">
-            <posx>col-7-begin</posx>
+            <posx>col-14-begin</posx>
             <posy>0</posy>
-            <visible>!Window.IsActive(visualisation) + !Window.IsActive(karaoke) + [Window.IsActive(musiclibrary) | Window.IsActive(videolibrary) | window.IsActive(home) | window.isactive(MusicFiles)]</visible>
+            <visible>!Window.IsActive(visualisation)</visible>
+            <animation type="windowopen">
+                <effect type="slide" start="0,-50" end="0,0" tween="cubic" easing="out" delay="500" time="300"/>
+                <effect type="fade" start="0" end="100" time="500" delay="500"/>
+            </animation>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>12-col</width>
-                <height>1-row</height>
+                <width>8-col</width>
+                <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>eeFFFFFF</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
+            </control>
+            <control type="image">
+                <posx>12</posx>
+                <posy>0</posy>
+                <width>1-col-gutter</width>
+                <height>1-col-gutter</height>
+                <texture>equaliser.gif</texture>
             </control>
             <control type="label">
                 <description>Artist</description>
-                <posx>12</posx>
+                <posx>1-col</posx>
                 <posy>0</posy>
-                <font>itemSubtitle</font>
-                <width>12-col-gutter</width>
-                <align>center</align>
+                <font>itemTitle</font>
+                <width>7-col-gutter</width>
+                <height>2-row</height>
+                <align>left</align>
+                <aligny>center</aligny>
                 <height>1-row</height>
-                <label>$LOCALIZE[31136] - [B]$INFO[MusicPlayer.Artist][/B] $INFO[musicplayer.Title]</label>
+                <label>$INFO[musicplayer.Artist] - $INFO[MusicPlayer.Title]</label>
                 <scroll>false</scroll>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
+                <textcolor>textActive</textcolor>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/MyMusicPlaylist.xml b/1080i/MyMusicPlaylist.xml
index c0dacbb..76ffffe 100644
--- a/1080i/MyMusicPlaylist.xml
+++ b/1080i/MyMusicPlaylist.xml
@@ -1,111 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">9500</defaultcontrol>
+    <defaultcontrol always="true">9999</defaultcontrol>
     <allowoverlay>no</allowoverlay>
     <previouswindow>home</previouswindow>
     <controls>
         <include>globalBackground</include>
+
         <!--page container group-->
         <control type="group">
+
             <!--window fader-->
             <animation type="conditional" condition="window.next(0) | window.next(1)">
                 <effect type="fade" start="100" end="0" time="300"/>
             </animation>
+
             <!--shift page for certain modal dialogs-->
             <include>modalDialogContentShift</include>
-            <!--content provider-->
-            <control type="group">
-                <posx>0</posx>
-                <posy>0</posy>
-                <!--main menu-->
-                <control type="group">
-                    <posx>col-1-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <include>dateTime</include>
-                    <include>hubMenu</include>
+
+            <!--Main content listing-->
+            <control type="group" id="9999">
+                <include>viewMusicPlayList</include>
+            </control>
+
+            <!--page scrollbar-->
+            <control type="group" id="8000">
+                <visible>Control.IsVisible(60)</visible>
+                <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
+                <control type="scrollbar" id="60">
+                    <posx>98r</posx>
+                    <posy>row-5-begin</posy>
+                    <height>22-row</height>
+                    <onleft>9999</onleft>
                 </control>
-                <!--Folder titles-->
-                <control type="group">
-                    <posx>col-4-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <!--source title-->
-                    <control type="grouplist">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>12-col</width>
-                        <height>1-row</height>
-                        <itemgap>0</itemgap>
-                        <orientation>horizontal</orientation>
-                        <control type="label">
-                            <width>auto</width>
-                            <font>pageTitle</font>
-                            <label>31123</label>
-                            <textcolor>textActive</textcolor>
-                        </control>
-                        <control type="label">
-                            <visible>Playlist.IsRandom</visible>
-                            <width>auto</width>
-                            <font>pageTitle</font>
-                            <label> ($LOCALIZE[31133])</label>
-                            <textcolor>highlight</textcolor>
-                        </control>
-                    </control>
-                    <!--source subtitle-->
+            </control>
+
+            <!--Folder titles-->
+            <control type="group">
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <!--source title-->
+                <control type="grouplist">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>12-col</width>
+                    <height>1-row</height>
+                    <itemgap>0</itemgap>
+                    <orientation>horizontal</orientation>
                     <control type="label">
-                        <posx>0</posx>
-                        <posy>45</posy>
-                        <width>24-col</width>
-                        <font>regular</font>
-                        <label>$INFO[container.Numitems,, $LOCALIZE[31014]]</label>
+                        <width>auto</width>
+                        <font>pageTitle</font>
+                        <label>31123</label>
                         <textcolor>textActive</textcolor>
                     </control>
-                </control>
-                <!--Main content listing-->
-                <control type="group" id="9999">
-                    <posx>col-4-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <animation type="windowopen">
-                        <include>listSlideIn</include>
-                    </animation>
-                    <animation type="windowclose">
-                        <effect type="fade" start="100" end="0" time="300" delay="300"/>
-                    </animation>
-                    <!--source content-->
-                    <control type="group" id="9500">
-                        <include>viewMusicPlayList</include>
+                    <control type="label">
+                        <visible>Playlist.IsRandom</visible>
+                        <width>auto</width>
+                        <font>pageTitle</font>
+                        <label> ($LOCALIZE[31133])</label>
+                        <textcolor>highlight</textcolor>
                     </control>
                 </control>
-                <!--page scrollbar-->
-                <control type="group" id="8000">
-                    <visible>Control.IsVisible(60)</visible>
-                    <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
-                    <control type="scrollbar" id="60">
-                        <posx>84r</posx>
-                        <posy>276</posy>
-                        <height>672</height>
-                        <onleft>9999</onleft>
-                    </control>
+                <!--source subtitle-->
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>45</posy>
+                    <width>24-col</width>
+                    <font>regular</font>
+                    <label>$INFO[container.Numitems,, $LOCALIZE[31014]]</label>
+                    <textcolor>textActive</textcolor>
                 </control>
             </control>
+
+            <!--dateTime-->
+            <include>dateTime</include>
         </control>
-        <!--sorting and misc controls-->
-        <control type="group" id="61">
-            <!--titles-->
-            <control type="group">
-                <posx>24</posx>
-                <posy>111</posy>
-                <animation type="Conditional" condition="controlgroup(62).hasfocus">
-                    <effect type="fade" start="0" end="100" time="300"/>
-                    <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
-                </animation>
-                <animation type="Conditional" condition="!controlgroup(62).hasfocus | Window.IsActive(5000) | Window.IsActive(5900)">
-                    <effect type="fade" start="100" end="0" time="400"/>
-                    <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
-                </animation>
-                <!--menu-->
-                <include>sideBarMenuItems</include>
-            </control>
-        </control>
+
+        <!--hub menu-->
+        <include>hubMenu</include>
+
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 9a1b042..262db14 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -34,11 +34,11 @@
                 <control type="group" id="9500">
                     <visible>[SubString(skin.string(showRecentVideoItems),false) | !skin.string(showRecentVideoItems)]</visible>
                     <include>movies</include>
+                    <include>files</include>
                     <include>tvshows</include>
                     <include>seasons</include>
                     <include>episodes</include>
                     <include>addons</include>
-                    <include>files</include>
                 </control>
             </control>
 
diff --git a/1080i/SmartPlaylistEditor.xml b/1080i/SmartPlaylistEditor.xml
index a1eca30..126b9e9 100644
--- a/1080i/SmartPlaylistEditor.xml
+++ b/1080i/SmartPlaylistEditor.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">9002</defaultcontrol>
+    <defaultcontrol always="true">22</defaultcontrol>
     <allowoverlay>no</allowoverlay>
     <controls>
         <include>globalBackground</include>
         <control type="group">
             <!--animations-->
             <include>modalDialogInOutVertical</include>
-            <visible>!Window.IsVisible(smartplaylistrule)</visible>
             <control type="group">
                 <posx>col-4-begin</posx>
                 <posy>row-3-begin</posy>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>18-col</width>
+                    <width>12-col</width>
                     <height>2-row</height>
                     <texture>colors/white.png</texture>
                     <colordiffuse>highlight</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
+                <!--
                 <control type="image">
                     <posx>0</posx>
                     <posy>2-row</posy>
@@ -29,6 +29,7 @@
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
+            -->
                 <control type="label">
                     <posx>12</posx>
                     <posy>0</posy>
@@ -38,154 +39,141 @@
                     <font>dialogTitle</font>
                     <label>31203</label>
                     <textcolor>textActive</textcolor>
-                    <shadowcolor>-</shadowcolor>
                 </control>
-                <!--set playlist type-->
-                <control type="spincontrolex" id="22">
-                    <description>Set Playlist type</description>
+
+                <!--name playlist-->
+                <control type="group">
                     <posx>0</posx>
                     <posy>2-row</posy>
-                    <width>14-col</width>
-                    <label>467</label>
-                    <onright>9002</onright>
-                    <ondown>12</ondown>
-                </control>
-
-                <control type="edit" id="12">
-                    <description>Name Button</description>
-                    <posx>4-col</posx>
-                    <posy>4-row</posy>
-                    <width>14-col-gutter</width>
-                    <label>-</label>
-                    <onup>22</onup>
-                    <onright>9002</onright>
-                    <ondown>10</ondown>
-                </control>
-                <control type="label">
-                    <description>Playlist Name Label</description>
-                    <posx>12</posx>
-                    <posy>4-row</posy>
-                    <width>14-col-gutter</width>
-                    <height>2-row</height>
-                    <font>mediumStrong</font>
-                    <label>21433</label>
-                    <textcolor>disabled</textcolor>
-                    <font>itemTitle</font>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>12-col</width>
+                        <height>96</height>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="edit" id="12">
+                        <description>Name Button</description>
+                        <posx>12</posx>
+                        <posy>12</posy>
+                        <width>12-col-gutter</width>
+                        <texturenofocus colordiffuse="99ffffff">colors/offblack.png</texturenofocus>
+                        <texturefocus>colors/offblack.png</texturefocus>
+                        <textoffsetx>24</textoffsetx>
+                        <hinttext>21433</hinttext>
+                        <align>left</align>
+                        <label>-</label>
+                        <onright>9002</onright>
+                        <ondown>22</ondown>
+                    </control>
                 </control>
 
+                <!--set playlist type, limits and sort-->
                 <control type="group">
-                    <posy>6-row</posy>
-                    <!--add / remove edit rules-->
-                    <control type="group">
-                        <control type="panel" id="9001">
-                            <posx>0</posx>
-                            <posy>55</posy>
-                            <width>4-col-gutter</width>
-                            <height>3-row</height>
-                            <itemgap>3</itemgap>
-                            <onright>10</onright>
-                            <onup>12</onup>
-                            <ondown>16</ondown>
-                            <orientation>vertical</orientation>
-                            <itemlayout width="6-col" height="1-row">
-                                <control type="image">
-                                    <posx>0</posx>
-                                    <posy>2</posy>
-                                    <width>6-col</width>
-                                    <height>53</height>
-                                    <aspectratio>stretch</aspectratio>
-                                    <texture>colors/black.png</texture>
-                                </control>
-                                <control type="label">
-                                    <posx>24</posx>
-                                    <posy>0</posy>
-                                    <width>1-col</width>
-                                    <font>symbol</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>$INFO[ListItem.label2]</label>
-                                    <shadowcolor>-</shadowcolor>
-                                </control>
-                                <control type="label">
-                                    <posx>1-col</posx>
-                                    <posy>2</posy>
-                                    <width>6-col</width>
-                                    <font>menuTitle</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>$INFO[ListItem.label]</label>
-                                    <shadowcolor>-</shadowcolor>
-                                </control>
-                            </itemlayout>
-                            <focusedlayout width="6-col" height="1-row">
-                                <control type="image">
-                                    <posx>0</posx>
-                                    <posy>2</posy>
-                                    <width>6-col</width>
-                                    <height>53</height>
-                                    <aspectratio>stretch</aspectratio>
-                                    <texture>colors/white.png</texture>
-                                </control>
-                                <control type="label">
-                                    <posx>24</posx>
-                                    <posy>0</posy>
-                                    <width>1-col</width>
-                                    <font>symbol</font>
-                                    <textcolor>black</textcolor>
-                                    <label>$INFO[ListItem.label2]</label>
-                                    <shadowcolor>-</shadowcolor>
-                                </control>
-                                <control type="label">
-                                    <posx>1-col</posx>
-                                    <posy>2</posy>
-                                    <width>6-col</width>
-                                    <font>menuTitle</font>
-                                    <textcolor>black</textcolor>
-                                    <label>$INFO[ListItem.label]</label>
-                                    <shadowcolor>-</shadowcolor>
-                                </control>
-                            </focusedlayout>
-                            <content>
-                                <item id="2">
-                                    <description>Remove Rule</description>
-                                    <label>1210</label>
-                                    <label2></label2>
-                                    <thumb>-</thumb>
-                                    <onclick>SendClick(129,14)</onclick>
-                                </item>
-                                <item id="3">
-                                    <description>Edit Button</description>
-                                    <label>21435</label>
-                                    <label2></label2>
-                                    <thumb>-</thumb>
-                                    <onclick>SendClick(129,15)</onclick>
-                                </item>
-                            </content>
-                        </control>
+                    <posx>0</posx>
+                    <posy>5-row</posy>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>12-col</width>
+                        <height>5-row</height>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="spincontrolex" id="22">
+                        <description>Set Playlist type</description>
+                        <posx>12</posx>
+                        <posy>12</posy>
+                        <width>6-col-gutter</width>
+                        <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
+                        <label>467</label>
+                        <onright>17</onright>
+                        <ondown>18</ondown>
+                        <onup>12</onup>
+                    </control>
+                    <control type="spincontrolex" id="17">
+                        <posx>6-col</posx>
+                        <posy>12</posy>
+                        <width>420</width>
+                        <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
+                        <label>21427</label>
+                        <onleft>22</onleft>
+                        <onup>12</onup>
+                        <ondown>19</ondown>
+                    </control>
+                    <control type="spincontrolex" id="18">
+                        <posx>12</posx>
+                        <posy>96</posy>
+                        <width>6-col-gutter</width>
+                        <label>21429</label>
+                        <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
+                        <onright>19</onright>
+                        <onup>22</onup>
+                        <ondown>10</ondown>
+                    </control>
+                    <control type="togglebutton" id="19">
+                        <posx>6-col</posx>
+                        <posy>96</posy>
+                        <width>420</width>
+                        <height>2-row</height>
+                        <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
+                        <alttexturenofocus colordiffuse="overlay">colors/black.png</alttexturenofocus>
+                        <texturefocus>colors/white.png</texturefocus>
+                        <alttexturefocus>colors/white.png</alttexturefocus>
+                        <textoffsetx>24</textoffsetx>
+                        <textcolor>textActive</textcolor>
+                        <focusedcolor>black</focusedcolor>
+                        <label>$LOCALIZE[31110]</label>
+                        <altlabel>$LOCALIZE[31109]</altlabel>
+                        <onright>9002</onright>
+                        <onup>17</onup>
+                        <onleft>18</onleft>
+                        <ondown>10</ondown>
+                    </control>
+                </control>
+
+                <!--rules list-->
+                <control type="group">
+                    <posx>0</posx>
+                    <posy>372</posy>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>12-col</width>
+                        <height>8-row</height>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
                     </control>
                     <control type="panel" id="10">
                         <description>Rules List Control</description>
-                        <posx>4-col</posx>
-                        <posy>1-row</posy>
-                        <width>8-col-gutter</width>
+                        <posx>12</posx>
+                        <posy>12</posy>
+                        <width>12-col-gutter</width>
                         <height>4-row</height>
-                        <onup>12</onup>
-                        <onleft>9001</onleft>
+                        <onup>18</onup>
+                        <onright>9001</onright>
                         <ondown>16</ondown>
-                        <itemlayout width="8-col" height="1-row">
+                        <itemlayout width="12-col" height="2-row">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
-                                <width>8-col</width>
-                                <height>53</height>
+                                <width>12-col</width>
+                                <height>69</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/black.png</texture>
                                 <bordersize>0</bordersize>
-                                <colordiffuse>ffFFFFFF</colordiffuse>
+                                <colordiffuse>overlay</colordiffuse>
                             </control>
                             <control type="label">
                                 <posx>12</posx>
-                                <posy>-1</posy>
-                                <width>8-col</width>
-                                <height>1-row</height>
+                                <posy>0</posy>
+                                <width>12-col-gutter</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
                                 <font>itemTitle</font>
                                 <textcolor>textActive</textcolor>
                                 <selectedcolor>black</selectedcolor>
@@ -193,12 +181,12 @@
                                 <shadowcolor>-</shadowcolor>
                             </control>
                         </itemlayout>
-                        <focusedlayout width="8-col" height="1-row">
+                        <focusedlayout width="12-col" height="2-row">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
-                                <width>8-col</width>
-                                <height>53</height>
+                                <width>12-col</width>
+                                <height>69</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
                                 <bordersize>0</bordersize>
@@ -206,9 +194,10 @@
                             </control>
                             <control type="label">
                                 <posx>12</posx>
-                                <posy>-1</posy>
-                                <width>8-col</width>
-                                <height>1-row</height>
+                                <posy>0</posy>
+                                <width>12-col-gutter</width>
+                                <height>2-row</height>
+                                <aligny>center</aligny>
                                 <font>itemTitle</font>
                                 <textcolor>black</textcolor>
                                 <selectedcolor>black</selectedcolor>
@@ -217,84 +206,118 @@
                             </control>
                         </focusedlayout>
                     </control>
+
+                    <!--items must match...-->
+                    <control type="spincontrolex" id="16">
+                        <posx>0</posx>
+                        <posy>8-row</posy>
+                        <width>12-col</width>
+                        <label>21424</label>
+                        <onright>9002</onright>
+                        <onup>10</onup>
+                        <ondown>17</ondown>
+                    </control>
                 </control>
-                <control type="spincontrolex" id="16">
-                    <posx>0</posx>
-                    <posy>14-row</posy>
+
+                <!--add / edit / delete rules-->
+                <control type="panel" id="9001">
+                    <posx>14-col</posx>
+                    <posy>6-row</posy>
                     <width>12-col-gutter</width>
-                    <label>21424</label>
-                    <onright>9002</onright>
-                    <onup>10</onup>
-                    <ondown>17</ondown>
-                </control>
-                <control type="spincontrolex" id="17">
-                    <posx>0</posx>
-                    <posy>15-row</posy>
-                    <width>12-col-gutter</width>
-                    <label>21427</label>
-                    <onright>9002</onright>
-                    <onup>16</onup>
-                    <ondown>18</ondown>
-                </control>
-                <control type="spincontrolex" id="18">
-                    <posx>0</posx>
-                    <posy>16-row</posy>
-                    <width>12-col-gutter</width>
-                    <label>21429</label>
-                    <onright>9002</onright>
-                    <onup>17</onup>
-                    <ondown>19</ondown>
-                </control>
-                <control type="label">
-                    <posx>12</posx>
-                    <posy>17-row</posy>
-                    <width>8-col</width>
-                    <height>1-row</height>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <label>31044</label>
-                    <shadowcolor>-</shadowcolor>
-                </control>
-                <control type="togglebutton" id="19">
-                    <posx>0</posx>
-                    <posy>17-row</posy>
-                    <width>12-col-gutter</width>
-                    <label>21431</label>
-                    <altlabel>21430</altlabel>
-                    <textcolor>textActive</textcolor>
-                    <texturefocus>colors/white.png</texturefocus>
-                    <alttexturefocus>colors/white.png</alttexturefocus>
-                    <align>right</align>
-                    <textoffsetx>12</textoffsetx>
-                    <onright>9002</onright>
-                    <onup>18</onup>
-                </control>
-                <!--bit of bloat... Handles togglebutton focus-->
-                <control type="label">
-                    <visible>control.hasfocus(19)</visible>
-                    <posx>12</posx>
-                    <posy>18-row</posy>
-                    <width>8-col</width>
-                    <height>1-row</height>
-                    <font>itemTitle</font>
-                    <textcolor>black</textcolor>
-                    <label>31044</label>
-                    <shadowcolor>-</shadowcolor>
-                </control>
-                <control type="label">
-                    <visible>control.hasfocus(19)</visible>
-                    <posx>828</posx>
-                    <posy>19-row</posy>
-                    <width>12-col-gutter</width>
-                    <align>right</align>
-                    <height>1-row</height>
-                    <font>itemTitle</font>
-                    <textcolor>black</textcolor>
-                    <label>$INFO[control.getlabel(19)]</label>
-                    <shadowcolor>-</shadowcolor>
+                    <height>8-row</height>
+                    <itemgap>3</itemgap>
+                    <onright>10</onright>
+                    <onup>12</onup>
+                    <ondown>16</ondown>
+                    <orientation>horizontal</orientation>
+                    <itemlayout width="3-col" height="2-row">
+                        <control type="label">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>symbol</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label2]</label>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>3-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label]</label>
+                        </control>
+                    </itemlayout>
+                    <focusedlayout width="3-col" height="2-row">
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col-textbox</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>highlight</colordiffuse>
+                            <include>spinFocusIcon</include>
+                        </control>
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>2-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                        </control>
+                        <control type="label">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>symbol</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label2]</label>
+                            <shadowcolor>-</shadowcolor>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>black</textcolor>
+                            <label>$INFO[ListItem.label]</label>
+                            <shadowcolor>-</shadowcolor>
+                        </control>
+                    </focusedlayout>
+                    <content>
+                        <item id="1">
+                            <description>New Rule</description>
+                            <label>Add</label>
+                            <label2></label2>
+                            <thumb>-</thumb>
+                            <onclick>SendClick(129,13)</onclick>
+                        </item>
+                        <item id="2">
+                            <description>Remove Rule</description>
+                            <label>1210</label>
+                            <label2></label2>
+                            <thumb>-</thumb>
+                            <onclick>SendClick(129,14)</onclick>
+                        </item>
+                    </content>
                 </control>
+
+
                 <!--OK / Cancel-->
                 <control type="panel" id="9002">
+                    <visible>false</visible>
                     <posx>14-col</posx>
                     <posy>2-row</posy>
                     <width>4-col</width>
diff --git a/1080i/SmartPlaylistRule.xml b/1080i/SmartPlaylistRule.xml
index 485b2e6..2d90efe 100644
--- a/1080i/SmartPlaylistRule.xml
+++ b/1080i/SmartPlaylistRule.xml
@@ -1,62 +1,106 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">15</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
+    <allowoverlay>yes</allowoverlay>
+    <include>fadeInOut</include>
     <controls>
-        <control type="group">
-            <posx>col-9-begin</posx>
-            <posy>row-6-begin</posy>
-            <control type="label">
-                <description>header label</description>
-                <posx>12</posx>
+         <control type="image">
+                <posx>0</posx>
                 <posy>0</posy>
-                <width>8-col</width>
-                <font>itemTitle</font>
-                <align>left</align>
+                <include>dimensionsFullscreen</include>
+                <texture>colors/black.png</texture>
+                <colordiffuse>ddffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <include>dimensionsFullscreen</include>
+                <texture>vignette.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+        <control type="group">
+            <posx>col-7-begin</posx>
+            <posy>row-9-begin</posy>
+            <!--animations-->
+            <include>modalDialogInOut</include>
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>12-col</width>
+                <height>2-row</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="label">
+                <posx>24</posx>
+                <posy>0</posy>
+                <width>12-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
+                <font>dialogTitle</font>
                 <label>21422</label>
+                <textcolor>textActive</textcolor>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>12-col</width>
+                <height>264</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>textboxInactive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
             <control type="group" id="9001">
                 <posx>0</posx>
-                <posy>1-row</posy>
+                <posy>84</posy>
                 <control type="spincontrolex" id="15">
                     <description>Rule Field</description>
-                    <posx>0</posx>
+                    <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
+                    <posx>12</posx>
                     <posy>0</posy>
-                    <width>8-col</width>
+                    <width>6-col-gutter</width>
                     <label>31046</label>
-                    <ondown>16</ondown>
+                    <onright>16</onright>
+                    <ondown>17</ondown>
                 </control>
                 <control type="spincontrolex" id="16">
                     <description>Rule operator</description>
-                    <posx>0</posx>
-                    <posy>1-row</posy>
-                    <width>8-col</width>
-                    <font>itemTitle</font>
-                    <label>31047</label>
-                    <onup>15</onup>
+                    <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
+                    <posx>6-col</posx>
+                    <posy>0</posy>
+                    <width>420</width>
+                    <onleft>15</onleft>
                     <ondown>17</ondown>
                 </control>
                 <control type="edit" id="17">
                     <description>Value Button</description>
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>6-col</width>
+                    <posx>12</posx>
+                    <posy>84</posy>
+                    <width>11-col-gutter</width>
+                    <texturenofocus colordiffuse="99ffffff">colors/offblack.png</texturenofocus>
+                    <texturefocus>colors/offblack.png</texturefocus>
+                    <textoffsetx>24</textoffsetx>
                     <label>-</label>
+                    <align>left</align>
                     <onup>16</onup>
                     <onright>20</onright>
                     <ondown>9002</ondown>
                 </control>
+                <!--just use a magnifying glass symbol for browse!-->
                 <control type="button" id="20">
                     <description>Browse Button</description>
-                    <posx>6-col</posx>
-                    <posy>2-row</posy>
-                    <width>2-col</width>
-                    <height>1-row</height>
+                    <posx>780</posx>
+                    <posy>84</posy>
+                    <width>1-col</width>
+                    <height>2-row</height>
                     <align>center</align>
+                    <aligny>center</aligny>
+                    <textoffsetx>0</textoffsetx>
                     <texturefocus>colors/white.png</texturefocus>
-                    <texturenofocus>colors/black.png</texturenofocus>
-                    <label>1024</label>
-                    <font>menuTitle</font>
+                    <texturenofocus colordiffuse="highlight">colors/white.png</texturenofocus>
+                    <label></label>
+                    <font>symbolLarge</font>
                     <textcolor>textActive</textcolor>
                     <focusedcolor>black</focusedcolor>
                     <onup>16</onup>
@@ -65,66 +109,73 @@
                 </control>
                 <!--OK / Cancel buttons-->
                 <control type="panel" id="9002">
-                    <posx>0</posx>
-                    <posy>4-row</posy>
-                    <width>6-col</width>
-                    <height>1-row</height>
-                    <itemgap>3</itemgap>
-                    <onright>10</onright>
-                    <onup>16</onup>
-                    <ondown>16</ondown>
+                    <posx>204</posx>
+                    <posy>168</posy>
+                    <width>9-col</width>
+                    <height>2-row</height>
+                    <onup>17</onup>
                     <orientation>horizontal</orientation>
-                    <itemlayout width="3-col" height="1-row">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <height>53</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/black.png</texture>
-                        </control>
+                    <itemlayout width="3-col" height="2-row">
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
                             <font>symbol</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
-                            <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <font>menuTitle</font>
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>3-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
-                            <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="3-col" height="1-row">
+                    <focusedlayout width="3-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>3-col</width>
-                            <height>53</height>
+                            <posy>0</posy>
+                            <width>1-col-textbox</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>highlight</colordiffuse>
+                            <include>spinFocusIcon</include>
+                        </control>
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>2-col</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
                             <font>symbol</font>
-                            <textcolor>black</textcolor>
+                            <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>2</posy>
-                            <width>3-col</width>
-                            <font>menuTitle</font>
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
@@ -145,6 +196,14 @@
                             <thumb>-</thumb>
                             <onclick>SendClick(129,19)</onclick>
                         </item>
+                        <item id="3">
+                            <description>Remove Rule</description>
+                            <label>1210</label>
+                            <label2></label2>
+                            <thumb>-</thumb>
+                            <onclick>dialog.close(137,true)</onclick>
+                            <onclick>Control.Message(14,click,136)</onclick>
+                        </item>
                     </content>
                 </control>
             </control>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index dc773da..83fc779 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -36,7 +36,6 @@
                         <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.Label]</label>
                     </control>
                     <control type="label">
diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml
new file mode 100644
index 0000000..258b820
--- /dev/null
+++ b/1080i/View_MusicPlaylist.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+    <!--playlist-->
+    <include name="viewMusicPlayList">
+        <control type="group">
+            <control type="panel" id="59">
+                <posx>col-1-begin</posx>
+                <posy>row-5-begin</posy>
+                <width>24-col</width>
+                <height>22-row</height>
+                <onleft>9000</onleft>
+                <onright>60</onright>
+                <onup>59</onup>
+                <ondown>59</ondown>
+                <pagecontrol>60</pagecontrol>
+                <scrolltime tween="sine" easing="inout">200</scrolltime>
+                <itemlayout width="24-col" height="2-row">
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>23-col</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
+                    </control>
+                    <control type="image">
+                        <visible>ListItem.IsPlaying</visible>
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>23-col</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>66ffffff</colordiffuse>
+                    </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>3</posy>
+                        <width>66</width>
+                        <height>66</height>
+                        <aspectratio scalediffuse="false">stretch</aspectratio>
+                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
+                        <width>11-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
+                    </control>
+                    <control type="label">
+                        <right>24</right>
+                        <posy>0</posy>
+                        <width>3-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <align>right</align>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[listitem.duration]</label>
+                    </control>
+                    <control type="label">
+                        <right>2-col</right>
+                        <posy>0</posy>
+                        <width>8-col-gutter</width>
+                        <height>2-row</height>
+                        <align>right</align>
+                        <aligny>center</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.Album] $INFO[listItem.year,(,)]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="24-col" height="2-row">
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>23-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                    </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>3</posy>
+                        <width>66</width>
+                        <height>66</height>
+                        <aspectratio scalediffuse="false">stretch</aspectratio>
+                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <animation type="focus" loop="false" reversible="false">
+                            <effect type="fade" time="500"/>
+                            <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                        </animation>
+                    </control>
+                    <control type="label">
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
+                        <width>11-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
+                    </control>
+                    <control type="label">
+                        <right>24</right>
+                        <posy>0</posy>
+                        <width>3-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <align>right</align>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[listitem.duration]</label>
+                    </control>
+                    <control type="label">
+                        <right>2-col</right>
+                        <posy>0</posy>
+                        <width>8-col-gutter</width>
+                        <height>2-row</height>
+                        <align>right</align>
+                        <aligny>center</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.Album] $INFO[listItem.year,(,)]</label>
+                    </control>
+                </focusedlayout>
+            </control>
+        </control>
+    </include>
+</includes>
diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml
index 4604090..9375c9e 100644
--- a/1080i/View_Photos.xml
+++ b/1080i/View_Photos.xml
@@ -62,16 +62,7 @@
                         <texture fallback="colors/offblack.png">$INFO[Listitem.icon]</texture>
                         <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                         <bordersize>3</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>3</posx>
-                        <posy>3</posy>
-                        <width>402</width>
-                        <height>266</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>ccFFFFFF</colordiffuse>
+                        <colordiffuse>ff666666</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>12</posx>
diff --git a/1080i/ViewsMusic.xml b/1080i/ViewsMusic.xml
deleted file mode 100644
index 8499ea7..0000000
--- a/1080i/ViewsMusic.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-    <!--playlist-->
-    <include name="viewMusicPlayList">
-        <control type="group">
-            <posx>0</posx>
-            <posy>3-row</posy>
-            <control type="panel" id="59">
-                <posx>0</posx>
-                <posy>4</posy>
-                <width>21-col</width>
-                <height>12-row</height>
-                <onleft>9000</onleft>
-                <onright>60</onright>
-                <ondown>59</ondown>
-                <onup>59</onup>
-                <pagecontrol>60</pagecontrol>
-                <scrolltime tween="sine" easing="inout">200</scrolltime>
-                <itemlayout width="21-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>21-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>99FFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <visible>ListItem.IsPlaying</visible>
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>21-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>66FFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>4</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>8-col</width>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
-                    </control>
-                    <control type="label">
-                        <posx>17-col-gutter</posx>
-                        <posy>17</posy>
-                        <width>4-col-gutter</width>
-                        <font>itemTitle</font>
-                        <align>left</align>
-                        <height>24</height>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[listitem.duration]</label>
-                    </control>
-                    <control type="label">
-                        <posx>11-col</posx>
-                        <posy>17</posy>
-                        <width>9-col-gutter</width>
-                        <font>smallStrong</font>
-                        <align>left</align>
-                        <height>24</height>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Album] $INFO[listItem.year,(,)]</label>
-                    </control>
-                    <control type="image">
-                        <visible>ListItem.IsPlaying</visible>
-                        <posx>52r</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture diffuse="masks/circle.png" border="0">colors/offblack.png</texture>
-                    </control>
-                    <control type="label">
-                        <visible>ListItem.IsPlaying</visible>
-                        <posx>36r</posx>
-                        <posy>0</posy>
-                        <width>10-col-gutter</width>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <selectedcolor>selected</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label></label>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="21-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>21-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>FFFFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>4</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>8-col</width>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Artist] - $INFO[ListItem.Title]</label>
-                    </control>
-                    <control type="label">
-                        <posx>17-col-gutter</posx>
-                        <posy>17</posy>
-                        <width>4-col-gutter</width>
-                        <font>itemTitle</font>
-                        <align>left</align>
-                        <height>24</height>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[listitem.duration]</label>
-                    </control>
-                    <control type="label">
-                        <posx>11-col</posx>
-                        <posy>17</posy>
-                        <width>9-col-gutter</width>
-                        <font>smallStrong</font>
-                        <align>left</align>
-                        <height>24</height>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Album] $INFO[listItem.year,(,)]</label>
-                    </control>
-                    <control type="image">
-                        <visible>ListItem.IsPlaying</visible>
-                        <posx>52r</posx>
-                        <posy>4</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture diffuse="masks/circle.png" border="0">colors/offblack.png</texture>
-                    </control>
-                    <control type="label">
-                        <visible>ListItem.IsPlaying</visible>
-                        <posx>36r</posx>
-                        <posy>0</posy>
-                        <width>10-col-gutter</width>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <selectedcolor>selected</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label></label>
-                    </control>
-                </focusedlayout>
-            </control>
-        </control>
-    </include>
-</includes>
diff --git a/addon.xml b/addon.xml
index 7d49608..8625747 100644
--- a/addon.xml
+++ b/addon.xml
@@ -4,7 +4,7 @@
         <import addon="xbmc.gui" version="5.3.0"/>
         <import addon="script.globalsearch" version="1.1.1"/>
         <import addon="script.artistslideshow" version="1.5.0"/>
-        <import addon="script.maximinimalism.functions" version="1.0.0"/>
+        <import addon="script.thedeadman.functions" version="1.0.0"/>
     </requires>
     <extension point="xbmc.gui.skin" debugging="false">
         <res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
diff --git a/language/English/strings.po b/language/English/strings.po
index 501c21d..4354881 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -1,6 +1,6 @@
 # Kodi Media Center language file
-# Addon Name: Maximinimalism
-# Addon id: skin.maximinimalism
+# Addon Name: Pellucid
+# Addon id: skin.pellucid
 # Addon Provider: chrisbevan
 msgid ""
 msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
 
 msgctxt "Addon Description"
 msgid ""
-"Maximinimalism is a lightweight, clean and simple Kodi experience designed for maximum usability and minimum fuss."
+"Pellucid is a lightweight, clean and simple Kodi experience designed for maximum usability and minimum fuss."
 msgstr ""
 
 msgctxt "#31000"
@@ -756,3 +756,11 @@ msgstr ""
 msgctxt "#31203"
 msgid "Smart Playlist"
 msgstr ""
+
+msgctxt "#31204"
+msgid "Playlist Rules"
+msgstr ""
+
+msgctxt "#31205"
+msgid "No further details available."
+msgstr ""
diff --git a/media/equaliser.gif b/media/equaliser.gif
new file mode 100644
index 0000000..7a70878
Binary files /dev/null and b/media/equaliser.gif differ