Merge branch 'master' of gitorious.org:manaplus/manaplus

66 files changed, 54 insertions, 120 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 302f0feae..2d63a033e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = fonts graphics help icons perserver sfx themes
+SUBDIRS = evol fonts graphics help icons perserver sfx themes
 
 EXTRA_DIST = CMakeLists.txt items.xsd
 
diff --git a/data/evol/Makefile.am b/data/evol/Makefile.am
new file mode 100644
index 000000000..2bd86e257
--- /dev/null
+++ b/data/evol/Makefile.am
@@ -0,0 +1,17 @@
+
+desktopdir = $(datarootdir)/applications
+
+evol-client:
+	     mkdir -p "$(pkgdatadir)/data/evol/icons"
+	     cp evol.desktop "$(desktopdir)"
+	     cp evol.manaplus "$(pkgdatadir)/data/evol"
+	     cp icons/evol-client.png "$(pkgdatadir)/data/evol/icons"
+	     cp icons/evol-client.png "$(datarootdir)/icons"
+	     cp -r images "$(pkgdatadir)/data/evol"
+
+EXTRA_DIST = evol.desktop \
+	    evol.manaplus \
+	    icons/evol-client.ico \
+	    icons/evol-client.png \
+	    icons/evol-client.xpm \
+	    images/loginwallpaper_800x600.png
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index 63a963495..9c4743852 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -6,6 +6,7 @@
  <option name="appIcon" value="evol/icons/evol-client"/>
  <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
  <option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/>
