From e33239eae5677b1e3760422e487dfc60c1b4ea26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20S=C3=B6derberg?= <lazze_1983@hotmail.com>
Date: Sun, 25 Aug 2013 23:15:20 +0200
Subject: [PATCH] Various fixes

---
 files/mygui/core_layouteditor.xml             |  36 ++---
 files/mygui/openmw_alchemy_window.layout      |   2 +-
 files/mygui/openmw_button.skin.xml            |   2 +-
 files/mygui/openmw_confirmation_dialog.layout |  12 +-
 files/mygui/openmw_console.layout             |   4 +-
 files/mygui/openmw_console.skin.xml           |  33 +++--
 files/mygui/openmw_dialogue_window.layout     |   6 +-
 files/mygui/openmw_dialogue_window_skin.xml   |  10 +-
 files/mygui/openmw_edit.skin.xml              |  12 +-
 files/mygui/openmw_hud_energybar.skin.xml     |  16 +--
 .../openmw_interactive_messagebox.layout      |  12 +-
 files/mygui/openmw_journal_skin.xml           |   6 +-
 files/mygui/openmw_list.skin.xml              |  42 +++---
 files/mygui/openmw_messagebox.layout          |  14 +-
 files/mygui/openmw_pointer.xml                |  70 +++++-----
 files/mygui/openmw_progress.skin.xml          |  26 ++--
 files/mygui/openmw_stats_window.layout        |   2 +-
 files/mygui/openmw_text.skin.xml              | 132 +++++++++---------
 files/mygui/openmw_tooltips.layout            |   2 +-
 files/mygui/openmw_windows.skin.xml           |  86 ++++++------
 20 files changed, 263 insertions(+), 262 deletions(-)

diff --git a/files/mygui/core_layouteditor.xml b/files/mygui/core_layouteditor.xml
index db917b6ef..007b5e638 100644
--- a/files/mygui/core_layouteditor.xml
+++ b/files/mygui/core_layouteditor.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI>
     <MyGUI type="List">
-        <List file="core.skin" />
-        <List file="openmw_resources.xml" />
+        <List file="core.skin"/>
+        <List file="openmw_resources.xml"/>
         <List file="openmw_font.xml"/>
-        <List file="openmw_text.skin.xml" />
-        <List file="openmw_windows.skin.xml" />
-        <List file="openmw_button.skin.xml" />
-        <List file="openmw_list.skin.xml" />
-        <List file="openmw_edit.skin.xml" />
-        <List file="openmw_box.skin.xml" />
-        <List file="openmw_progress.skin.xml" />
-        <List file="openmw_hud_energybar.skin.xml" />
-        <List file="openmw_hud_box.skin.xml" />
-        <List file="openmw_mainmenu_skin.xml" />
-        <List file="openmw_console.skin.xml" />
-        <List file="openmw_journal_skin.xml" />
-        <List file="openmw_map_window_skin.xml" />
-        <List file="openmw_dialogue_window_skin.xml" />
-        <List file="openmw_scroll_skin.xml" />
-        <List file="openmw_settings.xml" />
+        <List file="openmw_text.skin.xml"/>
+        <List file="openmw_windows.skin.xml"/>
+        <List file="openmw_button.skin.xml"/>
+        <List file="openmw_list.skin.xml"/>
+        <List file="openmw_edit.skin.xml"/>
+        <List file="openmw_box.skin.xml"/>
+        <List file="openmw_progress.skin.xml"/>
+        <List file="openmw_hud_energybar.skin.xml"/>
+        <List file="openmw_hud_box.skin.xml"/>
+        <List file="openmw_mainmenu_skin.xml"/>
+        <List file="openmw_console.skin.xml"/>
+        <List file="openmw_journal_skin.xml"/>
+        <List file="openmw_map_window_skin.xml"/>
+        <List file="openmw_dialogue_window_skin.xml"/>
+        <List file="openmw_scroll_skin.xml"/>
+        <List file="openmw_settings.xml"/>
     </MyGUI>
 </MyGUI>
 
diff --git a/files/mygui/openmw_alchemy_window.layout b/files/mygui/openmw_alchemy_window.layout
index 2241813cf..4b15ac1bd 100644
--- a/files/mygui/openmw_alchemy_window.layout
+++ b/files/mygui/openmw_alchemy_window.layout
@@ -2,7 +2,7 @@
 
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Window_NoCaption" layer="Windows" position="0 0 588 444" name="_Main">
-       <Property key="MinSize" value="420 360"/>
+       <Property key="MinSize" value="425 360"/>
 
         <!-- Name -->
 
diff --git a/files/mygui/openmw_button.skin.xml b/files/mygui/openmw_button.skin.xml
index 4f78f7125..e152a9112 100644
--- a/files/mygui/openmw_button.skin.xml
+++ b/files/mygui/openmw_button.skin.xml
@@ -62,7 +62,7 @@
     <!-- Button widget -->
     <Skin name="MW_Button" size="136 24">
         <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Center" />
+        <Property key="TextAlign" value="Center"/>
 
         <Child type="Widget" skin="BTN_Left" offset="0 4 4 16" align="VStretch Left"/>
         <Child type="Widget" skin="BTN_Right" offset="132 4 4 16" align="VStretch Right"/>
diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/mygui/openmw_confirmation_dialog.layout
index 024b8ab3b..47e1fd2b8 100644
--- a/files/mygui/openmw_confirmation_dialog.layout
+++ b/files/mygui/openmw_confirmation_dialog.layout
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 300 125" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 300 130" name="_Main">
         <Property key="Visible" value="false"/>
 
         <Widget type="EditBox" skin="MW_TextEditClient" position="8 8 284 400" name="Message" align="Left Top Stretch">
-            <Property key="FontName" value="Default" />
-            <Property key="TextAlign" value="Top HCenter" />
-            <Property key="TextColour" value="0.75 0.6 0.35" />
+            <Property key="FontName" value="Default"/>
+            <Property key="TextAlign" value="Top HCenter"/>
+            <Property key="TextColour" value="0.75 0.6 0.35"/>
             <Property key="Static" value="true"/>
             <Property key="WordWrap" value="true"/>
