diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 5b22470..fc2e170 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -166,9 +166,9 @@
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="image">
-                    <posx>8-col</posx>
+                    <posx>10-col</posx>
                     <posy>2-row</posy>
-                    <width>10-col</width>
+                    <width>8-col</width>
                     <height>20-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
@@ -178,14 +178,14 @@
                     <visible>!String.IsEqual(container.folderpath,addons://)</visible>
                     <posx>0</posx>
                     <posy>73</posy>
-                    <width>8-col</width>
+                    <width>10-col</width>
                     <height>717</height>
                     <onleft>activateWindow(1104)</onleft>
                     <onright>60</onright>
                     <ondown>50</ondown>
                     <onup>50</onup>
                     <pagecontrol>60</pagecontrol>
-                    <itemlayout width="12-col" height="2-row">
+                    <itemlayout width="10-col" height="2-row">
                         <control type="label">
                             <visible>ListItem.AddonBroken</visible>
                             <posx>0</posx>
@@ -215,7 +215,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>7-col-gutter</width>
+                            <width>9-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
@@ -224,7 +224,7 @@
                             <label>$INFO[ListItem.Label]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="12-col" height="2-row">
+                    <focusedlayout width="10-col" height="2-row">
                         <control type="group">
                             <include>spinFocusIcon</include>
                             <control type="image">
@@ -266,7 +266,7 @@
                         <control type="image">
                             <posx>1-col</posx>
                             <posy>0</posy>
-                            <width>7-col</width>
+                            <width>9-col-textbox</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture border="0">colors/white.png</texture>
@@ -274,7 +274,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>7-col-gutter</width>
+                            <width>9-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
@@ -286,36 +286,36 @@
                 </control>
                 <!--icon and description-->
                 <control type="group">
-                    <posx>8-col</posx>
+                    <posx>10-col</posx>
                     <posy>2-row</posy>
                     <control type="image">
                         <posx>0</posx>
-                        <posy>0</posy>
-                        <width>10-col</width>
-                        <height>10-col</height>
+                        <posy>1</posy>
+                        <width>8-col</width>
+                        <height>575</height>
+                        <fadetime>500</fadetime>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
                         <texture fallback="defaultAddon.png" border="0">$INFO[listitem.thumb]</texture>
                         <colordiffuse></colordiffuse>
                     </control>
                     <control type="image">
                         <posx>0</posx>
-                        <posy>17-row</posy>
-                        <width>10-col</width>
-                        <height>3-row</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture border="0">colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
+                        <posy>577</posy>
+                        <width>8-col</width>
+                        <height>141</height>
+                        <texture>colors/white.png</texture>
+                        <aspectratio>stretch</aspectratio>
+                        <colordiffuse>highlight</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>10-col-gutter</posx>
-                        <posy>17-row</posy>
-                        <width>9-col</width>
-                        <height>3-row</height>
-                        <align>right</align>
+                        <posx>24</posx>
+                        <posy>612</posy>
+                        <width>7-col</width>
+                        <height>2-row</height>
+                        <align>left</align>
                         <aligny>center</aligny>
-                        <font>itemTitle</font>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
-                        <shadowcolor>background</shadowcolor>
                         <wrapmultiline>true</wrapmultiline>
                         <label>$INFO[ListItem.AddonSummary]</label>
                     </control>
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 9c8efb5..8d17010 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -116,15 +116,15 @@
                     <height>2-row</height>
                     <aligny>center</aligny>
                     <font>mediumStrong</font>
-                    <label>$INFO[ListItem.addonname]</label>
+                    <label>$INFO[ListItem.addonname]$INFO[ListItem.addonversion, (,)]</label>
                 </control>
                 <control type="label">
                     <posx>2-col-indent</posx>
                     <posy>84</posy>
                     <width>12-col-gutter</width>
-                    <font>smallStrong</font>
+                    <font>buttonTitle</font>
                     <textcolor>highlight</textcolor>
-                    <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,][CR]$INFO[ListItem.addonversion,$LOCALIZE[31139]: , ]</label>
+                    <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082]]</label>
                 </control>
                 <control type="textbox" id="400">
                     <posx>12</posx>
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index 6738758..3484885 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -127,6 +127,18 @@
             <onclick>dialog.close(1104)</onclick>
             <onclick>UpdateLibrary(music)</onclick>
         </control>
+
+        <control type="radiobutton" id="20">
+            <!--<visible>musicPlaylist</visible>-->
+            <description>Shuffle</description>
+            <width>6-col</width>
+            <focusedcolor>textActive</focusedcolor>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <label>Shuffle</label>
+            <onclick condition="!Playlist.IsRandom">PlayerControl(randomOn)</onclick>
+            <onclick condition="Playlist.IsRandom">PlayerControl(randomOff)</onclick>
+        </control>
+
     </include>
     <!--pictures submenu items-->
     <include name="picturesSideMenu">
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 75124d6..62bcde3 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -39,7 +39,7 @@
     <!--Music player shuffle state-->
     <variable name="shuffleState">
         <value condition="Playlist.IsRandom">$LOCALIZE[191]: $LOCALIZE[16041]</value>
