diff --git a/mythtv/themes/default-wide/base.xml b/mythtv/themes/default-wide/base.xml
index ae44d1c..9c17470 100644
--- a/mythtv/themes/default-wide/base.xml
+++ b/mythtv/themes/default-wide/base.xml
@@ -8,6 +8,10 @@
         <color>#FFFFFF</color>
     </fontdef>
 
+    <fontdef name="myfont" from="basemedium">
+        <color>#222222</color>
+    </fontdef>
+
     <fontdef name="basemedium" from="basesmall">
         <pixelsize>25</pixelsize>
     </fontdef>
@@ -817,6 +821,28 @@
         </button>
     </window>
 
+    <window name="MythSpinBoxDialog">
+        <area>-1,-1,580,165</area>
+
+        <imagetype name="backimg">
+            <filename>mythprogressdialog-background.png</filename>
+        </imagetype>
+
+        <textarea name="message" from="basetextarea">
+            <area>20,20,540,30</area>
+            <align>allcenter</align>
+        </textarea>
+
+        <spinbox name="input" from="basespinbox">
+            <position>245,50</position>
+        </spinbox>
+
+        <button name="ok" from="basebutton">
+            <position>109,110</position>
+            <value>OK</value>
+        </button>
+    </window>
+
     <window name="MythSearchDialog">
         <area>-1,-1,500,500</area>
         <imagetype name="backimg">