-            <Property key="MultiLine" value="true" />
+            <Property key="MultiLine" value="true"/>
         </Widget>
 
-        <Widget type="HBox" position="0 84 272 24" align="Right Bottom">
+        <Widget type="HBox" position="0 89 272 24" align="Right Bottom">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
diff --git a/files/mygui/openmw_console.layout b/files/mygui/openmw_console.layout
index a65e8b4f4..bfda40c68 100644
--- a/files/mygui/openmw_console.layout
+++ b/files/mygui/openmw_console.layout
@@ -2,7 +2,7 @@
 <MyGUI type="Layout">
   <Widget type="Window" skin="MW_Window" position="0 0 400 400" layer="Console" name="_Main">
     <Property key="Caption" value="#{sConsoleTitle}"/>
-    <Property key="MinSize" value="405 245"/>
+    <Property key="MinSize" value="400 245"/>
     <Property key="MaxSize" value="2000 2000"/>
     <Property key="Visible" value="false"/>
 
@@ -12,7 +12,7 @@
     </Widget>
 
     <!-- Command line -->
-    <Widget type="EditBox" skin="MW_ConsoleCommand" position="2 335 380 28" align="HStretch Bottom" name="edit_Command"/>
+    <Widget type="EditBox" skin="MW_ConsoleCommand" position="0 338 384 28" align="HStretch Bottom" name="edit_Command"/>
 
   </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_console.skin.xml b/files/mygui/openmw_console.skin.xml
index 3537bd662..219cce39a 100644
--- a/files/mygui/openmw_console.skin.xml
+++ b/files/mygui/openmw_console.skin.xml
@@ -1,30 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Skin">
-    <Skin name="MW_LogClient" size="10 10">
-        <Property key="FontName" value="MonoFont" />
-        <Property key="TextAlign" value="Left Top" />
-        <Property key="TextColour" value="1 1 1" />
-        <BasisSkin type="EditText" offset="0 0 10 10" align="Stretch"/>
-    </Skin>
 
-    <!-- The edit control used for entering commands -->
-    <Skin name="MW_ConsoleCommand" size="29 28">
-        <Child type="TextBox" skin="MW_EditClient" offset="2 1 23 22" align="Bottom Stretch" name="Client"/>
+    <!-- Console Output -->
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 29 26" align="Bottom Stretch"/>
+    <Skin name="MW_LogClient" size="10 10">
+        <Property key="FontName" value="MonoFont"/>
+        <Property key="TextAlign" value="Left Top"/>
+        <Property key="TextColour" value="1 1 1"/>
+        <BasisSkin type="EditText" offset="0 0 10 10" align="Stretch"/>
     </Skin>
 
     <Skin name="MW_ConsoleLog" size="0 0 50 50">
-        <Property key="WordWrap" value="true" />
+        <Property key="WordWrap" value="true"/>
         <Child type="TextBox" skin="MW_LogClient" offset="0 0 35 10" align="Stretch" name="Client"/>
     </Skin>
 
+    <!-- Console Input -->
+
     <Skin name="MW_EditClient" size="10 10">
-        <Property key="FontName" value="MonoFont" />
-        <Property key="TextAlign" value="Left VCenter" />
-        <Property key="TextColour" value="1 1 1" />
-        <!--Property key="Pointer" value="beam" /-->
+        <Property key="FontName" value="MonoFont"/>
+        <Property key="TextAlign" value="Left VCenter"/>
+        <Property key="TextColour" value="1 1 1"/>
         <BasisSkin type="EditText" offset="0 0 10 10" align="Stretch"/>
     </Skin>
+
+    <Skin name="MW_ConsoleCommand" size="29 28">
+        <Child type="TextBox" skin="MW_EditClient" offset="4 2 19 22" align="Bottom Stretch" name="Client"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 29 26" align="Bottom Stretch"/>
+    </Skin>
+
 </MyGUI>
diff --git a/files/mygui/openmw_dialogue_window.layout b/files/mygui/openmw_dialogue_window.layout
index 9d54f03d0..78daa0705 100644
--- a/files/mygui/openmw_dialogue_window.layout
+++ b/files/mygui/openmw_dialogue_window.layout
@@ -15,11 +15,11 @@
             <Property key="Visible" value="false"/>
         </Widget>
 
-		<!-- The disposition bar-->
+        <!-- The disposition bar-->
         <Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="432 8 132 18"
             align="Right Top" name="Disposition">
-			<Widget type="EditBox" skin="MW_DispositionEdit" position_real="0 0 1 1" align="Stretch" name="DispositionText"/>
-		</Widget>
+            <Widget type="EditBox" skin="MW_DispositionEdit" position_real="0 0 1 1" align="Stretch" name="DispositionText"/>
+        </Widget>
         <!-- The list of topics -->
         <Widget type="MWList" skin="MW_SimpleList" position="432 31 132 328" name="TopicsList" align="Right VStretch">
         </Widget>
diff --git a/files/mygui/openmw_dialogue_window_skin.xml b/files/mygui/openmw_dialogue_window_skin.xml
index d4b76daa7..4f68a90fa 100644
--- a/files/mygui/openmw_dialogue_window_skin.xml
+++ b/files/mygui/openmw_dialogue_window_skin.xml
@@ -8,11 +8,11 @@
     </Skin>
 
     <Skin name="MW_DispositionEdit" size="0 0 50 50">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Center" />
-        <Property key="Colour" value="0000FF" />
-        <Property key="Static" value="1" />
-        <Property key="WordWrap" value="true" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Center"/>
+        <Property key="Colour" value="0000FF"/>
+        <Property key="Static" value="1"/>
+        <Property key="WordWrap" value="true"/>
         <Child type="TextBox" skin="MW_DispEdit" offset="0 0 0 -4" align="Stretch" name="Client"/>
     </Skin>
 
diff --git a/files/mygui/openmw_edit.skin.xml b/files/mygui/openmw_edit.skin.xml
index 76988a5be..b10854b19 100644
--- a/files/mygui/openmw_edit.skin.xml
+++ b/files/mygui/openmw_edit.skin.xml
@@ -21,12 +21,10 @@
         <!-- Input -->
 
         <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left VCenter"/>
+        <Property key="TextColour" value="0.75 0.6 0.35"/>
 
