From 875784e4d8b13e19ed23bdb3615c4bbc7a80bcd9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 25 Jan 2013 01:45:08 +0300
Subject: Fix xml files style.

Add or fix headers, replace tabs to spaces.
---
 data/themes/blacknblack/colors.xml            |  1 +
 data/themes/blacknblack/info.xml              |  1 +
 data/themes/blackwood/colors.xml              |  1 +
 data/themes/blackwood/info.xml                |  1 +
 data/themes/blackwood/speechbubble.xml        | 23 +++++------
 data/themes/enchilado/buy.xml                 |  1 +
 data/themes/enchilado/colors.xml              |  1 +
 data/themes/enchilado/equipment.xml           | 35 ++++++++---------
 data/themes/enchilado/info.xml                |  1 +
 data/themes/enchilado/inventory.xml           |  1 +
 data/themes/enchilado/ok.xml                  | 35 ++++++++---------
 data/themes/enchilado/popup.xml               | 35 ++++++++---------
 data/themes/enchilado/progressbar.xml         | 35 ++++++++---------
 data/themes/enchilado/quests.xml              |  1 +
 data/themes/enchilado/sell.xml                |  1 +
 data/themes/enchilado/server.xml              |  1 +
 data/themes/enchilado/shop.xml                |  1 +
 data/themes/enchilado/window.xml              | 35 ++++++++---------
 data/themes/enchilado/world.xml               |  1 +
 data/themes/jewelry/beingpopup.xml            | 35 +++++++++--------
 data/themes/jewelry/browserbox.xml            | 11 +++---
 data/themes/jewelry/button.xml                | 33 ++++++++--------
 data/themes/jewelry/button_disabled.xml       | 33 ++++++++--------
 data/themes/jewelry/button_highlighted.xml    | 33 ++++++++--------
 data/themes/jewelry/button_pressed.xml        | 33 ++++++++--------
 data/themes/jewelry/buy.xml                   | 47 +++++++++++------------
 data/themes/jewelry/chat.xml                  | 39 +++++++++----------
 data/themes/jewelry/checkbox.xml              | 27 +++++++------
 data/themes/jewelry/circle-off.xml            |  7 ++--
 data/themes/jewelry/circle-on.xml             |  7 ++--
 data/themes/jewelry/colors.xml                |  1 +
 data/themes/jewelry/complete_icon.xml         |  9 ++---
 data/themes/jewelry/dbutton.xml               | 37 +++++++++---------
 data/themes/jewelry/didyouknow.xml            | 51 ++++++++++++-------------
 data/themes/jewelry/dpad.xml                  | 37 +++++++++---------
 data/themes/jewelry/dropdown.xml              |  3 +-
 data/themes/jewelry/dropdown_background.xml   | 31 +++++++--------
 data/themes/jewelry/dropdown_pressed.xml      |  3 +-
 data/themes/jewelry/drops.xml                 | 33 ++++++++--------
 data/themes/jewelry/emotes.xml                | 33 ++++++++--------
 data/themes/jewelry/equipment.xml             | 55 +++++++++++++--------------
 data/themes/jewelry/equipment_background.xml  | 11 +++---
 data/themes/jewelry/help.xml                  | 53 +++++++++++++-------------
 data/themes/jewelry/incomplete_icon.xml       |  9 ++---
 data/themes/jewelry/info.xml                  |  1 +
 data/themes/jewelry/inventory.xml             | 53 +++++++++++++-------------
 data/themes/jewelry/item_selection.xml        |  7 ++--
 data/themes/jewelry/itemcontainer.xml         |  1 +
 data/themes/jewelry/itempopup.xml             | 33 ++++++++--------
 data/themes/jewelry/items.xml                 | 45 +++++++++++-----------
 data/themes/jewelry/keyboard_icon.xml         |  1 +
 data/themes/jewelry/listbox.xml               |  3 +-
 data/themes/jewelry/login.xml                 | 45 +++++++++++-----------
 data/themes/jewelry/map.xml                   | 45 +++++++++++-----------
 data/themes/jewelry/ministatus.xml            | 13 +++----
 data/themes/jewelry/npc.xml                   | 49 ++++++++++++------------
 data/themes/jewelry/ok.xml                    | 47 +++++++++++------------
 data/themes/jewelry/playerbox.xml             |  1 +
 data/themes/jewelry/popup.xml                 | 35 +++++++++--------
 data/themes/jewelry/popuplist.xml             | 31 +++++++--------
 data/themes/jewelry/progressbar.xml           | 35 +++++++++--------
 data/themes/jewelry/quests.xml                | 55 +++++++++++++--------------
 data/themes/jewelry/radio.xml                 | 23 ++++++-----
 data/themes/jewelry/resize.xml                |  7 ++--
 data/themes/jewelry/scroll.xml                | 29 +++++++-------
 data/themes/jewelry/scroll_background.xml     | 31 +++++++--------
 data/themes/jewelry/scroll_highlighted.xml    | 29 +++++++-------
 data/themes/jewelry/scroll_vbackground.xml    | 18 ++++-----
 data/themes/jewelry/scrollbuttons.xml         |  1 +
 data/themes/jewelry/scrollbuttons_pressed.xml |  1 +
 data/themes/jewelry/sell.xml                  | 47 +++++++++++------------
 data/themes/jewelry/server.xml                | 47 +++++++++++------------
 data/themes/jewelry/shop.xml                  |  3 +-
 data/themes/jewelry/slider.xml                | 21 +++++-----
 data/themes/jewelry/slider_highlighted.xml    | 21 +++++-----
 data/themes/jewelry/social.xml                | 53 +++++++++++++-------------
 data/themes/jewelry/spells.xml                | 45 +++++++++++-----------
 data/themes/jewelry/status.xml                | 51 ++++++++++++-------------
 data/themes/jewelry/tab.xml                   | 33 ++++++++--------
 data/themes/jewelry/tab_highlighted.xml       | 29 +++++++-------
 data/themes/jewelry/tab_selected.xml          | 29 +++++++-------
 data/themes/jewelry/tab_unused.xml            | 29 +++++++-------
 data/themes/jewelry/textfield.xml             | 35 +++++++++--------
 data/themes/jewelry/window.xml                | 51 ++++++++++++-------------
 data/themes/jewelry/windowmenu.xml            |  7 ++--
 data/themes/jewelry/world.xml                 |  3 +-
 data/themes/mana/colors.xml                   |  1 +
 data/themes/mana/info.xml                     |  1 +
 data/themes/mana/npc.xml                      |  1 +
 data/themes/mana/quests.xml                   |  1 +
 data/themes/mana/social.xml                   |  1 +
 data/themes/pink/buy.xml                      |  1 +
 data/themes/pink/colors.xml                   |  1 +
 data/themes/pink/equipment.xml                | 35 ++++++++---------
 data/themes/pink/info.xml                     |  1 +
 data/themes/pink/inventory.xml                |  1 +
 data/themes/pink/ok.xml                       | 35 ++++++++---------
 data/themes/pink/popup.xml                    | 35 ++++++++---------
 data/themes/pink/progressbar.xml              | 35 ++++++++---------
 data/themes/pink/quests.xml                   |  1 +
 data/themes/pink/sell.xml                     |  1 +
 data/themes/pink/server.xml                   |  1 +
 data/themes/pink/shop.xml                     |  1 +
 data/themes/pink/window.xml                   | 35 ++++++++---------
 data/themes/pink/world.xml                    |  1 +
 data/themes/unity/buy.xml                     |  1 +
 data/themes/unity/char.xml                    | 30 +++++++--------
 data/themes/unity/colors.xml                  |  1 +
 data/themes/unity/equipment.xml               | 37 +++++++++---------
 data/themes/unity/info.xml                    |  1 +
 data/themes/unity/inventory.xml               |  1 +
 data/themes/unity/npc.xml                     |  1 +
 data/themes/unity/ok.xml                      | 37 +++++++++---------
 data/themes/unity/popup.xml                   | 29 +++++++-------
 data/themes/unity/progressbar.xml             | 35 ++++++++---------
 data/themes/unity/quests.xml                  |  1 +
 data/themes/unity/sell.xml                    |  1 +
 data/themes/unity/server.xml                  |  1 +
 data/themes/unity/shop.xml                    |  1 +
 data/themes/unity/social.xml                  |  1 +
 data/themes/unity/window.xml                  | 37 +++++++++---------
 data/themes/unity/world.xml                   |  1 +
 data/themes/wood/buy.xml                      |  1 +
 data/themes/wood/colors.xml                   |  1 +
 data/themes/wood/equipment.xml                | 35 ++++++++---------
 data/themes/wood/info.xml                     |  1 +
 data/themes/wood/inventory.xml                |  1 +
 data/themes/wood/ok.xml                       | 35 ++++++++---------
 data/themes/wood/popup.xml                    | 35 ++++++++---------
 data/themes/wood/progressbar.xml              | 35 ++++++++---------
 data/themes/wood/quests.xml                   |  1 +
 data/themes/wood/sell.xml                     |  1 +
 data/themes/wood/server.xml                   |  1 +
 data/themes/wood/shop.xml                     |  1 +
 data/themes/wood/window.xml                   | 35 ++++++++---------
 data/themes/wood/world.xml                    |  1 +
 136 files changed, 1329 insertions(+), 1285 deletions(-)

(limited to 'data/themes')

diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index fb091b137..cc41030bb 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#ffffff" />
diff --git a/data/themes/blacknblack/info.xml b/data/themes/blacknblack/info.xml
index 6857485f7..1533948b8 100644
--- a/data/themes/blacknblack/info.xml
+++ b/data/themes/blacknblack/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>Black & black</name>
     <copyright>2012 ManaPlus developers</copyright>
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 078da2b30..28bbd9f4f 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#7a7972" />
diff --git a/data/themes/blackwood/info.xml b/data/themes/blackwood/info.xml
index 25d3b6b3a..44c045051 100644
--- a/data/themes/blackwood/info.xml
+++ b/data/themes/blackwood/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>Black wood</name>
     <copyright>2010-2011 Felix Jely\n2011-2012  The ManaPlus Developers</copyright>
diff --git a/data/themes/blackwood/speechbubble.xml b/data/themes/blackwood/speechbubble.xml
index 2be1fb8b4..b7c112bb8 100644
--- a/data/themes/blackwood/speechbubble.xml
+++ b/data/themes/blackwood/speechbubble.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="SpeechBubble" image="bubble.png">
     <widget type="Window">
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-	<part type="top-edge" xpos="5" ypos="0" width="5" height="5" />
-	<part type="top-right-corner" xpos="10" ypos="0" width="5" height="5" />
+        <part type="top-edge" xpos="5" ypos="0" width="5" height="5" />
+        <part type="top-right-corner" xpos="10" ypos="0" width="5" height="5" />
 
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="10" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="15" ypos="5" width="5" height="5" />
-	<part type="right-edge" xpos="10" ypos="5" width="5" height="5" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="10" ypos="5" width="5" height="5" />
+        <part type="bg-quad" xpos="15" ypos="5" width="5" height="5" />
+        <part type="right-edge" xpos="10" ypos="5" width="5" height="5" />
 
-	<!-- Bottom Row -->
-	<part type="bottom-left-corner" xpos="0" ypos="10" width="5" height="5" />
-	<part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
-	<part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="10" width="5" height="5" />
+        <part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
+        <part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
+    </widget>
 </skinset>
diff --git a/data/themes/enchilado/buy.xml b/data/themes/enchilado/buy.xml
index 6f1006f71..856aa2f4a 100644
--- a/data/themes/enchilado/buy.xml
+++ b/data/themes/enchilado/buy.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
         <option name="showbackground" value="1" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index d0396a3ec..a24e3516b 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#000000" />
diff --git a/data/themes/enchilado/equipment.xml b/data/themes/enchilado/equipment.xml
index 9ba3c4eb0..097e75934 100644
--- a/data/themes/enchilado/equipment.xml
+++ b/data/themes/enchilado/equipment.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="190" ypos="30">
+    <widget type="Window" xpos="190" ypos="30">
         <option name="itemPadding" value="2" />
         <option name="boxSize" value="36" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/enchilado/info.xml b/data/themes/enchilado/info.xml
index edadfcd49..4486e75be 100644
--- a/data/themes/enchilado/info.xml
+++ b/data/themes/enchilado/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>Enchilado</name>
     <copyright>2010-2011 R W E Sayers\n2010-2012 ManaPlus developers</copyright>
diff --git a/data/themes/enchilado/inventory.xml b/data/themes/enchilado/inventory.xml
index 6f1006f71..856aa2f4a 100644
--- a/data/themes/enchilado/inventory.xml
+++ b/data/themes/enchilado/inventory.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
         <option name="showbackground" value="1" />
diff --git a/data/themes/enchilado/ok.xml b/data/themes/enchilado/ok.xml
index bed8ab7e3..791393c51 100644
--- a/data/themes/enchilado/ok.xml
+++ b/data/themes/enchilado/ok.xml
@@ -1,24 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="190" ypos="30">
+    <widget type="Window" xpos="190" ypos="30">
         <option name="buttonPadding" value="8" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/enchilado/popup.xml b/data/themes/enchilado/popup.xml
index c5ff657ec..889beb339 100644
--- a/data/themes/enchilado/popup.xml
+++ b/data/themes/enchilado/popup.xml
@@ -1,23 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="190" ypos="30">
+    <widget type="Window" xpos="190" ypos="30">
         <option name="padding" value="6" />
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/enchilado/progressbar.xml b/data/themes/enchilado/progressbar.xml
index 2ffd0966e..4ff847499 100644
--- a/data/themes/enchilado/progressbar.xml
+++ b/data/themes/enchilado/progressbar.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="190" ypos="30">
+    <widget type="Window" xpos="190" ypos="30">
         <option name="padding" value="1" />
         <option name="fillPadding" value="3" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/enchilado/quests.xml b/data/themes/enchilado/quests.xml
index da4d306a9..2c73bf8f3 100644
--- a/data/themes/enchilado/quests.xml
+++ b/data/themes/enchilado/quests.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
         <option name="showlistbackground" value="1" />
diff --git a/data/themes/enchilado/sell.xml b/data/themes/enchilado/sell.xml
index 6f1006f71..856aa2f4a 100644
--- a/data/themes/enchilado/sell.xml
+++ b/data/themes/enchilado/sell.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
         <option name="showbackground" value="1" />
diff --git a/data/themes/enchilado/server.xml b/data/themes/enchilado/server.xml
index 6f1006f71..856aa2f4a 100644
--- a/data/themes/enchilado/server.xml
+++ b/data/themes/enchilado/server.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
         <option name="showbackground" value="1" />
diff --git a/data/themes/enchilado/shop.xml b/data/themes/enchilado/shop.xml
index 47e451913..21b38b8d6 100644
--- a/data/themes/enchilado/shop.xml
+++ b/data/themes/enchilado/shop.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
         <option name="showbuybackground" value="1" />
diff --git a/data/themes/enchilado/window.xml b/data/themes/enchilado/window.xml
index 607981b10..c4e12e15c 100644
--- a/data/themes/enchilado/window.xml
+++ b/data/themes/enchilado/window.xml
@@ -1,22 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="190" ypos="30">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+    <widget type="Window" xpos="190" ypos="30">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-60" ypos="-30" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-60" ypos="21" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-45" ypos="21" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/enchilado/world.xml b/data/themes/enchilado/world.xml
index 6f1006f71..856aa2f4a 100644
--- a/data/themes/enchilado/world.xml
+++ b/data/themes/enchilado/world.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
         <option name="showbackground" value="1" />
diff --git a/data/themes/jewelry/beingpopup.xml b/data/themes/jewelry/beingpopup.xml
index aab7e543e..88b73c928 100644
--- a/data/themes/jewelry/beingpopup.xml
+++ b/data/themes/jewelry/beingpopup.xml
@@ -1,23 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="109">
+    <widget type="Window" xpos="260" ypos="109">
+        <option name="padding" value="12" />
+        <option name="palette" value="1" />
 
-		<option name="padding" value="12" />
-		<option name="palette" value="1" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="30" height="15" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="30" height="15" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
+        <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
+        <part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
-		<part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
-		<part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
-		<part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
-		<part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
+        <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
+        <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/browserbox.xml b/data/themes/jewelry/browserbox.xml
index bfc14227e..35c99e548 100644
--- a/data/themes/jewelry/browserbox.xml
+++ b/data/themes/jewelry/browserbox.xml
@@ -1,8 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-
-	<option name="padding" value="4" />
-	<option name="newLinePadding" value="15" />
-
-	</widget>
+    <widget type="Window">
+        <option name="padding" value="4" />
+        <option name="newLinePadding" value="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/button.xml b/data/themes/jewelry/button.xml
index a98f67fd2..b3563a607 100644
--- a/data/themes/jewelry/button.xml
+++ b/data/themes/jewelry/button.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="0">
+    <widget type="Window" xpos="41" ypos="0">
+        <option name="padding" value="5" />
 
-		<option name="padding" value="5" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
+        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
+        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-		<part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-		<part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-		<part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-		<part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
+        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
+        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/button_disabled.xml b/data/themes/jewelry/button_disabled.xml
index 64810ca51..4a626aa3d 100644
--- a/data/themes/jewelry/button_disabled.xml
+++ b/data/themes/jewelry/button_disabled.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="75">
+    <widget type="Window" xpos="41" ypos="75">
+        <option name="padding" value="5" />
 
-		<option name="padding" value="5" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
+        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
+        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-		<part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-		<part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-		<part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-		<part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
+        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
+        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/button_highlighted.xml b/data/themes/jewelry/button_highlighted.xml
index d04272612..c2018dc89 100644
--- a/data/themes/jewelry/button_highlighted.xml
+++ b/data/themes/jewelry/button_highlighted.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="25">
+    <widget type="Window" xpos="41" ypos="25">
+        <option name="padding" value="5" />
 
-		<option name="padding" value="5" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
+        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
+        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-		<part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-		<part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-		<part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-		<part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
+        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
+        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/button_pressed.xml b/data/themes/jewelry/button_pressed.xml
index 35b52c9ae..c3db6da2d 100644
--- a/data/themes/jewelry/button_pressed.xml
+++ b/data/themes/jewelry/button_pressed.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="50">
+    <widget type="Window" xpos="41" ypos="50">
+        <option name="padding" value="5" />
 
-		<option name="padding" value="5" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
+        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
+        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-		<part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-		<part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-		<part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-		<part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
+        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
+        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/buy.xml b/data/themes/jewelry/buy.xml
index 155d81248..dc0f877a3 100644
--- a/data/themes/jewelry/buy.xml
+++ b/data/themes/jewelry/buy.xml
@@ -1,30 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="showbackground" value="1" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
 
