--- music-base.xml.orig	2016-12-13 20:45:06.068067497 +0000
+++ music-base.xml	2016-12-18 00:17:16.171607805 +0000
@@ -360,7 +360,6 @@
                     <textarea name="title" from="buttontext">
                         <area>143,0,1066,30</area>
                         <align>left,vcenter</align>
-                        <font>basesmall</font>
                         <template>%TITLE% by %ARTIST% on %ALBUM%</template>
                     </textarea>
                 </state>
@@ -412,9 +411,12 @@
                     </textarea>
                 </state>
                 <state name="selectedinactive" from="selectedactive">
-                <group name="select_bar" from="base_select_bar_selectedinactive_group">
-                    <area>0,0,100%,100%</area>
-                </group>
+                    <group name="select_bar" from="base_select_bar_selectedinactive_group">
+                        <area>0,0,100%,100%</area>
+                    </group>
+                    <textarea name="title">
+                        <font>basesmall</font>
+                    </textarea>
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
@@ -450,7 +452,7 @@
             <textarea name="shuffletext" from="basetextarea">
                 <area>0,0,300,22</area>
                 <font>basesmaller</font>
-                <value>Shuffle Mode: Intelligent</value>
+                <value>Shuffle Mode: Smart</value>
                 <align>left,vcenter</align>
             </textarea>
         </state>
@@ -504,7 +506,7 @@
         </statetype>
 
         <textarea name="playlistposition" from="basetextarea">
-            <area>192,9,170,14</area>
+            <area>192,8,170,14</area>
             <font>basesupersmallyellow</font>
             <align>right,vcenter</align>
         </textarea>
@@ -514,7 +516,7 @@
         </progressbar>
 
         <textarea name="playlisttime" from="basetextarea">
-            <area>918,9,230,14</area>
+            <area>918,8,230,14</area>
             <font>basesupersmallyellow</font>
             <align>left,vcenter</align>
         </textarea>
@@ -574,7 +576,7 @@
         </imagetype>
 
         <textarea name="title" from="basetextarea">
-            <area>171,18,938,24</area>
+            <area>171,14,938,24</area>
             <font>basesmallyellow</font>
         </textarea>
 
@@ -615,11 +617,11 @@
             <font>baseevensmaller</font>
             <align>allcenter</align>
         </textarea>
-
+<!--
         <group name="musiccontrols" from="base_music_controls">
             <position>535,140</position>
         </group>
-
+-->
         <statetype name="mutestate" from="base_mute_state">
             <position>44,146</position>
         </statetype>
@@ -629,11 +631,11 @@
         </textarea>
 
         <progressbar name="progress" from="baseprogressbar">
-            <position>372,162</position>
+            <position>372,152</position>
         </progressbar>
 
         <textarea name="time" from="basetextarea">
-            <area>918,161,185,14</area>
+            <area>918,149,185,14</area>
             <font>basesupersmallyellow</font>
         </textarea>
 
@@ -718,7 +720,7 @@
 
         <textarea name="title" from="basetextarea">
             <area>146,7,987,28</area>
-            <font>basesmaller</font>
+            <font>basesmalleryellow</font>
             <template>%TITLE% - %ARTIST% - %ALBUM%</template>
         </textarea>
 
@@ -739,17 +741,17 @@
         <textarea name="volume" from="base_volume">
             <position>190,57</position>
         </textarea>
-
+<!--
         <group name="musiccontrols" from="base_music_controls">
             <position>535,68</position>
         </group>
-
+-->
         <progressbar name="progress" from="baseprogressbar">
-            <position>372,90</position>
+            <position>372,79</position>
         </progressbar>
 
         <textarea name="time" from="basetextarea">
-            <area>918,89,185,14</area>
+            <area>918,77,185,14</area>
             <font>basesupersmallyellow</font>
         </textarea>