Run xmllint on our *.STX files. Fixed several XML syntax violations

svn-id: r34962

9 files changed, 153 insertions, 153 deletions

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 05c4106b6f..bff797a6b9 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -48,24 +48,24 @@
 "/> "
 "</fonts> "
 "<defaults fill = 'foreground' fg_color = 'darkgrey' bg_color = 'black' shadow = '0' bevel_color = 'lightgrey'/> "
-"<drawdata id = 'text_selection' cache = false> "
+"<drawdata id = 'text_selection' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "fg_color = 'green' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'mainmenu_bg' cache = false> "
+"<drawdata id = 'mainmenu_bg' cache = 'false'> "
 "<drawstep func = 'fill' "
 "fill = 'foreground' "
 "fg_color = 'black' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'special_bg' cache = false> "
+"<drawdata id = 'special_bg' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'separator' cache = false> "
+"<drawdata id = 'separator' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "height = '2' "
@@ -73,24 +73,24 @@
 "fg_color = 'lightgrey' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'scrollbar_base' cache = false> "
+"<drawdata id = 'scrollbar_base' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'scrollbar_handle_hover' cache = false> "
+"<drawdata id = 'scrollbar_handle_hover' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "fg_color = 'green2' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'scrollbar_handle_idle' cache = false> "
+"<drawdata id = 'scrollbar_handle_idle' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "fg_color = 'green' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'scrollbar_button_idle' cache = false> "
+"<drawdata id = 'scrollbar_button_idle' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "fill = 'none' "
@@ -105,7 +105,7 @@
 "orientation = 'top' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'scrollbar_button_hover' cache = false> "
+"<drawdata id = 'scrollbar_button_hover' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "fill = 'none' "
@@ -120,7 +120,7 @@
 "orientation = 'top' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'tab_active' cache = false> "
+"<drawdata id = 'tab_active' cache = 'false'> "
 "<text font = 'text_hover' "
 "vertical_align = 'center' "
 "horizontal_align = 'center' "
@@ -131,7 +131,7 @@
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'tab_inactive' cache = false> "
+"<drawdata id = 'tab_inactive' cache = 'false'> "
 "<text font = 'text_default' "
 "vertical_align = 'center' "
 "horizontal_align = 'center' "
@@ -142,39 +142,39 @@
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'tab_background' cache = false> "
+"<drawdata id = 'tab_background' cache = 'false'> "
 "</drawdata> "
-"<drawdata id = 'widget_slider' cache = false> "
+"<drawdata id = 'widget_slider' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'slider_disabled' cache = false> "
+"<drawdata id = 'slider_disabled' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "fg_color = 'lightgrey' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'slider_full' cache = false> "
+"<drawdata id = 'slider_full' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "fg_color = 'green' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'slider_hover' cache = false> "
+"<drawdata id = 'slider_hover' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "fg_color = 'green2' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'widget_small' cache = false> "
+"<drawdata id = 'widget_small' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'popup_idle' cache = false> "
+"<drawdata id = 'popup_idle' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "fill = 'none' "
@@ -193,7 +193,7 @@
 "horizontal_align = 'left' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'popup_hover' cache = false> "
+"<drawdata id = 'popup_hover' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "fill = 'none' "
@@ -212,29 +212,29 @@
 "horizontal_align = 'left' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'widget_textedit' cache = false> "
+"<drawdata id = 'widget_textedit' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'plain_bg' cache = false> "
+"<drawdata id = 'plain_bg' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'caret' cache = false> "
+"<drawdata id = 'caret' cache = 'false'> "
 "<drawstep func = 'square' "
 "fill = 'foreground' "
 "fg_color = 'lightgrey' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'default_bg' cache = false> "
+"<drawdata id = 'default_bg' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'button_idle' cache = false> "
+"<drawdata id = 'button_idle' cache = 'false'> "
 "<text font = 'text_button' "
 "vertical_align = 'center' "
 "horizontal_align = 'center' "
@@ -244,7 +244,7 @@
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'button_hover' cache = false> "
+"<drawdata id = 'button_hover' cache = 'false'> "
 "<text font = 'text_button_hover' "
 "vertical_align = 'center' "
 "horizontal_align = 'center' "
@@ -254,7 +254,7 @@
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'button_disabled' cache = false> "
+"<drawdata id = 'button_disabled' cache = 'false'> "
 "<text font = 'text_disabled' "
 "vertical_align = 'center' "
 "horizontal_align = 'center' "