-        <Property key="TextAlign" value="Left 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"/>
+        <Child type="TextBox" skin="MW_TextEditClient" offset="4 1 502 18" align="Stretch" name="Client"/>
 
 
         <!-- Borders -->
@@ -39,9 +37,9 @@
 
         <Property key="FontName" value="Default"/>
 
-        <Property key="TextAlign" value="Left Top" />
+        <Property key="TextAlign" value="Left Top"/>
 
-        <Property key="TextColour" value="0.75 0.6 0.35" />
+        <Property key="TextColour" value="0.75 0.6 0.35"/>
 
         <Child type="TextBox" skin="MW_TextBoxEditClient" offset="2 2 490 18" align="Stretch" name="Client"/>
 
diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml
index f64cb6ca0..f10908d7b 100644
--- a/files/mygui/openmw_hud_energybar.skin.xml
+++ b/files/mygui/openmw_hud_energybar.skin.xml
@@ -43,32 +43,32 @@
     <!-- Main energy bar widget definitions. There's one for each color.-->
 
     <Skin name="MW_EnergyBar_Red" size="64 12">
-        <Property key="TrackSkin" value="MW_BarTrack_Red" />
-        <Property key="TrackWidth" value="1" />
+        <Property key="TrackSkin" value="MW_BarTrack_Red"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
     <Skin name="MW_EnergyBar_Green" size="64 12">
-        <Property key="TrackSkin" value="MW_BarTrack_Green" />
-        <Property key="TrackWidth" value="1" />
+        <Property key="TrackSkin" value="MW_BarTrack_Green"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
     <Skin name="MW_EnergyBar_Blue" size="64 12">
-        <Property key="TrackSkin" value="MW_BarTrack_Blue" />
-        <Property key="TrackWidth" value="1" />
+        <Property key="TrackSkin" value="MW_BarTrack_Blue"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
     <Skin name="MW_EnergyBar_Yellow" size="64 12">
-        <Property key="TrackSkin" value="MW_BarTrack_Yellow" />
-        <Property key="TrackWidth" value="1" />
+        <Property key="TrackSkin" value="MW_BarTrack_Yellow"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
diff --git a/files/mygui/openmw_interactive_messagebox.layout b/files/mygui/openmw_interactive_messagebox.layout
index 8d6b6dc34..d3ac1f8b5 100644
--- a/files/mygui/openmw_interactive_messagebox.layout
+++ b/files/mygui/openmw_interactive_messagebox.layout
@@ -3,16 +3,16 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 500 400" name="_Main">
         <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="Left Top Stretch" name="message">
-            <Property key="FontName" value="Default" />
-            <Property key="TextAlign" value="Center" />
-            <Property key="TextColour" value="0.75 0.6 0.35" />
+            <Property key="FontName" value="Default"/>
+            <Property key="TextAlign" value="Center"/>
+            <Property key="TextColour" value="0.75 0.6 0.35"/>
             <Property key="Static" value="true"/>
             <Property key="WordWrap" value="true"/>
-            <Property key="MultiLine" value="1" />
-            <Property key="VisibleVScroll" value="1" />
+            <Property key="MultiLine" value="1"/>
+            <Property key="VisibleVScroll" value="1"/>
         </Widget>
         <Widget type="Widget" skin="" position="0 0 500 400" align="Stretch" name="buttons">
-            <!-- Widget type="Button" skin="MW_Button" position="0 0 30 18" name="somefunnybutton"/ -->
+            <!-- Widget type="Button" skin="MW_Button" position="0 0 30 18" name="somefunnybutton" / -->
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_journal_skin.xml b/files/mygui/openmw_journal_skin.xml
index 9fc5e4c7f..ca6d309d7 100644
--- a/files/mygui/openmw_journal_skin.xml
+++ b/files/mygui/openmw_journal_skin.xml
@@ -2,9 +2,9 @@
 
 <MyGUI type="Skin">
         <Skin name="MW_BookClient" size="10 10">
-                <Property key="FontName" value="Default" />
-                <Property key="TextAlign" value="Left Top" />
-                <Property key="TextColour" value="0 0 0" />
+                <Property key="FontName" value="Default"/>
+                <Property key="TextAlign" value="Left Top"/>
+                <Property key="TextColour" value="0 0 0"/>
                 <!--Property key="Pointer" value="beam" /-->
                 <BasisSkin type="EditText" offset="0 0 10 10" align="Stretch"/>
         </Skin>
diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
index 54143f270..02c11c354 100644
--- a/files/mygui/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -5,8 +5,8 @@
     <!-- Horizontal Scrollbar -->
 
     <Skin name="MW_HScroll" size="90 14">
-        <Property key="TrackRangeMargins" value="14 14" />
-        <Property key="MinTrackSize" value="14" />
+        <Property key="TrackRangeMargins" value="14 14"/>
+        <Property key="MinTrackSize" value="14"/>
         <Property key="VerticalAlignment" value="false"/>
         <Property key="MoveToClick" value="true"/>
 
@@ -43,8 +43,8 @@
     <!-- Vertical Scrollbar -->
 
     <Skin name="MW_VScroll" size="14 90">
-        <Property key="TrackRangeMargins" value="14 14" />
-        <Property key="MinTrackSize" value="14" />
+        <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 -->
@@ -89,17 +89,17 @@
 
     <Skin name="HeaderText" size="16 16">
         <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Center" />
-        <Property key="TextColour" value="0.82 0.74 0.58" />
+        <Property key="TextAlign" value="Center"/>
+        <Property key="TextColour" value="0.82 0.74 0.58"/>
 
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <!-- list and multilist skins -->
 
     <Skin name="MW_ListLine" size="5 5">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left VCenter" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left VCenter"/>
 
         <BasisSkin type="SimpleText" offset="2 0 1 5" align="Stretch">
             <State name="disabled" colour="0.70 0.57 0.33" shift="0"/>
@@ -114,9 +114,9 @@
     </Skin>
 
     <Skin name="MW_List" size="516 516" align="Left Top">
-        <Property key="NeedKey" value="true" />
-        <Property key="SkinLine" value="MW_ListLine" />
-        <Property key="HeightLine" value="20" />
+        <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="Stretch"/>
 