-		<option name="showbackground" value="1" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/chat.xml b/data/themes/jewelry/chat.xml
index bd0ef9434..28e68f0a9 100644
--- a/data/themes/jewelry/chat.xml
+++ b/data/themes/jewelry/chat.xml
@@ -1,26 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="109">
+    <widget type="Window" xpos="260" ypos="109">
+        <option name="padding" value="4" />
+        <option name="childPalette" value="1" />
 
-		<option name="padding" value="4" />
-		<option name="childPalette" value="1" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="30" height="15" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="30" height="15" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
+        <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
+        <part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
-		<part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
-		<part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
+        <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
+        <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
-		<part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
-		<part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
-
-		<part type="stickyImageUp" xpos="-130" ypos="-58" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="-58" width="19" height="22" />
-
-	</widget>
+        <part type="stickyImageUp" xpos="-130" ypos="-58" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="-58" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/checkbox.xml b/data/themes/jewelry/checkbox.xml
index d3e299b96..796d5fd7c 100644
--- a/data/themes/jewelry/checkbox.xml
+++ b/data/themes/jewelry/checkbox.xml
@@ -1,17 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="190" ypos="0">
+    <widget type="Window" xpos="190" ypos="0">
+        <option name="padding" value="3" />
+        <option name="imagePadding" value="8" />
+        <option name="imageSize" value="13" />
+        <option name="spacing" value="10" />
 
-		<option name="padding" value="3" />
-		<option name="imagePadding" value="8" />
-		<option name="imageSize" value="13" />
-		<option name="spacing" value="10" />
-
-		<part type="normal" xpos="0" ypos="0" width="13" height="13" />
-		<part type="checked" xpos="0" ypos="13" width="13" height="13" />
-		<part type="normal-highlighted" xpos="13" ypos="0" width="13" height="13" />
-		<part type="checked-highlighted" xpos="13" ypos="13" width="13" height="13" />
-		<part type="disabled" xpos="26" ypos="0" width="13" height="13" />
-		<part type="disabled-checked" xpos="26" ypos="13" width="13" height="13" />
-
-	</widget>
+        <part type="normal" xpos="0" ypos="0" width="13" height="13" />
+        <part type="checked" xpos="0" ypos="13" width="13" height="13" />
+        <part type="normal-highlighted" xpos="13" ypos="0" width="13" height="13" />
+        <part type="checked-highlighted" xpos="13" ypos="13" width="13" height="13" />
+        <part type="disabled" xpos="26" ypos="0" width="13" height="13" />
+        <part type="disabled-checked" xpos="26" ypos="13" width="13" height="13" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/circle-off.xml b/data/themes/jewelry/circle-off.xml
index 110bc1935..b28e3ae96 100644
--- a/data/themes/jewelry/circle-off.xml
+++ b/data/themes/jewelry/circle-off.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-		<part type="standart" xpos="105" ypos="164" width="13" height="13" />
-	</widget>
+    <widget type="Window">
+        <part type="standart" xpos="105" ypos="164" width="13" height="13" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/circle-on.xml b/data/themes/jewelry/circle-on.xml
index 7ae624236..962b62232 100644
--- a/data/themes/jewelry/circle-on.xml
+++ b/data/themes/jewelry/circle-on.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-		<part type="standart" xpos="89" ypos="164" width="13" height="13" />
-	</widget>
+    <widget type="Window">
+        <part type="standart" xpos="89" ypos="164" width="13" height="13" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml
index fdde78002..444ad8c96 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#402600" />
diff --git a/data/themes/jewelry/complete_icon.xml b/data/themes/jewelry/complete_icon.xml
index 82eb21afb..5a32e4f8a 100644
--- a/data/themes/jewelry/complete_icon.xml
+++ b/data/themes/jewelry/complete_icon.xml
@@ -1,7 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-
-		<part type="standart" xpos="41" ypos="223" width="20" height="18" />
-
-	</widget>
+    <widget type="Window">
+        <part type="standart" xpos="41" ypos="223" width="20" height="18" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/dbutton.xml b/data/themes/jewelry/dbutton.xml
index d2c967268..e2c59b161 100644
--- a/data/themes/jewelry/dbutton.xml
+++ b/data/themes/jewelry/dbutton.xml
@@ -1,24 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="371" ypos="33">
+    <widget type="Window" xpos="371" ypos="33">
+        <option name="padding" value="20" />
+        <option name="x" value="0" />
+        <option name="y" value="0" />
 
-		<option name="padding" value="20" />
-		<option name="x" value="0" />
-		<option name="y" value="0" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="19" height="19" />
+        <part type="top-edge" xpos="20" ypos="0" width="10" height="19" />
+        <part type="top-right-corner" xpos="31" ypos="0" width="19" height="19" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="19" height="19" />
-		<part type="top-edge" xpos="20" ypos="0" width="10" height="19" />
-		<part type="top-right-corner" xpos="31" ypos="0" width="19" height="19" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="20" width="19" height="10" />
+        <part type="bg-quad" xpos="20" ypos="20" width="10" height="10" />
+        <part type="right-edge" xpos="31" ypos="20" width="19" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="20" width="19" height="10" />
-		<part type="bg-quad" xpos="20" ypos="20" width="10" height="10" />
-		<part type="right-edge" xpos="31" ypos="20" width="19" height="10" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="31" width="19" height="19" />
-		<part type="bottom-edge" xpos="20" ypos="31" width="10" height="19" />
-		<part type="bottom-right-corner" xpos="31" ypos="31" width="19" height="19" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="31" width="19" height="19" />
+        <part type="bottom-edge" xpos="20" ypos="31" width="10" height="19" />
+        <part type="bottom-right-corner" xpos="31" ypos="31" width="19" height="19" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/didyouknow.xml b/data/themes/jewelry/didyouknow.xml
index c5afd3b63..aaa7d6c63 100644
--- a/data/themes/jewelry/didyouknow.xml
+++ b/data/themes/jewelry/didyouknow.xml
@@ -1,32 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarHeight" value="35" />
+        <option name="titlebarBold" value="1" />
+        <option name="padding" value="10" />
+        <option name="stickySpacing" value="24" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarHeight" value="35" />
-		<option name="titlebarBold" value="1" />
-		<option name="padding" value="10" />
-		<option name="stickySpacing" value="24" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/dpad.xml b/data/themes/jewelry/dpad.xml
index e2bd2cff7..6f585d181 100644
--- a/data/themes/jewelry/dpad.xml
+++ b/data/themes/jewelry/dpad.xml
@@ -1,24 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="371" ypos="0">
+    <widget type="Window" xpos="371" ypos="0">
+        <option name="padding" value="10" />
+        <option name="x" value="0" />
+        <option name="y" value="0" />
 
-		<option name="padding" value="10" />
-		<option name="x" value="0" />
-		<option name="y" value="0" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
+        <part type="top-edge" xpos="5" ypos="0" width="22" height="5" />
+        <part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-		<part type="top-edge" xpos="5" ypos="0" width="22" height="5" />
-		<part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="5" width="5" height="22" />
+        <part type="bg-quad" xpos="5" ypos="5" width="22" height="22" />
+        <part type="right-edge" xpos="27" ypos="5" width="5" height="22" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="5" width="5" height="22" />
-		<part type="bg-quad" xpos="5" ypos="5" width="22" height="22" />
-		<part type="right-edge" xpos="27" ypos="5" width="5" height="22" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
-		<part type="bottom-edge" xpos="5" ypos="27" width="22" height="5" />
-		<part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
+        <part type="bottom-edge" xpos="5" ypos="27" width="22" height="5" />
+        <part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/dropdown.xml b/data/themes/jewelry/dropdown.xml
index 386f1c26f..cab746e1f 100644
--- a/data/themes/jewelry/dropdown.xml
+++ b/data/themes/jewelry/dropdown.xml
@@ -1,12 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="89" ypos="132">
-
         <option name="padding" value="3" />
         <option name="frameSize" value="2" />
         <option name="imagePadding" value="4" />
 
         <part type="down" xpos="0" ypos="0" width="15" height="15" />
         <part type="up" xpos="0" ypos="16" width="15" height="15" />
-
     </widget>
 </skinset>
diff --git a/data/themes/jewelry/dropdown_background.xml b/data/themes/jewelry/dropdown_background.xml
index f8cc88055..657bcd2e9 100644
--- a/data/themes/jewelry/dropdown_background.xml
+++ b/data/themes/jewelry/dropdown_background.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="186">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-		<part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
-		<part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
+    <widget type="Window" xpos="41" ypos="186">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
+        <part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
+        <part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
-		<part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
-		<part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
-		
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
-		<part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
-		<part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
-	</widget>
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
+        <part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
+        <part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
+
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
+        <part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
+        <part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/dropdown_pressed.xml b/data/themes/jewelry/dropdown_pressed.xml
index 0483ba9d9..e6621e100 100644
--- a/data/themes/jewelry/dropdown_pressed.xml
+++ b/data/themes/jewelry/dropdown_pressed.xml
@@ -1,8 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="105" ypos="132">
-
         <part type="down" xpos="0" ypos="0" width="15" height="15" />
         <part type="up" xpos="0" ypos="16" width="15" height="15" />
-
     </widget>
 </skinset>
diff --git a/data/themes/jewelry/drops.xml b/data/themes/jewelry/drops.xml
index 90eb29ca4..3e533f54f 100644
--- a/data/themes/jewelry/drops.xml
+++ b/data/themes/jewelry/drops.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="152">
+    <widget type="Window" xpos="260" ypos="152">
+        <option name="padding" value="10" /> 
 