@@ -264,7 +264,7 @@
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'checkbox_disabled' cache = false> "
+"<drawdata id = 'checkbox_disabled' cache = 'false'> "
 "<text font = 'text_disabled' "
 "vertical_align = 'top' "
 "horizontal_align = 'left' "
@@ -274,7 +274,7 @@
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'checkbox_selected' cache = false> "
+"<drawdata id = 'checkbox_selected' cache = 'false'> "
 "<text font = 'text_default' "
 "vertical_align = 'top' "
 "horizontal_align = 'left' "
@@ -289,7 +289,7 @@
 "fg_color = 'green' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'checkbox_default' cache = false> "
+"<drawdata id = 'checkbox_default' cache = 'false'> "
 "<text font = 'text_default' "
 "vertical_align = 'top' "
 "horizontal_align = 'left' "
@@ -299,7 +299,7 @@
 "fill = 'none' "
 "/> "
 "</drawdata> "
-"<drawdata id = 'widget_default' cache = false> "
+"<drawdata id = 'widget_default' cache = 'false'> "
 "<drawstep func = 'bevelsq' "
 "bevel = '2' "
 "/> "
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 1bb2040570..50f7b1a9a2 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_gfx.stx b/gui/themes/scummclassic/classic_gfx.stx
index 7ec136c03d..cbf8f8f448 100644
--- a/gui/themes/scummclassic/classic_gfx.stx
+++ b/gui/themes/scummclassic/classic_gfx.stx
@@ -1,3 +1,4 @@
+<?xml version = "1.0"?>
 <!-- ScummVM - Graphic Adventure Engine
  -
  - ScummVM is the legal property of its developers, whose names
@@ -22,7 +23,6 @@
  - $Id$
  -
  -->
-<?xml version = "1.0"?>
 <render_info>
 	<palette>
 		<color name = 'black'
@@ -75,27 +75,27 @@
 
 	<defaults fill = 'foreground' fg_color = 'darkgrey' bg_color = 'black' shadow = '0' bevel_color = 'lightgrey'/>
 
-	<drawdata id = 'text_selection' cache = false>
+	<drawdata id = 'text_selection' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'green'
 		/>
 	</drawdata>
 
-	<drawdata id = 'mainmenu_bg' cache = false>
+	<drawdata id = 'mainmenu_bg' cache = 'false'>
 		<drawstep	func = 'fill'
 					fill = 'foreground'
 					fg_color = 'black'
 		/>
 	</drawdata>
 
-	<drawdata id = 'special_bg' cache = false>
+	<drawdata id = 'special_bg' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 		/>
 	</drawdata>
 
-	<drawdata id = 'separator' cache = false>
+	<drawdata id = 'separator' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					height = '2'
@@ -104,27 +104,27 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_base' cache = false>
+	<drawdata id = 'scrollbar_base' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_handle_hover' cache = false>
+	<drawdata id = 'scrollbar_handle_hover' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'green2'
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_handle_idle' cache = false>
+	<drawdata id = 'scrollbar_handle_idle' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'green'
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_button_idle' cache = false>
+	<drawdata id = 'scrollbar_button_idle' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 					fill = 'none'
@@ -140,7 +140,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_button_hover' cache = false>
+	<drawdata id = 'scrollbar_button_hover' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 					fill = 'none'
@@ -156,7 +156,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'tab_active' cache = false>
+	<drawdata id = 'tab_active' cache = 'false'>
 		<text	font = 'text_hover'
 				vertical_align = 'center'
 				horizontal_align = 'center'
@@ -168,7 +168,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'tab_inactive' cache = false>
+	<drawdata id = 'tab_inactive' cache = 'false'>
 		<text	font = 'text_default'
 				vertical_align = 'center'
 				horizontal_align = 'center'
@@ -180,45 +180,45 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'tab_background' cache = false>
+	<drawdata id = 'tab_background' cache = 'false'>
 	</drawdata>
 
-	<drawdata id = 'widget_slider' cache = false>
+	<drawdata id = 'widget_slider' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 					fill = 'none'
 		/>
 	</drawdata>
 	
-	<drawdata id = 'slider_disabled' cache = false>
+	<drawdata id = 'slider_disabled' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'lightgrey'
 		/>
 	</drawdata>
 
-	<drawdata id = 'slider_full' cache = false>
+	<drawdata id = 'slider_full' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'green'
 		/>
 	</drawdata>
 
