diff --git a/files/mygui/openmw_alchemy_window.layout b/files/mygui/openmw_alchemy_window.layout
index 076a9293a1..e8a617ff98 100644
--- a/files/mygui/openmw_alchemy_window.layout
+++ b/files/mygui/openmw_alchemy_window.layout
@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 410" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 414" name="_Main">
 
-        <Widget type="TextBox" skin="SandText" position="8 8 60 24">
+        <!-- Name -->
+
+        <Widget type="TextBox" skin="SandText" position="10 10 65 24">
             <Property key="Caption" value="#{sName}"/>
-            <Property key="TextAlign" value="Center"/>
+            <Property key="TextAlign" value="Left"/>
         </Widget>
 
-        <Widget type="EditBox" skin="MW_TextEdit" position="76 8 250 24" name="NameEdit"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="70 10 500 24" name="NameEdit"/>
 
-        <Widget type="TextBox" skin="SandText" position="270 40 140 24">
+
+        <!-- Apparatus -->
+
+        <Widget type="TextBox" skin="SandText" position="10 40 260 24">
             <Property key="Caption" value="#{sApparatus}"/>
             <Property key="TextAlign" value="Left"/>
         </Widget>
 
-        <!-- Apparatus bar -->
-        <Widget type="Widget" skin="" position="270 66 230 50">
+        <Widget type="Widget" skin="" position="10 66 260 50">
+
             <Widget type="Widget" skin="MW_Box" position="0 0 50 50">
                 <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Apparatus1"/>
             </Widget>
@@ -32,15 +37,19 @@
             <Widget type="Widget" skin="MW_Box" position="180 0 50 50">
                 <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Apparatus4"/>
             </Widget>
+
         </Widget>
 
-        <Widget type="TextBox" skin="SandText" position="8 40 140 24">
+
+        <!-- Used Ingredients -->
+
+        <Widget type="TextBox" skin="SandText" position="10 120 260 24">
             <Property key="Caption" value="#{sIngredients}"/>
             <Property key="TextAlign" value="Left"/>
         </Widget>
 
-        <!-- Used ingredients bar -->
-        <Widget type="Widget" skin="" position="8 66 230 50">
+        <Widget type="Widget" skin="" position="10 146 260 50">
+
             <Widget type="Widget" skin="MW_Box" position="0 0 50 50">
                 <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Ingredient1"/>
             </Widget>
@@ -56,32 +65,44 @@
             <Widget type="Widget" skin="MW_Box" position="180 0 50 50">
                 <Widget type="ImageBox" skin="ImageBox" position="9 9 32 32" name="Ingredient4"/>
             </Widget>
+
         </Widget>
 
-        <!-- Available ingredients -->
-        <Widget type="ItemView" skin="MW_ItemView" position="8 126 247 238" name="ItemView" align="Left Top Stretch">
-        </Widget>
 
-        <!-- Created effects -->
-        <Widget type="TextBox" skin="SandText" position="270 123 200 24">
+        <!-- Available Ingredients -->
+
+        <Widget type="ItemView" skin="MW_ItemView" position="10 206 560 158" name="ItemView" align="Left Top Stretch"/>
+
+
+        <!-- Created Effects -->
+
+        <Widget type="TextBox" skin="SandText" position="250 40 320 24">
             <Property key="Caption" value="#{sCreatedEffects}"/>
             <Property key="TextAlign" value="Left"/>
         </Widget>
-        <Widget type="Widget" skin="MW_Box" position="270 149 270 214">
-            <Widget type="Widget" skin="" position="4 4 262 204" name="CreatedEffects"/>
+
+        <Widget type="Widget" skin="MW_Box" position="250 66 320 130">
+            <Widget type="Widget" skin="" position="4 4 316 122" name="CreatedEffects"/>
         </Widget>
 
+
         <!-- Buttons -->
-        <Widget type="HBox" skin="" position="160 370 380 24">
+
+        <Widget type="HBox" skin="" position="110 372 460 24">
+
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
+
             <Widget type="AutoSizedButton" skin="MW_Button" name="CreateButton">
                 <Property key="Caption" value="#{sCreate}"/>
             </Widget>
+
             <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
                 <Property key="Caption" value="#{sCancel}"/>
             </Widget>
+
         </Widget>
+
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_box.skin.xml b/files/mygui/openmw_box.skin.xml
index 2a54edd60b..09665a4ee5 100644
--- a/files/mygui/openmw_box.skin.xml
+++ b/files/mygui/openmw_box.skin.xml
@@ -64,13 +64,13 @@ as around the sections of the stats window, or around popup info windows -->
 
     <!-- Main box definition -->
     <Skin name="MW_Box" size="516 516">
-        <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"/>
+        <Child type="Widget" skin="IB_T" offset="2 0 512 2" align="Top HStretch"/>
+        <Child type="Widget" skin="IB_B" offset="2 514 512 2" align="Bottom HStretch"/>
+        <Child type="Widget" skin="IB_L" offset="0 2 2 512" align="Left VStretch"/>
+        <Child type="Widget" skin="IB_R" offset="514 2 2 512" align="Right VStretch"/>
+        <Child type="Widget" skin="IB_TL" offset="0 0 2 2" align="Top Left"/>
+        <Child type="Widget" skin="IB_TR" offset="514 0 2 2" align="Top Right"/>
+        <Child type="Widget" skin="IB_BL" offset="0 514 2 2" align="Bottom Left"/>
+        <Child type="Widget" skin="IB_BR" offset="514 514 2 2" align="Bottom Right"/>
     </Skin>
 </MyGUI>
diff --git a/files/mygui/openmw_button.skin.xml b/files/mygui/openmw_button.skin.xml
index 2895d52cc2..c66105f35f 100644
--- a/files/mygui/openmw_button.skin.xml
+++ b/files/mygui/openmw_button.skin.xml
@@ -3,7 +3,7 @@
 <MyGUI type="Skin">
     <!-- Button graphics -->
     <Skin name="BTN_Top" size="128 4" texture="textures\menu_button_frame_top.dds">
-        <BasisSkin type="TileRect" offset="0 0 128 4" align="ALIGN_HSTRETCH">
+        <BasisSkin type="TileRect" offset="0 0 128 4" align="HStretch">
             <State name="normal" offset="0 0 128 4">
                 <Property key="TileSize" value="128 4"/>
                 <Property key="TileH" value="true"/>
@@ -12,7 +12,7 @@
         </BasisSkin>
     </Skin>
     <Skin name="BTN_Bottom" size="128 4" texture="textures\menu_button_frame_bottom.dds">
-        <BasisSkin type="TileRect" offset="0 0 128 4" align="ALIGN_HSTRETCH">
+        <BasisSkin type="TileRect" offset="0 0 128 4" align="HStretch">
             <State name="normal" offset="0 0 128 4">
                 <Property key="TileSize" value="128 4"/>
                 <Property key="TileH" value="true"/>
@@ -21,7 +21,7 @@
         </BasisSkin>
     </Skin>
     <Skin name="BTN_Left" size="4 16" texture="textures\menu_button_frame_left.dds">
-        <BasisSkin type="TileRect" offset="0 0 4 16" align="ALIGN_VSTRETCH">
+        <BasisSkin type="TileRect" offset="0 0 4 16" align="VStretch">
             <State name="normal" offset="0 0 4 16">
                 <Property key="TileSize" value="4 16"/>
                 <Property key="TileH" value="true"/>
@@ -30,7 +30,7 @@
         </BasisSkin>
     </Skin>
     <Skin name="BTN_Right" size="4 16" texture="textures\menu_button_frame_right.dds">
-        <BasisSkin type="TileRect" offset="0 0 4 16" align="ALIGN_VSTRETCH">
+        <BasisSkin type="TileRect" offset="0 0 4 16" align="VStretch">
             <State name="normal" offset="0 0 4 16">
                 <Property key="TileSize" value="4 16"/>
                 <Property key="TileH" value="true"/>
@@ -62,18 +62,18 @@
     <!-- Button widget -->
     <Skin name="MW_Button" size="136 24">
         <Property key="FontName" value = "Default"/>
-        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextAlign" value = "Center" />
 
-        <Child type="Widget" skin="BTN_Left" offset="0 4 4 16" align="ALIGN_VSTRETCH ALIGN_LEFT"/>
-        <Child type="Widget" skin="BTN_Right" offset="132 4 4 16" align="ALIGN_VSTRETCH ALIGN_RIGHT"/>
-        <Child type="Widget" skin="BTN_Top" offset="4 0 128 4" align="ALIGN_HSTRETCH ALIGN_TOP"/>
-        <Child type="Widget" skin="BTN_Bottom" offset="4 20 128 4" align="ALIGN_HSTRETCH ALIGN_BOTTOM"/>
-        <Child type="Widget" skin="BTN_TopLeft" offset="0 0 4 4" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="BTN_TopRight" offset="132 0 4 4" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="BTN_BottomLeft" offset="0 20 4 4" align="ALIGN_BOTTOM ALIGN_LEFT"/>
-        <Child type="Widget" skin="BTN_BottomRight" offset="132 20 4 4" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
+        <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"/>
+        <Child type="Widget" skin="BTN_Top" offset="4 0 128 4" align="HStretch Top"/>
+        <Child type="Widget" skin="BTN_Bottom" offset="4 20 128 4" align="HStretch Bottom"/>
+        <Child type="Widget" skin="BTN_TopLeft" offset="0 0 4 4" align="Top Left"/>
+        <Child type="Widget" skin="BTN_TopRight" offset="132 0 4 4" align="Top Right"/>
+        <Child type="Widget" skin="BTN_BottomLeft" offset="0 20 4 4" align="Bottom Left"/>
+        <Child type="Widget" skin="BTN_BottomRight" offset="132 20 4 4" align="Bottom Right"/>
 
-        <BasisSkin type="SimpleText" offset="4 4 128 16" align="ALIGN_STRETCH">
+        <BasisSkin type="SimpleText" offset="4 4 128 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"/>
diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index f4b8c518d4..75f741271f 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -5,12 +5,12 @@
         <Widget type="ListBox" skin="MW_List" position="8 13 196 137" name="BirthsignList" />
 
         <!-- Birthsign image -->
-        <Widget type="Widget" skin="MW_Box" position="206 13 263 137" align="ALIGN_LEFT ALIGN_TOP">
-            <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthsignImage" align="ALIGN_LEFT ALIGN_TOP" />
+        <Widget type="Widget" skin="MW_Box" position="206 13 263 137" align="Left Top">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthsignImage" align="Left Top" />
         </Widget>
 
         <!-- Spell list -->
-        <Widget type="Widget" skin="" position="8 160 465 178" align="ALIGN_LEFT ALIGN_TOP" name="SpellArea">
+        <Widget type="Widget" skin="" position="8 160 465 178" align="Left Top" name="SpellArea">
         </Widget>
 
         <!-- Dialog buttons -->
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index 00e3793bcc..6d159fe619 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -6,56 +6,56 @@
         <Widget type="ListBox" skin="MW_List" position="14 13 181 131" name="ClassList" />
 
         <!-- Class image -->