@@ -144,9 +144,9 @@
     </Skin>
 
     <Skin name="MW_MultiSubList" size="516 516" align="Left Top">
-        <Property key="NeedKey" value="true" />
-        <Property key="SkinLine" value="MW_ListLine" />
-        <Property key="HeightLine" value="20" />
+        <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="Stretch"/>
 
@@ -157,12 +157,12 @@
     </Skin>
 
     <Skin name="MW_MultiList" size="516 516" align="Left Top">
-        <Property key="NeedKey" value="true" />
-        <Property key="SkinButton" value="ButtonSmall" />
-        <Property key="_SkinButtonEmpty" value="EditBox" />
-        <Property key="HeightButton" value="20" />
+        <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" />
+        <Property key="SkinList" value="MW_MultiSubList"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
@@ -171,7 +171,7 @@
 
     <!-- Horizontal line -->
 
-    <Skin name="MW_HLine" size="512 10"  texture="textures\menu_thin_border_top.dds">
+    <Skin name="MW_HLine" size="512 10" texture="textures\menu_thin_border_top.dds">
         <BasisSkin type="SubSkin" offset="0 0 512 2" align="Bottom HStretch">
             <State name="normal" offset="0 0 512 2"/>
         </BasisSkin>
diff --git a/files/mygui/openmw_messagebox.layout b/files/mygui/openmw_messagebox.layout
index 3d91a289a..dfdb57648 100644
--- a/files/mygui/openmw_messagebox.layout
+++ b/files/mygui/openmw_messagebox.layout
@@ -2,17 +2,17 @@
 
 <MyGUI type="Layout">
     <!--Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 0 0" name="_Main">
-        <Widget type="TextBox" skin="TextBox" position="4 4 4 4" name="message" />
+        <Widget type="TextBox" skin="TextBox" position="4 4 4 4" name="message"/>
     </Widget-->
     <Widget type="Window" skin="MW_Dialog" layer="Notification" position="0 0 0 0" name="_Main">
-        <Widget type="EditBox" skin="MW_TextEditClient" position="5 -5 0 0" name="message"  align="Left Top Stretch">
-            <Property key="FontName" value="Default" />
-            <Property key="TextAlign" value="Center" />
-            <Property key="TextColour" value="0.75 0.6 0.35" />
+        <Widget type="EditBox" skin="MW_TextEditClient" position="5 -5 0 0" name="message" align="Left Top Stretch">
+            <Property key="FontName" value="Default"/>
+            <Property key="TextAlign" value="Center"/>
+            <Property key="TextColour" value="0.75 0.6 0.35"/>
             <Property key="Static" value="true"/>
             <Property key="WordWrap" value="true"/>
-            <Property key="MultiLine" value="1" />
-            <Property key="VisibleVScroll" value="1" />
+            <Property key="MultiLine" value="1"/>
+            <Property key="VisibleVScroll" value="1"/>
         </Widget>
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_pointer.xml b/files/mygui/openmw_pointer.xml
index cf21037f8..a55a5453c 100644
--- a/files/mygui/openmw_pointer.xml
+++ b/files/mygui/openmw_pointer.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Resource">
-	<Resource type="ResourceImageSetPointer" name="arrow">
-		<Property key="Point" value="7 0"/>
-		<Property key="Size" value="32 32"/>
-		<Property key="Resource" value="ArrowPointerImage"/>
-                <Property key="Rotation" value="0"/>
-	</Resource>
-	<Resource type="ResourceImageSetPointer" name="hresize">
-		<Property key="Point" value="16 14"/>
-		<Property key="Size" value="32 32"/>
-		<Property key="Resource" value="HResizePointerImage"/>
-                <Property key="Rotation" value="0"/>
-	</Resource>
-	<Resource type="ResourceImageSetPointer" name="vresize">
-		<Property key="Point" value="17 16"/>
-		<Property key="Size" value="32 32"/>
-                <Property key="Resource" value="HResizePointerImage"/>
-                <Property key="Rotation" value="90"/>
-	</Resource>
-	<Resource type="ResourceImageSetPointer" name="dresize">
-		<Property key="Point" value="17 15"/>
-		<Property key="Size" value="32 32"/>
-                <Property key="Resource" value="HResizePointerImage"/>
-                <Property key="Rotation" value="45"/>
-	</Resource>
-	<Resource type="ResourceImageSetPointer" name="dresize2">
-		<Property key="Point" value="15 15"/>
-		<Property key="Size" value="32 32"/>
-                <Property key="Resource" value="HResizePointerImage"/>
-                <Property key="Rotation" value="-45"/>
-	</Resource>
-	<Resource type="ResourceImageSetPointer" name="drop_ground">
-		<Property key="Point" value="0 24"/>
-		<Property key="Size" value="32 32"/>
-		<Property key="Resource" value="DropGroundPointerImage"/>
-	</Resource>
+    <Resource type="ResourceImageSetPointer" name="arrow">
+        <Property key="Point" value="7 0"/>
+        <Property key="Size" value="32 32"/>
+        <Property key="Resource" value="ArrowPointerImage"/>
+        <Property key="Rotation" value="0"/>
+    </Resource>
+    <Resource type="ResourceImageSetPointer" name="hresize">
+        <Property key="Point" value="16 14"/>
+        <Property key="Size" value="32 32"/>
+        <Property key="Resource" value="HResizePointerImage"/>
+        <Property key="Rotation" value="0"/>
+    </Resource>
+    <Resource type="ResourceImageSetPointer" name="vresize">
+        <Property key="Point" value="17 16"/>
+        <Property key="Size" value="32 32"/>
+        <Property key="Resource" value="HResizePointerImage"/>
+        <Property key="Rotation" value="90"/>
+    </Resource>
+    <Resource type="ResourceImageSetPointer" name="dresize">
+        <Property key="Point" value="17 15"/>
+        <Property key="Size" value="32 32"/>
+        <Property key="Resource" value="HResizePointerImage"/>
+        <Property key="Rotation" value="45"/>
+    </Resource>
+    <Resource type="ResourceImageSetPointer" name="dresize2">
+        <Property key="Point" value="15 15"/>
+        <Property key="Size" value="32 32"/>
+        <Property key="Resource" value="HResizePointerImage"/>
+        <Property key="Rotation" value="-45"/>
+    </Resource>
+    <Resource type="ResourceImageSetPointer" name="drop_ground">
+        <Property key="Point" value="0 24"/>
+        <Property key="Size" value="32 32"/>
+        <Property key="Resource" value="DropGroundPointerImage"/>
+    </Resource>
 </MyGUI>
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index 635e40fb2..aa994fea7 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -17,7 +17,7 @@
             <State name="normal" offset="0 28 2 14"/>
         </BasisSkin>
     </Skin>
