--- base.xml.orig	2016-12-13 20:41:54.779274682 +0000
+++ base.xml	2017-01-12 17:34:48.863983285 +0000
@@ -3,55 +3,55 @@
 <mythuitheme>
 
     <!-- Base Font Definitions -->
-    <fontdef name="basefont" face="DejaVu Sans">
+    <fontdef name="basefont" face="Overlock">
         <color>#e6e6e6</color>
-        <pixelsize>21</pixelsize>
+        <pixelsize>23</pixelsize>
     </fontdef>
 
     <fontdef name="basesupersmall" from="basefont">
-        <pixelsize>11</pixelsize>
+        <pixelsize>13</pixelsize>
         <weight>bold</weight>
     </fontdef>
 
     <fontdef name="baseextrasmall" from="basefont">
         <weight>bold</weight>
-        <pixelsize>13</pixelsize>
+        <pixelsize>15</pixelsize>
     </fontdef>
 
     <fontdef name="baseevensmaller" from="basefont">
         <weight>bold</weight>
-        <pixelsize>16</pixelsize>
+        <pixelsize>18</pixelsize>
     </fontdef>
 
     <fontdef name="basesmaller" from="basefont">
-        <pixelsize>18</pixelsize>
+        <pixelsize>20</pixelsize>
     </fontdef>
 
     <fontdef name="basesomewhatsmaller" from="basefont">
-        <pixelsize>19</pixelsize>
+        <pixelsize>21</pixelsize>
     </fontdef>
 
     <fontdef name="basesmall" from="basefont">
-        <pixelsize>20</pixelsize>
+        <pixelsize>22</pixelsize>
     </fontdef>
 
     <fontdef name="basemedium" from="basefont">
-        <pixelsize>22</pixelsize>
+        <pixelsize>24</pixelsize>
     </fontdef>
 
     <fontdef name="basemediumshadow" from="basefont">
-        <pixelsize>22</pixelsize>
+        <pixelsize>24</pixelsize>
         <shadowcolor>#000000</shadowcolor>
         <shadowoffset>2,2</shadowoffset>
         <shadowalpha>100</shadowalpha>
     </fontdef>
 
     <fontdef name="basemediumlarger" from="basefont">
-        <pixelsize>25</pixelsize>
+        <pixelsize>27</pixelsize>
     </fontdef>
 
     <fontdef name="basemediumlargerbold" from="basefont">
-        <pixelsize>25</pixelsize>
+        <pixelsize>27</pixelsize>
         <shadowcolor>#000000</shadowcolor>
         <shadowoffset>3,3</shadowoffset>
         <shadowalpha>100</shadowalpha>
@@ -59,15 +59,15 @@
     </fontdef>
 
     <fontdef name="baselarge" from="basefont">
-        <pixelsize>28</pixelsize>
+        <pixelsize>30</pixelsize>
     </fontdef>
 
     <fontdef name="baseextralarge" from="basefont">
-        <pixelsize>32</pixelsize>
+        <pixelsize>34</pixelsize>
     </fontdef>
 
     <fontdef name="baseextralargebold" from="basefont">
-        <pixelsize>32</pixelsize>
+        <pixelsize>34</pixelsize>
         <shadowcolor>#000000</shadowcolor>
         <shadowoffset>3,3</shadowoffset>
         <shadowalpha>100</shadowalpha>
@@ -85,31 +85,31 @@
     </fontdef>
 
     <fontdef name="basesupersmallblue" from="basesupersmall">
-        <color>#3a9ade</color>
+        <color>#0072bc</color>
     </fontdef>
 
     <fontdef name="baseextrasmallblue" from="baseextrasmall">
-        <color>#3a9ade</color>
+        <color>#0072bc</color>
     </fontdef>
 
     <fontdef name="baseevensmallerblue" from="baseevensmaller">
-        <color>#3a9ade</color>
+        <color>#0072bc</color>
     </fontdef>
 
     <fontdef name="basesomewhatsmallerblue" from="basesomewhatsmaller">
-        <color>#3a9ade</color>
+        <color>#0072bc</color>
     </fontdef>
 
     <fontdef name="basesmallerblue" from="basesmaller">
-        <color>#3a9ade</color>
+        <color>#0072bc</color>
     </fontdef>
 
     <fontdef name="basesmallblue" from="basesmall">