-        <Widget type="Widget" skin="MW_Box" position="212 9 265 138" align="ALIGN_LEFT ALIGN_TOP">
-            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="ALIGN_LEFT ALIGN_TOP" />
+        <Widget type="Widget" skin="MW_Box" position="212 9 265 138" align="Left Top">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="Left Top" />
         </Widget>
 
         <!-- Specialization -->
-        <Widget type="Widget" skin="" position="15 152 484 178" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="Widget" skin="" position="15 152 484 178" align="Left Top">
 
-        <Widget type="TextBox" skin="HeaderText" position="0 0 162 18" name="SpecializationT" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="TextBox" skin="HeaderText" position="0 0 162 18" name="SpecializationT" align="Left Top">
             <Property key="Caption" value="#{sChooseClassMenu1}"/>
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Property key="TextAlign" value="Left Top"/>
             <UserString key="ToolTipType" value="Layout"/>
             <UserString key="ToolTipLayout" value="TextToolTip"/>
             <UserString key="Caption_Text" value="#{sCreateClassMenuHelp1}"/>
         </Widget>
-        <Widget type="TextBox" skin="SandText" position="0 18 162 18" name="SpecializationName" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="SandText" position="0 18 162 18" name="SpecializationName" align="Left Top">
+            <Property key="TextAlign" value="Left Top"/>
         </Widget>
 
         <!-- Favorite Attributes -->
-        <Widget type="TextBox" skin="HeaderText" position="0 41 162 18" name="FavoriteAttributesT" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="TextBox" skin="HeaderText" position="0 41 162 18" name="FavoriteAttributesT" align="Left Top">
             <Property key="Caption" value="#{sChooseClassMenu2}"/>
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Property key="TextAlign" value="Left Top"/>
             <UserString key="ToolTipType" value="Layout"/>
             <UserString key="ToolTipLayout" value="TextToolTip"/>
             <UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/>
         </Widget>
-        <Widget type="MWAttribute" skin="MW_StatName" position="0 59 162 18" name="FavoriteAttribute0" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWAttribute" skin="MW_StatName" position="0 77 162 18" name="FavoriteAttribute1" align="ALIGN_LEFT ALIGN_TOP" />
+        <Widget type="MWAttribute" skin="MW_StatName" position="0 59 162 18" name="FavoriteAttribute0" align="Left Top" />
+        <Widget type="MWAttribute" skin="MW_StatName" position="0 77 162 18" name="FavoriteAttribute1" align="Left Top" />
 
         <!-- Major Skills -->
-        <Widget type="TextBox" skin="HeaderText" position="162 0 162 18" name="MajorSkillT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="162 0 162 18" name="MajorSkillT" align="Left Top">
+            <Property key="TextAlign" value="Left Top"/>
             <Property key="Caption" value="#{sChooseClassMenu3}"/>
         </Widget>
-        <Widget type="MWSkill" skin="MW_StatName" position="162 18 162 18" name="MajorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 36 162 18" name="MajorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 54 162 18" name="MajorSkill2" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 72 162 18" name="MajorSkill3" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 90 162 18" name="MajorSkill4" align="ALIGN_LEFT ALIGN_TOP" />
+        <Widget type="MWSkill" skin="MW_StatName" position="162 18 162 18" name="MajorSkill0" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="162 36 162 18" name="MajorSkill1" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="162 54 162 18" name="MajorSkill2" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="162 72 162 18" name="MajorSkill3" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="162 90 162 18" name="MajorSkill4" align="Left Top" />
 
         <!-- Minor Skills -->
-        <Widget type="TextBox" skin="HeaderText" position="325 0 162 18" name="MinorSkillT" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="TextBox" skin="HeaderText" position="325 0 162 18" name="MinorSkillT" align="Left Top">
             <Property key="Caption" value="#{sChooseClassMenu4}"/>
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Property key="TextAlign" value="Left Top"/>
         </Widget>
-        <Widget type="MWSkill" skin="MW_StatName" position="325 18 162 18" name="MinorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 36 162 18" name="MinorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 54 162 18" name="MinorSkill2" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 72 162 18" name="MinorSkill3" align="ALIGN_LEFT ALIGN_TOP" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 90 162 18" name="MinorSkill4" align="ALIGN_LEFT ALIGN_TOP" />
+        <Widget type="MWSkill" skin="MW_StatName" position="325 18 162 18" name="MinorSkill0" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="325 36 162 18" name="MinorSkill1" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="325 54 162 18" name="MinorSkill2" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="325 72 162 18" name="MinorSkill3" align="Left Top" />
+        <Widget type="MWSkill" skin="MW_StatName" position="325 90 162 18" name="MinorSkill4" align="Left Top" />
 
         </Widget>
 
diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/mygui/openmw_chargen_class_description.layout
index 8823e1e760..46fa410d16 100644
--- a/files/mygui/openmw_chargen_class_description.layout
+++ b/files/mygui/openmw_chargen_class_description.layout
@@ -7,7 +7,7 @@
 
         <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">
+        <Widget type="EditBox" skin="MW_TextBoxEdit" position="14 14 220 192" name="TextEdit" align="Left Top STRETCH">
             <Property key="MultiLine" value="1" />
             <Property key="VisibleVScroll" value="1" />
             <Property key="WordWrap" value="1" />
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index 54f73f2211..9677f438ff 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -2,58 +2,58 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 474 192" name="_Main">
         <!-- Class name -->
-        <Widget type="TextBox" skin="ProgressText" position="12 12 48 30" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="TextBox" skin="ProgressText" position="12 12 48 30" name="LabelT" align="Left Top">
             <Property key="Caption" value="Name"/>
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_VCENTRE"/>
+            <Property key="TextAlign" value="Left VCenter"/>
         </Widget>
-        <Widget type="EditBox" skin="MW_TextEdit" position="62 12 250 30" name="EditName" align="ALIGN_HSTRETCH ALIGN_TOP"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="62 12 250 30" name="EditName" align="HStretch Top"/>
 
-        <Widget type="Widget" skin="" position="12 46 480 110" align="ALIGN_STRETCH">
+        <Widget type="Widget" skin="" position="12 46 480 110" align="Stretch">
 
             <!-- Specialization -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 156 18" name="SpecializationT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 156 18" name="SpecializationT" align="Left Top">
                 <Property key="Caption" value="#{sChooseClassMenu1}"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="TextToolTip"/>
                 <UserString key="Caption_Text" value="#{sCreateClassMenuHelp1}"/>
             </Widget>
-            <Widget type="Button" skin="SandTextButton" position="0 18 156 18" name="SpecializationName" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Widget type="Button" skin="SandTextButton" position="0 18 156 18" name="SpecializationName" align="Left Top">
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
 
             <!-- Favorite Attributes -->
-            <Widget type="TextBox" skin="HeaderText" position="0 41 156 18" name="FavoriteAttributesT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="0 41 156 18" name="FavoriteAttributesT" align="Left Top">
                 <Property key="Caption" value="#{sChooseClassMenu2}"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="TextToolTip"/>
                 <UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 59 156 18" name="FavoriteAttribute0" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 77 156 18" name="FavoriteAttribute1" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 59 156 18" name="FavoriteAttribute0" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 77 156 18" name="FavoriteAttribute1" align="Left Top" />
 
             <!-- Major Skills -->
-            <Widget type="TextBox" skin="HeaderText" position="156 0 158 18" name="MajorSkillT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="156 0 158 18" name="MajorSkillT" align="Left Top">
                 <Property key="Caption" value="Major Skills:"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 18 158 18" name="MajorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 36 158 18" name="MajorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 54 158 18" name="MajorSkill2" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 72 158 18" name="MajorSkill3" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 90 158 18" name="MajorSkill4" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 18 158 18" name="MajorSkill0" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 36 158 18" name="MajorSkill1" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 54 158 18" name="MajorSkill2" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 72 158 18" name="MajorSkill3" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 90 158 18" name="MajorSkill4" align="Left Top" />
 
             <!-- Minor Skills -->
-            <Widget type="TextBox" skin="HeaderText" position="314 0 140 18" name="MinorSkillT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="314 0 140 18" name="MinorSkillT" align="Left Top">
                 <Property key="Caption" value="Minor Skills:"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 18 140 18" name="MinorSkill0" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 36 140 18" name="MinorSkill1" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 54 140 18" name="MinorSkill2" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 72 140 18" name="MinorSkill3" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 90 140 18" name="MinorSkill4" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 18 140 18" name="MinorSkill0" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 36 140 18" name="MinorSkill1" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 54 140 18" name="MinorSkill2" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 72 140 18" name="MinorSkill3" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 90 140 18" name="MinorSkill4" align="Left Top" />
 
         </Widget>
 
diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/mygui/openmw_chargen_generate_class_result.layout
index aa4a89d28c..9ee3e07015 100644
--- a/files/mygui/openmw_chargen_generate_class_result.layout
+++ b/files/mygui/openmw_chargen_generate_class_result.layout
@@ -3,20 +3,20 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 330 256" name="_Main">
         <!-- Class image -->
-        <Widget type="Widget" skin="MW_Box" position="32 10 265 138" align="ALIGN_LEFT ALIGN_TOP">
-            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="ALIGN_LEFT ALIGN_TOP" />
+        <Widget type="Widget" skin="MW_Box" position="32 10 265 138" align="Left Top">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="Left Top" />
         </Widget>
 
         <!-- Class text -->
-        <Widget type="EditBox" skin="SandText" position="32 152 265 40" name="ReflectT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTER"/>
+        <Widget type="EditBox" skin="SandText" position="32 152 265 40" name="ReflectT" align="Left Top">
+            <Property key="TextAlign" value="Top HCenter"/>
             <Property key="MultiLine" value="true"/>
             <Property key="WordWrap" value="true"/>
             <Property key="Static" value="true"/>
         </Widget>
-        <Widget type="TextBox" skin="SandText" position="32 192 265 23" name="ClassName" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="TextBox" skin="SandText" position="32 192 265 23" name="ClassName" align="Left Top">
             <Property key="Caption" value="[Class]"/>
-            <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTER"/>
+            <Property key="TextAlign" value="Top HCenter"/>
         </Widget>
 
         <!-- Dialog buttons -->
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index 55dbe32185..0f63ba700e 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -4,9 +4,9 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 588 433" name="_Main">
 
         <!-- Appearance -->