-	<drawdata id = 'slider_hover' cache = false>
+	<drawdata id = 'slider_hover' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'green2'
 		/>
 	</drawdata>
 	
-	<drawdata id = 'widget_small' cache = false>
+	<drawdata id = 'widget_small' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 					fill = 'none'
 		/>
 	</drawdata>
 		
-	<drawdata id = 'popup_idle' cache = false>
+	<drawdata id = 'popup_idle' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 					fill = 'none'
@@ -239,7 +239,7 @@
 	</drawdata>
 
 
-	<drawdata id = 'popup_hover' cache = false>
+	<drawdata id = 'popup_hover' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 					fill = 'none'
@@ -259,33 +259,33 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'widget_textedit' cache = false>
+	<drawdata id = 'widget_textedit' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 					fill = 'none'
 		/>
 	</drawdata>
 	
-	<drawdata id = 'plain_bg' cache = false>
+	<drawdata id = 'plain_bg' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 		/>
 	</drawdata>
 
-	<drawdata id = 'caret' cache = false>
+	<drawdata id = 'caret' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'lightgrey'
 		/>
 	</drawdata>
 
-	<drawdata id = 'default_bg' cache = false>
+	<drawdata id = 'default_bg' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 		/>
 	</drawdata>
 
-	<drawdata id = 'button_idle' cache = false>
+	<drawdata id = 'button_idle' cache = 'false'>
 		<text	font = 'text_button'
 				vertical_align = 'center'
 				horizontal_align = 'center'
@@ -296,7 +296,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'button_hover' cache = false>
+	<drawdata id = 'button_hover' cache = 'false'>
 		<text	font = 'text_button_hover'
 				vertical_align = 'center'
 				horizontal_align = 'center'
@@ -307,7 +307,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'button_disabled' cache = false>
+	<drawdata id = 'button_disabled' cache = 'false'>
 		<text	font = 'text_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'center'
@@ -318,7 +318,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'checkbox_disabled' cache = false>
+	<drawdata id = 'checkbox_disabled' cache = 'false'>
 		<text	font = 'text_disabled'
 				vertical_align = 'top'
 				horizontal_align = 'left'
@@ -329,7 +329,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'checkbox_selected' cache = false>
+	<drawdata id = 'checkbox_selected' cache = 'false'>
 		<text	font = 'text_default'
 				vertical_align = 'top'
 				horizontal_align = 'left'
@@ -345,7 +345,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'checkbox_default' cache = false>
+	<drawdata id = 'checkbox_default' cache = 'false'>
 		<text	font = 'text_default'
 				vertical_align = 'top'
 				horizontal_align = 'left'
@@ -356,7 +356,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'widget_default' cache = false>
+	<drawdata id = 'widget_default' cache = 'false'>
 		<drawstep	func = 'bevelsq'
 					bevel = '2'
 		/>
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 888d34ba3b..83fa8d91bc 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -1,3 +1,4 @@
+<?xml version = "1.0"?>
 <!-- ScummVM - Graphic Adventure Engine
  -
  - ScummVM is the legal property of its developers, whose names
@@ -22,7 +23,6 @@
  - $Id$
  -
  -->
-<?xml version = "1.0"?>
 <layout_info resolution = '-320xY, -256x240'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx
index 1e8b212a0c..f62144414a 100644
--- a/gui/themes/scummclassic/classic_layout_320.stx
+++ b/gui/themes/scummclassic/classic_layout_320.stx
@@ -1,3 +1,4 @@
+<?xml version = "1.0"?>
 <!-- ScummVM - Graphic Adventure Engine
  -
  - ScummVM is the legal property of its developers, whose names
@@ -22,7 +23,6 @@
  - $Id$
  -
  -->
-<?xml version = "1.0"?>
 <layout_info resolution = "320xY, 256x240">
 	<globals>
 		<def var = 'Line.Height' value = '12' />
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index a4c258b2bd..5055b31846 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index 4c592bf3ac..48d01d38f4 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -1,3 +1,4 @@
+<?xml version = "1.0"?>
 <!-- ScummVM - Graphic Adventure Engine
  -
  - ScummVM is the legal property of its developers, whose names
@@ -22,7 +23,6 @@
  - $Id$
  -
  -->
-<?xml version = "1.0"?>
 <render_info>
 	<palette>
 		<color name = 'darkred'