-        <color>#3a9ade</color>
+        <color>#0072bc</color>
     </fontdef>
 
     <fontdef name="basemediumblue" from="basemedium">
-        <color>#3a9ade</color>
+        <color>#0072bc</color>
     </fontdef>
 
     <fontdef name="basesupersmallgreen" from="basesupersmall">
@@ -200,6 +200,10 @@
         <color>#d97616</color>
     </fontdef>
 
+    <fontdef name="basemediumorange" from="basemedium">
+        <color>#d97616</color>
+    </fontdef>
+
     <fontdef name="baseextrasmallpurple" from="baseextrasmall">
         <color>#9898d9</color>
     </fontdef>
@@ -241,55 +245,55 @@
     </fontdef>
 
     <fontdef name="basesupersmallyellow" from="basesupersmall">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="baseextrasmallyellow" from="baseextrasmall">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="baseevensmalleryellow" from="basesmaller">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="basesmalleryellow" from="basesmaller">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="basesmallyellow" from="basesmall">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="basemediumyellow" from="basemedium">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="basemediumlargeryellow" from="basemediumlarger">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="baselargeyellow" from="baselarge">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="baseextralargeyellow" from="baseextralarge">
-        <color>#d9d900</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="basesmalldarkyellow" from="basesmall">
-        <color>#CCCC29</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="basemediumdarkyellow" from="basemedium">
-        <color>#CCCC29</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="basemediumlargerdarkyellow" from="basemediumlarger">
-        <color>#CCCC29</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <fontdef name="baselargedarkyellow" from="baselarge">
-        <color>#CCCC29</color>
+        <color>#ebb81c</color>
     </fontdef>
 
     <!-- Base definition of a textarea -->
@@ -305,7 +309,7 @@
         <font>baseextrasmallverylightgrey</font>
         <font state="disabled">baseextrasmalllightgrey</font>
         <font state="error">baseextrasmallred</font>
-        <font state="warning">baseextrasmallyellow</font>
+        <font state="warning">baseextrasmallorange</font>
         <font state="normal">baseextrasmallverylightgrey</font>
         <font state="running">baseextrasmallgreen</font>
         <cutdown>yes</cutdown>
@@ -317,7 +321,7 @@
         <font>basesmallerverylightgrey</font>
         <font state="disabled">basesmallerlightgrey</font>
         <font state="error">basesmallerred</font>
-        <font state="warning">basesmalleryellow</font>
+        <font state="warning">basesmallerorange</font>
         <font state="normal">basesmallerverylightgrey</font>
         <font state="running">basesmallergreen</font>
         <cutdown>yes</cutdown>
@@ -329,7 +333,7 @@
         <font>basesmallverylightgrey</font>
         <font state="disabled">basesmalllightgrey</font>
         <font state="error">basesmallred</font>
-        <font state="warning">basesmallyellow</font>
+        <font state="warning">basesmallorange</font>
         <font state="normal">basesmallverylightgrey</font>
         <font state="running">basesmallgreen</font>
         <cutdown>yes</cutdown>
@@ -411,7 +415,7 @@
         <area>283,436,50,11</area>
         <type>roundbox</type>
         <fill color="#000000" alpha="200" />
-        <cornerradius>90</cornerradius>
+        <cornerradius>5</cornerradius>
     </shape>
 
     <shape name="base_backdrop_line">
@@ -424,7 +428,7 @@
 
     <!-- Base definition of a base popup backdrop -->
     <shape name="base_popup_backdrop" from="base_backdrop">
-        <fill color="#000000" alpha="255" />
+        <fill color="#000000" alpha="235" />
     </shape>
 
     <!-- Base definition of a heading group -->
@@ -535,10 +539,10 @@
             <type>box</type>
             <fill style="gradient">
                 <gradient direction="horizontal" alpha="50">
-                    <stop position="0" color="#d6d6d6" />
-                    <stop position="25" color="#d6d6d6" alpha="255" />
-                    <stop position="50" color="#d6d6d6" />
-                    <stop position="100" color="#d6d6d6" />
+                    <stop position="0" color="#0072bc" />
+                    <stop position="25" color="#0072bc" alpha="255" />
+                    <stop position="50" color="#0072bc" />
+                    <stop position="100" color="#0072bc" />
                 </gradient>
             </fill>
         </shape>
@@ -547,10 +551,10 @@
             <type>box</type>
             <fill style="gradient">
                 <gradient direction="horizontal" alpha="50">
