--- musicsettings-ui.xml.orig	2017-10-26 18:28:30.226541178 +0000
+++ musicsettings-ui.xml	2017-10-26 19:57:07.944986189 +0000
@@ -60,7 +60,7 @@
         <textarea name="musiclocation_label" from="basetextarea">
             <area>129,72,428,40</area>
             <align>right,vcenter</align>
-            <value>Directory to hold music:</value>
+            <value>Directory to Hold Music:</value>
         </textarea>
 
         <textedit name="musiclocation" from="base_textedit">
@@ -70,7 +70,7 @@
         <textarea name="musiccddevice_label" from="basetextarea">
             <area>129,143,428,40</area>
             <align>right,vcenter</align>
-            <value>CD device:</value>
+            <value>CD Device:</value>
         </textarea>
 
         <textedit name="musiccddevice" from="base_textedit">
@@ -80,7 +80,7 @@
         <textarea name="musicaudiodevice_label" from="basetextarea">
             <area>129,214,428,40</area>
             <align>right,vcenter</align>
-            <value>Audio device:</value>
+            <value>Audio Device:</value>
         </textarea>
 
         <textedit name="musicaudiodevice" from="base_textedit">
@@ -90,7 +90,7 @@
         <textarea name="musicdefaultupmix_label" from="basetextarea">
             <area>129,285,429,30</area>
             <align>right,vcenter</align>
-            <value>Convert stereo to 5.1 sound:</value>
+            <value>Convert Stereo to 5.1 Surround:</value>
         </textarea>
 
         <checkbox name="musicdefaultupmix" from="base_checkbox">
@@ -120,7 +120,7 @@
         <textarea name="allowtagwriting_label" from="basetextarea">
             <area>129,478,428,30</area>
             <align>right,vcenter</align>
-            <value>Allow metadata to be written to tags:</value>
+            <value>Allow Metadata to be Written to Tags:</value>
         </textarea>
 
         <checkbox name="allowtagwriting" from="base_checkbox">
@@ -129,19 +129,20 @@
 
         <textarea name="helptext" from="basetextarea">
             <area>139,552,1003,66</area>
-            <font>basesmallerblue</font>
+            <font>basesmaller</font>
             <cutdown>yes</cutdown>
             <align>allcenter</align>
             <multiline>yes</multiline>
         </textarea>
 
-        <button name="save" from="base_button">
+        <button name="cancel" from="base_button">
             <area>233,632,350,40</area>
-            <value>Save</value>
+            <value>Cancel</value>
         </button>
-        <button name="cancel" from="base_button">
+
+        <button name="save" from="base_button">
             <area>697,632,350,40</area>
-            <value>Cancel</value>
+            <value>Save</value>
         </button>
     </window>
 
@@ -213,7 +214,7 @@
         <textarea name="filenametemplate_label" from="basetextarea">
             <area>128,127,430,40</area>
             <align>right,vcenter</align>
-            <value>File storage location:</value>
+            <value>File Storage Location:</value>
         </textarea>
 
         <textedit name="filenametemplate" from="base_textedit">
@@ -223,7 +224,7 @@
         <textarea name="nowhitespace_label" from="basetextarea">
             <area>128,190,430,30</area>
             <align>right,vcenter</align>
-            <value>Replace space with underscore:</value>
+            <value>Replace Space with Underscore:</value>
         </textarea>
 
         <checkbox name="nowhitespace" from="base_checkbox">
@@ -253,7 +254,7 @@
         <textarea name="mp3usevbr_label" from="basetextarea">
             <area>128,369,430,30</area>
             <align>right,vcenter</align>
-            <value>Use variable bitrates:</value>
+            <value>Use Variable Bitrates:</value>
         </textarea>
 
         <checkbox name="mp3usevbr" from="base_checkbox">
@@ -263,7 +264,7 @@
         <textarea name="ejectcd_label" from="basetextarea">
             <area>128,422,430,30</area>
             <align>right,vcenter</align>
-            <value>Automatically eject CDs after ripping:</value>
+            <value>Automatically Eject CDs After Ripping:</value>
         </textarea>
 
         <checkbox name="ejectcd" from="base_checkbox">