-        <value>$LOCALIZE[191]: $LOCALIZE[16039]</value>
+        <value condition="!Playlist.IsRandom">$LOCALIZE[191]: $LOCALIZE[16039]</value>
     </variable>
     <!--offset song view, show artist / album if parent view is active-->
     <variable name="songViewArtist">
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index e4fb588..00a82af 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -89,7 +89,7 @@
         <include>DebugGrid</include>
         <control type="label">
             <include>WindowID</include>
-            <label>MyMusicPlaylist.xml path: $INFO[container.folderpath]   name: $INFO[container.foldername]   content: $INFO[container.content]    Control: $INFO[System.CurrentControl]</label>
+            <label>MyPlaylist.xml path: $INFO[container.folderpath]   name: $INFO[container.foldername]   content: $INFO[container.content]    Control: $INFO[System.CurrentControl]</label>
         </control>
     </controls>
 </window>
diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml
index 8a86973..01938ee 100644
--- a/1080i/View_MusicPlaylist.xml
+++ b/1080i/View_MusicPlaylist.xml
@@ -4,15 +4,7 @@
     <include name="musicPlayList">
         <control type="group">
             <visible>$EXP[isMusicPlaylist]</visible>
-            <!--fanart-->
-            <control type="image">
-                <visible>$EXP[isMusicPlaylist]</visible>
-                <include>dimensionsFullscreen</include>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" border="0">$INFO[Listitem.art(fanart)]</texture>
-                <fadetime>500</fadetime>
-                <colordiffuse>22ffffff</colordiffuse>
-            </control>
+
             <control type="panel" id="59">
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
@@ -91,14 +83,14 @@
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
-                        <posy>26</posy>
+                        <posy>28</posy>
                         <width>13-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>smallStrong</font>
+                        <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]</label>
+                        <label>[B]$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album][/B]</label>
                     </control>
                     <control type="label">
                         <right>24</right>
@@ -195,14 +187,14 @@
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
-                        <posy>26</posy>
+                        <posy>28</posy>
                         <width>13-col</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>smallStrong</font>
+                        <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]</label>
+                        <label>[B]$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album][/B]</label>
                     </control>
                     <control type="label">
                         <right>24</right>
diff --git a/1080i/custom_musicOverlay.xml b/1080i/custom_musicOverlay.xml
index 215e4b5..60cd1cd 100644
--- a/1080i/custom_musicOverlay.xml
+++ b/1080i/custom_musicOverlay.xml
@@ -73,6 +73,7 @@
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
+            <visible>false</visible>
             <include>DialogID</include>
             <label>custom_musicOverlay.xml</label>
         </control>
diff --git a/1080i/custom_musicPlayerOptions.xml b/1080i/custom_musicPlayerOptions.xml
index 0b895ea..df7b71f 100644
--- a/1080i/custom_musicPlayerOptions.xml
+++ b/1080i/custom_musicPlayerOptions.xml
@@ -51,7 +51,7 @@
             </control>
             <!--thumbnail-->
             <control type="image">
-                <posx>24</posx>
+                <posx>27</posx>
                 <posy>24</posy>
                 <width>6-col</width>
                 <height>6-col</height>
@@ -61,7 +61,7 @@
             </control>
             <!--player controls-->
             <control type="panel" id="8001">
-                <posx>24</posx>
+                <posx>27</posx>
                 <posy>384</posy>
                 <width>6-col</width>
                 <height>2-row</height>
@@ -316,7 +316,8 @@
                         <label>$VAR[shuffleState]</label>
                         <label2></label2>
                         <thumb>-</thumb>
-                        <onclick>PlayerControl(Random)</onclick>
+                        <onclick condition="!Playlist.IsRandom">PlayerControl(RandomOn)</onclick>
+                        <onclick condition="Playlist.IsRandom">PlayerControl(RandomOff)</onclick>
                     </item>
                     <item>
                         <description>Visualisation</description>
diff --git a/changelog.txt b/changelog.txt
index 2db21e4..7ea1432 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,14 +1,12 @@
 **Changelog**
 
-[PLANNED WORKS]
-
 [V1.2.0]
 - [NEW] Extended fanart support for video info and seasons (active by default)
 - [NEW] 'Media Showcase'. This extension to the video info screen presents media art in a much more engaging way, taking advantage of available media art.
 - [NEW] User option: disable extended fanart
 - [NEW] Keyboard autocomplete support
 - [NEW] Improved playlist display in music view
-- Various tweaks and bugfixes
+- Various tweaks and adjustments
 
 [V1.1.1]
 - [FIXED] Aspect ratio incorrect in poster view (thanks wiiija)