-                    <stop position="0" color="#d6d6d6" />
-                    <stop position="50" color="#d6d6d6" />
-                    <stop position="75" color="#d6d6d6" alpha="255"/>
-                    <stop position="100" color="#d6d6d6" />
+                    <stop position="0" color="#0072bc" />
+                    <stop position="50" color="#0072bc" />
+                    <stop position="75" color="#0072bc" alpha="255"/>
+                    <stop position="100" color="#0072bc" />
                 </gradient>
             </fill>
         </shape>
@@ -667,10 +671,10 @@
             <type>box</type>
             <fill style="gradient">
                 <gradient direction="horizontal" alpha="50">
-                    <stop position="0" color="#d9d900" />
-                    <stop position="25" color="#d9d900" alpha="255" />
-                    <stop position="50" color="#d9d900" />
-                    <stop position="100" color="#d9d900" />
+                    <stop position="0" color="#d97616" />
+                    <stop position="25" color="#d97616" alpha="255" />
+                    <stop position="50" color="#d97616" />
+                    <stop position="100" color="#d97616" />
                 </gradient>
             </fill>
         </shape>
@@ -679,10 +683,10 @@
             <type>box</type>
             <fill style="gradient">
                 <gradient direction="horizontal" alpha="50">
-                    <stop position="0" color="#d9d900" />
-                    <stop position="50" color="#d9d900" />
-                    <stop position="75" color="#d9d900" alpha="255"/>
-                    <stop position="100" color="#d9d900" />
+                    <stop position="0" color="#d97616" />
+                    <stop position="50" color="#d97616" />
+                    <stop position="75" color="#d97616" alpha="255"/>
+                    <stop position="100" color="#d97616" />
                 </gradient>
             </fill>
         </shape>
@@ -700,10 +704,10 @@
             <type>box</type>
             <fill style="gradient">
                 <gradient direction="horizontal" alpha="50">
-                    <stop position="0" color="#d6d6d6" />
-                    <stop position="25" color="#d6d6d6" alpha="255" />
-                    <stop position="50" color="#d6d6d6" />
-                    <stop position="100" color="#d6d6d6" />
+                    <stop position="0" color="#0072bc" />
+                    <stop position="25" color="#0072bc" alpha="255" />
+                    <stop position="50" color="#0072bc" />
+                    <stop position="100" color="#0072bc" />
                 </gradient>
             </fill>
         </shape>
@@ -712,10 +716,10 @@
             <type>box</type>
             <fill style="gradient">
                 <gradient direction="horizontal" alpha="50">
-                    <stop position="0" color="#d6d6d6" />
-                    <stop position="50" color="#d6d6d6" />
-                    <stop position="75" color="#d6d6d6" alpha="255"/>
-                    <stop position="100" color="#d6d6d6" />
+                    <stop position="0" color="#0072bc" />
+                    <stop position="50" color="#0072bc" />
+                    <stop position="75" color="#0072bc" alpha="255"/>
+                    <stop position="100" color="#0072bc" />
                 </gradient>
             </fill>
         </shape>
@@ -863,7 +867,7 @@
             <type>roundbox</type>
             <fill color="#1a1a1a" alpha="175" />
             <line color="#454545" alpha="180" width="2" />
-            <cornerradius>90</cornerradius>
+            <cornerradius>5</cornerradius>
         </shape>
         <shape name="select_bar_top_highlight">
             <area>0,0,100%,2</area>
@@ -956,7 +960,7 @@
             <type>roundbox</type>
             <fill color="#333333" alpha="175" />
             <line color="#454545" alpha="180" width="2" />
-            <cornerradius>90</cornerradius>
+            <cornerradius>5</cornerradius>
         </shape>
      </group>
 
@@ -967,7 +971,7 @@
             <type>roundbox</type>
             <fill color="#1a1a1a" alpha="175" />
             <line color="#454545" alpha="180" width="2" />
-            <cornerradius>90</cornerradius>
+            <cornerradius>5</cornerradius>
         </shape>
         <shape name="select_bar_top_highlight">
             <area>0,0,100%,2</area>
@@ -1060,7 +1064,7 @@
             <type>roundbox</type>
             <fill color="#333333" alpha="175" />
             <line color="#454545" alpha="180" width="2" />
-            <cornerradius>90</cornerradius>
+            <cornerradius>5</cornerradius>
         </shape>
      </group>
 