-        <Widget type="TextBox" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="ALIGN_LEFT ALIGN_TOP">
+        <Widget type="TextBox" skin="HeaderText" position="8 16 241 18" name="AppearanceT" align="Left Top">
             <Property key="Caption" value="Appearance"/>
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+            <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <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"/>
@@ -19,57 +19,57 @@
         <!-- Gender choice -->
 
         <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 type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="Left VStretch" name="PrevGenderButton"/>
         </Widget>
 
         <Widget type="TextBox" skin="HeaderText" position="25 294 205 18" 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 type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="Right VStretch" name="NextGenderButton"/>
         </Widget>
 
         <!-- Face choice -->
 
         <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 type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="Left VStretch" name="PrevFaceButton"/>
         </Widget>
 
         <Widget type="TextBox" skin="HeaderText" position="25 316 205 18" 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 type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="Right VStretch" name="NextFaceButton"/>
         </Widget>
 
         <!-- Hair choice -->
 
         <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 type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="Left VStretch" name="PrevHairButton"/>
         </Widget>
 
         <Widget type="TextBox" skin="HeaderText" position="25 338 205 18" 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 type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="Right VStretch" name="NextHairButton"/>
         </Widget>
 
         <!-- 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 type="TextBox" skin="HeaderText" position="261 16 132 18" name="RaceT" align="Left Top">
+            <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <Widget type="ListBox" skin="MW_List" position="264 39 132 161" name="RaceList">
         </Widget>
 
         <!-- Spell powers -->
-        <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 type="TextBox" skin="HeaderText" position="261 210 132 18" name="SpellPowerT" align="Left Top">
+            <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <!-- Spell power sub-widgets will be placed here, no skin to make it invisible -->
         <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">
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="HeaderText" position="403 39 159 18" name="SkillsT" align="Left Top">
+            <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <!-- Skill bonus sub-widgets will be placed here, no skin to make it invisible -->
         <Widget type="Widget" skin="" position="403 59 159 360" name="SkillList" />
diff --git a/files/mygui/openmw_chargen_review.layout b/files/mygui/openmw_chargen_review.layout
index 97e32cfe28..84b105bd04 100644
--- a/files/mygui/openmw_chargen_review.layout
+++ b/files/mygui/openmw_chargen_review.layout
@@ -106,8 +106,8 @@
         </Widget>
 
         <!-- Player skills, factions, birthsign and reputation -->
-        <Widget type="Widget" skin="MW_Box" position="258 12 244 356" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Skills">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 236 346" align="ALIGN_STRETCH" name="SkillView" />
+        <Widget type="Widget" skin="MW_Box" position="258 12 244 356" align="Left VStretch" name="Skills">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 236 346" align="Stretch" name="SkillView" />
         </Widget>
 
         <!-- Dialog buttons -->
diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/mygui/openmw_chargen_select_attribute.layout
index 09c2a4aae0..b847bcd3bf 100644
--- a/files/mygui/openmw_chargen_select_attribute.layout
+++ b/files/mygui/openmw_chargen_select_attribute.layout
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 217 234" name="_Main">
-        <Widget type="Widget" skin="" position="14 14 186 203" align="ALIGN_STRETCH">
+        <Widget type="Widget" skin="" position="14 14 186 203" align="Stretch">
 
             <!-- Label -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 186 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 186 18" name="LabelT" align="Left Top">
                 <Property key="Caption" value="Choose a Specialization"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
 
             <!-- Attribute list -->
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 186 18" name="Attribute0" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 186 18" name="Attribute1" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 186 18" name="Attribute2" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 186 18" name="Attribute3" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 186 18" name="Attribute4" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 186 18" name="Attribute5" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 186 18" name="Attribute6" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 186 18" name="Attribute7" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 186 18" name="Attribute0" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 186 18" name="Attribute1" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 186 18" name="Attribute2" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 186 18" name="Attribute3" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 186 18" name="Attribute4" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 186 18" name="Attribute5" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 186 18" name="Attribute6" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 186 18" name="Attribute7" align="Left Top" />
 
             <!-- Dialog buttons -->
             <Widget type="AutoSizedButton" skin="MW_Button" position="120 180 66 21" name="CancelButton">
diff --git a/files/mygui/openmw_chargen_select_skill.layout b/files/mygui/openmw_chargen_select_skill.layout
index 2cf81e6c6b..90ae477e5b 100644
--- a/files/mygui/openmw_chargen_select_skill.layout
+++ b/files/mygui/openmw_chargen_select_skill.layout
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 477 270" name="_Main">
-        <Widget type="Widget" skin="" position="17 14 447 239" align="ALIGN_STRETCH">
+        <Widget type="Widget" skin="" position="17 14 447 239" align="Stretch">
 
             <!-- Label -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 447 18" name="LabelT" align="ALIGN_HCENTRE ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 447 18" name="LabelT" align="HCenter Top">
                 <Property key="Caption" value="Choose a Skill"/>
-                <Property key="TextAlign" value="ALIGN_HCENTRE ALIGN_TOP"/>
+                <Property key="TextAlign" value="HCenter Top"/>
             </Widget>
 
             <!-- Combat list -->
-            <Widget type="TextBox" skin="HeaderText" position="0 32 154 18" name="CombatLabelT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="0 32 154 18" name="CombatLabelT" align="Left Top">
                 <Property key="Caption" value="Combat"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 50 154 18" name="CombatSkill0" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 68 154 18" name="CombatSkill1" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 86 154 18" name="CombatSkill2" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 104 154 18" name="CombatSkill3" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 122 154 18" name="CombatSkill4" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 140 154 18" name="CombatSkill5" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 158 154 18" name="CombatSkill6" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 176 154 18" name="CombatSkill7" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 194 154 18" name="CombatSkill8" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 50 154 18" name="CombatSkill0" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 68 154 18" name="CombatSkill1" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 86 154 18" name="CombatSkill2" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 104 154 18" name="CombatSkill3" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 122 154 18" name="CombatSkill4" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 140 154 18" name="CombatSkill5" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 158 154 18" name="CombatSkill6" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 176 154 18" name="CombatSkill7" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 194 154 18" name="CombatSkill8" align="Left Top" />
 
             <!-- Magic list -->
-            <Widget type="TextBox" skin="HeaderText" position="158 32 154 18" name="MagicLabelT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="158 32 154 18" name="MagicLabelT" align="Left Top">
                 <Property key="Caption" value="Magic"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 50 154 18" name="MagicSkill0" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 68 154 18" name="MagicSkill1" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 86 154 18" name="MagicSkill2" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 104 154 18" name="MagicSkill3" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 122 154 18" name="MagicSkill4" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 140 154 18" name="MagicSkill5" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 158 154 18" name="MagicSkill6" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 176 154 18" name="MagicSkill7" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 194 154 18" name="MagicSkill8" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 50 154 18" name="MagicSkill0" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 68 154 18" name="MagicSkill1" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 86 154 18" name="MagicSkill2" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 104 154 18" name="MagicSkill3" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 122 154 18" name="MagicSkill4" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 140 154 18" name="MagicSkill5" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 158 154 18" name="MagicSkill6" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 176 154 18" name="MagicSkill7" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 194 154 18" name="MagicSkill8" align="Left Top" />
 
             <!-- Stealth list -->
-            <Widget type="TextBox" skin="HeaderText" position="316 32 131 18" name="StealthLabelT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="316 32 131 18" name="StealthLabelT" align="Left Top">
                 <Property key="Caption" value="Stealth"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 50 131 18" name="StealthSkill0" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 68 131 18" name="StealthSkill1" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 86 131 18" name="StealthSkill2" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 104 131 18" name="StealthSkill3" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 122 131 18" name="StealthSkill4" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 140 131 18" name="StealthSkill5" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 158 131 18" name="StealthSkill6" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 176 131 18" name="StealthSkill7" align="ALIGN_LEFT ALIGN_TOP" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 194 131 18" name="StealthSkill8" align="ALIGN_LEFT ALIGN_TOP" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 50 131 18" name="StealthSkill0" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 68 131 18" name="StealthSkill1" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 86 131 18" name="StealthSkill2" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 104 131 18" name="StealthSkill3" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 122 131 18" name="StealthSkill4" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 140 131 18" name="StealthSkill5" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 158 131 18" name="StealthSkill6" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 176 131 18" name="StealthSkill7" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 194 131 18" name="StealthSkill8" align="Left Top" />
 
             <!-- Dialog buttons -->
             <Widget type="AutoSizedButton" skin="MW_Button" position="381 218 66 21" name="CancelButton">
diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/mygui/openmw_chargen_select_specialization.layout
index e9cb76825f..7f8b5e02b5 100644
--- a/files/mygui/openmw_chargen_select_specialization.layout
+++ b/files/mygui/openmw_chargen_select_specialization.layout
@@ -2,23 +2,23 @@
 <MyGUI type="Layout">
     <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 247 144" name="_Main">
-        <Widget type="Widget" skin="" position="14 14 216 113" align="ALIGN_STRETCH">
+        <Widget type="Widget" skin="" position="14 14 216 113" align="Stretch">
 
             <!-- Label -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="Left Top">
                 <Property key="Caption" value="Choose a Specialization"/>
-                <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+                <Property key="TextAlign" value="Left Top"/>
             </Widget>
 
             <!-- Specialization list -->
-            <Widget type="Button" skin="SandTextButton" position="0 28 216 18" name="Specialization0" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTRE"/>
+            <Widget type="Button" skin="SandTextButton" position="0 28 216 18" name="Specialization0" align="Left Top">
+                <Property key="TextAlign" value="Top HCenter"/>
             </Widget>
-            <Widget type="Button" skin="SandTextButton" position="0 46 216 18" name="Specialization1" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTRE"/>
+            <Widget type="Button" skin="SandTextButton" position="0 46 216 18" name="Specialization1" align="Left Top">
+                <Property key="TextAlign" value="Top HCenter"/>
             </Widget>
-            <Widget type="Button" skin="SandTextButton" position="0 64 216 18" name="Specialization2" align="ALIGN_LEFT ALIGN_TOP">
-                <Property key="TextAlign" value="ALIGN_TOP ALIGN_HCENTRE"/>
+            <Widget type="Button" skin="SandTextButton" position="0 64 216 18" name="Specialization2" align="Left Top">
+                <Property key="TextAlign" value="Top HCenter"/>
             </Widget>
 
             <!-- Dialog buttons -->
diff --git a/files/mygui/openmw_console.skin.xml b/files/mygui/openmw_console.skin.xml
index 1758c728de..647cf06157 100644
--- a/files/mygui/openmw_console.skin.xml
+++ b/files/mygui/openmw_console.skin.xml
@@ -13,12 +13,12 @@
     <Skin name = "MW_ConsoleCommand" size = "29 26">
         <Child type="TextBox" skin="MW_EditClient" offset = "2 1 23 22" align = "Stretch" name = "Client"/>
 
-        <Child type="Widget" skin="MW_BarFrame" offset="0 0 29 26" align="ALIGN_STRETCH"/>
+        <Child type="Widget" skin="MW_BarFrame" offset="0 0 29 26" align="Stretch"/>
     </Skin>
 
     <Skin name="MW_ConsoleLog" size="0 0 50 50">
         <Property key="WordWrap" value = "true" />
-        <Child type="TextBox" skin="MW_LogClient" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
+        <Child type="TextBox" skin="MW_LogClient" offset="0 0 35 10" align = "Stretch" name = "Client"/>
         <!--Child type="VScroll" skin="VScroll" offset = "35 0 15 50" align = "Right VStretch" name = "VScroll"/-->
     </Skin>
 
