diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml
index 2c232e6d2..2ffc7d707 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_class_description_layout.xml
@@ -4,10 +4,10 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 249 249" name="_Main">
 
         <!-- Edit box -->
-        <Widget type="Edit" skin="MW_TextBoxEdit" position="14 14 220 192" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP STRETCH">
-            <Property key="Edit_MultiLine" value="1" />
-            <Property key="Edit_VisibleVScroll" value="1" />
-            <Property key="Edit_WordWrap" value="1" />
+        <Widget type="EditBox" skin="MW_TextBoxEdit" position="14 14 220 192" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP STRETCH">
+            <Property key="MultiLine" value="1" />
+            <Property key="VisibleVScroll" value="1" />
+            <Property key="WordWrap" value="1" />
         </Widget>
 
         <!-- Dialog buttons -->
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml
index 4946a5972..c8e421a78 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_chargen_create_class_layout.xml
@@ -6,7 +6,7 @@
             <Property key="Caption" value="Name"/>
             <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_VCENTRE"/>
         </Widget>
-        <Widget type="Edit" 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="ALIGN_HSTRETCH ALIGN_TOP"/>
 
         <Widget type="Widget" skin="" position="12 46 480 110" align="ALIGN_STRETCH">
 
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml
index 8fb635cac..f16d7ffc5 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_console_layout.xml
@@ -6,10 +6,10 @@
     <Property key="MaxSize" value="2000 2000"/>
 
     <!-- Log window -->
-    <Widget type="Edit" skin="MW_ConsoleLog" position="5 5 390 360" align="Stretch" name="list_History"/>
+    <Widget type="EditBox" skin="MW_ConsoleLog" position="5 5 390 360" align="Stretch" name="list_History"/>
 
     <!-- Command line -->
-    <Widget type="Edit" skin="MW_ConsoleCommand" position="0 365 392 28" align="HStretch Bottom" name="edit_Command"/>
+    <Widget type="EditBox" skin="MW_ConsoleCommand" position="0 365 392 28" align="HStretch Bottom" name="edit_Command"/>
 
   </Widget>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
index c611aceda..4a4f8a4ff 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml
@@ -20,7 +20,7 @@
 		<!-- The disposition bar-->
         <Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="432 39 132 18"
             align="Right Top" name="Disposition">		
-			<Widget type="Edit" skin="MW_DispositionEdit" position_real = "0.25 0 0.5 1" name = "DispositionText"/>	
+			<Widget type="EditBox" skin="MW_DispositionEdit" position_real = "0.25 0 0.5 1" name = "DispositionText"/>	
 		</Widget>
         <!-- The list of topics -->
         <Widget type="List" skin="MW_List" position="432 62 132 318" name="TopicsList">
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml
index 40c0787b8..4ef2243d4 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_interactive_messagebox_layout.xml
@@ -2,13 +2,13 @@
 
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 500 400" name="_Main">
-        <Widget type="Edit" skin="MW_TextEditClient" position="10 10 490 20" align="ALIGN_LEFT ALIGN_TOP STRETCH" name="message">
-            <Property key="Edit_Static" value="true"/>
-            <Property key="Edit_WordWrap" value="true"/>
-            <Property key="Text_FontHeight" value="18"/>
-            <Property key="Edit_MultiLine" value="1" />
-            <Property key="Edit_VisibleVScroll" value="1" />
-            <Property key="Widget_AlignText" value="ALIGN_CENTER" />
+        <Widget type="EditBox" skin="MW_TextEditClient" position="10 10 490 20" align="ALIGN_LEFT ALIGN_TOP STRETCH" name="message">
+            <Property key="Static" value="true"/>
+            <Property key="WordWrap" value="true"/>
+            <Property key="FontHeight" value="18"/>
+            <Property key="MultiLine" value="1" />
+            <Property key="VisibleVScroll" value="1" />
+            <Property key="TextAlign" value="ALIGN_CENTER" />
             <Property key="FontName" value = "MyGUI_CoreFont.18" />
             <Property key="TextColour" value = "0.7 0.7 0.7" />
         </Widget>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
index f101967c7..7cc405c50 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_list.skin.xml
@@ -229,7 +229,7 @@
     <Skin name = "MW_MultiList" size = "516 516" align = "ALIGN_LEFT ALIGN_TOP">
         <Property key="NeedKey" value = "true" />
         <Property key="SkinButton" value = "ButtonSmall" />
-        <Property key="_SkinButtonEmpty" value = "Edit" />
+        <Property key="_SkinButtonEmpty" value = "EditBox" />
         <Property key="HeightButton" value = "20" />
 
         <Property key="SkinList" value = "MW_MultiSubList" />
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml
index 4e22021ad..244f58c99 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_messagebox_layout.xml
@@ -5,13 +5,13 @@
         <Widget type="TextBox" skin="TextBox" position="4 4 4 4" name="message" />
     </Widget-->
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 0 0" name="_Main">
-        <Widget type="Edit" skin="MW_TextEditClient" position="5 -5 0 0" name="message"  align="ALIGN_LEFT ALIGN_TOP STRETCH">
-            <Property key="Edit_Static" value="true"/>
-            <Property key="Edit_WordWrap" value="true"/>
-            <Property key="Text_FontHeight" value="18"/>
-            <Property key="Edit_MultiLine" value="1" />
-            <Property key="Edit_VisibleVScroll" value="1" />
-            <Property key="Widget_AlignText" value="ALIGN_CENTER" />
+        <Widget type="EditBox" skin="MW_TextEditClient" position="5 -5 0 0" name="message"  align="ALIGN_LEFT ALIGN_TOP STRETCH">
+            <Property key="Static" value="true"/>
+            <Property key="WordWrap" value="true"/>
+            <Property key="FontHeight" value="18"/>
+            <Property key="MultiLine" value="1" />
+            <Property key="VisibleVScroll" value="1" />
+            <Property key="TextAlign" value="ALIGN_CENTER" />
             <Property key="FontName" value = "MyGUI_CoreFont.18" />
             <Property key="TextColour" value = "0.7 0.7 0.7" />
         </Widget>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml b/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml
index 566f34a51..d170a293f 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_text_input_layout.xml
@@ -7,7 +7,7 @@
         <Widget type="TextBox" skin="ProgressText" position="10 12 300 18" name="LabelT" align="ALIGN_LEFT ALIGN_TOP">
             <Property key="Widget_AlignText" value="ALIGN_LEFT ALIGN_TOP"/>
         </Widget>
-        <Widget type="Edit" skin="MW_TextEdit" position="10 28 300 30" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="10 28 300 30" name="TextEdit" align="ALIGN_LEFT ALIGN_TOP"/>
 
         <!-- Dialog buttons -->
         <Widget type="Button" skin="MW_Button" position="264 60 42 23" name="OKButton">