diff --git a/mythtv/themes/default-wide/standardsetting-ui.xml b/mythtv/themes/default-wide/standardsetting-ui.xml
new file mode 100644
index 0000000..852335b
--- /dev/null
+++ b/mythtv/themes/default-wide/standardsetting-ui.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+
+<!-- theme.xml for the MythCenter theme - by Jeroen Brosens -->
+<mythuitheme>
+
+    <window name="settingssetup">
+
+
+        <textarea name="title" from="basetextarea">
+            <area>30,15,100%-30,30</area>
+            <font>baselarge</font>
+            <align>hcenter</align>
+        </textarea>
+
+        <shape name="GroupHelpBackground"> 
+            <area>15,80,100%-15,80</area> 
+            <type>roundbox</type> 
+            <cornerradius>10</cornerradius>
+            <fill color="#FFFFFF" alpha="30" />
+        </shape>
+
+        <!-- optionnal, display the help for the current group of settings -->
+        <textarea name="grouphelp" from="basetextarea">
+            <area>30,90-120,100%-30,60</area>
+            <font>basesmall</font>
+            <align>lefthcenter</align>
+            <multiline>yes</multiline>
+        </textarea>
+
+        <buttonlist name="settingslist"  from2="basebuttonlist">
+            <area>100,200,100%-100,100%-160</area>
+            <layout>vertical</layout>
+            <spacing>4</spacing>
+            <wrapstyle>selection</wrapstyle>
+            <arrange>stack</arrange>
+            <spacing>5</spacing>
+            <buttonarea>0,0,100%,97%</buttonarea>
+            <statetype name="buttonitem">
+                <area>0,0,100%,90</area>
+                <state name="active">
+                    <area>0,0,100%,30</area>
+                    <group name="labels">
+                        <area>0,0,50%-1,100%</area>
+                        <shape name="buttonbackground">
+                            <area>0,0,100%,100%</area>
+                            <fill style="gradient">
+                                <gradient start="#505050" end="#000000" alpha="200" direction="vertical"  />
+                            </fill>
+                        </shape>
+                        <textarea name="buttontext">
+                            <area>5,0,100%-10,100%</area>
+                            <font>basemedium</font>
+                            <cutdown>yes</cutdown>
+                            <align>left,vcenter</align>
+                        </textarea>
+                    </group>
+                    <group name="widgets">
+                        <area>50%+1,0,100%,100%</area>
+                        <shape name="buttonbackgroundselection">
+                            <area>0,0,100%,100%</area>
+                            <!--type>roundbox</type--> 
+                            <!--cornerradius>15</cornerradius-->
+                            <fill style="gradient">
+                                <gradient start="#505050" end="#000000" alpha="200" direction="vertical"  />
+                            </fill>
+                            <!--fill style="gradient">
+                                <gradient start="#52CA38" end="#349838" alpha="255" />
+                            </fill-->
+                        </shape>
+
+                        <statetype name="widgettype">
+                            <area>0,0,100%-23,100%</area>
+                            <!--position>100%-23,7</position-->
+                            <state name="standard"></state>
+                            <state name="group"></state>
+                            <state name="checkbox"></state>
+                            <state name="textedit">
+                                <!--imagetype name="texteditimage">
+                                    <filename>checked_high.png</filename>
+                                </imagetype-->
+                                <shape name="texteditshape"> 
+                                    <!--area>0,2,520,26</area--> 
+                                    <!--area>0,2,100%,26</area DOES NOT WORK --> 
+                                    <area>20,2,480,26</area> 
+                                    <type>roundbox</type> 
+                                    <cornerradius>5</cornerradius>
+                                    <line color="#000000" alpha="255" width="1" />
+                                    <fill color="#FFFFFF" alpha="50" />
+                                </shape> 
+                                <!--textarea name="value">
+                                    <area>0,0,100,30</area>
+                                    <font>myfont</font>
+                                    <cutdown>yes</cutdown>
+                                    <align>right,vcenter</align>
+                                </textarea-->
+                            </state>
+                            <state name="filebrowser">
+                                <shape name="texteditshape"> 
+                                    <area>20,2,480,26</area> 
+                                    <!--area>20,2,50%,26</area--> 
+                                    <type>roundbox</type> 
+                                    <cornerradius>5</cornerradius>
+                                    <line color="#000000" alpha="255" width="1" />
+                                    <fill color="#FFFFFF" alpha="50" />
+                                </shape> 
+                                <imagetype name="filebrowserimage">
+                                    <area>500,5,20,20</area>
+                                    <!-- todo find a good icon -->
+                                    <filename>shared/directory.png</filename>
+                                </imagetype>
+                            </state>
+                            <state name="spinbox">
+                                <imagetype name="spinboximage2">
+                                    <area>0,5,20,20</area>
+                                    <filename>lb-ltarrow-sel.png</filename>
+                                </imagetype>
+                                <shape name="texteditshape"> 
+                                    <area>20,2,480,26</area> 
+                                    <!--area>20,2,50%,26</area--> 
+                                    <type>roundbox</type> 
+                                    <cornerradius>5</cornerradius>
+                                    <line color="#000000" alpha="255" width="1" />
+                                    <fill color="#FFFFFF" alpha="50" />
+                                </shape> 
+                                <imagetype name="spinboximage">
+                                    <area>500,5,20,20</area>
+                                    <filename>lb-rtarrow-sel.png</filename>
+                                </imagetype>
+                            </state>
+                            <state name="combobox">
+                                <shape name="texteditshape"> 
+                                    <area>20,2,480,26</area> 
+                                    <!--area>0,2,100%,26</area DOES NOT WORK --> 
+                                    <type>roundbox</type> 
+                                    <cornerradius>5</cornerradius>
+                                    <line color="#000000" alpha="255" width="1" />
+                                    <fill color="#FFFFFF" alpha="50" />
+                                </shape> 
+                                <imagetype name="comboboximage">
+                                    <area>500,5,20,20</area>
+                                    <filename>lb-dnarrow-sel.png</filename>
+                                </imagetype>
+
+                            </state>
+                            <state name="button">
+                                <imagetype name="comboboximage">
+                                    <area>100%-20,0,20,20</area>
+                                    <filename>button_selected_background.png</filename>
+                                </imagetype>
+                            </state>
+                        </statetype>
+                        <!-- we can not put more than one textarea with the same name
+                            The textarea can no be in a custom state 
+                            We can not put the textarea in a state from statetype neither
+                            Which mean we can not theme them differently according to the statetype
+                        -->
+                        <textarea name="value">
+                            <area>5,0,100%-46,30</area>
+                            <font>basesmall</font>
+                            <cutdown>yes</cutdown>
+                            <align>right,vcenter</align>
+                        </textarea>
+
+
+                    </group>
+                    <!--textarea name="value">
+                        <area>50%+5,0,100%-46,30</area>
+                        <font>myfont</font>
+                        <cutdown>yes</cutdown>
+                        <align>right,vcenter</align>
+                    </textarea-->
+                    <!--textarea name="description">
+                        <area>5,30,100%-40,60</area>
+                        <font>basesmall</font>
+                        <cutdown>yes</cutdown>
+                        <multiline>yes</multiline>
+                    </textarea-->
+                    <statetype name="buttoncheck">
+                        <position>100%-40,5</position>
+                        <state type="off">
+                            <imagetype name="checkoff">
+                                <filename>lb-check-empty.png</filename>
+                            </imagetype>
+                        </state>
+                        <state type="half">
+                            <imagetype name="checkhalf">
+                                <filename>lb-check-half.png</filename>
+                            </imagetype>
+                        </state>
+                        <state type="full">
+                            <imagetype name="checkfull">
+                                <filename>lb-check-full.png</filename>
+                            </imagetype>
+                        </state>
+                    </statetype>
+                    <imagetype name="buttonarrow">
+                        <position>100%-20,7</position>
+                        <filename>lb-arrow.png</filename>
+                    </imagetype>
+                </state>
+                <state name="selectedactive" from="active">
+                    <shape name="buttonbackgroundselection">
+                        <fill style="gradient">
+                            <gradient start="#52CA38" end="#349838" alpha="255" />
+                        </fill>
+                    </shape>
+                    <imagetype name="buttonarrow">
+                        <position>100%-20,7</position>
+                        <filename>lb-arrow.png</filename>
+                    </imagetype>
+                </state>
+                <state name="disabledactive" from="active">
+                    <shape name="buttonbackgroundselection">
+                        <fill style="gradient">
+                            <gradient start="#888888" end="#777777" alpha="255" />
+                        </fill>
+                    </shape>
+                </state>
+                <state name="disabledinactive" from="disabledactive">
+                </state>
+                <state name="selectedinactive" from="active">
+                </state>
+            </statetype>
+        </buttonlist>
+
+        <shape name="HelpBackground"> 
+            <area>15,100%-140,100%-15,80</area> 
+            <type>roundbox</type> 
+            <cornerradius>10</cornerradius>
+            <fill color="#000000" alpha="30" />
+        </shape> 
+
+        <!-- optionnal, display the help for the currently selected setting -->
+        <textarea name="selectedsettinghelp" from="basetextarea">
+            <area>30,100%-120,100%-30,60</area>
+            <font>basesmall</font>
+            <multiline>yes</multiline>
+        </textarea>
+    </window>
+</mythuitheme>
diff --git a/mythtv/themes/default/base.xml b/mythtv/themes/default/base.xml
index 82b6ed7..b87d4a9 100644
--- a/mythtv/themes/default/base.xml
+++ b/mythtv/themes/default/base.xml
@@ -900,6 +900,28 @@
         </button>
     </window>
 
+    <window name="MythSpinBoxDialog">
+        <area>-1,-1,580,165</area>
+
+        <imagetype name="backimg">
+            <filename>mythprogressdialog-background.png</filename>
+        </imagetype>
+
+        <textarea name="message" from="basetextarea">
+            <area>20,20,540,30</area>
+            <align>allcenter</align>
+        </textarea>
+
+        <spinbox name="input" from="basespinbox">
+            <position>245,50</position>
+        </spinbox>
+
+        <button name="ok" from="basebutton">
+            <position>109,110</position>
+            <value>OK</value>
+        </button>
+    </window>
+
     <window name="MythSearchDialog">
         <area>-1,-1,500,500</area>
         <imagetype name="backimg">