diff --git a/files/mygui/openmw_dialogue_window.layout b/files/mygui/openmw_dialogue_window.layout
index a314ba3120..c42ea8d7d3 100644
--- a/files/mygui/openmw_dialogue_window.layout
+++ b/files/mygui/openmw_dialogue_window.layout
@@ -5,12 +5,12 @@
 
         <Widget type="Widget" skin="MW_Box" position="8 8 415 381" align="Stretch" name = "Client"/>
 
-        <Widget type="Widget" position="13 13 391 371" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH">
-            <Widget type="BookPage" skin="MW_BookPage" position="0 0 391 371" name="History" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH">
+        <Widget type="Widget" position="13 13 391 371" align="Left Top Stretch">
+            <Widget type="BookPage" skin="MW_BookPage" position="0 0 391 371" name="History" align="Left Top Stretch">
             </Widget>
         </Widget>
 
-        <Widget type="MWScrollBar" skin="MW_VScroll" position="404 13 14 371" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="VScroll">
+        <Widget type="MWScrollBar" skin="MW_VScroll" position="404 13 14 371" align="Right VStretch" name="VScroll">
             <Property key="Visible" value="false"/>
         </Widget>
 
diff --git a/files/mygui/openmw_dialogue_window_skin.xml b/files/mygui/openmw_dialogue_window_skin.xml
index 31ce626be0..59ff1dc8bd 100644
--- a/files/mygui/openmw_dialogue_window_skin.xml
+++ b/files/mygui/openmw_dialogue_window_skin.xml
@@ -13,7 +13,7 @@
         <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 = "ALIGN_STRETCH" name = "Client"/>
+        <Child type="TextBox" skin="MW_DispEdit" offset="0 0 0 -4" align = "Stretch" name = "Client"/>
     </Skin>
     
 </MyGUI>
diff --git a/files/mygui/openmw_edit.skin.xml b/files/mygui/openmw_edit.skin.xml
index 1f14f6f666..3307beb772 100644
--- a/files/mygui/openmw_edit.skin.xml
+++ b/files/mygui/openmw_edit.skin.xml
@@ -22,7 +22,7 @@
 
         <Property key="FontName" value = "Default"/>
 
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_VCENTER" />
+        <Property key="TextAlign" value = "Left VCenter" />
 
         <Property key="TextColour" value = "0.75 0.6 0.35" />
 
@@ -31,7 +31,7 @@
 
         <!-- Borders -->
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 512 20" align="ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 512 20" align="Stretch" name="Client"/>
 
     </Skin>
 
@@ -39,7 +39,7 @@
 
         <Property key="FontName" value = "Default"/>
 
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_TOP" />
+        <Property key="TextAlign" value = "Left Top" />
 
         <Property key="TextColour" value = "0.75 0.6 0.35" />
 
diff --git a/files/mygui/openmw_hud.layout b/files/mygui/openmw_hud.layout
index 9faa931c61..2dcb27d2a4 100644
--- a/files/mygui/openmw_hud.layout
+++ b/files/mygui/openmw_hud.layout
@@ -109,7 +109,7 @@
                 <Widget type="ScrollView" skin="MW_MapView" position="2 2 61 61" align="Left Bottom" name="MiniMap">
                     <Property key="CanvasSize" value="1536 1536"/>
 
-                    <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_BOTTOM ALIGN_LEFT" name="Compass">
+                    <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="Bottom Left" name="Compass">
                         <Property key="ImageTexture" value="textures\compass.dds"/>
                     </Widget>
 
diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml
index f847ca51ab..dd8172661b 100644
--- a/files/mygui/openmw_hud_box.skin.xml
+++ b/files/mygui/openmw_hud_box.skin.xml
@@ -8,27 +8,27 @@
 
         <!-- Borders -->
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="ALIGN_LEFT Stretch" name="Client"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="Left Stretch" name="Client"/>
 
         <!-- The interior of the box -->
 
-        <Child type="Widget" skin="BlackBG" offset="2 2 36 36" align="ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="BlackBG" offset="2 2 36 36" align="Stretch" name="Client"/>
 
     </Skin>
 
     <Skin name="HUD_Box_Transparent" size="40 40">
-        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="ALIGN_LEFT Stretch" name="Client"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="Left Stretch" name="Client"/>
     </Skin>
 
     <Skin name="HUD_Box_NoTransp" size="40 40">
 
         <!-- Borders -->
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" align="ALIGN_LEFT Stretch" name="Client"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 40 40" 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"/>
+        <Child type="Widget" skin="DialogBG" offset="2 2 36 36" align="Stretch" name="Client"/>
 
     </Skin>
 
diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml
index 9ec065e360..556732df18 100644
--- a/files/mygui/openmw_hud_energybar.skin.xml
+++ b/files/mygui/openmw_hud_energybar.skin.xml
@@ -20,30 +20,30 @@
 
     <Skin name="MW_BarFrame" size="64 12">
         <!-- Edges -->
-        <Child type="Widget" skin="HUD_Bar_Top" offset="0 0 64 2" align="ALIGN_HSTRETCH ALIGN_TOP"/>
-        <Child type="Widget" skin="HUD_Bar_Bottom" offset="0 10 64 2" align="ALIGN_HSTRETCH ALIGN_BOTTOM"/>
-        <Child type="Widget" skin="HUD_Bar_Side" offset="0 2 2 8" align="ALIGN_VSTRETCH ALIGN_LEFT"/>
-        <Child type="Widget" skin="HUD_Bar_Side" offset="62 2 2 8" align="ALIGN_VSTRETCH ALIGN_RIGHT"/>
+        <Child type="Widget" skin="HUD_Bar_Top" offset="0 0 64 2" align="HStretch Top"/>
+        <Child type="Widget" skin="HUD_Bar_Bottom" offset="0 10 64 2" align="HStretch Bottom"/>
+        <Child type="Widget" skin="HUD_Bar_Side" offset="0 2 2 8" align="VStretch Left"/>
+        <Child type="Widget" skin="HUD_Bar_Side" offset="62 2 2 8" align="VStretch Right"/>
     </Skin>
 
     <!-- Progress bar track, various colors -->
     <Skin name = "MW_BarTrack_Red" size = "4 8" texture = "smallbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "Stretch">
             <State name="normal" offset = "0 0 4 8"/>
         </BasisSkin>
     </Skin>
     <Skin name = "MW_BarTrack_Green" size = "4 8" texture = "smallbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "Stretch">
             <State name="normal" offset = "0 16 4 8"/>
         </BasisSkin>
     </Skin>
     <Skin name = "MW_BarTrack_Blue" size = "4 8" texture = "smallbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "Stretch">
             <State name="normal" offset = "0 8 4 8"/>
         </BasisSkin>
     </Skin>
     <Skin name = "MW_BarTrack_Yellow" size = "4 8" texture = "smallbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 4 8" align = "Stretch">
             <State name="normal" offset = "0 32 4 8"/>
         </BasisSkin>
     </Skin>
@@ -54,32 +54,32 @@
         <Property key="TrackSkin" value = "MW_BarTrack_Red" />
         <Property key="TrackWidth" value = "1" />
 
-        <Child type="Widget" skin="MW_BarFrame" offset="0 0 64 12" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="MW_BarFrame" 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" />
 
-        <Child type="Widget" skin="MW_BarFrame" offset="0 0 64 12" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="MW_BarFrame" 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" />
 
-        <Child type="Widget" skin="MW_BarFrame" offset="0 0 64 12" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="MW_BarFrame" 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" />
 
-        <Child type="Widget" skin="MW_BarFrame" offset="0 0 64 12" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="MW_BarFrame" offset="0 0 64 12" align="Stretch"/>
+        <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "Stretch" name="Client"/>
     </Skin>
 
 </MyGUI>
diff --git a/files/mygui/openmw_infobox.layout b/files/mygui/openmw_infobox.layout
index 89031a6162..4e70cd2c4f 100644
--- a/files/mygui/openmw_infobox.layout
+++ b/files/mygui/openmw_infobox.layout
@@ -4,13 +4,13 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 545 265" name="_Main">
 
         <!-- Edit box -->
-        <Widget type="Widget" skin="" position="14 14 516 70" name="TextBox" align="ALIGN_TOP ALIGN_HCENTER">
-            <Widget type="TextBox" skin="SandText" position="4 4 508 62" name="Text" align="ALIGN_TOP ALIGN_HCENTER">
+        <Widget type="Widget" skin="" position="14 14 516 70" name="TextBox" align="Top HCenter">
+            <Widget type="TextBox" skin="SandText" position="4 4 508 62" name="Text" align="Top HCenter">
                 <Property key="WordWrap" value="1" />
             </Widget>
         </Widget>
 
         <!-- Button bar, buttons are created as children -->
-        <Widget type="Widget" skin="" position="72 98 400 150" name="ButtonBar" align="ALIGN_TOP ALIGN_HCENTER" />
+        <Widget type="Widget" skin="" position="72 98 400 150" name="ButtonBar" align="Top HCenter" />
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_interactive_messagebox.layout b/files/mygui/openmw_interactive_messagebox.layout
index b8a71c670d..f92af813ca 100644
--- a/files/mygui/openmw_interactive_messagebox.layout
+++ b/files/mygui/openmw_interactive_messagebox.layout
@@ -2,16 +2,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="ALIGN_LEFT ALIGN_TOP STRETCH" name="message">
+        <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="ALIGN_CENTER" />
+            <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" />
         </Widget>
-        <Widget type="Widget" skin="" position="0 0 500 400" align="ALIGN_STRETCH" name="buttons">
+        <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>
     </Widget>
diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
index d680f80d2b..54143f270f 100644
--- a/files/mygui/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -12,22 +12,22 @@
 
         <!-- 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"/>
+        <Child type="Button" skin="MW_Box" offset="18 0 54 14" 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="0 0 15 14" align="Left VStretch"/>
+        <Child type="Button" skin="MW_ArrowLeft" offset="3 2 10 10" align="Left 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"/>
+        <Child type="Widget" skin="MW_Box" offset="75 0 15 14" align="Right VStretch"/>
+        <Child type="Button" skin="MW_ArrowRight" offset="76 2 10 10" align="Right 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_ScrollEmptyPart" offset="14 0 24 14" align="Top HStretch" name="FirstPart"/>
+        <Child type="Button" skin="MW_ScrollEmptyPart" offset="52 0 24 14" align="Top HStretch" name="SecondPart"/>
 
-        <Child type="Button" skin="MW_ScrollTrackH" offset="38 2 30 9" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Track"/>
+        <Child type="Button" skin="MW_ScrollTrackH" offset="38 2 30 9" align="Left VStretch" name="Track"/>
     </Skin>
 
     <Skin name="MW_ScrollTrackH" size="16 16" texture="textures\tx_menubook_bookmark.dds">
@@ -49,24 +49,24 @@
 
         <!-- 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"/>