-		<option name="padding" value="10" /> 
+        <!-- Top Row -->
+        <part type="top-left-corner" width="30" height="15" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="30" height="15" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
+        <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
+        <part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
-		<part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
-		<part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
-		<part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
-		<part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
+        <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
+        <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/emotes.xml b/data/themes/jewelry/emotes.xml
index 90eb29ca4..3e533f54f 100644
--- a/data/themes/jewelry/emotes.xml
+++ b/data/themes/jewelry/emotes.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="152">
+    <widget type="Window" xpos="260" ypos="152">
+        <option name="padding" value="10" /> 
 
-		<option name="padding" value="10" /> 
+        <!-- Top Row -->
+        <part type="top-left-corner" width="30" height="15" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="30" height="15" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
+        <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
+        <part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
-		<part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
-		<part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
-		<part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
-		<part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
+        <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
+        <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/equipment.xml b/data/themes/jewelry/equipment.xml
index 78e70e4b2..31dfc1b55 100644
--- a/data/themes/jewelry/equipment.xml
+++ b/data/themes/jewelry/equipment.xml
@@ -1,34 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
+        <option name="itemPadding" value="3" />
+        <option name="boxSize" value="38" />
+        <option name="stickySpacing" value="6" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
-		<option name="itemPadding" value="3" />
-		<option name="boxSize" value="38" />
-		<option name="stickySpacing" value="6" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/equipment_background.xml b/data/themes/jewelry/equipment_background.xml
index f22696093..b762ff33c 100644
--- a/data/themes/jewelry/equipment_background.xml
+++ b/data/themes/jewelry/equipment_background.xml
@@ -1,8 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="176" ypos="75">
-
-		<part type="standart" xpos="0" ypos="0" width="38" height="38" />
-		<part type="highlighted" xpos="39" ypos="0" width="38" height="38" />
-
-	</widget>
+    <widget type="Window" xpos="176" ypos="75">
+        <part type="standart" xpos="0" ypos="0" width="38" height="38" />
+        <part type="highlighted" xpos="39" ypos="0" width="38" height="38" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/help.xml b/data/themes/jewelry/help.xml
index a34ec2136..3b6f4dc12 100644
--- a/data/themes/jewelry/help.xml
+++ b/data/themes/jewelry/help.xml
@@ -1,33 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarHeight" value="35" />
+        <option name="titlebarBold" value="1" />
+        <option name="padding" value="10" />
+        <option name="stickySpacing" value="24" />
+        <option name="childPalette" value="2" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarHeight" value="35" />
-		<option name="titlebarBold" value="1" />
-		<option name="padding" value="10" />
-		<option name="stickySpacing" value="24" />
-		<option name="childPalette" value="2" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/incomplete_icon.xml b/data/themes/jewelry/incomplete_icon.xml
index 311faa0d8..9120ee861 100644
--- a/data/themes/jewelry/incomplete_icon.xml
+++ b/data/themes/jewelry/incomplete_icon.xml
@@ -1,7 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-
-		<part type="standart" xpos="63" ypos="223" width="20" height="18" />
-
-	</widget>
+    <widget type="Window">
+        <part type="standart" xpos="63" ypos="223" width="20" height="18" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/info.xml b/data/themes/jewelry/info.xml
index d62b32fbb..2b61d2b0c 100644
--- a/data/themes/jewelry/info.xml
+++ b/data/themes/jewelry/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>Jewelry</name>
     <copyright>2012 Hal9000\n2012 ManaPlus developers</copyright>
diff --git a/data/themes/jewelry/inventory.xml b/data/themes/jewelry/inventory.xml
index 6e523b50e..509498029 100644
--- a/data/themes/jewelry/inventory.xml
+++ b/data/themes/jewelry/inventory.xml
@@ -1,33 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="showbackground" value="1" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
+        <option name="stickySpacing" value="6" />
 
-		<option name="showbackground" value="1" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
-		<option name="stickySpacing" value="6" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/item_selection.xml b/data/themes/jewelry/item_selection.xml
index 2fb494892..5acaaa45c 100644
--- a/data/themes/jewelry/item_selection.xml
+++ b/data/themes/jewelry/item_selection.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-		<part type="standart" xpos="215" ypos="114" width="38" height="38" />
-	</widget>
+    <widget type="Window">
+        <part type="standart" xpos="215" ypos="114" width="38" height="38" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/itemcontainer.xml b/data/themes/jewelry/itemcontainer.xml
index bb1fdc6b5..6508445a1 100644
--- a/data/themes/jewelry/itemcontainer.xml
+++ b/data/themes/jewelry/itemcontainer.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window">
         <option name="boxWidth" value="38" />
diff --git a/data/themes/jewelry/itempopup.xml b/data/themes/jewelry/itempopup.xml
index c1951618c..2485d209e 100644
--- a/data/themes/jewelry/itempopup.xml
+++ b/data/themes/jewelry/itempopup.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="109">
+    <widget type="Window" xpos="260" ypos="109">
+        <option name="padding" value="10" />
 
-		<option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="30" height="15" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="30" height="15" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
+        <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
+        <part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
-		<part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
-		<part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
-		<part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
-		<part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
+        <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
+        <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/items.xml b/data/themes/jewelry/items.xml
index d9c774d60..faed923eb 100644
--- a/data/themes/jewelry/items.xml
+++ b/data/themes/jewelry/items.xml
@@ -1,29 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="padding" value="15" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlePadding" value="25" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="padding" value="15" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlePadding" value="25" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/keyboard_icon.xml b/data/themes/jewelry/keyboard_icon.xml
index ed5773dda..34748ddaf 100644
--- a/data/themes/jewelry/keyboard_icon.xml
+++ b/data/themes/jewelry/keyboard_icon.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window">
         <option name="padding" value="6" />
diff --git a/data/themes/jewelry/listbox.xml b/data/themes/jewelry/listbox.xml
index c18750726..5129469cd 100644
--- a/data/themes/jewelry/listbox.xml
+++ b/data/themes/jewelry/listbox.xml
@@ -1,11 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window">
-
         <option name="padding" value="8" />
         <option name="textPadding" value="48" />
         <option name="imagePadding" value="2" />
         <option name="itemPadding" value="1" />
         <option name="spacing" value="0" />
-
     </widget>
 </skinset>
diff --git a/data/themes/jewelry/login.xml b/data/themes/jewelry/login.xml
index 6827a891b..740d9f729 100644
--- a/data/themes/jewelry/login.xml
+++ b/data/themes/jewelry/login.xml
@@ -1,29 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="showbackground" value="1" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
 
-		<option name="showbackground" value="1" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-136" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-136" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/map.xml b/data/themes/jewelry/map.xml
index cdfe451e0..716dbf8e6 100644
--- a/data/themes/jewelry/map.xml
+++ b/data/themes/jewelry/map.xml
@@ -1,29 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="109">
+    <widget type="Window" xpos="260" ypos="109">
+        <option name="captionoffsetx" value="12" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="padding" value="10" />
+        <option name="titlebarHeight" value="26" />
+        <option name="stickySpacing" value="6" />
 
-		<option name="captionoffsetx" value="12" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="padding" value="10" />
-		<option name="titlebarHeight" value="26" />
-		<option name="stickySpacing" value="6" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="30" height="15" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="30" height="15" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
+        <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
+        <part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
-		<part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
-		<part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
+        <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
+        <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
-		<part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
-		<part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
-
-		<part type="stickyImageUp" xpos="-130" ypos="-58" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="-58" width="19" height="22" />
-
-	</widget>
+        <part type="stickyImageUp" xpos="-130" ypos="-58" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="-58" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/ministatus.xml b/data/themes/jewelry/ministatus.xml
index 7db6eda92..3e3fbfc35 100644
--- a/data/themes/jewelry/ministatus.xml
+++ b/data/themes/jewelry/ministatus.xml
@@ -1,11 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-
+    <widget type="Window">
         <option name="padding" value="5" />
-	    <option name="spacing" value="3" />
-	
-	    <option name="iconPadding" value="3" />
-	    <option name="iconSpacing" value="2" />
+        <option name="spacing" value="3" />
 
-	</widget>
+        <option name="iconPadding" value="3" />
+        <option name="iconSpacing" value="2" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/npc.xml b/data/themes/jewelry/npc.xml
index d6e2ab0c8..c651b5284 100644
--- a/data/themes/jewelry/npc.xml
+++ b/data/themes/jewelry/npc.xml
@@ -1,31 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="showlistbackground" value="1" />
+        <option name="showtextbackground" value="1" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
 
-		<option name="showlistbackground" value="1" />
-		<option name="showtextbackground" value="1" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/ok.xml b/data/themes/jewelry/ok.xml
index bf42a195a..c62df149e 100644
--- a/data/themes/jewelry/ok.xml
+++ b/data/themes/jewelry/ok.xml
@@ -1,30 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="buttonPadding" value="8" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
 
-		<option name="buttonPadding" value="8" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/playerbox.xml b/data/themes/jewelry/playerbox.xml
index 8b9b1b412..3a78cf407 100644
--- a/data/themes/jewelry/playerbox.xml
+++ b/data/themes/jewelry/playerbox.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="41" ypos="186">
         <option name="drawbackground" value="1" />
diff --git a/data/themes/jewelry/popup.xml b/data/themes/jewelry/popup.xml
index bf5294cee..b333d40e4 100644
--- a/data/themes/jewelry/popup.xml
+++ b/data/themes/jewelry/popup.xml
@@ -1,23 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="109">
+    <widget type="Window" xpos="260" ypos="109">
+        <option name="padding" value="10" />
+        <option name="palette" value="1" />
 