-	<Skin name="MW_BigTrack_Progress_Blue_Small" size="2 6" texture="smallbars.png" >
+    <Skin name="MW_BigTrack_Progress_Blue_Small" size="2 6" texture="smallbars.png" >
         <BasisSkin type="MainSkin" offset="0 0 2 6" align="Stretch">
             <State name="normal" offset="0 26 2 6"/>
         </BasisSkin>
@@ -25,41 +25,41 @@
 
     <Skin name="ProgressText" size="16 16">
         <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Center" />
-        <Property key="TextColour" value="0.75 0.6 0.35" />
+        <Property key="TextAlign" value="Center"/>
+        <Property key="TextColour" value="0.75 0.6 0.35"/>
 
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <!-- Main energy bar widget definitions. There's one for each color.-->
 
     <Skin name="MW_Progress_Red" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Red" />
-        <Property key="TrackWidth" value="1" />
+        <Property key="TrackSkin" value="MW_BigTrack_Red"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
     <Skin name="MW_Progress_Green" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Green" />
-        <Property key="TrackWidth" value="1" />
+        <Property key="TrackSkin" value="MW_BigTrack_Green"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
     <Skin name="MW_Progress_Blue" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Blue" />
-        <Property key="TrackWidth" value="1" />
+        <Property key="TrackSkin" value="MW_BigTrack_Blue"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
-	<Skin name="MW_Progress_Loading" size="64 6">
-        <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small" />
-        <Property key="TrackWidth" value="1" />
+    <Skin name="MW_Progress_Loading" size="64 6">
+        <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/>
+        <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 2" align="Stretch" name="Client"/>
diff --git a/files/mygui/openmw_stats_window.layout b/files/mygui/openmw_stats_window.layout
index dec962f05..5ae3f96ca 100644
--- a/files/mygui/openmw_stats_window.layout
+++ b/files/mygui/openmw_stats_window.layout
@@ -219,7 +219,7 @@
 
             <!-- Player skills, factions, birthsign and reputation -->
             <Widget type="Widget" skin="MW_Box" position="8 8 248 292" align="Left Stretch" name="Skills">
-                <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 240 284" align="Left Top Stretch" name="SkillView" />
+                <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 240 284" align="Left Top Stretch" name="SkillView"/>
             </Widget>
 
         </Widget>
diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
index 6959c1f5b..6a1dea60b 100644
--- a/files/mygui/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -4,46 +4,46 @@
 
     <!-- HTML colour: #DDC79E -->
     <Skin name="NormalText" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left Bottom" />
-        <Property key="TextColour" value="0.87 0.78 0.62" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Bottom"/>
+        <Property key="TextColour" value="0.87 0.78 0.62"/>
         <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <Skin name="NumFPS" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="HCenter Bottom" />
-        <Property key="TextColour" value="1 1 1" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="HCenter Bottom"/>
+        <Property key="TextColour" value="1 1 1"/>
         <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <!-- HTML colour: #9A9074 -->
     <Skin name="SandTextGreyedOut" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left Bottom" />
-        <Property key="TextColour" value="0.6 0.56 0.45" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Bottom"/>
+        <Property key="TextColour" value="0.6 0.56 0.45"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <!-- HTML colour: #BF9959 -->
     <Skin name="SandText" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left Bottom" />
-        <Property key="TextColour" value="0.75 0.6 0.35" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Bottom"/>
+        <Property key="TextColour" value="0.75 0.6 0.35"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <Skin name="SandTextC" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Top HCenter" />
-        <Property key="TextColour" value="0.75 0.6 0.35" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Top HCenter"/>
+        <Property key="TextColour" value="0.75 0.6 0.35"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <Skin name="SandTextRight" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Right Bottom" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Right Bottom"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch">
             <State name="normal" colour="0.75 0.6 0.35"/>
             <State name="increased" colour="0.757 0.679 0.539"/>
             <State name="decreased" colour="0.785 0.363 0.308"/>
@@ -51,36 +51,36 @@
     </Skin>
 
     <Skin name="SandBrightText" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left Bottom" />
-        <Property key="TextColour" value="0.85 0.76 0.60" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Bottom"/>
+        <Property key="TextColour" value="0.85 0.76 0.60"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <Skin name="DaedricText" size="16 16">
-        <Property key="FontName" value="daedric36" />
-        <Property key="FontHeight" value="36" />
-        <Property key="TextAlign" value="Default" />
-        <Property key="TextColour" value="1 1 1" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <Property key="FontName" value="daedric36"/>
+        <Property key="FontHeight" value="36"/>
+        <Property key="TextAlign" value="Default"/>
+        <Property key="TextColour" value="1 1 1"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <Skin name="DaedricText_orig" size="16 16">
-        <Property key="FontName" value="daedric_orig36" />
-        <Property key="FontHeight" value="36" />
-        <Property key="TextAlign" value="Default" />
-        <Property key="TextColour" value="1 1 1" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch"/>
+        <Property key="FontName" value="daedric_orig36"/>
+        <Property key="FontHeight" value="36"/>
+        <Property key="TextAlign" value="Default"/>
+        <Property key="TextColour" value="1 1 1"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
     </Skin>
 
     <Skin name="MW_StatNameC" size="200 18">
-        <Child type="TextBoxC" skin="SandText" offset="0 0 200 18" align="Left HStretch" name="StatName" />
+        <Child type="TextBoxC" skin="SandText" offset="0 0 200 18" align="Left HStretch" name="StatName"/>
     </Skin>
 
     <Skin name="SandTextButtonC" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Top HCenter" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Top HCenter"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch">
             <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.75 0.6 0.35" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