+        <Child type="Button" skin="MW_Box" offset="0 18 14 55" 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 0 14 15" align="Top HStretch"/>
+        <Child type="Button" skin="MW_ArrowUp" offset="2 3 10 10" align="Top 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"/>
+        <Child type="Widget" skin="MW_Box" offset="0 76 14 15" align="Bottom HStretch"/>
+        <Child type="Button" skin="MW_ArrowDown" offset="2 77 10 10" align="Bottom 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"/>
+        <Child type="Button" skin="MW_ScrollEmptyPart" offset="0 14 24 14" align="Left VStretch" name="FirstPart"/>
+        <Child type="Button" skin="MW_ScrollEmptyPart" offset="0 52 24 14" align="Left 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"/>
+        <Child type="Button" skin="MW_ScrollTrackV" offset="2 40 9 30" align="Top HStretch" name="Track"/>
 
     </Skin>
 
@@ -89,19 +89,19 @@
 
     <Skin name="HeaderText" size="16 16">
         <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="ALIGN_CENTER" />
+        <Property key="TextAlign" value="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="Stretch"/>
     </Skin>
 
     <!-- list and multilist skins -->
 
     <Skin name="MW_ListLine" size="5 5">
         <Property key="FontName" value="Default" />
-        <Property key="TextAlign" value="ALIGN_LEFT ALIGN_VCENTER" />
+        <Property key="TextAlign" value="Left VCenter" />
 
-        <BasisSkin type="SimpleText" offset="2 0 1 5" align="ALIGN_STRETCH">
+        <BasisSkin type="SimpleText" offset="2 0 1 5" 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"/>
@@ -113,50 +113,50 @@
         </BasisSkin>
     </Skin>
 
-    <Skin name="MW_List" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
+    <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" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
-        <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="VScroll"/>
+        <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="Right VStretch" name="VScroll"/>
 
-        <Child type="Widget" skin="" offset="3 3 493 509" align="ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="" offset="3 3 493 509" align="Stretch" name="Client"/>
 
     </Skin>
 
-    <Skin name="MW_ItemView" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
-        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
+    <Skin name="MW_ItemView" size="516 516" align="Left Top">
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
-        <Child type="ScrollView" skin="MW_ScrollViewH" offset="3 3 509 509" align="ALIGN_STRETCH" name="ScrollView">
+        <Child type="ScrollView" skin="MW_ScrollViewH" offset="3 3 509 509" align="Stretch" name="ScrollView">
             <Property key="CanvasAlign" value="Left Top"/>
             <Property key="NeedMouse" value="true"/>
         </Child>
     </Skin>
 
-    <Skin name="MW_SimpleList" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
+    <Skin name="MW_SimpleList" size="516 516" align="Left Top">
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
-        <Child type="Widget" skin="" offset="3 3 510 510" align="Top Left ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="" offset="3 3 510 510" align="Top Left Stretch" name="Client"/>
 
     </Skin>
 
-    <Skin name="MW_MultiSubList" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
+    <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" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
-        <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="VScroll"/>
+        <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="Right VStretch" name="VScroll"/>
 
-        <Child type="Widget" skin="Default" offset="3 3 493 509" align="ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="Default" offset="3 3 493 509" align="Stretch" name="Client"/>
 
     </Skin>
 
-    <Skin name="MW_MultiList" size="516 516" align="ALIGN_LEFT ALIGN_TOP">
+    <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" />
@@ -164,15 +164,15 @@
 
         <Property key="SkinList" value="MW_MultiSubList" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="ALIGN_STRETCH"/>
+        <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
-        <Child type="Widget" skin="" offset="3 3 516 516" align="ALIGN_STRETCH" name="Client"/>
+        <Child type="Widget" skin="" offset="3 3 516 516" 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">
+        <BasisSkin type="SubSkin" offset="0 0 512 2" align="Bottom HStretch">
             <State name="normal" offset="0 0 512 2"/>
         </BasisSkin>
     </Skin>
diff --git a/files/mygui/openmw_map_window.layout b/files/mygui/openmw_map_window.layout
index d4b87e60d1..b1b0ef733b 100644
--- a/files/mygui/openmw_map_window.layout
+++ b/files/mygui/openmw_map_window.layout
@@ -4,34 +4,34 @@
     <Widget type="ExposedWindow" skin="MW_Window_Pinnable" layer="Windows" position="0 0 300 300" name="_Main">
 
         <!-- Local map -->
-        <Widget type="ScrollView" skin="MW_MapView" position="0 0 284 264" align="ALIGN_STRETCH" name="LocalMap">
+        <Widget type="ScrollView" skin="MW_MapView" position="0 0 284 264" align="Stretch" name="LocalMap">
             <Property key="CanvasSize" value="1536 1536"/>
 
-            <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_TOP ALIGN_LEFT" name="CompassLocal">
+            <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="Top Left" name="CompassLocal">
                 <Property key="ImageTexture" value="textures\compass.dds"/>
             </Widget>
 
-            <Widget type="Button" skin="" position_real="0 0 1 1" name="EventBoxLocal" align="ALIGN_STRETCH"/>
+            <Widget type="Button" skin="" position_real="0 0 1 1" name="EventBoxLocal" align="Stretch"/>
         </Widget>
 
         <!-- Global map -->
-        <Widget type="ScrollView" skin="MW_MapView" position="0 0 284 264" align="ALIGN_STRETCH" name="GlobalMap">
+        <Widget type="ScrollView" skin="MW_MapView" position="0 0 284 264" align="Stretch" name="GlobalMap">
             <Property key="CanvasSize" value="1536 1536"/>
 
             <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Stretch" name="GlobalMapImage">
                 <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Stretch" name="GlobalMapOverlay"/>
             </Widget>
 
-            <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_TOP ALIGN_LEFT" name="CompassGlobal">
+            <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="Top Left" name="CompassGlobal">
                 <Property key="ImageTexture" value="textures\compass.dds"/>
             </Widget>
 
-            <Widget type="Button" skin="" position_real="0 0 1 1" name="EventBoxGlobal" align="ALIGN_STRETCH"/>
+            <Widget type="Button" skin="" position_real="0 0 1 1" name="EventBoxGlobal" align="Stretch"/>
         </Widget>
 
 
         <!-- World button -->
-        <Widget type="AutoSizedButton" skin="MW_Button" position="213 233 61 22" align="ALIGN_BOTTOM ALIGN_RIGHT" name="WorldButton">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="213 233 61 22" align="Bottom Right" name="WorldButton">
             <Property key="ExpandDirection" value="Left"/>
         </Widget>
 
diff --git a/files/mygui/openmw_map_window_skin.xml b/files/mygui/openmw_map_window_skin.xml
index 2f5bb4faf8..887e33293c 100644
--- a/files/mygui/openmw_map_window_skin.xml
+++ b/files/mygui/openmw_map_window_skin.xml
@@ -5,7 +5,7 @@
         <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
 
         <!-- invisible scroll bars, needed for setting the view offset -->
-        <Child type="MWScrollBar" skin="" offset="0 0 0 0" align="ALIGN_DEFAULT" name="VScroll"/>
-        <Child type="MWScrollBar" skin="" offset="0 0 0 0" align="ALIGN_DEFAULT" name="HScroll"/>
+        <Child type="MWScrollBar" skin="" offset="0 0 0 0" align="Default" name="VScroll"/>
+        <Child type="MWScrollBar" skin="" offset="0 0 0 0" align="Default" name="HScroll"/>
     </Skin>
 </MyGUI>
diff --git a/files/mygui/openmw_messagebox.layout b/files/mygui/openmw_messagebox.layout
index c5a7464ef6..f90ffc6363 100644
--- a/files/mygui/openmw_messagebox.layout
+++ b/files/mygui/openmw_messagebox.layout
@@ -5,9 +5,9 @@
         <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="ALIGN_LEFT ALIGN_TOP STRETCH">
+        <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="ALIGN_CENTER" />
+            <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"/>
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index 4666be2217..fa0501b738 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -3,32 +3,32 @@
 <MyGUI type="Skin">
     <!-- Progress bar track, various colors -->
     <Skin name = "MW_BigTrack_Red" size = "2 14" texture = "bigbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 2 14" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 2 14" align = "Stretch">
             <State name="normal" offset = "0 0 2 14"/>
         </BasisSkin>
     </Skin>
     <Skin name = "MW_BigTrack_Blue" size = "2 14" texture = "bigbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 2 14" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 2 14" align = "Stretch">
             <State name="normal" offset = "0 14 2 14"/>
         </BasisSkin>
     </Skin>
     <Skin name = "MW_BigTrack_Green" size = "2 14" texture = "bigbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 2 14" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 2 14" align = "Stretch">
             <State name="normal" offset = "0 28 2 14"/>
         </BasisSkin>
     </Skin>
 	<Skin name = "MW_BigTrack_Progress_Blue_Small" size = "2 6" texture = "smallbars.png" >
-        <BasisSkin type="MainSkin" offset = "0 0 2 6" align = "ALIGN_STRETCH">
+        <BasisSkin type="MainSkin" offset = "0 0 2 6" align = "Stretch">
             <State name="normal" offset = "0 26 2 6"/>
         </BasisSkin>
     </Skin>
 
     <Skin name = "ProgressText" size = "16 16">
         <Property key="FontName" value = "Default"/>
-        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <Property key="TextAlign" value = "Center" />
         <Property key="TextColour" value = "0.75 0.6 0.35" />
 
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
+        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "Stretch"/>
     </Skin>
 
     <!-- Main energy bar widget definitions. There's one for each color.-->
@@ -37,31 +37,31 @@
         <Property key="TrackSkin" value = "MW_BigTrack_Red" />
         <Property key="TrackWidth" value = "1" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
+        <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" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
+        <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" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
+        <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" />
 
-        <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="ALIGN_STRETCH"/>
-        <Child type="Widget" skin="BlackBG" offset = "2 2 60 2" align = "ALIGN_STRETCH" name="Client"/>
+        <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"/>
     </Skin>
 </MyGUI>
diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml
index e47ff6386d..75569eda4e 100644
--- a/files/mygui/openmw_resources.xml
+++ b/files/mygui/openmw_resources.xml
@@ -263,10 +263,10 @@
     <Resource type="ResourceLayout" name="MW_StatNameValue" version="3.2.0">
         <Widget type="Widget" skin="" position="0 0 200 18" name="Root">
             <Property key="NeedMouse" value="true"/>
-            <Widget type="TextBox" skin="SandText" position = "0 0 160 18" align = "ALIGN_LEFT ALIGN_HSTRETCH" name = "StatName">
+            <Widget type="TextBox" skin="SandText" position = "0 0 160 18" align = "Left HStretch" name = "StatName">
                 <Property key="NeedMouse" value="false"/>
             </Widget>
-            <Widget type="TextBox" skin="SandTextRight" position = "160 0 40 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "StatValue">
+            <Widget type="TextBox" skin="SandTextRight" position = "160 0 40 18" align = "Right Top" name = "StatValue">
                 <Property key="NeedMouse" value="false"/>
             </Widget>
         </Widget>
@@ -275,7 +275,7 @@
     <Resource type="ResourceLayout" name="MW_StatName" version="3.2.0">
         <Widget type="Widget" skin="" position="0 0 200 18" name="Root">
             <Property key="NeedMouse" value="true"/>