+ <option name="onlineServerFile" value="evol.xml"/>
  <option name="defaultServer" value="world.evolonline.org"/>
  <option name="defaultPort" value="6901"/>
  <option name="defaultServerType" value="evol"/>
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index aba42b39c..b262a5ac3 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -3,6 +3,7 @@ SET (FILES
     button.png
     button_disabled.png
     buttonhi.png
+    buttonplay.png
     buttonpress.png
     checkbox.png
     circle-gray.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 7fb82f545..6f294fa45 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -6,6 +6,7 @@ gui_DATA =				\
 	button.png			\
 	button_disabled.png		\
 	buttonhi.png			\
+	buttonplay.png			\
 	buttonpress.png			\
 	checkbox.png			\
 	circle-gray.png			\
diff --git a/data/graphics/gui/buttonplay.png b/data/graphics/gui/buttonplay.png
new file mode 100644
index 000000000..cd3a2c3db
--- /dev/null
+++ b/data/graphics/gui/buttonplay.png
diff --git a/data/sfx/system/CMakeLists.txt b/data/sfx/system/CMakeLists.txt
index bf6f0f0f3..0fa325a45 100644
--- a/data/sfx/system/CMakeLists.txt
+++ b/data/sfx/system/CMakeLists.txt
@@ -1,5 +1,21 @@
 SET (FILES
+    attention.ogg
+    chat1.ogg
+    chat2.ogg
+    complete.ogg
+    email.ogg
+    error.ogg
+    finish.ogg
+    incoming.ogg
+    move.ogg
+    notify.ogg
     newmessage.ogg
+    offline.ogg
+    online.ogg
+    reminder.ogg
+    send.ogg
+    start.ogg
+    watcher.ogg
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/sfx/system)
diff --git a/data/sfx/system/Makefile.am b/data/sfx/system/Makefile.am
index e744932c3..d46934461 100644
--- a/data/sfx/system/Makefile.am
+++ b/data/sfx/system/Makefile.am
@@ -1,7 +1,23 @@
 systemdir = $(pkgdatadir)/data/sfx/system
 
 system_DATA =				\
-	newmessage.ogg
+	attention.ogg \
+	chat1.ogg \
+	chat2.ogg \
+	complete.ogg \
+	email.ogg \
+	error.ogg \
+	finish.ogg \
+	incoming.ogg \
+	move.ogg \
+	newmessage.ogg \
+	notify.ogg \
+	offline.ogg \
+	online.ogg \
+	reminder.ogg \
+	send.ogg \
+	start.ogg \
+	watcher.ogg
 
 EXTRA_DIST =				\
 	$(system_DATA) \
diff --git a/data/sfx/system/attention.ogg b/data/sfx/system/attention.ogg
new file mode 100644
index 000000000..929265775
--- /dev/null
+++ b/data/sfx/system/attention.ogg
diff --git a/data/sfx/system/chat1.ogg b/data/sfx/system/chat1.ogg
new file mode 100644
index 000000000..ad6c52a1d
--- /dev/null
+++ b/data/sfx/system/chat1.ogg
diff --git a/data/sfx/system/chat2.ogg b/data/sfx/system/chat2.ogg
new file mode 100644
index 000000000..155b15e1f
--- /dev/null
+++ b/data/sfx/system/chat2.ogg
diff --git a/data/sfx/system/complete.ogg b/data/sfx/system/complete.ogg
new file mode 100644
index 000000000..0975ff7c8
--- /dev/null
+++ b/data/sfx/system/complete.ogg
diff --git a/data/sfx/system/email.ogg b/data/sfx/system/email.ogg
new file mode 100644
index 000000000..afb25909f
--- /dev/null
+++ b/data/sfx/system/email.ogg
diff --git a/data/sfx/system/error.ogg b/data/sfx/system/error.ogg
new file mode 100644
index 000000000..69dccfe7c
--- /dev/null
+++ b/data/sfx/system/error.ogg
diff --git a/data/sfx/system/finish.ogg b/data/sfx/system/finish.ogg
new file mode 100644
index 000000000..d8dbbf80f
--- /dev/null
+++ b/data/sfx/system/finish.ogg
diff --git a/data/sfx/system/incoming.ogg b/data/sfx/system/incoming.ogg
new file mode 100644
index 000000000..a8ff86676
--- /dev/null
+++ b/data/sfx/system/incoming.ogg
diff --git a/data/sfx/system/move.ogg b/data/sfx/system/move.ogg
new file mode 100644
index 000000000..e5c703bbf
--- /dev/null
+++ b/data/sfx/system/move.ogg
diff --git a/data/sfx/system/notify.ogg b/data/sfx/system/notify.ogg
new file mode 100644
index 000000000..95d8fed4a
--- /dev/null
+++ b/data/sfx/system/notify.ogg
diff --git a/data/sfx/system/offline.ogg b/data/sfx/system/offline.ogg
new file mode 100644
index 000000000..cc1b8e938
--- /dev/null
+++ b/data/sfx/system/offline.ogg
diff --git a/data/sfx/system/online.ogg b/data/sfx/system/online.ogg
new file mode 100644
index 000000000..3e55793fd
--- /dev/null
+++ b/data/sfx/system/online.ogg
diff --git a/data/sfx/system/reminder.ogg b/data/sfx/system/reminder.ogg
new file mode 100644
index 000000000..d7beeed6f
--- /dev/null
+++ b/data/sfx/system/reminder.ogg
diff --git a/data/sfx/system/send.ogg b/data/sfx/system/send.ogg
new file mode 100644
index 000000000..b5941323d
--- /dev/null
+++ b/data/sfx/system/send.ogg
diff --git a/data/sfx/system/start.ogg b/data/sfx/system/start.ogg
new file mode 100644
index 000000000..0b1f85643
--- /dev/null
+++ b/data/sfx/system/start.ogg
diff --git a/data/sfx/system/watcher.ogg b/data/sfx/system/watcher.ogg
new file mode 100644
index 000000000..9a0dd1af2
--- /dev/null
+++ b/data/sfx/system/watcher.ogg
diff --git a/data/themes/blackwood/Makefile.am b/data/themes/blackwood/Makefile.am
index 31cb547c1..52463440e 100644
--- a/data/themes/blackwood/Makefile.am
+++ b/data/themes/blackwood/Makefile.am
@@ -34,12 +34,6 @@ gui_DATA =				\
 	tab.png				\
 	tab_hilight.png			\
 	tabselected.png			\
-	target-cursor-blue-l.png	\
-	target-cursor-blue-m.png	\
-	target-cursor-blue-s.png	\
-	target-cursor-red-l.png		\
-	target-cursor-red-m.png		\
-	target-cursor-red-s.png		\
 	vscroll_down_default.png	\
 	vscroll_down_highlight.png	\
 	vscroll_down_pressed.png	\
diff --git a/data/themes/blackwood/target-cursor-blue-l.png b/data/themes/blackwood/target-cursor-blue-l.png
deleted file mode 100644
index 88d0bf40e..000000000
--- a/data/themes/blackwood/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-blue-m.png b/data/themes/blackwood/target-cursor-blue-m.png
deleted file mode 100644
index ac0189d0f..000000000
--- a/data/themes/blackwood/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-blue-s.png b/data/themes/blackwood/target-cursor-blue-s.png
deleted file mode 100644
index 90b22d72d..000000000
--- a/data/themes/blackwood/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-red-l.png b/data/themes/blackwood/target-cursor-red-l.png
deleted file mode 100644
index 776c8acdf..000000000
--- a/data/themes/blackwood/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-red-m.png b/data/themes/blackwood/target-cursor-red-m.png
deleted file mode 100644
index af657dc14..000000000
--- a/data/themes/blackwood/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-red-s.png b/data/themes/blackwood/target-cursor-red-s.png
deleted file mode 100644
index 090ec040d..000000000
--- a/data/themes/blackwood/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/pink/CMakeLists.txt b/data/themes/pink/CMakeLists.txt
index f6f6e81f6..56b11fb87 100644
--- a/data/themes/pink/CMakeLists.txt
+++ b/data/themes/pink/CMakeLists.txt
@@ -5,8 +5,6 @@ SET (FILES
     buttonhi.png
     buttonpress.png
     checkbox.png
-    circle-gray.png
-    circle-green.png
     close_button.png
     colors.xml
     deepbox.png
@@ -17,7 +15,6 @@ SET (FILES
     hscroll_right_highlight.png
     hscroll_right_pressed.png
     item_shortcut_bgr.png
-    mouse.png
     progress-indicator.png
     radioin.png
     radioin_highlight.png
@@ -27,17 +24,10 @@ SET (FILES
     selection.png
     slider.png
     slider_hilight.png
-    speechbubble.xml
     sticky_button.png
     tab.png
     tab_hilight.png
     tabselected.png
-    target-cursor-blue-l.png
-    target-cursor-blue-m.png
-    target-cursor-blue-s.png
-    target-cursor-red-l.png
-    target-cursor-red-m.png
-    target-cursor-red-s.png
     unknown-item.png
     vscroll_down_default.png
     vscroll_down_highlight.png
diff --git a/data/themes/pink/Makefile.am b/data/themes/pink/Makefile.am
index 5fd4904f5..54d84bd97 100644
--- a/data/themes/pink/Makefile.am
+++ b/data/themes/pink/Makefile.am
@@ -8,8 +8,6 @@ gui_DATA =				\
 	buttonhi.png			\
 	buttonpress.png			\
 	checkbox.png			\
-	circle-gray.png			\
-	circle-green.png		\
 	close_button.png		\
 	colors.xml		\
 	deepbox.png			\
@@ -21,7 +19,6 @@ gui_DATA =				\
 	hscroll_right_highlight.png	\
 	hscroll_right_pressed.png	\
 	item_shortcut_bgr.png		\
-	mouse.png			\
 	progress-indicator.png		\
 	radioin.png			\
 	radioin_highlight.png		\
@@ -31,17 +28,10 @@ gui_DATA =				\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
-	speechbubble.xml		\
 	sticky_button.png		\
 	tab.png				\
 	tab_hilight.png			\
 	tabselected.png			\
-	target-cursor-blue-l.png	\
-	target-cursor-blue-m.png	\
-	target-cursor-blue-s.png	\
-	target-cursor-red-l.png		\
-	target-cursor-red-m.png		\
-	target-cursor-red-s.png		\
 	unknown-item.png		\
 	vscroll_down_default.png	\
 	vscroll_down_highlight.png	\
diff --git a/data/themes/pink/circle-gray.png b/data/themes/pink/circle-gray.png
deleted file mode 100644
index 3e884f405..000000000
--- a/data/themes/pink/circle-gray.png
+++ /dev/null
diff --git a/data/themes/pink/circle-green.png b/data/themes/pink/circle-green.png
deleted file mode 100644
index 2c98e9ef1..000000000
--- a/data/themes/pink/circle-green.png
+++ /dev/null
diff --git a/data/themes/pink/mouse.png b/data/themes/pink/mouse.png
deleted file mode 100644
index df460e49c..000000000
--- a/data/themes/pink/mouse.png
+++ /dev/null
diff --git a/data/themes/pink/speechbubble.xml b/data/themes/pink/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/pink/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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" />
-
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="5" 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>
-</skinset>
diff --git a/data/themes/pink/target-cursor-blue-l.png b/data/themes/pink/target-cursor-blue-l.png
deleted file mode 100644
index 77cdf4b6d..000000000
--- a/data/themes/pink/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-blue-m.png b/data/themes/pink/target-cursor-blue-m.png
deleted file mode 100644
index c0107357a..000000000
--- a/data/themes/pink/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-blue-s.png b/data/themes/pink/target-cursor-blue-s.png
deleted file mode 100644
index 3e81c75de..000000000
--- a/data/themes/pink/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-red-l.png b/data/themes/pink/target-cursor-red-l.png
deleted file mode 100644
index 76d2101b1..000000000
--- a/data/themes/pink/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-red-m.png b/data/themes/pink/target-cursor-red-m.png
deleted file mode 100644
index e2ab79c29..000000000
--- a/data/themes/pink/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-red-s.png b/data/themes/pink/target-cursor-red-s.png
deleted file mode 100644
index 09195f440..000000000
--- a/data/themes/pink/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/redandblack/CMakeLists.txt b/data/themes/redandblack/CMakeLists.txt
index 22408ceae..e07edacb1 100644
--- a/data/themes/redandblack/CMakeLists.txt
+++ b/data/themes/redandblack/CMakeLists.txt
@@ -26,18 +26,10 @@ SET (FILES
     selection.png
     slider.png
     slider_hilight.png
-    speechbubble.xml
     sticky_button.png
     tab.png
     tab_hilight.png
     tabselected.png
-    target-cursor-blue-l.png
-    target-cursor-blue-m.png
-    target-cursor-blue-s.png
-    target-cursor-red-l.png
-    target-cursor-red-m.png
-    target-cursor-red-s.png
-    unknown-item.png
     vscroll_down_default.png
     vscroll_down_highlight.png
     vscroll_down_pressed.png
diff --git a/data/themes/redandblack/Makefile.am b/data/themes/redandblack/Makefile.am
index 24b9920cb..bee931d4f 100644
--- a/data/themes/redandblack/Makefile.am
+++ b/data/themes/redandblack/Makefile.am
@@ -30,18 +30,10 @@ gui_DATA =				\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
-	speechbubble.xml		\
 	sticky_button.png		\
 	tab.png				\
 	tab_hilight.png			\
 	tabselected.png			\
-	target-cursor-blue-l.png	\
-	target-cursor-blue-m.png	\
-	target-cursor-blue-s.png	\
-	target-cursor-red-l.png		\
-	target-cursor-red-m.png		\
-	target-cursor-red-s.png		\
-	unknown-item.png		\
 	vscroll_down_default.png	\
 	vscroll_down_highlight.png	\
 	vscroll_down_pressed.png	\
diff --git a/data/themes/redandblack/speechbubble.xml b/data/themes/redandblack/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/redandblack/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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" />
-
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="5" 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>
-</skinset>
diff --git a/data/themes/redandblack/target-cursor-blue-l.png b/data/themes/redandblack/target-cursor-blue-l.png
deleted file mode 100644
index cd6aaa225..000000000
--- a/data/themes/redandblack/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-blue-m.png b/data/themes/redandblack/target-cursor-blue-m.png
deleted file mode 100644
index d961cd363..000000000
--- a/data/themes/redandblack/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-blue-s.png b/data/themes/redandblack/target-cursor-blue-s.png
deleted file mode 100644
index c9edefe48..000000000
--- a/data/themes/redandblack/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-red-l.png b/data/themes/redandblack/target-cursor-red-l.png
deleted file mode 100644
index de9337e6a..000000000
--- a/data/themes/redandblack/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-red-m.png b/data/themes/redandblack/target-cursor-red-m.png
deleted file mode 100644
index 8e669f6f7..000000000
--- a/data/themes/redandblack/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-red-s.png b/data/themes/redandblack/target-cursor-red-s.png
deleted file mode 100644
index 0dd1e0d7c..000000000
--- a/data/themes/redandblack/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/redandblack/unknown-item.png b/data/themes/redandblack/unknown-item.png
deleted file mode 100644
index 9201d688e..000000000
--- a/data/themes/redandblack/unknown-item.png
+++ /dev/null
diff --git a/data/themes/wood/CMakeLists.txt b/data/themes/wood/CMakeLists.txt
index 153e4d04b..797b29f9e 100644
--- a/data/themes/wood/CMakeLists.txt
+++ b/data/themes/wood/CMakeLists.txt
@@ -1,12 +1,9 @@
 SET (FILES
-    bubble.png
     button.png
     button_disabled.png
     buttonhi.png
     buttonpress.png
     checkbox.png
-    circle-gray.png
-    circle-green.png
     close_button.png
     colors.xml
     deepbox.png
@@ -26,18 +23,10 @@ SET (FILES
     selection.png
     slider.png
     slider_hilight.png
-    speechbubble.xml
     sticky_button.png
     tab.png
     tab_hilight.png
     tabselected.png
-    target-cursor-blue-l.png
-    target-cursor-blue-m.png
-    target-cursor-blue-s.png
-    target-cursor-red-l.png
-    target-cursor-red-m.png
-    target-cursor-red-s.png
-    unknown-item.png
     vscroll_down_default.png
     vscroll_down_highlight.png
     vscroll_down_pressed.png
diff --git a/data/themes/wood/Makefile.am b/data/themes/wood/Makefile.am
index f9f04c254..78aba7d35 100644
--- a/data/themes/wood/Makefile.am
+++ b/data/themes/wood/Makefile.am
@@ -2,14 +2,11 @@
 guidir = $(pkgdatadir)/data/themes/wood
 
 gui_DATA =				\
-	bubble.png			\
 	button.png			\
 	button_disabled.png		\
 	buttonhi.png			\
 	buttonpress.png			\
 	checkbox.png			\
-	circle-gray.png			\
-	circle-green.png		\
 	close_button.png		\
 	colors.xml		\
 	deepbox.png			\
@@ -30,18 +27,10 @@ gui_DATA =				\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
-	speechbubble.xml		\
 	sticky_button.png		\
 	tab.png				\
 	tab_hilight.png			\
 	tabselected.png			\
-	target-cursor-blue-l.png	\
-	target-cursor-blue-m.png	\
-	target-cursor-blue-s.png	\
-	target-cursor-red-l.png		\
-	target-cursor-red-m.png		\
-	target-cursor-red-s.png		\
-	unknown-item.png		\
 	vscroll_down_default.png	\
 	vscroll_down_highlight.png	\
 	vscroll_down_pressed.png	\
diff --git a/data/themes/wood/bubble.png b/data/themes/wood/bubble.png
deleted file mode 100644
index 45322eb2e..000000000
--- a/data/themes/wood/bubble.png
+++ /dev/null
diff --git a/data/themes/wood/circle-gray.png b/data/themes/wood/circle-gray.png
deleted file mode 100644
index 3e884f405..000000000
--- a/data/themes/wood/circle-gray.png
+++ /dev/null
diff --git a/data/themes/wood/circle-green.png b/data/themes/wood/circle-green.png
deleted file mode 100644
index 2c98e9ef1..000000000
--- a/data/themes/wood/circle-green.png
+++ /dev/null
diff --git a/data/themes/wood/speechbubble.xml b/data/themes/wood/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/wood/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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" />
-
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="5" 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>
-</skinset>
diff --git a/data/themes/wood/target-cursor-blue-l.png b/data/themes/wood/target-cursor-blue-l.png
deleted file mode 100644
index 77cdf4b6d..000000000
--- a/data/themes/wood/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-blue-m.png b/data/themes/wood/target-cursor-blue-m.png
deleted file mode 100644
index c0107357a..000000000
--- a/data/themes/wood/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-blue-s.png b/data/themes/wood/target-cursor-blue-s.png
deleted file mode 100644
index 3e81c75de..000000000
--- a/data/themes/wood/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-red-l.png b/data/themes/wood/target-cursor-red-l.png
deleted file mode 100644
index 76d2101b1..000000000
--- a/data/themes/wood/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-red-m.png b/data/themes/wood/target-cursor-red-m.png
deleted file mode 100644
index e2ab79c29..000000000
--- a/data/themes/wood/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-red-s.png b/data/themes/wood/target-cursor-red-s.png
deleted file mode 100644
index 09195f440..000000000
--- a/data/themes/wood/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/wood/unknown-item.png b/data/themes/wood/unknown-item.png
deleted file mode 100644
index 9201d688e..000000000
--- a/data/themes/wood/unknown-item.png
+++ /dev/null