-		<option name="padding" value="10" />
-		<option name="palette" value="1" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="30" height="15" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="30" height="15" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="15" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="15" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
+        <part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
+        <part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="16" width="30" height="10" />
-		<part type="bg-quad" xpos="31" ypos="16" width="48" height="10" />
-		<part type="right-edge" xpos="80" ypos="16" width="30" height="10" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
-		<part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
-		<part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="30" height="14" />
+        <part type="bottom-edge" xpos="31" ypos="27" width="48" height="14" />
+        <part type="bottom-right-corner" xpos="80" ypos="27" width="30" height="14" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/popuplist.xml b/data/themes/jewelry/popuplist.xml
index f8cc88055..657bcd2e9 100644
--- a/data/themes/jewelry/popuplist.xml
+++ b/data/themes/jewelry/popuplist.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="186">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-		<part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
-		<part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
+    <widget type="Window" xpos="41" ypos="186">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
+        <part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
+        <part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
-		<part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
-		<part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
-		
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
-		<part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
-		<part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
-	</widget>
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
+        <part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
+        <part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
+
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
+        <part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
+        <part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/progressbar.xml b/data/themes/jewelry/progressbar.xml
index 9f8032ca4..f1ec4be26 100644
--- a/data/themes/jewelry/progressbar.xml
+++ b/data/themes/jewelry/progressbar.xml
@@ -1,23 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="80" ypos="186">
+    <widget type="Window" xpos="80" ypos="186">
+        <option name="padding" value="3" />
+        <option name="fillPadding" value="4" />
 
-		<option name="padding" value="3" />
-		<option name="fillPadding" value="4" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
+        <part type="top-edge" xpos="4" ypos="0" width="2" height="4" />
+        <part type="top-right-corner" xpos="6" ypos="0" width="4" height="4" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
-		<part type="top-edge" xpos="4" ypos="0" width="2" height="4" />
-		<part type="top-right-corner" xpos="6" ypos="0" width="4" height="4" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="4" width="4" height="14" />
+        <part type="bg-quad" xpos="4" ypos="4" width="2" height="14" />
+        <part type="right-edge" xpos="6" ypos="4" width="4" height="14" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="4" width="4" height="14" />
-		<part type="bg-quad" xpos="4" ypos="4" width="2" height="14" />
-		<part type="right-edge" xpos="6" ypos="4" width="4" height="14" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="18" width="4" height="4" />
-		<part type="bottom-edge" xpos="4" ypos="18" width="2" height="4" />
-		<part type="bottom-right-corner" xpos="6" ypos="18" width="4" height="4" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="18" width="4" height="4" />
+        <part type="bottom-edge" xpos="4" ypos="18" width="2" height="4" />
+        <part type="bottom-right-corner" xpos="6" ypos="18" width="4" height="4" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/quests.xml b/data/themes/jewelry/quests.xml
index bf3fdc8b0..594066c87 100644
--- a/data/themes/jewelry/quests.xml
+++ b/data/themes/jewelry/quests.xml
@@ -1,34 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="showlistbackground" value="1" />
+        <option name="showtextbackground" value="1" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
+        <option name="stickySpacing" value="6" />
 
-		<option name="showlistbackground" value="1" />
-		<option name="showtextbackground" value="1" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
-		<option name="stickySpacing" value="6" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/radio.xml b/data/themes/jewelry/radio.xml
index 6b6c9e4b1..bcec42477 100644
--- a/data/themes/jewelry/radio.xml
+++ b/data/themes/jewelry/radio.xml
@@ -1,15 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="190" ypos="26">
+    <widget type="Window" xpos="190" ypos="26">
+        <option name="padding" value="3" />
+        <option name="imagePadding" value="8" />
+        <option name="imageSize" value="13" />
+        <option name="spacing" value="10" />
 
-		<option name="padding" value="3" />
-		<option name="imagePadding" value="8" />
-		<option name="imageSize" value="13" />
-		<option name="spacing" value="10" />
-
-		<part type="out" xpos="0" ypos="0" width="13" height="13" />
-		<part type="in" xpos="0" ypos="13" width="13" height="13" />
-		<part type="out-highlighted" xpos="13" ypos="0" width="13" height="13" />
-		<part type="in-highlighted" xpos="13" ypos="13" width="13" height="13" />
-
-	</widget>
+        <part type="out" xpos="0" ypos="0" width="13" height="13" />
+        <part type="in" xpos="0" ypos="13" width="13" height="13" />
+        <part type="out-highlighted" xpos="13" ypos="0" width="13" height="13" />
+        <part type="in-highlighted" xpos="13" ypos="13" width="13" height="13" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/resize.xml b/data/themes/jewelry/resize.xml
index ff5160019..834390138 100644
--- a/data/themes/jewelry/resize.xml
+++ b/data/themes/jewelry/resize.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-		<part type="standart" xpos="145" ypos="0" width="13" height="13" />
-	</widget>
+    <widget type="Window">
+        <part type="standart" xpos="145" ypos="0" width="13" height="13" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/scroll.xml b/data/themes/jewelry/scroll.xml
index 718ee1c26..6d2181160 100644
--- a/data/themes/jewelry/scroll.xml
+++ b/data/themes/jewelry/scroll.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="164">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="4" />
-		<part type="top-edge" xpos="5" ypos="0" width="1" height="4" />
-		<part type="top-right-corner" xpos="6" ypos="0" width="5" height="4" />
+    <widget type="Window" xpos="41" ypos="164">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="4" />
+        <part type="top-edge" xpos="5" ypos="0" width="1" height="4" />
+        <part type="top-right-corner" xpos="6" ypos="0" width="5" height="4" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="4" width="5" height="11" />
-		<part type="bg-quad" xpos="5" ypos="4" width="1" height="11" />
-		<part type="right-edge" xpos="6" ypos="4" width="5" height="11" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="4" width="5" height="11" />
+        <part type="bg-quad" xpos="5" ypos="4" width="1" height="11" />
+        <part type="right-edge" xpos="6" ypos="4" width="5" height="11" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="15" width="5" height="4" />
-		<part type="bottom-edge" xpos="5" ypos="15" width="1" height="4" />
-		<part type="bottom-right-corner" xpos="6" ypos="15" width="5" height="4" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="15" width="5" height="4" />
+        <part type="bottom-edge" xpos="5" ypos="15" width="1" height="4" />
+        <part type="bottom-right-corner" xpos="6" ypos="15" width="5" height="4" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/scroll_background.xml b/data/themes/jewelry/scroll_background.xml
index f8cc88055..657bcd2e9 100644
--- a/data/themes/jewelry/scroll_background.xml
+++ b/data/themes/jewelry/scroll_background.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="186">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-		<part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
-		<part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
+    <widget type="Window" xpos="41" ypos="186">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
+        <part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
+        <part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
-		<part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
-		<part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
-		
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
-		<part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
-		<part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
-	</widget>
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
+        <part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
+        <part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
+
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
+        <part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
+        <part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/scroll_highlighted.xml b/data/themes/jewelry/scroll_highlighted.xml
index f6cce5e52..0521a6400 100644
--- a/data/themes/jewelry/scroll_highlighted.xml
+++ b/data/themes/jewelry/scroll_highlighted.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="57" ypos="164">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="4" />
-		<part type="top-edge" xpos="5" ypos="0" width="1" height="4" />
-		<part type="top-right-corner" xpos="6" ypos="0" width="5" height="4" />
+    <widget type="Window" xpos="57" ypos="164">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="4" />
+        <part type="top-edge" xpos="5" ypos="0" width="1" height="4" />
+        <part type="top-right-corner" xpos="6" ypos="0" width="5" height="4" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="4" width="5" height="11" />
-		<part type="bg-quad" xpos="5" ypos="4" width="1" height="11" />
-		<part type="right-edge" xpos="6" ypos="4" width="5" height="11" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="4" width="5" height="11" />
+        <part type="bg-quad" xpos="5" ypos="4" width="1" height="11" />
+        <part type="right-edge" xpos="6" ypos="4" width="5" height="11" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="15" width="5" height="4" />
-		<part type="bottom-edge" xpos="5" ypos="15" width="1" height="4" />
-		<part type="bottom-right-corner" xpos="6" ypos="15" width="5" height="4" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="15" width="5" height="4" />
+        <part type="bottom-edge" xpos="5" ypos="15" width="1" height="4" />
+        <part type="bottom-right-corner" xpos="6" ypos="15" width="5" height="4" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/scroll_vbackground.xml b/data/themes/jewelry/scroll_vbackground.xml
index 2bd1ca982..bc7f46ea7 100644
--- a/data/themes/jewelry/scroll_vbackground.xml
+++ b/data/themes/jewelry/scroll_vbackground.xml
@@ -1,13 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="105" ypos="186">
+    <widget type="Window" xpos="105" ypos="186">
+        <!-- Top Row -->
+        <part type="top-edge" xpos="0" ypos="0" width="10" height="11" />
 
-		<!-- Top Row -->
-		<part type="top-edge" xpos="0" ypos="0" width="10" height="11" />
+        <!-- Middle Row -->
+        <part type="bg-quad" xpos="16" ypos="0" width="10" height="11" />
 
-		<!-- Middle Row -->
-		<part type="bg-quad" xpos="16" ypos="0" width="10" height="11" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-edge" xpos="32" ypos="0" width="10" height="11" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-edge" xpos="32" ypos="0" width="10" height="11" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/scrollbuttons.xml b/data/themes/jewelry/scrollbuttons.xml
index 2c57cd0ba..381f102ba 100644
--- a/data/themes/jewelry/scrollbuttons.xml
+++ b/data/themes/jewelry/scrollbuttons.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="41" ypos="100">
         <part type="left" xpos="0" ypos="0" width="12" height="12" />
