diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 5a6998d9e..850ffa4ca 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -281,13 +281,11 @@ namespace MWInput
             if (actionIsActive(A_MoveLeft))
             {
                 triedToMove = true;
-                mPlayer.setAutoMove (false);
                 mPlayer.setLeftRight (-1);
             }
             else if (actionIsActive(A_MoveRight))
             {
                 triedToMove = true;
-                mPlayer.setAutoMove (false);
                 mPlayer.setLeftRight (1);
             }
             else
diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp
index 601ee58e3..1a14b86bf 100644
--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@@ -119,6 +119,10 @@ void LocalMap::requestMap(MWWorld::Ptr::CellStore* cell)
 void LocalMap::requestMap(MWWorld::Ptr::CellStore* cell,
                             AxisAlignedBox bounds)
 {
+    // if we're in an empty cell, don't bother rendering anything
+    if (bounds.isNull ())
+        return;
+
     mInterior = true;
     mBounds = bounds;
 
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index e7e5b695e..beace5b81 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -9,7 +9,6 @@ set(MYGUI_FILES
     core.skin
     core.xml
     EBGaramond-Regular.ttf
-    mwgui.png
     Obliviontt.zip
     openmw_alchemy_window.layout
     openmw_book.layout
diff --git a/files/mygui/mwgui.png b/files/mygui/mwgui.png
deleted file mode 100644
index 318f16e41..000000000
Binary files a/files/mygui/mwgui.png and /dev/null differ
diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/mygui/openmw_chargen_class_description.layout
index 11031eb4e..8823e1e76 100644
--- a/files/mygui/openmw_chargen_class_description.layout
+++ b/files/mygui/openmw_chargen_class_description.layout
@@ -4,6 +4,9 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 249 249" name="_Main">
 
         <!-- Edit box -->
+
+        <Widget type="Widget" skin="MW_Box" position="14 14 220 192" align="Stretch" name = "Client"/>
+
         <Widget type="EditBox" skin="MW_TextBoxEdit" position="14 14 220 192" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP STRETCH">
             <Property key="MultiLine" value="1" />
             <Property key="VisibleVScroll" value="1" />
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index a9ec9905d..4ef8da0f3 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -8,33 +8,52 @@
             <Property key="Caption" value="Appearance"/>
             <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
-        <Widget type="Widget" skin="MW_Box" position="8 39 241 230">
+        <Widget type="Widget" skin="MW_Box" position="8 39 241 220">
             <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Stretch" name="PreviewImage"/>
         </Widget>
 
         <!-- Sliders -->
         <!-- Rotation of head -->
-        <Widget type="ScrollBar" skin="MW_HScroll" position="8 276 241 14" name="HeadRotate"/>
+        <Widget type="ScrollBar" skin="MW_HScroll" position="8 270 241 14" name="HeadRotate"/>
 
         <!-- Gender choice -->
-        <Widget type="Button" skin="MW_ScrollLeft" position="8 298 14 14" name="PrevGenderButton"/>
-        <Widget type="TextBox" skin="HeaderText" position="14 298 227 14" name="GenderChoiceT">
+
+        <Widget type="Widget" skin="MW_Box" position="8 298 15 14">
+            <Widget type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="ALIGN_LEFT ALIGN_VSTRETCH" name="PrevGenderButton"/>
+        </Widget>
+
+        <Widget type="TextBox" skin="HeaderText" position="14 298 227 14" name="GenderChoiceT" />
+
+        <Widget type="Widget" skin="MW_Box" position="234 298 15 14">
+            <Widget type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="NextGenderButton"/>
         </Widget>
-        <Widget type="Button" skin="MW_ScrollRight" position="235 298 14 14" name="NextGenderButton"/>
 
         <!-- Face choice -->
-        <Widget type="Button" skin="MW_ScrollLeft" position="8 320 14 14" name="PrevFaceButton"/>
-        <Widget type="TextBox" skin="HeaderText" position="14 320 227 14" name="FaceChoiceT">
+
+        <Widget type="Widget" skin="MW_Box" position="8 320 15 14">
+            <Widget type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="ALIGN_LEFT ALIGN_VSTRETCH" name="PrevFaceButton"/>
+        </Widget>
+
+        <Widget type="TextBox" skin="HeaderText" position="14 320 227 14" name="FaceChoiceT" />
+
+        <Widget type="Widget" skin="MW_Box" position="234 320 15 14">
+            <Widget type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="NextFaceButton"/>
         </Widget>
-        <Widget type="Button" skin="MW_ScrollRight" position="235 320 14 14" name="NextFaceButton"/>
 
         <!-- Hair choice -->
-        <Widget type="Button" skin="MW_ScrollLeft" position="8 342 14 14" name="PrevHairButton"/>
-        <Widget type="TextBox" skin="HeaderText" position="14 342 227 14" name="HairChoiceT">
+
+        <Widget type="Widget" skin="MW_Box" position="8 342 15 14">
+            <Widget type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="ALIGN_LEFT ALIGN_VSTRETCH" name="PrevHairButton"/>
+        </Widget>
+
+        <Widget type="TextBox" skin="HeaderText" position="14 342 227 14" name="HairChoiceT" />
+
+        <Widget type="Widget" skin="MW_Box" position="234 342 15 14">
+            <Widget type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="NextHairButton"/>
         </Widget>
-        <Widget type="Button" skin="MW_ScrollRight" position="235 342 14 14" name="NextHairButton"/>
 
         <!-- Race -->
+
         <Widget type="TextBox" skin="HeaderText" position="261 16 132 18" name="RaceT" align="ALIGN_LEFT ALIGN_TOP">
             <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
@@ -42,11 +61,11 @@
         </Widget>
 
         <!-- Spell powers -->
-        <Widget type="TextBox" skin="HeaderText" position="261 200 132 18" name="SpellPowerT" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="TextBox" skin="HeaderText" position="261 210 132 18" name="SpellPowerT" align="ALIGN_LEFT ALIGN_TOP">
             <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
         <!-- Spell power sub-widgets will be placed here, no skin to make it invisible -->
-        <Widget type="Widget" skin="" position="261 220 250 140" name="SpellPowerList" />
+        <Widget type="Widget" skin="" position="261 230 250 140" name="SpellPowerList" />
 
         <!-- Skill bonus -->
         <Widget type="TextBox" skin="HeaderText" position="403 39 159 18" name="SkillsT" align="ALIGN_LEFT ALIGN_TOP">
diff --git a/files/mygui/openmw_dialogue_window.layout b/files/mygui/openmw_dialogue_window.layout
index 1271a287b..9a9da72d4 100644
--- a/files/mygui/openmw_dialogue_window.layout
+++ b/files/mygui/openmw_dialogue_window.layout
@@ -3,13 +3,15 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 588 433" name="_Main">
 
+        <Widget type="Widget" skin="MW_Box" position="8 8 415 381" align="Stretch" name = "Client"/>
+
         <!-- The Dialogue history -->
-        <Widget type="DialogueHistory" skin="MW_TextBoxEdit" position="8 8 415 381" name="History"  align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH">
+        <Widget type="DialogueHistory" skin="MW_TextBoxEdit" position="13 13 405 371" name="History"  align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH">
             <Property key="Static" value="true"/>
             <Property key="WordWrap" value="true"/>
             <Property key="MultiLine" value="1" />
             <Property key="VisibleVScroll" value="1" />
-            <!-- invisible box for receiving mouse events -->
+            <!-- box for receiving mouse events -->
             <Widget type="Widget" skin="" position="0 0 400 375" name="EventBox" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH"/>
         </Widget>
 
diff --git a/files/mygui/openmw_edit.skin.xml b/files/mygui/openmw_edit.skin.xml
index 02fee4b17..da21385e2 100644
--- a/files/mygui/openmw_edit.skin.xml
+++ b/files/mygui/openmw_edit.skin.xml
@@ -1,55 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Skin">
+
     <!-- Text edit widget -->
+
     <Skin name = "MW_TextEditClient" size = "10 10">
+
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
+
     </Skin>
 
     <Skin name = "MW_TextBoxEditClient" size = "10 10">
+
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
+
     </Skin>
 
-    <Skin name="MW_TextEdit" size="512 20" texture="mwgui.png">
-        <Property key="FontName" value = "Default"/>
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_VCENTER" />
-        <Property key="TextColour" value = "0.75 0.6 0.35" />
+    <Skin name="MW_TextEdit" size="512 20">
 
-        <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 2 512 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "2 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "510 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "512 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 20 512 2"/>
-        </BasisSkin>
+        <!-- Input -->
+
+        <Property key="FontName" value = "Default"/>
+
+        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_VCENTER" />
+
+        <Property key="TextColour" value = "0.75 0.6 0.35" />
 
         <Child type="TextBox" skin="MW_TextEditClient" offset = "2 2 508 18" align = "Stretch" name = "Client"/>
+
+
+        <!-- Borders -->
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 512 20" align="ALIGN_STRETCH" name="Client"/>
+
     </Skin>
 
-    <Skin name="MW_TextBoxEdit" size="512 20" texture="mwgui.png">
+    <Skin name="MW_TextBoxEdit" size="512 20">
+
         <Property key="FontName" value = "Default"/>
+
         <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_TOP" />
+
         <Property key="TextColour" value = "0.75 0.6 0.35" />
 
-        <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 2 512 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "2 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "510 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "512 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 20 512 2"/>
-        </BasisSkin>
-
         <Child type="TextBox" skin="MW_TextBoxEditClient" offset = "2 2 490 18" align = "Stretch" name = "Client"/>
+
         <Child type="ScrollBar" skin="MW_VScroll" offset = "494 3 14 14" align = "Right VStretch" name = "VScroll"/>
+
     </Skin>
+
 </MyGUI>
diff --git a/files/mygui/openmw_edit_effect.layout b/files/mygui/openmw_edit_effect.layout
index 45ecb63ed..cad22c064 100644
--- a/files/mygui/openmw_edit_effect.layout
+++ b/files/mygui/openmw_edit_effect.layout
@@ -31,7 +31,7 @@
                 <Property key="TextAlign" value="Center"/>
                 <Property key="Caption" value="0"/>
             </Widget>
-            <Widget type="ScrollBar" skin="MW_HSlider" position="122 20 210 13" name="MagnitudeMinSlider">
+            <Widget type="ScrollBar" skin="MW_HScroll" position="122 20 210 13" name="MagnitudeMinSlider">
                 <Property key="Range" value="100"/>
             </Widget>
 
@@ -39,7 +39,7 @@
                 <Property key="TextAlign" value="Center"/>
                 <Property key="Caption" value="0"/>
             </Widget>
-            <Widget type="ScrollBar" skin="MW_HSlider" position="122 52 210 13" name="MagnitudeMaxSlider">
+            <Widget type="ScrollBar" skin="MW_HScroll" position="122 52 210 13" name="MagnitudeMaxSlider">
                 <Property key="Range" value="100"/>
             </Widget>
         </Widget>
@@ -56,7 +56,7 @@
                 <Property key="TextAlign" value="Center"/>
                 <Property key="Caption" value="0"/>
             </Widget>
-            <Widget type="ScrollBar" skin="MW_HSlider" position="122 20 210 13" name="DurationSlider">
+            <Widget type="ScrollBar" skin="MW_HScroll" position="122 20 210 13" name="DurationSlider">
                 <Property key="Range" value="1440"/>
             </Widget>
         </Widget>
@@ -72,7 +72,7 @@
                 <Property key="TextAlign" value="Center"/>
                 <Property key="Caption" value="0"/>
             </Widget>
-            <Widget type="ScrollBar" skin="MW_HSlider" position="122 20 210 13" name="AreaSlider">
+            <Widget type="ScrollBar" skin="MW_HScroll" position="122 20 210 13" name="AreaSlider">
                 <Property key="Range" value="51"/>
             </Widget>
         </Widget>
diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml
index 464b6343a..23480e8d3 100644
--- a/files/mygui/openmw_hud_box.skin.xml
+++ b/files/mygui/openmw_hud_box.skin.xml
@@ -1,80 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Skin">
+
     <!-- The 'box' frame that surrounds various HUD items and other elements -->
-    <Skin name="HUD_Box" size="40 40" texture="mwgui.png">
 
-        <BasisSkin type="TileRect" offset="0 0 39 2" align="ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset="4 2 38 2">
-                <Property key="TileSize" value="40 2"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
+    <Skin name="HUD_Box" size="40 40">
 
-        <BasisSkin type="TileRect" offset="0 1 2 37" align="ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset="2 26 2 36">
-                <Property key="TileSize" value="2 40"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
+        <!-- Borders -->
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="ALIGN_LEFT Stretch" name="Client"/>
 
-        <BasisSkin type="TileRect" offset="38 0 2 40" align="ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset="16 26 2 38">
-                <Property key="TileSize" value="2 40"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
-        
-        <BasisSkin type="TileRect" offset="0 38 39 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset="4 20 40 2">
-                <Property key="TileSize" value="40 2"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
-        
         <!-- The interior of the box -->
+
         <Child type="Widget" skin="BlackBG" offset="2 2 36 36" align="ALIGN_STRETCH" name="Client"/>
+
     </Skin>
 
-    <Skin name="HUD_Box_NoTransp" size="40 40" texture="mwgui.png">
-    
-        <BasisSkin type="TileRect" offset="0 0 39 2" align="ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset="4 2 38 2">
-                <Property key="TileSize" value="40 2"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
+    <Skin name="HUD_Box_NoTransp" size="40 40">
 
-        <BasisSkin type="TileRect" offset="0 1 2 37" align="ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset="2 26 2 36">
-                <Property key="TileSize" value="2 40"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
+        <!-- Borders -->
 
-        <BasisSkin type="TileRect" offset="38 0 2 40" align="ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset="16 26 2 38">
-                <Property key="TileSize" value="2 40"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
-        
-        <BasisSkin type="TileRect" offset="0 38 39 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset="4 20 40 2">
-                <Property key="TileSize" value="40 2"/>
-                <Property key="TileH" value="true"/>
-                <Property key="TileV" value="true"/>
-            </State>
-        </BasisSkin>
+        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="ALIGN_LEFT Stretch" name="Client"/>
 
         <!-- The interior of the box -->
+
         <Child type="Widget" skin="DialogBG" offset="2 2 36 36" align="ALIGN_STRETCH" name="Client"/>
+
     </Skin>
+
 </MyGUI>
diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
index 64435451a..6631424cc 100644
--- a/files/mygui/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -1,228 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Skin">
-    <!-- scroll tracker -->
-    <Skin name = "MW_ScrollTrack" size = "16 20" texture="mwgui.png">
-        <BasisSkin type="SubSkin" offset = "0 0 16 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "38 24 16 2"/>
-        </BasisSkin>
-        <BasisSkin type="TileRect" offset="0 2 16 16" align="ALIGN_STRETCH">
-            <State name="normal" offset="38 26 16 16">
+
+    <!-- Horizontal Scrollbar -->
+
+    <Skin name="MW_HScroll" size="90 14">
+        <Property key="TrackRangeMargins" value="14 14" />
+        <Property key="MinTrackSize" value="14" />
+        <Property key="VerticalAlignment" value="false"/>
+        <Property key="MoveToClick" value="true"/>
+
+        <!-- Tracker must be last to be on top and receive mouse events -->
+
+        <Child type="Button" skin="MW_Box" offset="18 0 54 14" align="ALIGN_STRETCH" name="Background"/>
+
+        <!-- Arrows -->
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 15 14" align="ALIGN_LEFT ALIGN_VSTRETCH"/>
+        <Child type="Button" skin="MW_ArrowLeft" offset="3 2 10 10" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Start"/>
+
+        <Child type="Widget" skin="MW_Box" offset="75 0 15 14" align="ALIGN_RIGHT ALIGN_VSTRETCH"/>
+        <Child type="Button" skin="MW_ArrowRight" offset="76 2 10 10" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="End"/>
+
+        <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
+
+        <Child type="Button" skin="MW_ScrollEmptyPart" offset="14 0 24 14" align="ALIGN_TOP ALIGN_HSTRETCH" name="FirstPart"/>
+        <Child type="Button" skin="MW_ScrollEmptyPart" offset="52 0 24 14" align="ALIGN_TOP ALIGN_HSTRETCH" name="SecondPart"/>
+
+        <Child type="Button" skin="MW_ScrollTrackH" offset="38 2 30 9" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Track"/>
+    </Skin>
+
+    <Skin name="MW_ScrollTrackH" size="16 16" texture="textures\tx_menubook_bookmark.dds">
+        <BasisSkin type="TileRect" offset="6 0 3 16" align="Stretch">
+            <State name="normal" offset="70 22 16 16">
                 <Property key="TileSize" value="16 16"/>
                 <Property key="TileH" value="true"/>
                 <Property key="TileV" value="true"/>
             </State>
         </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 16 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "38 42 16 2"/>
-        </BasisSkin>
     </Skin>
-    <Skin name = "MW_ScrollTrackH" size = "12 20" texture="mwgui.png">
-        <BasisSkin type="SubSkin" offset = "0 0 12 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "38 24 12 2"/>
-        </BasisSkin>
-        <BasisSkin type="TileRect" offset="0 2 12 16" align="ALIGN_STRETCH">
-            <State name="normal" offset="40 26 12 16">
-                <Property key="TileSize" value="12 16"/>
+
+    <!-- Vertical Scrollbar -->
+
+    <Skin name="MW_VScroll" size="14 90">
+        <Property key="TrackRangeMargins" value="14 14" />
+        <Property key="MinTrackSize" value="14" />
+        <Property key="MoveToClick" value="true"/>
+
+        <!-- Background widget trick that must go first to be placed behind Track and FirstPart/SecondPart widgets, provides the bar texture -->
+
+        <Child type="Button" skin="MW_Box" offset="0 18 14 55" align="ALIGN_STRETCH" name="Background"/>
+
+        <!-- Arrows -->
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 14 15" align="ALIGN_TOP ALIGN_HSTRETCH"/>
+        <Child type="Button" skin="MW_ArrowUp" offset="2 3 10 10" align="ALIGN_TOP ALIGN_HSTRETCH" name="Start"/>
+
+        <Child type="Widget" skin="MW_Box" offset="0 76 14 15" align="ALIGN_BOTTOM ALIGN_HSTRETCH"/>
+        <Child type="Button" skin="MW_ArrowDown" offset="2 77 10 10" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="End"/>
+
+        <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
+
+        <Child type="Button" skin="MW_ScrollEmptyPart" offset="0 14 24 14" align="ALIGN_LEFT ALIGN_VSTRETCH" name="FirstPart"/>
+        <Child type="Button" skin="MW_ScrollEmptyPart" offset="0 52 24 14" align="ALIGN_LEFT ALIGN_VSTRETCH" name="SecondPart"/>
+
+        <!-- Tracker must be last to be on top and receive mouse events -->
+
+        <Child type="Button" skin="MW_ScrollTrackV" offset="2 40 9 30" align="ALIGN_TOP ALIGN_HSTRETCH" name="Track"/>
+
+    </Skin>
+
+    <Skin name="MW_ScrollTrackV" size="16 16" texture="textures\tx_menubook_bookmark.dds">
+        <BasisSkin type="TileRect" offset="0 7 16 3" align="Stretch">
+            <State name="normal" offset="68 19 16 16">
+                <Property key="TileSize" value="16 16"/>
                 <Property key="TileH" value="true"/>
                 <Property key="TileV" value="true"/>
             </State>
         </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 12 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "38 42 12 2"/>
-        </BasisSkin>
     </Skin>
 
-    <Skin name = "MW_ScrollUp" size = "16 20" texture="mwgui.png">
-        <!-- border -->
-        <BasisSkin type="SubSkin" offset = "0 0 16 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 24 16 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "20 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "14 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "34 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 16 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 42 16 2"/>
-        </BasisSkin>
-        <!-- arrow -->
-        <BasisSkin type="SubSkin" offset = "2 2 12 16" align = "ALIGN_STRETCH">
-            <State name="normal" offset = "56 24 8 8"/>
-        </BasisSkin>
+    <!-- Empty space in scrollbar -->
+
+    <Skin name="MW_ScrollEmptyPart" size="16 16" >
     </Skin>
 
-    <Skin name = "MW_ScrollDown" size = "16 20"  texture="mwgui.png">
-        <!-- border -->
-        <BasisSkin type="SubSkin" offset = "0 0 16 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 24 16 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "20 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "14 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "34 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 16 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 42 16 2"/>
-        </BasisSkin>
-        <!-- arrow -->
-        <BasisSkin type="SubSkin" offset = "2 2 12 16" align = "ALIGN_STRETCH">
-            <State name="normal" offset = "56 44 8 8"/>
-        </BasisSkin>
-    </Skin>
+    <!-- Header text -->
 
-    <Skin name = "MW_ScrollLeft" size = "16 20" texture="mwgui.png">
-        <!-- border -->
-        <BasisSkin type="SubSkin" offset = "0 0 16 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 24 16 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "20 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "14 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "34 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 16 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 42 16 2"/>
-        </BasisSkin>
-        <!-- arrow -->
-        <BasisSkin type="SubSkin" offset = "2 2 12 16" align = "ALIGN_STRETCH">
-            <State name="normal" offset = "56 54 8 8"/>
-        </BasisSkin>
-    </Skin>
+    <Skin name="HeaderText" size="16 16">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="ALIGN_CENTER" />
+        <Property key="TextColour" value="0.82 0.74 0.58" />
 
-    <Skin name = "MW_ScrollRight" size = "16 20"  texture="mwgui.png">
-        <!-- border -->
-        <BasisSkin type="SubSkin" offset = "0 0 16 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 24 16 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "20 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "14 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "34 26 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 16 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 42 16 2"/>
-        </BasisSkin>
-        <!-- arrow -->
-        <BasisSkin type="SubSkin" offset = "2 2 12 16" align = "ALIGN_STRETCH">
-            <State name="normal" offset = "56 34 8 8"/>
-        </BasisSkin>
-    </Skin>
-
-    <Skin name = "MW_HScrollBackground" size = "512 20"  texture="mwgui.png">
-        <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 2 512 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "2 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "510 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "512 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 20 512 2"/>
-        </BasisSkin>
-    </Skin>
-
-    <Skin name = "MW_VScrollBackground" size = "16 512"  texture="mwgui.png">
-        <BasisSkin type="SubSkin" offset = "0 0 16 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 24 16 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 512" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "2 26 2 512"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "14 2 2 512" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "16 26 2 512"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 512 16 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 538 16 2"/>
-        </BasisSkin>
-    </Skin>
-
-    <Skin name = "MW_ScrollEmptyPart" size = "16 16" >
-    </Skin>
-
-    <!-- Morrowind has a 1 pixel gap between the left arrow and the inner bar, this skin does not replicate that -->
-    <Skin name = "MW_HScroll" size = "90 14">
-        <Property key="TrackRangeMargins" value = "14 14" />
-        <Property key="MinTrackSize" value = "14" />
-        <Property key="VerticalAlignment" value="false"/>
-        <Property key="MoveToClick" value="true"/>
-
-        <!-- Background widget trick that must go first to be placed behind Track and FirstPart/SecondPart widgets, provides the bar texture -->
-        <Child type="Button" skin="MW_HScrollBackground" offset = "14 0 62 14" align = "ALIGN_STRETCH" name = "Background"/>
-
-        <Child type="Button" skin="MW_ScrollLeft" offset = "0 0 14 14" align = "ALIGN_LEFT ALIGN_VSTRETCH" name = "Start"/>
-        <Child type="Button" skin="MW_ScrollRight" offset = "76 0 14 14" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "End"/>
-
-        <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset = "14 0 24 14" align = "ALIGN_TOP ALIGN_HSTRETCH" name = "FirstPart"/>
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset = "52 0 24 14" align = "ALIGN_TOP ALIGN_HSTRETCH" name = "SecondPart"/>
-
-        <!-- Tracker must be last to be on top and receive mouse events -->
-        <Child type="Button" skin="MW_ScrollTrackH" offset = "38 0 14 14" align = "ALIGN_LEFT ALIGN_VSTRETCH" name = "Track"/>
-    </Skin>
-
-    <!-- Morrowind has a 1 pixel gap between the left arrow and the inner bar, this skin does not replicate that -->
-    <Skin name = "MW_HSlider" size = "90 14">
-        <Property key="TrackRangeMargins" value = "14 14" />
-        <Property key="MinTrackSize" value = "14" />
-        <Property key="VerticalAlignment" value="false"/>
-        <Property key="MoveToClick" value="true"/>
-
-        <!-- Background widget trick that must go first to be placed behind Track and FirstPart/SecondPart widgets, provides the bar texture -->
-        <Child type="Button" skin="MW_HScrollBackground" offset = "14 0 62 14" align = "ALIGN_STRETCH" name = "Background"/>
-
-        <Child type="Button" skin="MW_ScrollLeft" offset = "0 0 14 14" align = "ALIGN_LEFT ALIGN_VSTRETCH" name = "Start"/>
-        <Child type="Button" skin="MW_ScrollRight" offset = "76 0 14 14" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "End"/>
-
-        <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset = "14 0 24 14" align = "ALIGN_TOP ALIGN_HSTRETCH" name = "FirstPart"/>
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset = "52 0 24 14" align = "ALIGN_TOP ALIGN_HSTRETCH" name = "SecondPart"/>
-
-        <!-- Tracker must be last to be on top and receive mouse events -->
-        <Child type="Button" skin="MW_ScrollTrackH" offset = "38 0 14 14" align = "ALIGN_LEFT ALIGN_VSTRETCH" name = "Track"/>
-    </Skin>
-
-    <!-- Morrowind has a 1 pixel gap between the top arrow and the inner bar, this skin does not replicate that -->
-    <Skin name = "MW_VScroll" size = "14 90">
-        <Property key="TrackRangeMargins" value = "14 14" />
-        <Property key="MinTrackSize" value = "14" />
-        <Property key="MoveToClick" value="true"/>
-
-        <!-- Background widget trick that must go first to be placed behind Track and FirstPart/SecondPart widgets, provides the bar texture -->
-        <Child type="Button" skin="MW_VScrollBackground" offset = "0 14 14 62" align = "ALIGN_STRETCH" name = "Background"/>
-
-        <Child type="Button" skin="MW_ScrollUp" offset = "0 0 14 14" align = "ALIGN_TOP ALIGN_HSTRETCH" name = "Start"/>
-        <Child type="Button" skin="MW_ScrollDown" offset = "0 76 14 14" align = "ALIGN_BOTTOM ALIGN_HSTRETCH" name = "End"/>
-
-        <!-- These are only provided to get mouse input, they should have no skin and be transparent -->
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset = "0 14 24 14" align = "ALIGN_LEFT ALIGN_VSTRETCH" name = "FirstPart"/>
-        <Child type="Button" skin="MW_ScrollEmptyPart" offset = "0 52 24 14" align = "ALIGN_LEFT ALIGN_VSTRETCH" name = "SecondPart"/>
-
-        <!-- Tracker must be last to be on top and receive mouse events -->
-        <Child type="Button" skin="MW_ScrollTrack" offset = "0 38 14 14" align = "ALIGN_TOP ALIGN_HSTRETCH" name = "Track"/>
-
-    </Skin>
-
-    <Skin name = "HeaderText" size = "16 16">
-        <Property key="FontName" value = "Default"/>
-        <Property key="TextAlign" value = "ALIGN_CENTER" />
-        <Property key="TextColour" value = "0.82 0.74 0.58" />
-
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="ALIGN_STRETCH"/>
     </Skin>
 
     <!-- list and multilist skins -->
-    <Skin name = "MW_ListLine" size = "5 5" texture="mwgui.png">
-        <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_VCENTER" />
 
-        <BasisSkin type="SimpleText" offset = "2 0 1 5" align = "ALIGN_STRETCH">
+    <Skin name="MW_ListLine" size="5 5">
+        <Property key="FontName" value="Default" />
+        <Property key="TextAlign" value="ALIGN_LEFT ALIGN_VCENTER" />
+
+        <BasisSkin type="SimpleText" offset="2 0 1 5" align="ALIGN_STRETCH">
             <State name="disabled" colour="0.70 0.57 0.33" shift="0"/>
             <State name="normal" colour="0.70 0.57 0.33" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
@@ -234,81 +113,85 @@
         </BasisSkin>
     </Skin>
 
-    <Skin name = "MW_List" size = "516 516" align = "ALIGN_LEFT ALIGN_TOP" texture="mwgui.png">
-        <Property key="NeedKey" value = "true" />
-        <Property key="SkinLine" value = "MW_ListLine" />
-        <Property key="HeightLine" value = "20" />
+    <Skin name="MW_List" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
+        <Property key="NeedKey" value="true" />
+        <Property key="SkinLine" value="MW_ListLine" />
+        <Property key="HeightLine" value="20" />
 
-        <Child type="ScrollBar" skin="MW_VScroll" offset = "498 3 14 509" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "VScroll">
-        </Child>
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
 
-        <Child type="Widget" skin="" offset = "3 3 493 509" align = "ALIGN_STRETCH" name = "Client">
-        </Child>
+        <Child type="ScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="VScroll"/>
 
-        <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="IB_B" offset="2 514 512 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="IB_L" offset="0 2 2 512" align="ALIGN_LEFT ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="IB_R" offset="514 2 2 512" align="ALIGN_RIGHT ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="IB_TL" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="IB_TR" offset="514 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="IB_BL" offset="0 514 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
-        <Child type="Widget" skin="IB_BR" offset="514 514 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
-    </Skin>
-
-    <Skin name = "MW_SimpleList" size = "516 516" align = "ALIGN_LEFT ALIGN_TOP" texture="mwgui.png">
-        <Child type="Widget" skin="" offset = "3 3 510 510" align = "ALIGN_STRETCH" name = "Client">
-        </Child>
-
-        <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="IB_B" offset="2 514 512 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="IB_L" offset="0 2 2 512" align="ALIGN_LEFT ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="IB_R" offset="514 2 2 512" align="ALIGN_RIGHT ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="IB_TL" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="IB_TR" offset="514 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="IB_BL" offset="0 514 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
-        <Child type="Widget" skin="IB_BR" offset="514 514 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
-    </Skin>
-
-    <Skin name = "MW_MultiSubList" size = "516 516" align = "ALIGN_LEFT ALIGN_TOP">
-        <Property key="NeedKey" value = "true" />
-        <Property key="SkinLine" value = "MW_ListLine" />
-        <Property key="HeightLine" value = "20" />
-
-        <Child type="ScrollBar" skin="VScroll" offset = "498 3 14 509" align = "ALIGN_RIGHT ALIGN_VSTRETCH" name = "VScroll">
-        </Child>
-
-        <Child type="Widget" skin="Default" offset = "3 3 493 509" align = "ALIGN_STRETCH" name = "Client">
-        </Child>
-
-        <BasisSkin type="MainSkin" offset = "0 0 0 0" align = "ALIGN_LEFT ALIGN_TOP"/>
+        <Child type="Widget" skin="" offset="3 3 493 509" align="ALIGN_STRETCH" name="Client"/>
 
     </Skin>
 
-    <Skin name = "MW_MultiList" size = "516 516" align = "ALIGN_LEFT ALIGN_TOP">
-        <Property key="NeedKey" value = "true" />
-        <Property key="SkinButton" value = "ButtonSmall" />
-        <Property key="_SkinButtonEmpty" value = "EditBox" />
-        <Property key="HeightButton" value = "20" />
+    <Skin name="MW_SimpleList" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
 
-        <Property key="SkinList" value = "MW_MultiSubList" />
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
 
-        <Child type="Widget" skin="" offset = "3 3 516 516" align = "ALIGN_STRETCH" name = "Client">
-        </Child>
+        <Child type="Widget" skin="" offset="3 3 510 510" align="Top Left ALIGN_STRETCH" name="Client"/>
 
-        <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="ALIGN_TOP ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="IB_B" offset="2 514 512 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="IB_L" offset="0 2 2 512" align="ALIGN_LEFT ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="IB_R" offset="514 2 2 512" align="ALIGN_RIGHT ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="IB_TL" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="IB_TR" offset="514 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="IB_BL" offset="0 514 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
-        <Child type="Widget" skin="IB_BR" offset="514 514 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
     </Skin>
 
-    <!-- textures/menu_thin_border_top.dds -->
-    <Skin name = "MW_HLine" size = "512 18"  texture="mwgui.png">
-        <BasisSkin type="SubSkin" offset = "0 8 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "20 106 512 2"/>
+    <Skin name="MW_MultiSubList" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
+        <Property key="NeedKey" value="true" />
+        <Property key="SkinLine" value="MW_ListLine" />
+        <Property key="HeightLine" value="20" />
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
+
+        <Child type="ScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="VScroll"/>
+
+        <Child type="Widget" skin="Default" offset="3 3 493 509" align="ALIGN_STRETCH" name="Client"/>
+
+    </Skin>
+
+    <Skin name="MW_MultiList" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
+        <Property key="NeedKey" value="true" />
+        <Property key="SkinButton" value="ButtonSmall" />
+        <Property key="_SkinButtonEmpty" value="EditBox" />
+        <Property key="HeightButton" value="20" />
+
+        <Property key="SkinList" value="MW_MultiSubList" />
+
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
+
+        <Child type="Widget" skin="" offset="3 3 516 516" align="ALIGN_STRETCH" name="Client"/>
+    </Skin>
+
+    <!-- Horizontal line -->
+
+    <Skin name="MW_HLine" size="512 10"  texture="textures\menu_thin_border_top.dds">
+        <BasisSkin type="SubSkin" offset="0 0 512 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
+            <State name="normal" offset="0 0 512 2"/>
         </BasisSkin>
     </Skin>
+
+    <!-- Arrows -->
+
+    <Skin name="MW_ArrowLeft" size="20 20" texture="textures\menu_scroll_left.dds">
+        <BasisSkin type="SubSkin" offset="0 0 19 20" align="Stretch">
+            <State name="normal" offset="0 0 19 20"/>
+        </BasisSkin>
+    </Skin>
+
+    <Skin name="MW_ArrowRight" size="20 20" texture="textures\menu_scroll_right.dds">
+        <BasisSkin type="SubSkin" offset="1 0 19 20" align="Stretch">
+            <State name="normal" offset="1 0 19 20"/>
+        </BasisSkin>
+    </Skin>
+
+    <Skin name="MW_ArrowUp" size="20 20" texture="textures\menu_scroll_up.dds">
+        <BasisSkin type="SubSkin" offset="0 0 20 19" align="Stretch">
+            <State name="normal" offset="0 0 20 19"/>
+        </BasisSkin>
+    </Skin>
+
+    <Skin name="MW_ArrowDown" size="20 20" texture="textures\menu_scroll_down.dds">
+        <BasisSkin type="SubSkin" offset="0 1 20 20" align="Stretch">
+            <State name="normal" offset="0 1 20 20"/>
+        </BasisSkin>
+    </Skin>
+
 </MyGUI>
diff --git a/files/mygui/openmw_map_window_skin.xml b/files/mygui/openmw_map_window_skin.xml
index 0c6050969..13f18c6d3 100644
--- a/files/mygui/openmw_map_window_skin.xml
+++ b/files/mygui/openmw_map_window_skin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Skin">
-    <Skin name="MW_MapView" size="516 516" texture="mwgui.png">
+    <Skin name="MW_MapView" size="516 516">
         <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
 
         <!-- invisible scroll bars, needed for setting the view offset -->
diff --git a/files/mygui/openmw_scroll_skin.xml b/files/mygui/openmw_scroll_skin.xml
index 70fad3f4b..1b94f0c29 100644
--- a/files/mygui/openmw_scroll_skin.xml
+++ b/files/mygui/openmw_scroll_skin.xml
@@ -2,12 +2,12 @@
 
 <MyGUI type="Skin">
 
-    <Skin name="MW_ScrollView" size="516 516" texture="mwgui.png">
+    <Skin name="MW_ScrollView" size="516 516">
         <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
-        <Child type="ScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="VScroll"/>
+        <Child type="ScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="ALIGN_RIGHT ALIGN_TOP ALIGN_VSTRETCH" name="VScroll"/>
     </Skin>
 
-    <Skin name="MW_ScrollViewH" size="516 516" texture="mwgui.png">
+    <Skin name="MW_ScrollViewH" size="516 516">
         <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
         <Child type="ScrollBar" skin="MW_HScroll" offset="3 498 509 14" align="ALIGN_LEFT ALIGN_BOTTOM ALIGN_HSTRETCH" name="HScroll"/>
     </Skin>
diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index 2f9b5a67f..8d435bfd5 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -15,7 +15,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 4 352 18" align="Left Top">
                     <Property key="Caption" value="#{sTransparency_Menu}"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 28 352 18" align="Left Top" name="MenuTransparencySlider">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 28 352 18" align="Left Top" name="MenuTransparencySlider">
                     <Property key="Range" value="1000000"/>
                 </Widget>
                 <Widget type="TextBox" skin="SandText" position="4 52 352 18" align="Left Top">
@@ -30,7 +30,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 78 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMenu_Help_Delay}"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 102 352 18" align="Left Top" name="ToolTipDelaySlider">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 102 352 18" align="Left Top" name="ToolTipDelaySlider">
                     <Property key="Range" value="1000000"/>
                 </Widget>
                 <Widget type="TextBox" skin="SandText" position="4 126 352 18" align="Left Top">
@@ -64,35 +64,35 @@
                 <Widget type="TextBox" skin="NormalText" position="4 4 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMaster}"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 28 352 18" align="Left Top" name="MasterVolume">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 28 352 18" align="Left Top" name="MasterVolume">
                     <Property key="Range" value="1000000"/>
                 </Widget>
 
                 <Widget type="TextBox" skin="NormalText" position="4 54 352 18" align="Left Top">
                     <Property key="Caption" value="#{sVoice}"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 78 352 18" align="Left Top" name="VoiceVolume">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 78 352 18" align="Left Top" name="VoiceVolume">
                     <Property key="Range" value="1000000"/>
                 </Widget>
 
                 <Widget type="TextBox" skin="NormalText" position="4 104 352 18" align="Left Top">
                     <Property key="Caption" value="#{sEffects}"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 128 352 18" align="Left Top" name="EffectsVolume">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 128 352 18" align="Left Top" name="EffectsVolume">
                     <Property key="Range" value="1000000"/>
                 </Widget>
 
                 <Widget type="TextBox" skin="NormalText" position="4 154 352 18" align="Left Top">
                     <Property key="Caption" value="#{sFootsteps}"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 178 352 18" align="Left Top" name="FootstepsVolume">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 178 352 18" align="Left Top" name="FootstepsVolume">
                     <Property key="Range" value="1000000"/>
                 </Widget>
 
                 <Widget type="TextBox" skin="NormalText" position="4 204 352 18" align="Left Top">
                     <Property key="Caption" value="#{sMusic}"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 228 352 18" align="Left Top" name="MusicVolume">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 228 352 18" align="Left Top" name="MusicVolume">
                     <Property key="Range" value="1000000"/>
                 </Widget>
             </Widget>
@@ -117,7 +117,7 @@
                 <Widget type="TextBox" skin="NormalText" position="4 228 160 18" align="Left Top">
                     <Property key="Caption" value="UI cursor sensitivity"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="4 252 160 18" align="Left Top" name="UISensitivitySlider">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="4 252 160 18" align="Left Top" name="UISensitivitySlider">
                     <Property key="Range" value="1000000"/>
                 </Widget>
                 <Widget type="TextBox" skin="SandText" position="4 276 160 18" align="Left Top">
@@ -133,7 +133,7 @@
                 <Widget type="TextBox" skin="NormalText" position="180 228 160 18" align="Left Top">
                     <Property key="Caption" value="Camera sensitivity"/>
                 </Widget>
-                <Widget type="ScrollBar" skin="MW_HSlider" position="180 252 160 18" align="Left Top" name="CameraSensitivitySlider">
+                <Widget type="ScrollBar" skin="MW_HScroll" position="180 252 160 18" align="Left Top" name="CameraSensitivitySlider">
                     <Property key="Range" value="1000000"/>
                 </Widget>
                 <Widget type="TextBox" skin="SandText" position="180 276 160 18" align="Left Top">
@@ -192,7 +192,7 @@
                         <Widget type="TextBox" skin="NormalText" position="4 128 329 18" align="Left Top" name="GammaText">
                             <Property key="Caption" value="Gamma"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HSlider" position="4 152 329 18" align="Left Top" name="GammaSlider">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="4 152 329 18" align="Left Top" name="GammaSlider">
                             <Property key="Range" value="1000000"/>
                         </Widget>
                         <Widget type="TextBox" skin="SandText" position="4 176 329 18" align="Left Top">
@@ -208,7 +208,7 @@
                         <Widget type="TextBox" skin="NormalText" position="4 198 329 18" align="Left Top" name="FovText">
                             <Property key="Caption" value="Field of View"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HSlider" position="4 222 329 18" align="Left Top" name="FOVSlider">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="4 222 329 18" align="Left Top" name="FOVSlider">
                             <Property key="Range" value="1000000"/>
                         </Widget>
                         <Widget type="TextBox" skin="SandText" position="4 246 329 18" align="Left Top">
@@ -233,7 +233,7 @@
                             <Widget type="TextBox" skin="SandText" position="0 0 300 24" align="Left Top" name="AnisotropyLabel">
                                 <Property key="Caption" value="Anisotropy"/>
                             </Widget>
-                            <Widget type="ScrollBar" skin="MW_HSlider" position="0 28 150 18" align="Left Top" name="AnisotropySlider">
+                            <Widget type="ScrollBar" skin="MW_HScroll" position="0 28 150 18" align="Left Top" name="AnisotropySlider">
                                 <Property key="Range" value="1000000"/>
                             </Widget>
                         </Widget>
@@ -241,7 +241,7 @@
                         <Widget type="TextBox" skin="NormalText" position="4 130 322 18" align="Left Top">
                             <Property key="Caption" value="#{sRender_Distance}"/>
                         </Widget>
-                        <Widget type="ScrollBar" skin="MW_HSlider" position="4 154 322 18" align="Left Top" name="ViewDistanceSlider">
+                        <Widget type="ScrollBar" skin="MW_HScroll" position="4 154 322 18" align="Left Top" name="ViewDistanceSlider">
                             <Property key="Range" value="1000000"/>
                         </Widget>
                         <Widget type="TextBox" skin="SandText" position="4 178 332 18" align="Left Top">