@@ -95,14 +95,14 @@
 	<cursor file = 'cursor.bmp' hotspot = '0, 0' scale = '3'/>
 	<cursor resolution = '320xY, 256x240' file = 'cursor_small.bmp' hotspot = '0, 0' scale = '3'/>
 
-	<drawdata id = 'text_selection' cache = false>
+	<drawdata id = 'text_selection' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'bgreen'
 		/>
 	</drawdata>
 
-	<drawdata id = 'mainmenu_bg' cache = false>
+	<drawdata id = 'mainmenu_bg' cache = 'false'>
 		<drawstep	func = 'fill'
 					fill = 'gradient'
 					gradient_start = '208, 112, 8'
@@ -110,7 +110,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'special_bg' cache = false>
+	<drawdata id = 'special_bg' cache = 'false'>
 		<drawstep	func = 'roundedsq'
 					radius = '4'
 					fill = 'gradient'
@@ -122,7 +122,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'separator' cache = false>
+	<drawdata id = 'separator' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					height = '1'
@@ -131,20 +131,20 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_base' cache = false>
+	<drawdata id = 'scrollbar_base' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
+					stroke = '1'
+					radius = '6'
 					fill = 'background'
 					fg_color = '176, 164, 160'
 					bg_color = '240, 228, 160'
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_handle_hover' cache = false>
+	<drawdata id = 'scrollbar_handle_hover' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
+					stroke = '1'
+					radius = '6'
 					fill = 'gradient'
 					fg_color = 'blandyellow'
 					gradient_start = 'xtrabrightred'
@@ -152,10 +152,10 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_handle_idle' cache = false>
+	<drawdata id = 'scrollbar_handle_idle' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 6
+					stroke = '1'
+					radius = '6'
 					fill = 'gradient'
 					fg_color = 'blandyellow'
 					gradient_start = 'brightred'
@@ -163,12 +163,12 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_button_idle' cache = false>
+	<drawdata id = 'scrollbar_button_idle' cache = 'false'>
 		<drawstep	func = 'roundedsq'
 					radius = '4'
 					fill = 'none'
 					fg_color = '176, 164, 160'
-					stroke = 1
+					stroke = '1'
 		/>
 		<drawstep	func = 'triangle'
 					fg_color = '0, 0, 0'
@@ -181,13 +181,13 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'scrollbar_button_hover' cache = false>
+	<drawdata id = 'scrollbar_button_hover' cache = 'false'>
 		<drawstep	func = 'roundedsq'
 					radius = '4'
 					fill = 'background'
 					fg_color = '120, 120, 120'
 					bg_color = '206, 121, 99'
-					stroke = 1
+					stroke = '1'
 		/>
 		<drawstep	func = 'triangle'
 					fg_color = '0, 0, 0'
@@ -200,7 +200,7 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'tab_active' cache = false>
+	<drawdata id = 'tab_active' cache = 'false'>
 		<text	font = 'text_default'
 				vertical_align = 'center'
 				horizontal_align = 'center'
@@ -211,11 +211,11 @@
 					fill = 'gradient'
 					gradient_end = 'xtrabrightred'
 					gradient_start = 'blandyellow'
-					shadow = 3
+					shadow = '3'
 		/>
 	</drawdata>
 
-	<drawdata id = 'tab_inactive' cache = false>
+	<drawdata id = 'tab_inactive' cache = 'false'>
 		<text	font = 'text_default'
 				vertical_align = 'center'
 				horizontal_align = 'center'
@@ -225,35 +225,35 @@
 					stroke = '0'
 					fill = 'foreground'
 					fg_color = '240, 205, 118'
-					shadow = 3
+					shadow = '3'
 		/>
 	</drawdata>
 
-	<drawdata id = 'tab_background' cache = false>
+	<drawdata id = 'tab_background' cache = 'false'>
 		<drawstep	func = 'tab'
 					radius = '6'
 					stroke = '0'
 					fill = 'foreground'
 					fg_color = '232, 180, 81'
-					shadow = 3
+					shadow = '3'
 		/>
 	</drawdata>
 
-	<drawdata id = 'widget_slider' cache = false>
+	<drawdata id = 'widget_slider' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
+					stroke = '0'
+					radius = '4'
 					fill = 'foreground'
 					fg_color = 'blandyellow'
-					bevel = 1
+					bevel = '1'
 					bevel_color = 'shadowcolor'
 		/>
 	</drawdata>
 