@@ -93,9 +93,9 @@
     </Skin>
 
     <Skin name="SandTextButton" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left Bottom" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Bottom"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch">
             <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.75 0.6 0.35" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
@@ -108,9 +108,9 @@
     </Skin>
 
     <Skin name="SpellText" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left Bottom" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Bottom"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch">
             <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.75 0.6 0.35" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
@@ -123,9 +123,9 @@
     </Skin>
 
     <Skin name="SpellTextUnequipped" size="16 16">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Left Bottom" />
-        <BasisSkin type="SimpleText" offset="0 0 16 16"  align="Stretch">
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Left Bottom"/>
+        <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch">
             <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.6 0.56 0.45" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
@@ -138,46 +138,46 @@
     </Skin>
 
     <Skin name="MW_StatNameButtonC" size="200 18">
-        <Child type="Button" skin="SandTextButtonC" offset="0 0 200 18" align="Left HStretch" name="StatNameButton" />
+        <Child type="Button" skin="SandTextButtonC" offset="0 0 200 18" align="Left HStretch" name="StatNameButton"/>
     </Skin>
 
 
 
     <Skin name="MW_StatNameValueButton" size="200 18">
-        <Child type="Button" skin="SandText" offset="0 0 160 18" align="Left HStretch" name="StatNameButton" />
-        <Child type="Button" skin="SandTextRight" offset="160 0 40 18" align="Right Top" name="StatValueButton" />
+        <Child type="Button" skin="SandText" offset="0 0 160 18" align="Left HStretch" name="StatNameButton"/>
+        <Child type="Button" skin="SandTextRight" offset="160 0 40 18" align="Right Top" name="StatValueButton"/>
     </Skin>
 
     <Skin name="MW_EffectImage" size="200 24">
-        <Child type="ImageBox" skin="ImageBox" offset="4 4 16 16" align="Left Top" name="Image" />
-        <Child type="TextBox" skin="SandText" offset="24 0 176 20" align="VCenter HStretch" name="Text" />
+        <Child type="ImageBox" skin="ImageBox" offset="4 4 16 16" align="Left Top" name="Image"/>
+        <Child type="TextBox" skin="SandText" offset="24 0 176 20" align="VCenter HStretch" name="Text"/>
     </Skin>
 
     <Skin name="MW_ChargeBar" size="204 18">
-        <Child type="ProgressBar" skin="MW_Progress_Red" offset="0 0 204 18" align="Right Top Stretch" name="Bar" />
-        <Child type="TextBox" skin="SandTextC" offset="0 0 204 18" align="Right Top Stretch" name="BarText" />
+        <Child type="ProgressBar" skin="MW_Progress_Red" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
+        <Child type="TextBox" skin="SandTextC" offset="0 0 204 18" align="Right Top Stretch" name="BarText"/>
     </Skin>
 
     <Skin name="MW_ChargeBar_Blue" size="204 18">
-        <Child type="ProgressBar" skin="MW_Progress_Blue" offset="0 0 204 18" align="Right Top Stretch" name="Bar" />
-        <Child type="TextBox" skin="SandTextC" offset="0 0 204 18" align="Right Top Stretch" name="BarText" />
+        <Child type="ProgressBar" skin="MW_Progress_Blue" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
+        <Child type="TextBox" skin="SandTextC" offset="0 0 204 18" align="Right Top Stretch" name="BarText"/>
     </Skin>
 
     <Skin name="MW_DynamicStat_Red" size="204 18">
-        <Child type="TextBox" skin="SandText" offset="0 0 100 18" align="Left Top" name="Text" />
-        <Child type="ProgressBar" skin="MW_Progress_Red" offset="74 0 130 18" align="Right Top" name="Bar" />
-        <Child type="TextBox" skin="SandTextC" offset="74 0 130 18" align="Right Top" name="BarText" />
+        <Child type="TextBox" skin="SandText" offset="0 0 100 18" align="Left Top" name="Text"/>
+        <Child type="ProgressBar" skin="MW_Progress_Red" offset="74 0 130 18" align="Right Top" name="Bar"/>
+        <Child type="TextBox" skin="SandTextC" offset="74 0 130 18" align="Right Top" name="BarText"/>
     </Skin>
 
     <Skin name="MW_DynamicStat_Blue" size="204 18">
-        <Child type="TextBox" skin="SandText" offset="0 0 100 18" align="Left Top" name="Text" />
-        <Child type="ProgressBar" skin="MW_Progress_Blue" offset="74 0 130 18" align="Right Top" name="Bar" />
-        <Child type="TextBox" skin="SandTextC" offset="74 0 130 18" align="Right Top" name="BarText" />
+        <Child type="TextBox" skin="SandText" offset="0 0 100 18" align="Left Top" name="Text"/>
+        <Child type="ProgressBar" skin="MW_Progress_Blue" offset="74 0 130 18" align="Right Top" name="Bar"/>
+        <Child type="TextBox" skin="SandTextC" offset="74 0 130 18" align="Right Top" name="BarText"/>
     </Skin>
 
     <Skin name="MW_DynamicStat_Green" size="204 18">
-        <Child type="TextBox" skin="SandText" offset="0 0 100 18" align="Left Top" name="Text" />
-        <Child type="ProgressBar" skin="MW_Progress_Green" offset="74 0 130 18" align="Right Top" name="Bar" />
-        <Child type="TextBox" skin="SandTextC" offset="74 0 130 18" align="Right Top" name="BarText" />
+        <Child type="TextBox" skin="SandText" offset="0 0 100 18" align="Left Top" name="Text"/>
+        <Child type="ProgressBar" skin="MW_Progress_Green" offset="74 0 130 18" align="Right Top" name="Bar"/>
+        <Child type="TextBox" skin="SandTextC" offset="74 0 130 18" align="Right Top" name="BarText"/>
     </Skin>
 </MyGUI>
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index bec6dd87c..624c133f2 100644
--- a/files/mygui/openmw_tooltips.layout
+++ b/files/mygui/openmw_tooltips.layout
@@ -200,7 +200,7 @@
 
             <!-- Birthsign image -->
             <Widget type="Widget" skin="MW_Box" position="18 13 263 137" align="Top HCenter">