-            <Widget type="TextBox" skin="SandText" position="0 0 200 18" align="ALIGN_LEFT ALIGN_HSTRETCH" name="StatName">
+            <Widget type="TextBox" skin="SandText" position="0 0 200 18" align="Left HStretch" name="StatName">
                 <Property key="NeedMouse" value="false"/>
             </Widget>
         </Widget>
@@ -283,7 +283,7 @@
 
     <Resource type="ResourceLayout" name="MW_StatNameButton" version="3.2.0">
         <Widget type="Widget" skin="" position="0 0 200 18" name="Root">
-            <Widget type="Button" skin="SandTextButton" position = "0 0 200 18" align = "ALIGN_LEFT ALIGN_HSTRETCH" name = "StatNameButton">
+            <Widget type="Button" skin="SandTextButton" position = "0 0 200 18" align = "Left HStretch" name = "StatNameButton">
                 <Property key="NeedMouse" value="true"/>
             </Widget>
         </Widget>
diff --git a/files/mygui/openmw_scroll_skin.xml b/files/mygui/openmw_scroll_skin.xml
index 76e22c69fe..b6ed9155f1 100644
--- a/files/mygui/openmw_scroll_skin.xml
+++ b/files/mygui/openmw_scroll_skin.xml
@@ -4,12 +4,12 @@
 
     <Skin name="MW_ScrollView" size="516 516">
         <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
-        <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="ALIGN_RIGHT ALIGN_TOP ALIGN_VSTRETCH" name="VScroll"/>
+        <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="Right Top VStretch" name="VScroll"/>
     </Skin>
 
     <Skin name="MW_ScrollViewH" size="516 516">
         <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
-        <Child type="MWScrollBar" skin="MW_HScroll" offset="3 498 509 14" align="ALIGN_LEFT ALIGN_BOTTOM ALIGN_HSTRETCH" name="HScroll"/>
+        <Child type="MWScrollBar" skin="MW_HScroll" offset="3 498 509 14" align="Left Bottom HStretch" name="HScroll"/>
     </Skin>
 
 </MyGUI>
diff --git a/files/mygui/openmw_spell_buying_window.layout b/files/mygui/openmw_spell_buying_window.layout
index c55cd0e22d..1510372ddb 100644
--- a/files/mygui/openmw_spell_buying_window.layout
+++ b/files/mygui/openmw_spell_buying_window.layout
@@ -15,8 +15,8 @@
         </Widget>
 
 
-        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="ALIGN_LEFT ALIGN_STRETCH">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH" name="SpellsView">
+        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="SpellsView">
                 <Property key="CanvasAlign" value="Left"/>
             </Widget>
         </Widget>
diff --git a/files/mygui/openmw_stats_window.layout b/files/mygui/openmw_stats_window.layout
index 55ee7b9dac..d1c89593cf 100644
--- a/files/mygui/openmw_stats_window.layout
+++ b/files/mygui/openmw_stats_window.layout
@@ -217,8 +217,8 @@
         <Widget type="Widget" skin="" name="RightPane" position="220 0 280 342">
 
             <!-- Player skills, factions, birthsign and reputation -->
-            <Widget type="Widget" skin="MW_Box" position="8 8 248 292" align="ALIGN_LEFT ALIGN_STRETCH" name="Skills">
-                <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 240 284" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH" name="SkillView" />
+            <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>
 
         </Widget>
diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
index b2a15b503b..5e07665e6c 100644
--- a/files/mygui/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -5,45 +5,45 @@
     <!-- HTML colour: #DDC79E -->
     <Skin name = "NormalText" size = "16 16">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
+        <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 = "ALIGN_STRETCH"/>
+        <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 = "ALIGN_HCENTER ALIGN_BOTTOM" />
+        <Property key="TextAlign" value = "HCenter Bottom" />
         <Property key="TextColour" value = "1 1 1" />
-        <BasisSkin type="SimpleText" offset = "0 0 16 16" align = "ALIGN_STRETCH"/>
+        <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 = "ALIGN_LEFT ALIGN_BOTTOM" />
+        <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 = "ALIGN_STRETCH"/>
+        <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 = "ALIGN_LEFT ALIGN_BOTTOM" />
+        <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 = "ALIGN_STRETCH"/>
+        <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 = "ALIGN_STRETCH"/>
+        <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 = "ALIGN_RIGHT ALIGN_BOTTOM" />
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
+        <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"/>
@@ -52,25 +52,25 @@
 
     <Skin name = "SandBrightText" size = "16 16">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
+        <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 = "ALIGN_STRETCH"/>
+        <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 = "ALIGN_DEFAULT" />
+        <Property key="TextAlign" value = "Default" />
         <Property key="TextColour" value = "1 1 1" />
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
+        <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 = "ALIGN_DEFAULT" />
+        <Property key="TextAlign" value = "Default" />
         <Property key="TextColour" value = "1 1 1" />
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH"/>
+        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "Stretch"/>
     </Skin>
 
     <Skin name = "MW_StatNameC" size = "200 18">
@@ -80,7 +80,7 @@
     <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 = "ALIGN_STRETCH">
+        <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"/>
@@ -94,8 +94,8 @@
 
     <Skin name = "SandTextButton" size = "16 16">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
+        <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"/>
@@ -109,8 +109,8 @@
 
     <Skin name = "SpellText" size = "16 16">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
+        <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"/>
@@ -124,8 +124,8 @@
 
     <Skin name = "SpellTextUnequipped" size = "16 16">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
-        <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
+        <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"/>
@@ -144,40 +144,40 @@
 
 
     <Skin name = "MW_StatNameValueButton" size = "200 18">
-        <Child type="Button" skin="SandText" offset = "0 0 160 18" align = "ALIGN_LEFT ALIGN_HSTRETCH" name = "StatNameButton" />
-        <Child type="Button" skin="SandTextRight" offset = "160 0 40 18" align = "ALIGN_RIGHT ALIGN_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 = "ALIGN_LEFT ALIGN_TOP" name = "Image" />
-        <Child type="TextBox" skin="SandText" offset = "24 0 176 20" align = "ALIGN_VCENTRE ALIGN_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 = "ALIGN_RIGHT ALIGN_TOP ALIGN_STRETCH" name = "Bar" />
-        <Child type="TextBox" skin="SandTextC" offset = "0 0 204 18" align = "ALIGN_RIGHT ALIGN_TOP ALIGN_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 = "ALIGN_RIGHT ALIGN_TOP ALIGN_STRETCH" name = "Bar" />
-        <Child type="TextBox" skin="SandTextC" offset = "0 0 204 18" align = "ALIGN_RIGHT ALIGN_TOP ALIGN_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 = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="ProgressBar" skin="MW_Progress_Red" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
-        <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_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 = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="ProgressBar" skin="MW_Progress_Blue" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
-        <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_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 = "ALIGN_LEFT ALIGN_TOP" name = "Text" />
-        <Child type="ProgressBar" skin="MW_Progress_Green" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_TOP" name = "Bar" />
-        <Child type="TextBox" skin="SandTextC" offset = "74 0 130 18" align = "ALIGN_RIGHT ALIGN_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_text_input.layout b/files/mygui/openmw_text_input.layout
index a2ed94c672..012b0a82b3 100644
--- a/files/mygui/openmw_text_input.layout
+++ b/files/mygui/openmw_text_input.layout
@@ -4,10 +4,10 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 320 97" name="_Main">
 
         <!-- Appearance -->
-        <Widget type="TextBox" skin="ProgressText" position="6 6 300 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
-            <Property key="TextAlign" value="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="TextBox" skin="ProgressText" position="6 6 300 18" name="LabelT" align="Left Top">
+            <Property key="TextAlign" value="Left Top"/>
         </Widget>
-        <Widget type="EditBox" skin="MW_TextEdit" position="6 28 300 30" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="6 28 300 30" name="TextEdit" align="Left Top"/>
 
         <!-- Dialog buttons -->
         <Widget type="AutoSizedButton" skin="MW_Button" position="264 60 42 23" name="OKButton">
diff --git a/files/mygui/openmw_tooltips.layout b/files/mygui/openmw_tooltips.layout
index 7291f2ca21..bec6dd87c6 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="ALIGN_LEFT ALIGN_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_travel_window.layout b/files/mygui/openmw_travel_window.layout
index 07a6daf489..db3fa24a08 100644
--- a/files/mygui/openmw_travel_window.layout
+++ b/files/mygui/openmw_travel_window.layout
@@ -15,8 +15,8 @@
         </Widget>
 
 
-        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="ALIGN_LEFT ALIGN_STRETCH">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH" name="DestinationsView">
+        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="DestinationsView">
                 <Property key="CanvasAlign" value="Left"/>
             </Widget>
         </Widget>
diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml
index 73f68e80dc..fd898ad3c4 100644
--- a/files/mygui/openmw_windows.skin.xml
+++ b/files/mygui/openmw_windows.skin.xml
@@ -97,27 +97,27 @@
         <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="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PU_BR" offset="17 17 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-				<Child type="Widget" skin="PU_R"  offset="17 2 2 15" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PU_TR" offset="17 0 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PU_T"  offset="2 0 15 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PU_TL" offset="0 0 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PU_L"  offset="0 2 2 15" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PU_BL" offset="0 17 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
+        <Child type="Widget" skin="PU_B"  offset="2 17 15 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PU_BR" offset="17 17 2 2" align="HStretch VStretch"/>
+				<Child type="Widget" skin="PU_R"  offset="17 2 2 15" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PU_TR" offset="17 0 2 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PU_T"  offset="2 0 15 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PU_TL" offset="0 0 2 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PU_L"  offset="0 2 2 15" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PU_BL" offset="0 17 2 2" align="HStretch VStretch"/>
     </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="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PD_BR" offset="17 17 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-				<Child type="Widget" skin="PD_R"  offset="17 2 2 15" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PD_TR" offset="17 0 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PD_T"  offset="2 0 15 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PD_TL" offset="0 0 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PD_L"  offset="0 2 2 15" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
-        <Child type="Widget" skin="PD_BL" offset="0 17 2 2" align="ALIGN_HSTRETCH ALIGN_VSTRETCH"/>
+        <Child type="Widget" skin="PD_B"  offset="2 17 15 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PD_BR" offset="17 17 2 2" align="HStretch VStretch"/>
+				<Child type="Widget" skin="PD_R"  offset="17 2 2 15" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PD_TR" offset="17 0 2 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PD_T"  offset="2 0 15 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PD_TL" offset="0 0 2 2" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PD_L"  offset="0 2 2 15" align="HStretch VStretch"/>
+        <Child type="Widget" skin="PD_BL" offset="0 17 2 2" align="HStretch VStretch"/>
     </Skin>
 
     <!-- Defines a pure black background -->
@@ -319,36 +319,36 @@
     </Skin>
 
     <Skin name="HB_ALL" size="260 20">