@@ -282,20 +283,20 @@
 
         <textarea name="helptext" from="basetextarea">
             <area>139,552,1003,66</area>
-            <font>basesmallerblue</font>
+            <font>basesmaller</font>
             <cutdown>yes</cutdown>
             <align>allcenter</align>
             <multiline>yes</multiline>
         </textarea>
 
-        <button name="save" from="base_button">
+        <button name="cancel" from="base_button">
             <area>233,632,350,40</area>
-            <value>Save</value>
+            <value>Cancel</value>
         </button>
 
-        <button name="cancel" from="base_button">
+        <button name="save" from="base_button">
             <area>697,632,350,40</area>
-            <value>Cancel</value>
+            <value>Save</value>
         </button>
     </window>
 
@@ -307,109 +308,140 @@
         </textarea>
 
         <shape name="player-settings-backdrop" from="base_backdrop">
-            <area>215,36,850,649</area>
+            <area>115,36,1050,649</area>
         </shape>
 
         <shape name="player-settings-backdrop-line" from="base_backdrop_line">
-            <area>216,37,848,506</area>
+            <area>116,37,1048,506</area>
         </shape>
 
         <shape name="player-settings-top-line" from="base_highlight_line">
-            <area>217,38,846,2</area>
+            <area>117,38,1046,2</area>
         </shape>
 
         <shape name="player-settings-bottom-line" from="base_highlight_line">
-            <area>217,540,846,2</area>
+            <area>117,540,1046,2</area>
         </shape>
 
         <shape name="player-settings-left-line" from="base_highlight_vertical_line">
-            <area>217,40,2,500</area>
+            <area>117,40,2,500</area>
         </shape>
 
         <shape name="player-settings-right-line" from="base_highlight_vertical_line">
-            <area>1061,40,2,500</area>
+            <area>1161,40,2,500</area>
         </shape>
 
         <shape name="player-settings-bottom-backdrop-line" from="base_backdrop_line">
-            <area>216,547,848,137</area>
+            <area>116,547,1048,137</area>
         </shape>
 
         <shape name="player-settings-bottom-top-line" from="base_highlight_line">
-            <area>217,548,846,2</area>
+            <area>117,548,1046,2</area>
         </shape>
 
         <shape name="player-settings-bottom-bottom-line" from="base_highlight_line">
-            <area>217,681,846,2</area>
+            <area>117,681,1046,2</area>
         </shape>
 
         <shape name="player-settings-bottom-left-line" from="base_highlight_vertical_line">
-            <area>217,550,2,131</area>
+            <area>117,550,2,131</area>
         </shape>
 
         <shape name="player-settings-bottom-right-line" from="base_highlight_vertical_line">
-            <area>1061,550,2,131</area>
+            <area>1161,550,2,131</area>
         </shape>
 
         <shape name="player-settings-bottom-seperator-first-line" from="base_line">
-            <area>238,613,804,2</area>
+            <area>138,620,1004,2</area>
         </shape>
 
         <textarea name="resumemode_label" from="basetextarea">
-            <area>315,112,300,40</area>
+            <area>129,72,428,40</area>
             <align>right,vcenter</align>
-            <value>Resume mode:</value>
+            <value>Playlist Resume Mode:</value>
         </textarea>
 
         <buttonlist name="resumemode" from="base_selector">
-            <area>625,112,300,40</area>
+            <area>567,72,550,40</area>
+        </buttonlist>
+
+        <textarea name="resumemodeeditor_label" from="basetextarea">
+            <area>129,143,428,40</area>
+            <align>right,vcenter</align>
+            <value>Editor Resume Mode:</value>
+        </textarea>
+
+        <buttonlist name="resumemodeeditor" from="base_selector">
+            <area>567,143,550,40</area>
+        </buttonlist>
+
+        <textarea name="resumemoderadio_label" from="basetextarea">
+            <area>129,214,428,40</area>
+            <align>right,vcenter</align>
+            <value>Radio Resume Mode:</value>
+        </textarea>
+
+        <buttonlist name="resumemoderadio" from="base_selector">
+            <area>567,214,550,40</area>
+        </buttonlist>
+
+        <textarea name="jumpaction_label" from="basetextarea">
+            <area>129,285,429,30</area>
+            <align>right,vcenter</align>
+            <value>Action on Jump Point:</value>
+        </textarea>
+
+        <buttonlist name="jumpaction" from="resumemode">
+            <position>567,285</position>
         </buttonlist>
 
         <textarea name="exitaction_label" from="basetextarea">