-                <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthSignImage" align="Left Top" />
+                <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthSignImage" align="Left Top"/>
             </Widget>
 
             <Widget type="AutoSizedTextBox" skin="NormalText" position="8 154 284 138" align="Top" name="BirthSignText">
diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index e8861578f..22586716c 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -97,26 +97,26 @@
         <BasisSkin type="MainSkin" offset="0 0 19 19">
             <State name="normal" offset="0 0 19 19"/>
         </BasisSkin>
-        <Child type="Widget" skin="PU_B"  offset="2 17 15 2" align="Stretch"/>
+        <Child type="Widget" skin="PU_B" offset="2 17 15 2" align="Stretch"/>
         <Child type="Widget" skin="PU_BR" offset="17 17 2 2" align="Stretch"/>
-				<Child type="Widget" skin="PU_R"  offset="17 2 2 15" align="Stretch"/>
+        <Child type="Widget" skin="PU_R" offset="17 2 2 15" align="Stretch"/>
         <Child type="Widget" skin="PU_TR" offset="17 0 2 2" align="Stretch"/>
-        <Child type="Widget" skin="PU_T"  offset="2 0 15 2" align="Stretch"/>
+        <Child type="Widget" skin="PU_T" offset="2 0 15 2" align="Stretch"/>
         <Child type="Widget" skin="PU_TL" offset="0 0 2 2" align="Stretch"/>
-        <Child type="Widget" skin="PU_L"  offset="0 2 2 15" align="Stretch"/>
+        <Child type="Widget" skin="PU_L" offset="0 2 2 15" align="Stretch"/>
         <Child type="Widget" skin="PU_BL" offset="0 17 2 2" align="Stretch"/>
     </Skin>
     <Skin name="PinDown" size="19 19" texture="textures\menu_rightbuttondown_center.dds">
         <BasisSkin type="MainSkin" offset="0 0 19 19">
             <State name="normal" offset="0 0 19 19"/>
         </BasisSkin>
-        <Child type="Widget" skin="PD_B"  offset="2 17 15 2" align="Stretch"/>
+        <Child type="Widget" skin="PD_B" offset="2 17 15 2" align="Stretch"/>
         <Child type="Widget" skin="PD_BR" offset="17 17 2 2" align="Stretch"/>
-				<Child type="Widget" skin="PD_R"  offset="17 2 2 15" align="Stretch"/>
+        <Child type="Widget" skin="PD_R" offset="17 2 2 15" align="Stretch"/>
         <Child type="Widget" skin="PD_TR" offset="17 0 2 2" align="Stretch"/>
-        <Child type="Widget" skin="PD_T"  offset="2 0 15 2" align="Stretch"/>
+        <Child type="Widget" skin="PD_T" offset="2 0 15 2" align="Stretch"/>
         <Child type="Widget" skin="PD_TL" offset="0 0 2 2" align="Stretch"/>
-        <Child type="Widget" skin="PD_L"  offset="0 2 2 15" align="Stretch"/>
+        <Child type="Widget" skin="PD_L" offset="0 2 2 15" align="Stretch"/>
         <Child type="Widget" skin="PD_BL" offset="0 17 2 2" align="Stretch"/>
     </Skin>
 
@@ -167,7 +167,7 @@
         </BasisSkin>
     </Skin>
     <Skin name="DB_BL" size="4 4" texture="textures\menu_thick_border_bottom_left_corner.dds">
-        <Property key="Pointer" value="dresize2" />
+        <Property key="Pointer" value="dresize2"/>
         <BasisSkin type="MainSkin" offset="0 0 4 4">
             <State name="normal" offset="0 0 4 4"/>
         </BasisSkin>
@@ -185,7 +185,7 @@
 
     <!-- These define the window borders -->
     <Skin name="TB_B" size="512 4" texture="textures\menu_thick_border_bottom.dds">
-        <Property key="Pointer" value="vresize" />
+        <Property key="Pointer" value="vresize"/>
         <BasisSkin type="TileRect" offset="0 0 512 4" align="Stretch">
             <State name="normal" offset="0 0 512 4">
                 <Property key="TileSize" value="512 4"/>
@@ -196,7 +196,7 @@
     </Skin>
 
     <Skin name="TB_R" size="4 512" texture="textures\menu_thick_border_right.dds">
-        <Property key="Pointer" value="hresize" />
+        <Property key="Pointer" value="hresize"/>
         <BasisSkin type="TileRect" offset="0 0 4 512" align="Stretch">
             <State name="normal" offset="0 0 4 512">
                 <Property key="TileSize" value="4 512"/>
@@ -207,7 +207,7 @@
     </Skin>
 
     <Skin name="TB_T" size="512 4" texture="textures\menu_thick_border_top.dds">
-        <Property key="Pointer" value="vresize" />
+        <Property key="Pointer" value="vresize"/>
         <BasisSkin type="TileRect" offset="0 0 512 4" align="Stretch">
             <State name="normal" offset="0 0 512 4">
                 <Property key="TileSize" value="512 4"/>
@@ -218,7 +218,7 @@
     </Skin>
 
     <Skin name="TB_L" size="4 512" texture="textures\menu_thick_border_left.dds">
-        <Property key="Pointer" value="hresize" />
+        <Property key="Pointer" value="hresize"/>
         <BasisSkin type="TileRect" offset="0 0 4 512" align="Stretch">
             <State name="normal" offset="0 0 4 512">
                 <Property key="TileSize" value="4 512"/>
@@ -230,25 +230,25 @@
 
     <!-- Window border corners -->
     <Skin name="TB_BR" size="4 4" texture="textures\menu_thick_border_bottom_right_corner.dds">
-        <Property key="Pointer" value="dresize" />
+        <Property key="Pointer" value="dresize"/>
         <BasisSkin type="MainSkin" offset="0 0 4 4">
             <State name="normal" offset="0 0 4 4"/>
         </BasisSkin>
     </Skin>
     <Skin name="TB_BL" size="4 4" texture="textures\menu_thick_border_bottom_left_corner.dds">