diff --git a/data/themes/jewelry/scrollbuttons_pressed.xml b/data/themes/jewelry/scrollbuttons_pressed.xml
index f4fb89f15..d278742d6 100644
--- a/data/themes/jewelry/scrollbuttons_pressed.xml
+++ b/data/themes/jewelry/scrollbuttons_pressed.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="57" ypos="100">
         <part type="left" xpos="0" ypos="0" width="12" height="12" />
diff --git a/data/themes/jewelry/sell.xml b/data/themes/jewelry/sell.xml
index 155d81248..dc0f877a3 100644
--- a/data/themes/jewelry/sell.xml
+++ b/data/themes/jewelry/sell.xml
@@ -1,30 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="showbackground" value="1" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
 
-		<option name="showbackground" value="1" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/server.xml b/data/themes/jewelry/server.xml
index 155d81248..dc0f877a3 100644
--- a/data/themes/jewelry/server.xml
+++ b/data/themes/jewelry/server.xml
@@ -1,30 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="showbackground" value="1" />
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
 
-		<option name="showbackground" value="1" />
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/shop.xml b/data/themes/jewelry/shop.xml
index 008ddca79..dda68e41c 100644
--- a/data/themes/jewelry/shop.xml
+++ b/data/themes/jewelry/shop.xml
@@ -1,6 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
-
         <option name="showbuybackground" value="1" />
         <option name="showsellbackground" value="1" />
         <option name="captionoffsetx" value="20" /> 
@@ -26,6 +26,5 @@
 
         <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
         <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
     </widget>
 </skinset>
diff --git a/data/themes/jewelry/slider.xml b/data/themes/jewelry/slider.xml
index dbc4818d0..63bc37445 100644
--- a/data/themes/jewelry/slider.xml
+++ b/data/themes/jewelry/slider.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="137" ypos="132">
-		<part type="hstart" xpos="16" ypos="0" width="4" height="7" />
-		<part type="hmiddle" xpos="20" ypos="0" width="7" height="7" />
-		<part type="hend" xpos="27" ypos="0" width="4" height="7" />
-		<part type="hgrip" xpos="0" ypos="0" width="13" height="13" />
+    <widget type="Window" xpos="137" ypos="132">
+        <part type="hstart" xpos="16" ypos="0" width="4" height="7" />
+        <part type="hmiddle" xpos="20" ypos="0" width="7" height="7" />
+        <part type="hend" xpos="27" ypos="0" width="4" height="7" />
+        <part type="hgrip" xpos="0" ypos="0" width="13" height="13" />
 
-		<part type="vstart" xpos="0" ypos="6" width="6" height="4" />
-		<part type="vmiddle" xpos="0" ypos="10" width="6" height="8" />
-		<part type="vend" xpos="0" ypos="18" width="6" height="9" />
-		<part type="vgrip" xpos="6" ypos="7" width="9" height="10" />
-	</widget>
+        <part type="vstart" xpos="0" ypos="6" width="6" height="4" />
+        <part type="vmiddle" xpos="0" ypos="10" width="6" height="8" />
+        <part type="vend" xpos="0" ypos="18" width="6" height="9" />
+        <part type="vgrip" xpos="6" ypos="7" width="9" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/slider_highlighted.xml b/data/themes/jewelry/slider_highlighted.xml
index 533a05d01..488605a61 100644
--- a/data/themes/jewelry/slider_highlighted.xml
+++ b/data/themes/jewelry/slider_highlighted.xml
@@ -1,13 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="137" ypos="148">
-		<part type="hstart" xpos="16" ypos="0" width="4" height="7" />
-		<part type="hmiddle" xpos="20" ypos="0" width="7" height="7" />
-		<part type="hend" xpos="27" ypos="0" width="4" height="7" />
-		<part type="hgrip" xpos="0" ypos="0" width="13" height="13" />
+    <widget type="Window" xpos="137" ypos="148">
+        <part type="hstart" xpos="16" ypos="0" width="4" height="7" />
+        <part type="hmiddle" xpos="20" ypos="0" width="7" height="7" />
+        <part type="hend" xpos="27" ypos="0" width="4" height="7" />
+        <part type="hgrip" xpos="0" ypos="0" width="13" height="13" />
 
-		<part type="vstart" xpos="0" ypos="6" width="6" height="4" />
-		<part type="vmiddle" xpos="0" ypos="10" width="6" height="8" />
-		<part type="vend" xpos="0" ypos="18" width="6" height="9" />
-		<part type="vgrip" xpos="6" ypos="7" width="9" height="10" />
-	</widget>
+        <part type="vstart" xpos="0" ypos="6" width="6" height="4" />
+        <part type="vmiddle" xpos="0" ypos="10" width="6" height="8" />
+        <part type="vend" xpos="0" ypos="18" width="6" height="9" />
+        <part type="vgrip" xpos="6" ypos="7" width="9" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/social.xml b/data/themes/jewelry/social.xml
index 16ac9e0a6..75bc9e5b8 100644
--- a/data/themes/jewelry/social.xml
+++ b/data/themes/jewelry/social.xml
@@ -1,33 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
+        <option name="showtabbackground" value="1" />
+        <option name="stickySpacing" value="6" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
-		<option name="showtabbackground" value="1" />
-		<option name="stickySpacing" value="6" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/spells.xml b/data/themes/jewelry/spells.xml
index d9c774d60..faed923eb 100644
--- a/data/themes/jewelry/spells.xml
+++ b/data/themes/jewelry/spells.xml
@@ -1,29 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="padding" value="15" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlePadding" value="25" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="padding" value="15" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlePadding" value="25" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/status.xml b/data/themes/jewelry/status.xml
index 282d5c0d8..bb5ba0aa5 100644
--- a/data/themes/jewelry/status.xml
+++ b/data/themes/jewelry/status.xml
@@ -1,32 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarHeight" value="35" />
+        <option name="titlebarBold" value="1" />
+        <option name="padding" value="10" />
+        <option name="stickySpacing" value="6" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarHeight" value="35" />
-		<option name="titlebarBold" value="1" />
-		<option name="padding" value="10" />
-		<option name="stickySpacing" value="6" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/tab.xml b/data/themes/jewelry/tab.xml
index 138cc962e..610031d7b 100644
--- a/data/themes/jewelry/tab.xml
+++ b/data/themes/jewelry/tab.xml
@@ -1,22 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="68" ypos="0">
+    <widget type="Window" xpos="68" ypos="0">
+        <option name="padding" value="5" />
 
-		<option name="padding" value="5" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
+        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
+        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-		<part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-		<part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-		<part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-		<part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
+        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
+        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/tab_highlighted.xml b/data/themes/jewelry/tab_highlighted.xml
index 1d9c55790..3c0e19a17 100644
--- a/data/themes/jewelry/tab_highlighted.xml
+++ b/data/themes/jewelry/tab_highlighted.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="68" ypos="25">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+    <widget type="Window" xpos="68" ypos="25">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-		<part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-		<part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
+        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
+        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-		<part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-		<part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
+        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
+        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/tab_selected.xml b/data/themes/jewelry/tab_selected.xml
index a5235916e..679ae58aa 100644
--- a/data/themes/jewelry/tab_selected.xml
+++ b/data/themes/jewelry/tab_selected.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="68" ypos="50">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
+    <widget type="Window" xpos="68" ypos="50">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="4" height="10" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
-		<part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
-		<part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="2" />
+        <part type="bg-quad" xpos="11" ypos="11" width="4" height="2" />
+        <part type="right-edge" xpos="16" ypos="11" width="10" height="2" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
-		<part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
-		<part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="14" width="10" height="10" />
+        <part type="bottom-edge" xpos="11" ypos="14" width="4" height="10" />
+        <part type="bottom-right-corner" xpos="16" ypos="14" width="10" height="10" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/tab_unused.xml b/data/themes/jewelry/tab_unused.xml
index 95b48e695..ed13c1168 100644
--- a/data/themes/jewelry/tab_unused.xml
+++ b/data/themes/jewelry/tab_unused.xml
@@ -1,18 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="68" ypos="75">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
-		<part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
-		<part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
+    <widget type="Window" xpos="68" ypos="75">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="5" />
+        <part type="top-edge" xpos="9" ypos="0" width="8" height="5" />
+        <part type="top-right-corner" xpos="16" ypos="0" width="10" height="5" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
-		<part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
-		<part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="4" width="10" height="16" />
+        <part type="bg-quad" xpos="9" ypos="4" width="8" height="16" />
+        <part type="right-edge" xpos="16" ypos="4" width="10" height="16" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
-		<part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
-		<part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="19" width="10" height="5" />
+        <part type="bottom-edge" xpos="9" ypos="19" width="8" height="5" />
+        <part type="bottom-right-corner" xpos="16" ypos="19" width="10" height="5" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/textfield.xml b/data/themes/jewelry/textfield.xml
index 870b75d72..8df1885ff 100644
--- a/data/themes/jewelry/textfield.xml
+++ b/data/themes/jewelry/textfield.xml
@@ -1,23 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="41" ypos="186">
+    <widget type="Window" xpos="41" ypos="186">
+        <option name="padding" value="4" />
+        <option name="frameSize" value="2" />
 