@@ -1071,7 +1075,7 @@
             <type>roundbox</type>
             <fill color="#1a1a1a" alpha="175" />
             <line color="#454545" alpha="180" width="2" />
-            <cornerradius>90</cornerradius>
+            <cornerradius>5</cornerradius>
         </shape>
         <shape name="select_bar_top_highlight">
             <area>0,0,100%,2</area>
@@ -1164,7 +1168,7 @@
             <type>roundbox</type>
             <fill color="#1a1a1a" alpha="175" />
             <line color="#454545" alpha="180" width="2" />
-            <cornerradius>90</cornerradius>
+            <cornerradius>5</cornerradius>
         </shape>
     </group>
 
@@ -1233,7 +1237,7 @@
             <type>roundbox</type>
             <fill color="#333333" alpha="175" />
             <line color="#454545" alpha="180" width="2" />
-            <cornerradius>90</cornerradius>
+            <cornerradius>5</cornerradius>
         </shape>
      </group>
 
@@ -1455,7 +1459,7 @@
                     <area>0,0,100%,100%</area>
                 </group>
                 <textarea name="buttontext">
-                    <font>basesmall</font>
+                    <font>basesmallyellow</font>
                 </textarea>
             </state>
             <state name="selectedinactive" from="active">
@@ -1564,6 +1568,9 @@
                 <group name="select_bar" from="base_select_bar_selectedinactive_group">
                     <area>0,0,100%,100%</area>
                 </group>
+                <textarea name="buttontext">
+                    <font>basesmall</font>
+                </textarea>
                 <imagetype name="buttonarrow">
                     <filename>images/lists_right_arrow.png</filename>
                     <alpha>0</alpha>
@@ -1664,6 +1671,7 @@
                         </state>
                     </statetype>
                 <textarea name="buttontext" from="base_text_font_state_small">
+                    <font state="normal">basesmallyellow</font>
                 </textarea>
                 <statetype name="buttoncheck">
                     <state type="off">
@@ -2186,7 +2194,7 @@
         </shape>
 
         <shape name="popup-seperator-line" from="base_line">
-            <area>23,212,556,2</area>
+            <area>23,174,556,2</area>
         </shape>
 
         <shape name="popup-third-line" from="base_highlight_line">
@@ -2202,18 +2210,18 @@
         </shape>
 
         <shape name="popup-arrows-backdrop" from="base_arrows_backdrop">
-            <area>3,488,50,13</area>
+            <area>549,488,50,13</area>
         </shape>
 
         <textarea name="messagearea" from="basetextarea">
-            <area>16,10,570,196</area>
-            <font>basesmalldarkyellow</font>
+            <area>16,10,570,158</area>
+            <font>basesmall</font>
             <multiline>yes</multiline>
             <align>allcenter</align>     
         </textarea>
 
         <buttonlist name="list" from="base_button_list">
-            <area>8,216,586,264</area>
+            <area>8,178,586,302</area>
             <statetype name="buttonitem">
                 <state name="active">
                     <area>0,0,100%,34</area>
@@ -2244,10 +2252,10 @@
                 </state>
             </statetype>
         <statetype name="upscrollarrow">
-            <position>2,274</position>
+            <position>548,312</position>
         </statetype>
         <statetype name="downscrollarrow">
-            <position>22,274</position>
+            <position>568,312</position>
         </statetype>
         </buttonlist>
     </window>
@@ -2299,7 +2307,7 @@
         </shape>
 
         <shape name="large-dialogbox-arrows-backdrop" from="base_arrows_backdrop">
-            <area>3,488,50,13</area>
+            <area>761,488,50,13</area>
         </shape>
 
         <textarea name="messagearea" from="basetextarea">
@@ -2332,10 +2340,10 @@
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
-                <position>2,198</position>
+                <position>762,198</position>
             </statetype>
             <statetype name="downscrollarrow">
-                <position>22,198</position>
+                <position>782,198</position>
             </statetype>
         </buttonlist>
     </window>
@@ -2795,10 +2803,10 @@
                 </state>
             </statetype>
             <statetype name="upscrollarrow">
-                <position>0,272</position>
+                <position>550,272</position>
             </statetype>
             <statetype name="downscrollarrow">
-                <position>20,272</position>
+                <position>570,272</position>
             </statetype>
         </buttonlist>