-            <area>315,224,300,40</area>
+            <area>129,346,428,40</area>
             <align>right,vcenter</align>
-            <value>Action on exit:</value>
+            <value>Action on Exit:</value>
         </textarea>
 
         <buttonlist name="exitaction" from="resumemode">
-            <area>625,224,300,40</area>
+            <area>567,346,550,40</area>
         </buttonlist>
 
         <textarea name="autolookupcd_label" from="basetextarea">
-            <area>315,336,300,30</area>
+            <area>129,417,428,30</area>
             <align>right,vcenter</align>
-            <value>Automatically lookup CDs:</value>
+            <value>Automatically Lookup CDs:</value>
         </textarea>
 
         <checkbox name="autolookupcd" from="base_checkbox">
-            <position>625,336</position>
+            <position>567,417</position>
         </checkbox>
 
         <textarea name="autoplaycd_label" from="basetextarea">
-            <area>315,438,300,30</area>
+            <area>129,478,428,30</area>
             <align>right,vcenter</align>
             <value>Automatically Play CDs:</value>
         </textarea>
 
         <checkbox name="autoplaycd" from="base_checkbox">
-            <position>625,438</position>
+            <position>567,478</position>
         </checkbox>
 
         <textarea name="helptext" from="basetextarea">
-            <area>239,559,802,44</area>
-            <font>basesmallerblue</font>
+            <area>139,552,1003,66</area>
+            <font>basesmaller</font>
             <cutdown>yes</cutdown>
             <align>allcenter</align>
             <multiline>yes</multiline>
         </textarea>
 
-        <button name="save" from="base_button">
-            <area>273,628,350,40</area>
-            <value>Save</value>
-        </button>
         <button name="cancel" from="base_button">
-            <area>657,628,350,40</area>
+            <area>233,632,350,40</area>
             <value>Cancel</value>
         </button>
+
+        <button name="save" from="base_button">
+            <area>697,632,350,40</area>
+            <value>Save</value>
+        </button>
     </window>
 
     <window name="ratingsettings">
@@ -508,23 +540,22 @@
         </spinbox>
 
         <textarea name="helptext" from="basetextarea">
-            <area>239,559,802,44</area>
-            <font>basesmallerblue</font>
+            <area>239,553,802,50</area>
+            <font>basesmaller</font>
             <cutdown>yes</cutdown>
             <align>allcenter</align>
             <multiline>yes</multiline>
         </textarea>
 
-        <button name="save" from="base_button">
-            <area>273,628,350,40</area>
-            <value>Save</value>
-        </button>
-
         <button name="cancel" from="base_button">
-            <area>657,628,350,40</area>
+            <area>233,632,350,40</area>
             <value>Cancel</value>
         </button>
 
+        <button name="save" from="base_button">
+            <area>697,632,350,40</area>
+            <value>Save</value>
+        </button>
     </window>
 
     <window name="visualizationsettings">
@@ -624,21 +655,21 @@
 
         <textarea name="helptext" from="basetextarea">
             <area>239,559,802,44</area>
-            <font>basesmallerblue</font>
+            <font>basesmaller</font>
             <cutdown>yes</cutdown>
             <align>allcenter</align>
             <multiline>yes</multiline>
         </textarea>
 
-        <button name="save" from="base_button">
-            <area>273,628,350,40</area>
-            <value>Save</value>
-        </button>
-
         <button name="cancel" from="base_button">
-            <area>657,628,350,40</area>
+            <area>233,632,350,40</area>
             <value>Cancel</value>
         </button>
+
+        <button name="save" from="base_button">
+            <area>697,632,350,40</area>
+            <value>Save</value>
+        </button>
     </window>
 
 </mythuitheme>