-		<option name="padding" value="4" />
-		<option name="frameSize" value="2" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
+        <part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
+        <part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-		<part type="top-edge" xpos="5" ypos="0" width="20" height="5" />
-		<part type="top-right-corner" xpos="27" ypos="0" width="5" height="5" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
+        <part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
+        <part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="5" width="5" height="20" />
-		<part type="bg-quad" xpos="5" ypos="5" width="20" height="20" />
-		<part type="right-edge" xpos="27" ypos="5" width="5" height="20" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
-		<part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
-		<part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
-
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="27" width="5" height="5" />
+        <part type="bottom-edge" xpos="5" ypos="27" width="20" height="5" />
+        <part type="bottom-right-corner" xpos="27" ypos="27" width="5" height="5" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/window.xml b/data/themes/jewelry/window.xml
index a65ff9287..e4e11476a 100644
--- a/data/themes/jewelry/window.xml
+++ b/data/themes/jewelry/window.xml
@@ -1,32 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="captionoffsetx" value="20" /> 
+        <option name="captionoffsety" value="7" />
+        <option name="titlebarBold" value="1" />
+        <option name="titlebarHeight" value="35" />
+        <option name="padding" value="10" />
+        <option name="stickySpacing" value="6" />
 
-		<option name="captionoffsetx" value="20" /> 
-		<option name="captionoffsety" value="7" />
-		<option name="titlebarBold" value="1" />
-		<option name="titlebarHeight" value="35" />
-		<option name="padding" value="10" />
-		<option name="stickySpacing" value="6" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
+        <part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
+        <part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
-		<part type="top-edge" xpos="31" ypos="0" width="48" height="53" />
-		<part type="top-right-corner" xpos="80" ypos="0" width="30" height="53" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
+        <part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
+        <part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="54" width="30" height="24" />
-		<part type="bg-quad" xpos="31" ypos="54" width="48" height="24" />
-		<part type="right-edge" xpos="80" ypos="54" width="30" height="24" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
+        <part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
+        <part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="79" width="30" height="28" />
-		<part type="bottom-edge" xpos="31" ypos="79" width="48" height="28" />
-		<part type="bottom-right-corner" xpos="80" ypos="79" width="30" height="28" />
-
-		<part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
-		<part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
-		<part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
-
-	</widget>
+        <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
+        <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="19" height="22" />
+        <part type="stickyImageDown" xpos="-99" ypos="51" width="19" height="22" />
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/windowmenu.xml b/data/themes/jewelry/windowmenu.xml
index 06f20bf2f..b998c47ad 100644
--- a/data/themes/jewelry/windowmenu.xml
+++ b/data/themes/jewelry/windowmenu.xml
@@ -1,8 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window">
-
+    <widget type="Window">
         <option name="padding" value="4" />
         <option name="spacing" value="3" />
-
-	</widget>
+    </widget>
 </skinset>
diff --git a/data/themes/jewelry/world.xml b/data/themes/jewelry/world.xml
index 3de361207..dc0f877a3 100644
--- a/data/themes/jewelry/world.xml
+++ b/data/themes/jewelry/world.xml
@@ -1,6 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
-
         <option name="showbackground" value="1" />
         <option name="captionoffsetx" value="20" /> 
         <option name="captionoffsety" value="7" />
@@ -25,6 +25,5 @@
 
         <part type="closeImage" xpos="-163" ypos="0" width="22" height="22" />
         <part type="closeImageHighlighted" xpos="-138" ypos="0" width="22" height="22" />
-
     </widget>
 </skinset>
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index bd394f901..c15ca9141 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#000000" />
diff --git a/data/themes/mana/info.xml b/data/themes/mana/info.xml
index 994939d00..d68965729 100644
--- a/data/themes/mana/info.xml
+++ b/data/themes/mana/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>mana</name>
     <copyright>2004-2009  The Mana World Development Team\n2009-2010  The Mana Developers\n2011-2012  The ManaPlus Developers</copyright>
diff --git a/data/themes/mana/npc.xml b/data/themes/mana/npc.xml
index 04664d19d..0d208300c 100644
--- a/data/themes/mana/npc.xml
+++ b/data/themes/mana/npc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window">
         <option name="showlistbackground" value="1" />
diff --git a/data/themes/mana/quests.xml b/data/themes/mana/quests.xml
index 04664d19d..0d208300c 100644
--- a/data/themes/mana/quests.xml
+++ b/data/themes/mana/quests.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window">
         <option name="showlistbackground" value="1" />
diff --git a/data/themes/mana/social.xml b/data/themes/mana/social.xml
index db05a14fb..6113ec61b 100644
--- a/data/themes/mana/social.xml
+++ b/data/themes/mana/social.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window">
         <option name="showtabbackground" value="1" />
diff --git a/data/themes/pink/buy.xml b/data/themes/pink/buy.xml
index f6ffe5cc9..effd5d24f 100644
--- a/data/themes/pink/buy.xml
+++ b/data/themes/pink/buy.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index a30652fdb..37823138f 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#FF00FF" />
diff --git a/data/themes/pink/equipment.xml b/data/themes/pink/equipment.xml
index 3a7f2e374..01ada23e3 100644
--- a/data/themes/pink/equipment.xml
+++ b/data/themes/pink/equipment.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="250" ypos="0">
+    <widget type="Window" xpos="250" ypos="0">
         <option name="itemPadding" value="2" />
         <option name="boxSize" value="36" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
-		<part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+        <part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
-		<part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
-		<part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+        <part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+        <part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
-		<part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
-		<part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+        <part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+        <part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
 
-		<part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/pink/info.xml b/data/themes/pink/info.xml
index e77d203c2..dc3a7e376 100644
--- a/data/themes/pink/info.xml
+++ b/data/themes/pink/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>Pink</name>
     <copyright>2011 Aline Ferraz de Souza\n2011-2012 ManaPlus Developers</copyright>
diff --git a/data/themes/pink/inventory.xml b/data/themes/pink/inventory.xml
index f6ffe5cc9..effd5d24f 100644
--- a/data/themes/pink/inventory.xml
+++ b/data/themes/pink/inventory.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/pink/ok.xml b/data/themes/pink/ok.xml
index 00b902f09..0dd68d3bd 100644
--- a/data/themes/pink/ok.xml
+++ b/data/themes/pink/ok.xml
@@ -1,24 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="250" ypos="0">
+    <widget type="Window" xpos="250" ypos="0">
         <option name="buttonPadding" value="8" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
-		<part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+        <part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
-		<part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
-		<part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+        <part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+        <part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
-		<part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
-		<part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+        <part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+        <part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
 
-		<part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/pink/popup.xml b/data/themes/pink/popup.xml
index d9ed2522b..8c923e2a9 100644
--- a/data/themes/pink/popup.xml
+++ b/data/themes/pink/popup.xml
@@ -1,23 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="250" ypos="0">
+    <widget type="Window" xpos="250" ypos="0">
         <option name="padding" value="5" />
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
-		<part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+        <part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
-		<part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
-		<part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+        <part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+        <part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
-		<part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
-		<part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+        <part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+        <part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
 
-		<part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/pink/progressbar.xml b/data/themes/pink/progressbar.xml
index f8d3563e2..83529fd62 100644
--- a/data/themes/pink/progressbar.xml
+++ b/data/themes/pink/progressbar.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="250" ypos="0">
+    <widget type="Window" xpos="250" ypos="0">
         <option name="padding" value="1" />
         <option name="fillPadding" value="3" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
-		<part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+        <part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
-		<part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
-		<part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+        <part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+        <part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
-		<part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
-		<part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+        <part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+        <part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
 
-		<part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/pink/quests.xml b/data/themes/pink/quests.xml
index 98d3c754c..6055f6a83 100644
--- a/data/themes/pink/quests.xml
+++ b/data/themes/pink/quests.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
         <option name="showlistbackground" value="1" />
diff --git a/data/themes/pink/sell.xml b/data/themes/pink/sell.xml
index f6ffe5cc9..effd5d24f 100644
--- a/data/themes/pink/sell.xml
+++ b/data/themes/pink/sell.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/pink/server.xml b/data/themes/pink/server.xml
index f6ffe5cc9..effd5d24f 100644
--- a/data/themes/pink/server.xml
+++ b/data/themes/pink/server.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/pink/shop.xml b/data/themes/pink/shop.xml
index 87be730a7..949f15430 100644
--- a/data/themes/pink/shop.xml
+++ b/data/themes/pink/shop.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
         <option name="showbuybackground" value="1" />
diff --git a/data/themes/pink/window.xml b/data/themes/pink/window.xml
index 0192aa991..dbfa79ad0 100644
--- a/data/themes/pink/window.xml
+++ b/data/themes/pink/window.xml
@@ -1,22 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="250" ypos="0">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
-		<part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
+    <widget type="Window" xpos="250" ypos="0">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
+        <part type="top-right-corner" xpos="0" ypos="20" width="10" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
-		<part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
-		<part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="30" width="10" height="10" />
+        <part type="bg-quad" xpos="0" ypos="40" width="10" height="10" />
+        <part type="right-edge" xpos="0" ypos="50" width="10" height="10" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
-		<part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
-		<part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="60" width="10" height="10" />
+        <part type="bottom-edge" xpos="0" ypos="70" width="10" height="10" />
+        <part type="bottom-right-corner" xpos="10" ypos="0" width="132" height="134" />
 