-        <Child type="Widget" skin="HB_MID" offset="2 2 256 16" align="ALIGN_TOP ALIGN_LEFT ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="HB_TOP" offset="2 0 256 2" align="ALIGN_TOP ALIGN_HSTRETCH ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="HB_BOTTOM" offset="2 18 256 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH"/>
-        <Child type="Widget" skin="HB_LEFT" offset="0 2 2 16" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="HB_RIGHT" offset="258 2 2 16" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="HB_TR" offset="258 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="HB_TL" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="HB_BR" offset="258 18 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
-        <Child type="Widget" skin="HB_BL" offset="0 18 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
+        <Child type="Widget" skin="HB_MID" offset="2 2 256 16" align="Top Left HStretch"/>
+        <Child type="Widget" skin="HB_TOP" offset="2 0 256 2" align="Top HStretch HStretch"/>
+        <Child type="Widget" skin="HB_BOTTOM" offset="2 18 256 2" align="Bottom HStretch"/>
+        <Child type="Widget" skin="HB_LEFT" offset="0 2 2 16" align="Top Left"/>
+        <Child type="Widget" skin="HB_RIGHT" offset="258 2 2 16" align="Top Right"/>
+        <Child type="Widget" skin="HB_TR" offset="258 0 2 2" align="Top Right"/>
+        <Child type="Widget" skin="HB_TL" offset="0 0 2 2" align="Top Left"/>
+        <Child type="Widget" skin="HB_BR" offset="258 18 2 2" align="Bottom Right"/>
+        <Child type="Widget" skin="HB_BL" offset="0 18 2 2" align="Bottom Left"/>
     </Skin>
 
     <!-- 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 = "ALIGN_CENTER" />
+        <Property key="TextAlign" value = "Center" />
         <Property key="TextColour" value = "0.75 0.62 0.36" />
 
-        <BasisSkin type="SubSkin" offset="0 0 88 20" align="ALIGN_STRETCH">
+        <BasisSkin type="SubSkin" offset="0 0 88 20" align="Stretch">
             <State name="normal" offset = "0 0 8 8"/>
         </BasisSkin>
-        <BasisSkin type="SimpleText" offset = "2 0 84 20" align = "ALIGN_STRETCH"/>
+        <BasisSkin type="SimpleText" offset = "2 0 84 20" align = "Stretch"/>
 
         <!-- Add the borders of the surrounding blocks -->
-        <Child type="Widget" skin="HB_LEFT" offset="86 2 2 16" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="HB_RIGHT" offset="0 2 2 16" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="HB_TR" offset="0 0 2 2" align="ALIGN_TOP ALIGN_LEFT"/>
-        <Child type="Widget" skin="HB_TL" offset="86 0 2 2" align="ALIGN_TOP ALIGN_RIGHT"/>
-        <Child type="Widget" skin="HB_BR" offset="0 18 2 2" align="ALIGN_BOTTOM ALIGN_LEFT"/>
-        <Child type="Widget" skin="HB_BL" offset="86 18 2 2" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
+        <Child type="Widget" skin="HB_LEFT" offset="86 2 2 16" align="Top Right"/>
+        <Child type="Widget" skin="HB_RIGHT" offset="0 2 2 16" align="Top Left"/>
+        <Child type="Widget" skin="HB_TR" offset="0 0 2 2" align="Top Left"/>
+        <Child type="Widget" skin="HB_TL" offset="86 0 2 2" align="Top Right"/>
+        <Child type="Widget" skin="HB_BR" offset="0 18 2 2" align="Bottom Left"/>
+        <Child type="Widget" skin="HB_BL" offset="86 18 2 2" align="Bottom Right"/>
     </Skin>
 
 <!-- ----------------------------------------------------
@@ -359,266 +359,266 @@
 
     <Skin name = "MW_Window" size = "256 54">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <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 18" align = "ALIGN_STRETCH" name = "Client"/>
+        <Child type="Widget" skin="BlackBG" offset = "8 28 240 18" align = "Stretch" name = "Client"/>
 
         <!-- Outer borders -->
-        <Child type="Widget" skin="TB_T" offset="4 0 248 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_T" offset="4 0 248 4" align="Top HStretch" name="Action">
             <Property key="Scale" value = "0 1 0 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_L" offset="0 4 4 46" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_L" offset="0 4 4 46" align="Left VStretch" name="Action">
             <Property key="Scale" value = "1 0 -1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_B" offset="4 50 248 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_B" offset="4 50 248 4" align="Bottom HStretch" name="Action">
             <Property key="Scale" value = "0 0 0 1"/>
         </Child>
-        <Child type="Widget" skin="TB_R" offset="252 4 4 46" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_R" offset="252 4 4 46" align="Right VStretch" name="Action">
             <Property key="Scale" value = "0 0 1 0"/>
         </Child>
 
-        <Child type="Widget" skin="TB_BR" offset="252 50 4 4" align="ALIGN_RIGHT ALIGN_BOTTOM" name="Action">
+        <Child type="Widget" skin="TB_BR" offset="252 50 4 4" align="Right Bottom" name="Action">
             <Property key="Scale" value = "0 0 1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_BL" offset="0 50 4 4" align="ALIGN_LEFT ALIGN_BOTTOM" name="Action">
+        <Child type="Widget" skin="TB_BL" offset="0 50 4 4" align="Left Bottom" name="Action">
             <Property key="Scale" value = "1 0 -1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_TR" offset="252 0 4 4" align="ALIGN_RIGHT ALIGN_TOP" name="Action">
+        <Child type="Widget" skin="TB_TR" offset="252 0 4 4" align="Right Top" name="Action">
             <Property key="Scale" value = "0 1 1 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_TL" offset="0 0 4 4" align="ALIGN_LEFT ALIGN_TOP" name="Action">
+        <Child type="Widget" skin="TB_TL" offset="0 0 4 4" align="Left Top" name="Action">
             <Property key="Scale" value = "1 1 -1 -1"/>
         </Child>
 
         <!-- Inner borders -->
-        <Child type="Widget" skin="TB_T" offset="8 24 240 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_T" offset="8 24 240 4" align="Top HStretch" name="Action">
             <Property key="Scale" value = "0 1 0 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_L" offset="4 28 4 18" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_L" offset="4 28 4 18" align="Left VStretch" name="Action">
             <Property key="Scale" value = "1 0 -1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_B" offset="8 46 240 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_B" offset="8 46 240 4" align="Bottom HStretch" name="Action">
             <Property key="Scale" value = "0 0 0 1"/>
         </Child>
-        <Child type="Widget" skin="TB_R" offset="248 28 4 18" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_R" offset="248 28 4 18" align="Right VStretch" name="Action">
             <Property key="Scale" value = "0 0 1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_BR" offset="248 46 4 4" align="ALIGN_BOTTOM ALIGN_RIGHT" name="Action">
+        <Child type="Widget" skin="TB_BR" offset="248 46 4 4" align="Bottom Right" name="Action">
             <Property key="Scale" value = "0 0 1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_BL" offset="4 46 4 4" align="ALIGN_BOTTOM ALIGN_LEFT" name="Action">
+        <Child type="Widget" skin="TB_BL" offset="4 46 4 4" align="Bottom Left" name="Action">
             <Property key="Scale" value = "1 0 -1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_TR" offset="248 24 4 4" align="ALIGN_TOP ALIGN_RIGHT" name="Action">
+        <Child type="Widget" skin="TB_TR" offset="248 24 4 4" align="Top Right" name="Action">
             <Property key="Scale" value = "0 1 1 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_TL" offset="4 24 4 4" align="ALIGN_TOP ALIGN_LEFT" name="Action">
+        <Child type="Widget" skin="TB_TL" offset="4 24 4 4" align="Top Left" name="Action">
             <Property key="Scale" value = "1 1 -1 -1"/>
         </Child>
 
         <!-- Caption -->
-        <Child type="Widget" skin="HB_ALL" offset="4 4 248 20" align = "ALIGN_TOP ALIGN_HSTRETCH">
+        <Child type="Widget" skin="HB_ALL" offset="4 4 248 20" align = "Top HStretch">
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
 
-        <Child type="TextBox" skin="MW_Caption" offset = "80 4 88 20" align = "ALIGN_HCENTER ALIGN_TOP" name = "Caption">
+        <Child type="TextBox" skin="MW_Caption" offset = "80 4 88 20" align = "HCenter Top" name = "Caption">
         </Child>
 
         <!-- This invisible button makes it possible to move the
              window by dragging the caption. -->
-        <Child type="Button" offset="4 4 248 20" align="ALIGN_HSTRETCH ALIGN_TOP" name="Action">
+        <Child type="Button" offset="4 4 248 20" align="HStretch Top" name="Action">
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
     </Skin>
 
     <Skin name = "MW_Window_NoCaption" size = "256 54">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <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 18" align = "ALIGN_STRETCH" name = "Client"/>
+        <Child type="Widget" skin="BlackBG" offset = "8 28 240 18" align = "Stretch" name = "Client"/>
 
         <!-- Outer borders -->
-        <Child type="Widget" skin="TB_T" offset="4 0 248 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_T" offset="4 0 248 4" align="Top HStretch" name="Action">
             <Property key="Scale" value = "0 1 0 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_L" offset="0 4 4 46" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_L" offset="0 4 4 46" align="Left VStretch" name="Action">
             <Property key="Scale" value = "1 0 -1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_B" offset="4 50 248 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_B" offset="4 50 248 4" align="Bottom HStretch" name="Action">
             <Property key="Scale" value = "0 0 0 1"/>
         </Child>
-        <Child type="Widget" skin="TB_R" offset="252 4 4 46" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_R" offset="252 4 4 46" align="Right VStretch" name="Action">
             <Property key="Scale" value = "0 0 1 0"/>
         </Child>
 
-        <Child type="Widget" skin="TB_BR" offset="252 50 4 4" align="ALIGN_RIGHT ALIGN_BOTTOM" name="Action">
+        <Child type="Widget" skin="TB_BR" offset="252 50 4 4" align="Right Bottom" name="Action">
             <Property key="Scale" value = "0 0 1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_BL" offset="0 50 4 4" align="ALIGN_LEFT ALIGN_BOTTOM" name="Action">
+        <Child type="Widget" skin="TB_BL" offset="0 50 4 4" align="Left Bottom" name="Action">
             <Property key="Scale" value = "1 0 -1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_TR" offset="252 0 4 4" align="ALIGN_RIGHT ALIGN_TOP" name="Action">
+        <Child type="Widget" skin="TB_TR" offset="252 0 4 4" align="Right Top" name="Action">
             <Property key="Scale" value = "0 1 1 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_TL" offset="0 0 4 4" align="ALIGN_LEFT ALIGN_TOP" name="Action">
+        <Child type="Widget" skin="TB_TL" offset="0 0 4 4" align="Left Top" name="Action">
             <Property key="Scale" value = "1 1 -1 -1"/>
         </Child>
 
         <!-- Inner borders -->