-	<drawdata id = 'slider_full' cache = false>
+	<drawdata id = 'slider_full' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
+					stroke = '1'
+					radius = '4'
 					fill = 'gradient'
 					fg_color = '123, 112, 56'
 					gradient_start = 'brightred'
@@ -261,10 +261,10 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'slider_hover' cache = false>
+	<drawdata id = 'slider_hover' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
+					stroke = '1'
+					radius = '4'
 					fill = 'gradient'
 					fg_color = '123, 112, 56'
 					gradient_start = 'xtrabrightred'
@@ -272,10 +272,10 @@
 		/>
 	</drawdata>
 	
-	<drawdata id = 'slider_disabled' cache = false>
+	<drawdata id = 'slider_disabled' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 1
-					radius = 4
+					stroke = '1'
+					radius = '4'
 					fill = 'gradient'
 					fg_color = '123, 112, 56'
 					gradient_start = 'xtrabrightred'
@@ -283,13 +283,13 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'popup_idle' cache = false>
+	<drawdata id = 'popup_idle' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
+					stroke = '0'
+					radius = '4'
 					fill = 'foreground'
 					fg_color = '250, 237, 190'
-					shadow = 2
+					shadow = '2'
 		/>
 		<drawstep	func = 'triangle'
 					fg_color = '63, 60, 52'
@@ -307,14 +307,14 @@
 	</drawdata>
 
 
-	<drawdata id = 'popup_hover' cache = false>
+	<drawdata id = 'popup_hover' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					stroke = 0
-					radius = 4
+					stroke = '0'
+					radius = '4'
 					fill = 'gradient'
 					gradient_start = 'blandyellow'
 					gradient_end = '250, 237, 190'
-					shadow = 0
+					shadow = '0'
 		/>
 		<drawstep	func = 'triangle'
 					fg_color = '63, 60, 52'
@@ -331,114 +331,114 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'widget_textedit' cache = false>
+	<drawdata id = 'widget_textedit' cache = 'false'>
 		<drawstep	func = 'roundedsq'
 					fill = 'foreground'
-					radius = 4
+					radius = '4'
 					fg_color = 'blandyellow'
-					shadow = 0
-					bevel = 1
+					shadow = '0'
+					bevel = '1'
 					bevel_color = 'shadowcolor'
 		/>
 	</drawdata>
 	
-	<drawdata id = 'plain_bg' cache = false>
+	<drawdata id = 'plain_bg' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					radius = 6
-					stroke = 0
+					radius = '6'
+					stroke = '0'
 					gradient_start = 'blandyellow'
 					gradient_end = 'xtrabrightred'
 					fill = 'gradient'
-					shadow = 3
+					shadow = '3'
 		/>
 	</drawdata>
 
-	<drawdata id = 'caret' cache = false>
+	<drawdata id = 'caret' cache = 'false'>
 		<drawstep	func = 'square'
 					fill = 'foreground'
 					fg_color = 'black'
 		/>
 	</drawdata>
 
-	<drawdata id = 'default_bg' cache = false>
+	<drawdata id = 'default_bg' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					radius = 12
-					stroke = 0
+					radius = '12'
+					stroke = '0'
 					fg_color = 'xtrabrightred'
 					fill = 'foreground'
-					shadow = 3
+					shadow = '3'
 		/>
 	</drawdata>
 
-	<drawdata id = 'button_idle' cache = false>
+	<drawdata id = 'button_idle' cache = 'false'>
 		<text	font = 'text_button'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
 		<drawstep	func = 'roundedsq'
 					radius = '3'
-					stroke = 1
+					stroke = '1'
 					fill = 'gradient'
-					shadow = 0
+					shadow = '0'
 					fg_color = 'shadowcolor'
 					gradient_start = 'brightred'
 					gradient_end = 'darkred'
-					bevel = 1
+					bevel = '1'
 		/>
 	</drawdata>
 
-	<drawdata id = 'button_hover' cache = false>
+	<drawdata id = 'button_hover' cache = 'false'>
 		<text	font = 'text_button_hover'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
 		<drawstep	func = 'roundedsq'
 					radius = '3'
-					gradient_factor = 1
-					stroke = 1 
+					gradient_factor = '1'
+					stroke = '1' 
 					fill = 'gradient'
-					shadow = 0
+					shadow = '0'
 					fg_color = 'shadowcolor'
 					gradient_start = 'xtrabrightred'
 					gradient_end = 'darkred'
 					bevel_color = 'xtrabrightred'