-		<part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-120" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-120" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-105" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/pink/world.xml b/data/themes/pink/world.xml
index f6ffe5cc9..effd5d24f 100644
--- a/data/themes/pink/world.xml
+++ b/data/themes/pink/world.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/unity/buy.xml b/data/themes/unity/buy.xml
index 9311e5d26..ef63a0c83 100644
--- a/data/themes/unity/buy.xml
+++ b/data/themes/unity/buy.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="10" />
diff --git a/data/themes/unity/char.xml b/data/themes/unity/char.xml
index 5b9c25bdb..f6ff6c264 100644
--- a/data/themes/unity/char.xml
+++ b/data/themes/unity/char.xml
@@ -1,19 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
-		<!-- <option name="padding" value="5" /> -->
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+    <widget type="Window" xpos="260" ypos="0">
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+    </widget>
 </skinset>
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 2f53b3cbe..eab87aca2 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#E0E0E0" />
diff --git a/data/themes/unity/equipment.xml b/data/themes/unity/equipment.xml
index 763826259..3c75fc0fd 100644
--- a/data/themes/unity/equipment.xml
+++ b/data/themes/unity/equipment.xml
@@ -1,26 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
         <option name="itemPadding" value="2" />
         <option name="boxSize" value="36" />
-		<option name="padding" value="10" />
+        <option name="padding" value="10" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/unity/info.xml b/data/themes/unity/info.xml
index 6f587e010..7cfb3d2f5 100644
--- a/data/themes/unity/info.xml
+++ b/data/themes/unity/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>Unity</name>
     <copyright>2011 Aline Ferraz de Souza\n2011-2012 ManaPlus Developers</copyright>
diff --git a/data/themes/unity/inventory.xml b/data/themes/unity/inventory.xml
index dde95c2f9..aea7ca8f8 100644
--- a/data/themes/unity/inventory.xml
+++ b/data/themes/unity/inventory.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/unity/npc.xml b/data/themes/unity/npc.xml
index c2256ab35..5d3d2941c 100644
--- a/data/themes/unity/npc.xml
+++ b/data/themes/unity/npc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showlistbackground" value="1" />
diff --git a/data/themes/unity/ok.xml b/data/themes/unity/ok.xml
index 5ebf31e3e..ac19b1c60 100644
--- a/data/themes/unity/ok.xml
+++ b/data/themes/unity/ok.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
-		<option name="padding" value="10" />
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="padding" value="10" />
         <option name="buttonPadding" value="8" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/unity/popup.xml b/data/themes/unity/popup.xml
index 4059063aa..c1f0034bb 100644
--- a/data/themes/unity/popup.xml
+++ b/data/themes/unity/popup.xml
@@ -1,19 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="6" />
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
-	</widget>
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+    </widget>
 </skinset>
diff --git a/data/themes/unity/progressbar.xml b/data/themes/unity/progressbar.xml
index 44d1e58f7..96a8af783 100644
--- a/data/themes/unity/progressbar.xml
+++ b/data/themes/unity/progressbar.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="7" />
         <option name="fillPadding" value="9" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/unity/quests.xml b/data/themes/unity/quests.xml
index 16283c02d..f870937e5 100644
--- a/data/themes/unity/quests.xml
+++ b/data/themes/unity/quests.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="10" />
diff --git a/data/themes/unity/sell.xml b/data/themes/unity/sell.xml
index 9311e5d26..ef63a0c83 100644
--- a/data/themes/unity/sell.xml
+++ b/data/themes/unity/sell.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="10" />
diff --git a/data/themes/unity/server.xml b/data/themes/unity/server.xml
index 9311e5d26..ef63a0c83 100644
--- a/data/themes/unity/server.xml
+++ b/data/themes/unity/server.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="10" />
diff --git a/data/themes/unity/shop.xml b/data/themes/unity/shop.xml
index b0b2e0219..0ced680fd 100644
--- a/data/themes/unity/shop.xml
+++ b/data/themes/unity/shop.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="10" />
diff --git a/data/themes/unity/social.xml b/data/themes/unity/social.xml
index 0af4a3818..f7762e1df 100644
--- a/data/themes/unity/social.xml
+++ b/data/themes/unity/social.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showtabbackground" value="1" />
diff --git a/data/themes/unity/window.xml b/data/themes/unity/window.xml
index 74ff48915..e59c22879 100644
--- a/data/themes/unity/window.xml
+++ b/data/themes/unity/window.xml
@@ -1,23 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
-		<option name="padding" value="10" />
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+    <widget type="Window" xpos="260" ypos="0">
+        <option name="padding" value="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/unity/world.xml b/data/themes/unity/world.xml
index 9311e5d26..ef63a0c83 100644
--- a/data/themes/unity/world.xml
+++ b/data/themes/unity/world.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="10" />
diff --git a/data/themes/wood/buy.xml b/data/themes/wood/buy.xml
index 39c568e78..a51183d53 100644
--- a/data/themes/wood/buy.xml
+++ b/data/themes/wood/buy.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 7b6125439..3a7a0ea4d 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <colors>
     <palette id="0">
         <color id="BROWSERBOX" color="#000000" />
diff --git a/data/themes/wood/equipment.xml b/data/themes/wood/equipment.xml
index 26ff1c834..08d3a2a1e 100644
--- a/data/themes/wood/equipment.xml
+++ b/data/themes/wood/equipment.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
         <option name="itemPadding" value="2" />
         <option name="boxSize" value="36" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/wood/info.xml b/data/themes/wood/info.xml
index 8e35d65ad..8abd812f9 100644
--- a/data/themes/wood/info.xml
+++ b/data/themes/wood/info.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <info>
     <name>Wood</name>
     <copyright>Vianney Rousset\n2004-2009 The Mana World Development Team\n2009-2010 The Mana Developers\n2011-2012 ManaPlus Developers</copyright>
diff --git a/data/themes/wood/inventory.xml b/data/themes/wood/inventory.xml
index 39c568e78..a51183d53 100644
--- a/data/themes/wood/inventory.xml
+++ b/data/themes/wood/inventory.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/wood/ok.xml b/data/themes/wood/ok.xml
index f328e63b9..d9ad0a034 100644
--- a/data/themes/wood/ok.xml
+++ b/data/themes/wood/ok.xml
@@ -1,24 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
         <option name="buttonPadding" value="8" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/wood/popup.xml b/data/themes/wood/popup.xml
index 1a1964af5..f8d88c101 100644
--- a/data/themes/wood/popup.xml
+++ b/data/themes/wood/popup.xml
@@ -1,23 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="6" />
-		<!-- Top Row -->
-		<part type="top-left-corner" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/wood/progressbar.xml b/data/themes/wood/progressbar.xml
index 5a0113287..4e5479313 100644
--- a/data/themes/wood/progressbar.xml
+++ b/data/themes/wood/progressbar.xml
@@ -1,25 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
+    <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="1" />
         <option name="fillPadding" value="3" />
 
-		<!-- Top Row -->
-		<part type="top-left-corner" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+        <!-- Top Row -->
+        <part type="top-left-corner" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/wood/quests.xml b/data/themes/wood/quests.xml
index 1ecdb91ad..d2824d3f8 100644
--- a/data/themes/wood/quests.xml
+++ b/data/themes/wood/quests.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showlistbackground" value="1" />
diff --git a/data/themes/wood/sell.xml b/data/themes/wood/sell.xml
index 39c568e78..a51183d53 100644
--- a/data/themes/wood/sell.xml
+++ b/data/themes/wood/sell.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/wood/server.xml b/data/themes/wood/server.xml
index 39c568e78..a51183d53 100644
--- a/data/themes/wood/server.xml
+++ b/data/themes/wood/server.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showbackground" value="1" />
diff --git a/data/themes/wood/shop.xml b/data/themes/wood/shop.xml
index 0ca7971a6..7f8828f06 100644
--- a/data/themes/wood/shop.xml
+++ b/data/themes/wood/shop.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showbuybackground" value="1" />
diff --git a/data/themes/wood/window.xml b/data/themes/wood/window.xml
index 47bc2f1ac..0ed48061a 100644
--- a/data/themes/wood/window.xml
+++ b/data/themes/wood/window.xml
@@ -1,22 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
-	<widget type="Window" xpos="260" ypos="0">
-		<!-- Top Row -->
-		<part type="top-left-corner" width="10" height="10" />
-		<part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
-		<part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
+    <widget type="Window" xpos="260" ypos="0">
+        <!-- Top Row -->
+        <part type="top-left-corner" width="10" height="10" />
+        <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
+        <part type="top-right-corner" xpos="139" ypos="0" width="12" height="10" />
 
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
-		<part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
-		<part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
+        <!-- Middle Row -->
+        <part type="left-edge" xpos="0" ypos="11" width="10" height="81" />
+        <part type="bg-quad" xpos="11" ypos="11" width="127" height="81" />
+        <part type="right-edge" xpos="139" ypos="11" width="12" height="81" />
 
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
-		<part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
-		<part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
+        <!-- Bottom Row -->
+        <part type="bottom-left-corner" xpos="0" ypos="93" width="10" height="12" />
+        <part type="bottom-edge" xpos="11" ypos="93" width="127" height="12" />
+        <part type="bottom-right-corner" xpos="139" ypos="93" width="12" height="12" />
 
-		<part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
-		<part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
-		<part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
-	</widget>
+        <part type="closeImage" xpos="-130" ypos="0" width="15" height="15" />
+        <part type="stickyImageUp" xpos="-130" ypos="51" width="15" height="15" />
+        <part type="stickyImageDown" xpos="-115" ypos="51" width="15" height="15" />
+    </widget>
 </skinset>
diff --git a/data/themes/wood/world.xml b/data/themes/wood/world.xml
index 39c568e78..a51183d53 100644
--- a/data/themes/wood/world.xml
+++ b/data/themes/wood/world.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="showbackground" value="1" />
-- 
cgit v1.2.3-70-g09d2