-        <Child type="Widget" skin="TB_T" offset="8 24 240 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_T" offset="8 24 240 4" align="Top HStretch" name="Action">
             <Property key="Scale" value = "0 1 0 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_L" offset="4 28 4 18" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_L" offset="4 28 4 18" align="Left VStretch" name="Action">
             <Property key="Scale" value = "1 0 -1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_B" offset="8 46 240 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_B" offset="8 46 240 4" align="Bottom HStretch" name="Action">
             <Property key="Scale" value = "0 0 0 1"/>
         </Child>
-        <Child type="Widget" skin="TB_R" offset="248 28 4 18" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_R" offset="248 28 4 18" align="Right VStretch" name="Action">
             <Property key="Scale" value = "0 0 1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_BR" offset="248 46 4 4" align="ALIGN_BOTTOM ALIGN_RIGHT" name="Action">
+        <Child type="Widget" skin="TB_BR" offset="248 46 4 4" align="Bottom Right" name="Action">
             <Property key="Scale" value = "0 0 1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_BL" offset="4 46 4 4" align="ALIGN_BOTTOM ALIGN_LEFT" name="Action">
+        <Child type="Widget" skin="TB_BL" offset="4 46 4 4" align="Bottom Left" name="Action">
             <Property key="Scale" value = "1 0 -1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_TR" offset="248 24 4 4" align="ALIGN_TOP ALIGN_RIGHT" name="Action">
+        <Child type="Widget" skin="TB_TR" offset="248 24 4 4" align="Top Right" name="Action">
             <Property key="Scale" value = "0 1 1 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_TL" offset="4 24 4 4" align="ALIGN_TOP ALIGN_LEFT" name="Action">
+        <Child type="Widget" skin="TB_TL" offset="4 24 4 4" align="Top Left" name="Action">
             <Property key="Scale" value = "1 1 -1 -1"/>
         </Child>
 
         <!-- Caption -->
-        <Child type="Widget" skin="HB_ALL" offset="4 4 248 20" align = "ALIGN_TOP ALIGN_HSTRETCH">
+        <Child type="Widget" skin="HB_ALL" offset="4 4 248 20" align = "Top HStretch">
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
 
         <!-- This invisible button makes it possible to move the
              window by dragging the caption. -->
-        <Child type="Button" offset="4 4 248 20" align="ALIGN_HSTRETCH ALIGN_TOP" name="Action">
+        <Child type="Button" offset="4 4 248 20" align="HStretch Top" name="Action">
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
     </Skin>
 
     <Skin name = "MW_Window_Pinnable" size = "256 54">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <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 18" align = "ALIGN_STRETCH" name = "Client"/>
+        <Child type="Widget" skin="BlackBG" offset = "8 28 240 18" align = "Stretch" name = "Client"/>
 
         <!-- Outer borders -->
-        <Child type="Widget" skin="TB_T" offset="4 0 248 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_T" offset="4 0 248 4" align="Top HStretch" name="Action">
             <Property key="Scale" value = "0 1 0 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_L" offset="0 4 4 46" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_L" offset="0 4 4 46" align="Left VStretch" name="Action">
             <Property key="Scale" value = "1 0 -1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_B" offset="4 50 248 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_B" offset="4 50 248 4" align="Bottom HStretch" name="Action">
             <Property key="Scale" value = "0 0 0 1"/>
         </Child>
-        <Child type="Widget" skin="TB_R" offset="252 4 4 46" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_R" offset="252 4 4 46" align="Right VStretch" name="Action">
             <Property key="Scale" value = "0 0 1 0"/>
         </Child>
 
-        <Child type="Widget" skin="TB_BR" offset="252 50 4 4" align="ALIGN_RIGHT ALIGN_BOTTOM" name="Action">
+        <Child type="Widget" skin="TB_BR" offset="252 50 4 4" align="Right Bottom" name="Action">
             <Property key="Scale" value = "0 0 1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_BL" offset="0 50 4 4" align="ALIGN_LEFT ALIGN_BOTTOM" name="Action">
+        <Child type="Widget" skin="TB_BL" offset="0 50 4 4" align="Left Bottom" name="Action">
             <Property key="Scale" value = "1 0 -1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_TR" offset="252 0 4 4" align="ALIGN_RIGHT ALIGN_TOP" name="Action">
+        <Child type="Widget" skin="TB_TR" offset="252 0 4 4" align="Right Top" name="Action">
             <Property key="Scale" value = "0 1 1 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_TL" offset="0 0 4 4" align="ALIGN_LEFT ALIGN_TOP" name="Action">
+        <Child type="Widget" skin="TB_TL" offset="0 0 4 4" align="Left Top" name="Action">
             <Property key="Scale" value = "1 1 -1 -1"/>
         </Child>
 
         <!-- Inner borders -->
-        <Child type="Widget" skin="TB_T" offset="8 24 240 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_T" offset="8 24 240 4" align="Top HStretch" name="Action">
             <Property key="Scale" value = "0 1 0 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_L" offset="4 28 4 18" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_L" offset="4 28 4 18" align="Left VStretch" name="Action">
             <Property key="Scale" value = "1 0 -1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_B" offset="8 46 240 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_B" offset="8 46 240 4" align="Bottom HStretch" name="Action">
             <Property key="Scale" value = "0 0 0 1"/>
         </Child>
-        <Child type="Widget" skin="TB_R" offset="248 28 4 18" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Action">
+        <Child type="Widget" skin="TB_R" offset="248 28 4 18" align="Right VStretch" name="Action">
             <Property key="Scale" value = "0 0 1 0"/>
         </Child>
-        <Child type="Widget" skin="TB_BR" offset="248 46 4 4" align="ALIGN_BOTTOM ALIGN_RIGHT" name="Action">
+        <Child type="Widget" skin="TB_BR" offset="248 46 4 4" align="Bottom Right" name="Action">
             <Property key="Scale" value = "0 0 1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_BL" offset="4 46 4 4" align="ALIGN_BOTTOM ALIGN_LEFT" name="Action">
+        <Child type="Widget" skin="TB_BL" offset="4 46 4 4" align="Bottom Left" name="Action">
             <Property key="Scale" value = "1 0 -1 1"/>
         </Child>
-        <Child type="Widget" skin="TB_TR" offset="248 24 4 4" align="ALIGN_TOP ALIGN_RIGHT" name="Action">
+        <Child type="Widget" skin="TB_TR" offset="248 24 4 4" align="Top Right" name="Action">
             <Property key="Scale" value = "0 1 1 -1"/>
         </Child>
-        <Child type="Widget" skin="TB_TL" offset="4 24 4 4" align="ALIGN_TOP ALIGN_LEFT" name="Action">
+        <Child type="Widget" skin="TB_TL" offset="4 24 4 4" align="Top Left" name="Action">
             <Property key="Scale" value = "1 1 -1 -1"/>
         </Child>
 
         <!-- Caption -->
 
-        <Child type="Widget" skin="HB_ALL" offset="4 4 248 20" align = "ALIGN_TOP ALIGN_HSTRETCH">
+        <Child type="Widget" skin="HB_ALL" offset="4 4 248 20" align = "Top HStretch">
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
 
-        <Child type="TextBox" skin="MW_Caption" offset = "80 4 88 20" align = "ALIGN_HCENTER ALIGN_TOP" name = "Caption">
+        <Child type="TextBox" skin="MW_Caption" offset = "80 4 88 20" align = "HCenter Top" name = "Caption">
         </Child>
 
         <!-- This invisible button makes it possible to move the
              window by dragging the caption. -->
-        <Child type="Button" offset="4 4 248 20" align="ALIGN_HSTRETCH ALIGN_TOP" name="Action">
+        <Child type="Button" offset="4 4 248 20" align="HStretch Top" name="Action">
             <Property key="Scale" value = "1 1 0 0"/>
         </Child>
 
-        <Child type="Button" skin="PinUp" offset="232 4 19 19" align="ALIGN_RIGHT ALIGN_TOP" name="Button"/>
+        <Child type="Button" skin="PinUp" offset="232 4 19 19" align="Right Top" name="Button"/>
     </Skin>
 
     <Skin name = "MW_Dialog" size = "256 54">
         <Property key="FontName" value = "Default" />
-        <Property key="TextAlign" value = "ALIGN_CENTER" />
+        <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 = "ALIGN_STRETCH" name = "Client"/>
+        <Child type="Widget" skin="BlackBG" offset = "4 4 248 46" align = "Stretch" name = "Client"/>
 
         <!-- Outer borders -->
-        <Child type="Widget" skin="DB_T" offset="4 0 248 4" align="ALIGN_TOP ALIGN_HSTRETCH" name="Border">
+        <Child type="Widget" skin="DB_T" offset="4 0 248 4" align="Top HStretch" name="Border">
             <Property key="Scale" value = "0 1 0 -1"/>
         </Child>
-        <Child type="Widget" skin="DB_L" offset="0 4 4 46" align="ALIGN_LEFT ALIGN_VSTRETCH" name="Border">
+        <Child type="Widget" skin="DB_L" offset="0 4 4 46" align="Left VStretch" name="Border">
             <Property key="Scale" value = "1 0 -1 0"/>
         </Child>
-        <Child type="Widget" skin="DB_B" offset="4 50 248 4" align="ALIGN_BOTTOM ALIGN_HSTRETCH" name="Border">
+        <Child type="Widget" skin="DB_B" offset="4 50 248 4" align="Bottom HStretch" name="Border">
             <Property key="Scale" value = "0 0 0 1"/>
         </Child>
-        <Child type="Widget" skin="DB_R" offset="252 4 4 46" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="Border">
+        <Child type="Widget" skin="DB_R" offset="252 4 4 46" align="Right VStretch" name="Border">
             <Property key="Scale" value = "0 0 1 0"/>
         </Child>
 
-        <Child type="Widget" skin="DB_BR" offset="252 50 4 4" align="ALIGN_RIGHT ALIGN_BOTTOM" name="Border">
+        <Child type="Widget" skin="DB_BR" offset="252 50 4 4" align="Right Bottom" name="Border">
             <Property key="Scale" value = "0 0 1 1"/>
         </Child>
-        <Child type="Widget" skin="DB_BL" offset="0 50 4 4" align="ALIGN_LEFT ALIGN_BOTTOM" name="Border">
+        <Child type="Widget" skin="DB_BL" offset="0 50 4 4" align="Left Bottom" name="Border">
             <Property key="Scale" value = "1 0 -1 1"/>
         </Child>
-        <Child type="Widget" skin="DB_TR" offset="252 0 4 4" align="ALIGN_RIGHT ALIGN_TOP" name="Border">
+        <Child type="Widget" skin="DB_TR" offset="252 0 4 4" align="Right Top" name="Border">
             <Property key="Scale" value = "0 1 1 -1"/>
         </Child>
-        <Child type="Widget" skin="DB_TL" offset="0 0 4 4" align="ALIGN_LEFT ALIGN_TOP" name="Border">
+        <Child type="Widget" skin="DB_TL" offset="0 0 4 4" align="Left Top" name="Border">
             <Property key="Scale" value = "1 1 -1 -1"/>
         </Child>
     </Skin>