-        <Property key="Pointer" value="dresize2" />
+        <Property key="Pointer" value="dresize2"/>
         <BasisSkin type="MainSkin" offset="0 0 4 4">
             <State name="normal" offset="0 0 4 4"/>
         </BasisSkin>
     </Skin>
     <Skin name="TB_TR" size="4 4" texture="textures\menu_thick_border_top_right_corner.dds">
-        <Property key="Pointer" value="dresize2" />
+        <Property key="Pointer" value="dresize2"/>
         <BasisSkin type="MainSkin" offset="0 0 4 4">
             <State name="normal" offset="0 0 4 4"/>
         </BasisSkin>
     </Skin>
     <Skin name="TB_TL" size="4 4" texture="textures\menu_thick_border_top_left_corner.dds">
-        <Property key="Pointer" value="dresize" />
+        <Property key="Pointer" value="dresize"/>
         <BasisSkin type="MainSkin" offset="0 0 4 4">
             <State name="normal" offset="0 0 4 4"/>
         </BasisSkin>
@@ -256,56 +256,56 @@
 
     <!-- Expanded border corners, to get larger diagonal corner pointer area -->
     <Skin name="TB_TL_T" size="10 4" texture="textures\menu_thick_border_top.dds">
-        <Property key="Pointer" value="dresize" />
+        <Property key="Pointer" value="dresize"/>
         <BasisSkin type="MainSkin" offset="0 0 10 4">
             <State name="normal" offset="0 0 10 4"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_TL_B" size="4 10" texture="textures\menu_thick_border_left.dds">
-        <Property key="Pointer" value="dresize" />
+        <Property key="Pointer" value="dresize"/>
         <BasisSkin type="MainSkin" offset="0 0 4 10">
             <State name="normal" offset="0 0 4 10"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_TR_T" size="10 4" texture="textures\menu_thick_border_top.dds">
-        <Property key="Pointer" value="dresize2" />
+        <Property key="Pointer" value="dresize2"/>
         <BasisSkin type="MainSkin" offset="0 0 10 4">
             <State name="normal" offset="0 0 10 4"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_TR_B" size="4 10" texture="textures\menu_thick_border_right.dds">
-        <Property key="Pointer" value="dresize2" />
+        <Property key="Pointer" value="dresize2"/>
         <BasisSkin type="MainSkin" offset="0 0 4 10">
             <State name="normal" offset="0 0 4 10"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_BL_T" size="4 10" texture="textures\menu_thick_border_left.dds">
-        <Property key="Pointer" value="dresize2" />
+        <Property key="Pointer" value="dresize2"/>
         <BasisSkin type="MainSkin" offset="0 0 4 10">
             <State name="normal" offset="0 0 4 10"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_BL_B" size="10 4" texture="textures\menu_thick_border_bottom.dds">
-        <Property key="Pointer" value="dresize2" />
+        <Property key="Pointer" value="dresize2"/>
         <BasisSkin type="MainSkin" offset="0 0 10 4">
             <State name="normal" offset="0 0 10 4"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_BR_T" size="4 10" texture="textures\menu_thick_border_right.dds">
-        <Property key="Pointer" value="dresize" />
+        <Property key="Pointer" value="dresize"/>
         <BasisSkin type="MainSkin" offset="0 0 4 10">
             <State name="normal" offset="0 0 4 10"/>
         </BasisSkin>
     </Skin>
 
     <Skin name="TB_BR_B" size="10 4" texture="textures\menu_thick_border_bottom.dds">
-        <Property key="Pointer" value="dresize" />
+        <Property key="Pointer" value="dresize"/>
         <BasisSkin type="MainSkin" offset="0 0 10 4">
             <State name="normal" offset="0 0 10 4"/>
         </BasisSkin>
@@ -390,9 +390,9 @@
     <!-- The actual caption. It contains the edges of the blocks on
          its sides as well -->
     <Skin name="MW_Caption" size="88 20" texture="black.png" >
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Center" />
-        <Property key="TextColour" value="0.75 0.62 0.36" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Center"/>
+        <Property key="TextColour" value="0.75 0.62 0.36"/>
 
         <BasisSkin type="SubSkin" offset="0 0 88 20" align="Stretch">
             <State name="normal" offset="0 0 8 8"/>
@@ -415,10 +415,10 @@
 ------------------------------------------------------ -->
 
     <Skin name="MW_Window" size="256 256">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Center" />
-        <Property key="TextColour" value="0.8 0.8 0.8" />
-        <Property key="Snap" value="true" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Center"/>
+        <Property key="TextColour" value="0.8 0.8 0.8"/>
+        <Property key="Snap" value="true"/>
         <Property key="MinSize" value="64 64"/>
 
         <Child type="Widget" skin="BlackBG" offset="8 28 240 220" align="Stretch" name="Client"/>
@@ -555,10 +555,10 @@
     </Skin>
 
     <Skin name="MW_Window_NoCaption" size="256 256">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Center" />
-        <Property key="TextColour" value="0.8 0.8 0.8" />
-        <Property key="Snap" value="true" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Center"/>
+        <Property key="TextColour" value="0.8 0.8 0.8"/>
+        <Property key="Snap" value="true"/>
         <Property key="MinSize" value="64 64"/>
 
         <Child type="Widget" skin="BlackBG" offset="8 28 240 220" align="Stretch" name="Client"/>
@@ -692,10 +692,10 @@
     </Skin>
 
     <Skin name="MW_Window_Pinnable" size="256 256">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Center" />
-        <Property key="TextColour" value="0.8 0.8 0.8" />
-        <Property key="Snap" value="true" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Center"/>
+        <Property key="TextColour" value="0.8 0.8 0.8"/>
+        <Property key="Snap" value="true"/>
         <Property key="MinSize" value="64 64"/>
 
         <Child type="Widget" skin="BlackBG" offset="8 28 240 220" align="Stretch" name="Client"/>
@@ -835,9 +835,9 @@
     </Skin>
 
     <Skin name="MW_Dialog" size="256 54">
-        <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="Center" />
-        <Property key="TextColour" value="0.8 0.8 0.8" />
+        <Property key="FontName" value="Default"/>
+        <Property key="TextAlign" value="Center"/>
+        <Property key="TextColour" value="0.8 0.8 0.8"/>
 
         <Child type="Widget" skin="BlackBG" offset="4 4 248 46" align="Stretch" name="Client"/>