-					bevel = 1
+					bevel = '1'
 		/>
 	</drawdata>
 
-	<drawdata id = 'button_disabled' cache = false>
+	<drawdata id = 'button_disabled' cache = 'false'>
 		<text	font = 'text_disabled'
 				vertical_align = 'center'
 				horizontal_align = 'center'
 		/>
 		<drawstep	func = 'roundedsq'
 					radius = '3'
-					stroke = 1
+					stroke = '1'
 					fill = 'gradient'
-					shadow = 0
+					shadow = '0'
 					fg_color = 'shadowcolor'
 					gradient_start = 'brightred'
 					gradient_end = 'darkred'
-					bevel = 1
+					bevel = '1'
 		/>
 	</drawdata>
 
-	<drawdata id = 'checkbox_disabled' cache = false>
+	<drawdata id = 'checkbox_disabled' cache = 'false'>
 		<text	font = 'text_disabled'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
 		<drawstep	func = 'roundedsq'
 					fill = 'none'
-					radius = 4
+					radius = '4'
 					fg_color = 'black'
-					shadow = 0
-					bevel = 1
+					shadow = '0'
+					bevel = '1'
 					bevel_color = 'shadowcolor'
 		/>
 	</drawdata>
 
-	<drawdata id = 'checkbox_selected' cache = false>
+	<drawdata id = 'checkbox_selected' cache = 'false'>
 		<text	font = 'text_default'
 				vertical_align = 'top'
 				horizontal_align = 'left'
@@ -448,42 +448,42 @@
 		/>
 	</drawdata>
 
-	<drawdata id = 'checkbox_default' cache = false>
+	<drawdata id = 'checkbox_default' cache = 'false'>
 		<text	font = 'text_default'
 				vertical_align = 'top'
 				horizontal_align = 'left'
 		/>
 		<drawstep	func = 'roundedsq'
 					fill = 'foreground'
-					radius = 4
+					radius = '4'
 					fg_color = 'blandyellow'
-					shadow = 0
-					bevel = 1
+					shadow = '0'
+					bevel = '1'
 					bevel_color = 'shadowcolor'
 		/>
 	</drawdata>
 
-	<drawdata id = 'widget_default' cache = false>
+	<drawdata id = 'widget_default' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					radius = 8
-					stroke = 0
+					radius = '8'
+					stroke = '0'
 					gradient_start = 'blandyellow'
 					gradient_end = '251, 241, 206'
 					gradient_factor = '6'
 					fill = 'gradient'
-					shadow = 3
+					shadow = '3'
 		/>
 	</drawdata>
 	
-	<drawdata id = 'widget_small' cache = false>
+	<drawdata id = 'widget_small' cache = 'false'>
 		<drawstep	func = 'roundedsq'
-					radius = 8
-					stroke = 0
+					radius = '8'
+					stroke = '0'
 					gradient_start = 'blandyellow'
 					gradient_end = 'xtrabrightred'
 					gradient_factor = '6'
 					fill = 'gradient'
-					shadow = 3
+					shadow = '3'
 		/>
 	</drawdata>
 </render_info>
\ No newline at end of file
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 7e463894ff..afeef51d55 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -1,3 +1,4 @@
+<?xml version = "1.0"?>
 <!-- ScummVM - Graphic Adventure Engine
  -
  - ScummVM is the legal property of its developers, whose names
@@ -22,7 +23,6 @@
  - $Id$
  -
  -->
-<?xml version = "1.0"?>
 <layout_info resolution = '-320xY, -256x240'>
 	<globals>
 		<def var = 'Line.Height' value = '16' />
diff --git a/gui/themes/scummmodern/scummmodern_layout_320.stx b/gui/themes/scummmodern/scummmodern_layout_320.stx
index 30fc9e3e3c..9dd1f8f521 100644
--- a/gui/themes/scummmodern/scummmodern_layout_320.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_320.stx
@@ -1,3 +1,4 @@
+<?xml version = "1.0"?>
 <!-- ScummVM - Graphic Adventure Engine
  -
  - ScummVM is the legal property of its developers, whose names
@@ -22,7 +23,6 @@
  - $Id$
  -
  -->
-<?xml version = "1.0"?>
 <layout_info resolution = "320xY, 256x240">
 	<globals>
 		<def var = 'Line.Height' value = '12' />