From a8837fed419442a2f5d9ec95966b3cfa54f0ddce Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Thu, 25 Aug 2016 13:24:03 +0000
Subject: [PATCH] Major GUI stlye and sprite cleanup.

Remove many unused and orphaned entries from common/,
including the entire Wheat theme from more than a decade ago and
most parts of the Stone theme.

Besides being unused, nearly all of the styles were ugly and don't fit
to the existing theme.
No entry should be reintroduced without being actually used somewhere
and if so, use a new subdirectory with the name of the theme.

This was SVN commit r18633.
---
 .../ui/global/border/bottom_marble.dds        |   3 -
 .../ui/global/border/corner_bronze.dds        |   3 -
 .../textures/ui/global/border/left_marble.dds |   3 -
 .../ui/global/border/right_marble.dds         |   3 -
 .../textures/ui/global/border/scrollbar.dds   |   3 -
 .../textures/ui/global/border/top_marble.dds  |   3 -
 .../ui/global/button/checkbox_cross_gray.dds  |   3 -
 .../button/checkbox_cross_over_gray.dds       |   3 -
 .../ui/global/button/checkbox_open_gray.dds   |   3 -
 .../ui/global/button/checkbox_tick_gray.dds   |   3 -
 .../art/textures/ui/global/icon/bullet.dds    |   3 -
 .../art/textures/ui/global/icon/infinity.dds  |   3 -
 .../textures/ui/global/icon/product_black.dds |   3 -
 .../art/textures/ui/global/tile/granite.dds   |   3 -
 .../art/textures/ui/global/tile/sandstone.dds |   3 -
 .../ui/global/titlebar/left_gold_fern.dds     |   3 -
 .../ui/global/titlebar/middle_gold_fern.dds   |   3 -
 .../ui/global/titlebar/right_gold_fern.dds    |   3 -
 .../mods/public/gui/common/common_sprites.xml | 331 ------------
 .../mods/public/gui/common/common_styles.xml  | 112 ----
 .../data/mods/public/gui/common/setup.xml     |  53 --
 .../data/mods/public/gui/common/sprite1.xml   | 491 ------------------
 .../data/mods/public/gui/session/sprites.xml  | 179 -------
 .../mods/public/gui/session/trade_window.xml  |   4 +-
 24 files changed, 2 insertions(+), 1222 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/border/bottom_marble.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/border/corner_bronze.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/border/left_marble.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/border/right_marble.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/border/scrollbar.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/border/top_marble.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_gray.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_over_gray.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/button/checkbox_open_gray.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/button/checkbox_tick_gray.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/icon/bullet.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/icon/infinity.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/icon/product_black.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/tile/granite.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/tile/sandstone.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/titlebar/left_gold_fern.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/titlebar/middle_gold_fern.dds
 delete mode 100644 binaries/data/mods/public/art/textures/ui/global/titlebar/right_gold_fern.dds

diff --git a/binaries/data/mods/public/art/textures/ui/global/border/bottom_marble.dds b/binaries/data/mods/public/art/textures/ui/global/border/bottom_marble.dds
deleted file mode 100644
index d95bedeee8..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/border/bottom_marble.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef80933f8cd4bce2ced7a08d19bf6ea31122a0bb060475d3848e3081c35ce685
-size 4224
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/corner_bronze.dds b/binaries/data/mods/public/art/textures/ui/global/border/corner_bronze.dds
deleted file mode 100644
index c7de52ee21..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/border/corner_bronze.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b959a7406c13f4cedbcbe5e2acff8a5545e1ba140ec2604a28e70ebfb383cc53
-size 384
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/left_marble.dds b/binaries/data/mods/public/art/textures/ui/global/border/left_marble.dds
deleted file mode 100644
index ab3f7004d2..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/border/left_marble.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2554ab20cd644d762540a41d1b0b21079576b725309dd3f70eeceb4a9f7fcc85
-size 4224
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/right_marble.dds b/binaries/data/mods/public/art/textures/ui/global/border/right_marble.dds
deleted file mode 100644
index ee1a359114..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/border/right_marble.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b957da6ddd8150322cbd2e745d78caae6193bd3e9a9c68e4dd44b0ea661a777c
-size 4224
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/scrollbar.dds b/binaries/data/mods/public/art/textures/ui/global/border/scrollbar.dds
deleted file mode 100644
index 2bfd9ddc79..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/border/scrollbar.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:217091d274fba072cf4d0ad933757b0d5baa1cffe5a02ea0ac4b9c2bc383269f
-size 1152
diff --git a/binaries/data/mods/public/art/textures/ui/global/border/top_marble.dds b/binaries/data/mods/public/art/textures/ui/global/border/top_marble.dds
deleted file mode 100644
index 596868d457..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/border/top_marble.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:119e754dc354cdeea640f14bed068433f81c68c4a5b23dcfea28d7e039e37fbb
-size 4224
diff --git a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_gray.dds b/binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_gray.dds
deleted file mode 100644
index 6a02cd2b2c..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_gray.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0bd6ef4465a2ca603c54061f7ed84be897e27b7958392dd743ceb79ca25028f
-size 256
diff --git a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_over_gray.dds b/binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_over_gray.dds
deleted file mode 100644
index 2b6ce4ace0..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_cross_over_gray.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71536a4feb08d9d3d5fdf5a7899bd99155f99e4ea9d8f3b0b0e4bd40a906a5a8
-size 256
diff --git a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_open_gray.dds b/binaries/data/mods/public/art/textures/ui/global/button/checkbox_open_gray.dds
deleted file mode 100644
index f3333fc98c..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_open_gray.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ed45fec0ae8c168d4ac0355b7204fda87d805a9ab7bbc7402e391e49dc59b2a
-size 256
diff --git a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_tick_gray.dds b/binaries/data/mods/public/art/textures/ui/global/button/checkbox_tick_gray.dds
deleted file mode 100644
index 3a3ed48a2f..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/button/checkbox_tick_gray.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9f53bd5ae854d4a23244bef2901f6f40906b484b47a5f7ee42e4b9da59d594e
-size 256
diff --git a/binaries/data/mods/public/art/textures/ui/global/icon/bullet.dds b/binaries/data/mods/public/art/textures/ui/global/icon/bullet.dds
deleted file mode 100644
index 5fc414a307..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/icon/bullet.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:647bbf18b00b01cee9ff56a0c1725712e45d6daf81e529cc3012de8d4174f8ac
-size 192
diff --git a/binaries/data/mods/public/art/textures/ui/global/icon/infinity.dds b/binaries/data/mods/public/art/textures/ui/global/icon/infinity.dds
deleted file mode 100644
index be468d13a5..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/icon/infinity.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c2ab79ea240a4319df3433165934a5118084096fa3f27172576f766c9fa5b5c6
-size 384
diff --git a/binaries/data/mods/public/art/textures/ui/global/icon/product_black.dds b/binaries/data/mods/public/art/textures/ui/global/icon/product_black.dds
deleted file mode 100644
index 78c10bf969..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/icon/product_black.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae846d6791035491d7e31f63fcb1b73cb8a7af78d50cecbd1aa0c1bfec69660a
-size 384
diff --git a/binaries/data/mods/public/art/textures/ui/global/tile/granite.dds b/binaries/data/mods/public/art/textures/ui/global/tile/granite.dds
deleted file mode 100644
index 6a55ce91fb..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/tile/granite.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:624a2093a02ea9679bb16a24889386457ac55e151566de2bacfedd5d70092aab
-size 32896
diff --git a/binaries/data/mods/public/art/textures/ui/global/tile/sandstone.dds b/binaries/data/mods/public/art/textures/ui/global/tile/sandstone.dds
deleted file mode 100644
index ab3865bbd8..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/tile/sandstone.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d0d533bd5072a22a0d95efd060b562b9cfa637acbef8c94e61bfd787c8a18388
-size 22000
diff --git a/binaries/data/mods/public/art/textures/ui/global/titlebar/left_gold_fern.dds b/binaries/data/mods/public/art/textures/ui/global/titlebar/left_gold_fern.dds
deleted file mode 100644
index 53dc2f9ea4..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/titlebar/left_gold_fern.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9bb25ce6788bd79a820da28af11fa23d9b82dd667cfcf18a1f51bd547cea5339
-size 2176
diff --git a/binaries/data/mods/public/art/textures/ui/global/titlebar/middle_gold_fern.dds b/binaries/data/mods/public/art/textures/ui/global/titlebar/middle_gold_fern.dds
deleted file mode 100644
index 9773c74a51..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/titlebar/middle_gold_fern.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:971f2db36c3e3352fedcbd6885f631feb96f237685caea91af61be0683bf4218
-size 2176
diff --git a/binaries/data/mods/public/art/textures/ui/global/titlebar/right_gold_fern.dds b/binaries/data/mods/public/art/textures/ui/global/titlebar/right_gold_fern.dds
deleted file mode 100644
index 83edc4473e..0000000000
--- a/binaries/data/mods/public/art/textures/ui/global/titlebar/right_gold_fern.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2d039f31ecbf2b97ff32aa56d35a5813034f0b02d4d84c11660527ff077de9f
-size 2176
diff --git a/binaries/data/mods/public/gui/common/common_sprites.xml b/binaries/data/mods/public/gui/common/common_sprites.xml
index 40500b9055..57945e1c86 100644
--- a/binaries/data/mods/public/gui/common/common_sprites.xml
+++ b/binaries/data/mods/public/gui/common/common_sprites.xml
@@ -33,34 +33,6 @@
 		/>
 	</sprite>
 
-        <sprite name="BackgroundBlack">
-                <image 	backcolor="black"
-			size="0 0 100% 100%"
-		/>
-        </sprite>
-
-        <sprite name="BackgroundRed">
-                <image 	backcolor="darkred"
-			size="0 0 100% 100%"
-		/>
-        </sprite>
-
-        <sprite name="BackgroundSelectArea">
-                <image 	backcolor="darkred"
-			bordercolor="gold"
-			size="0 0 100% 100%"
-			border="true"
-		/>
-        </sprite>
-
-	<sprite name="BackgroundListBox">
-		<image	backcolor="darkbrown"
-			size="0 0 100% 100%"
-			border="true"
-			bordercolor="60 60 40"
-		/>
-	</sprite>
-
 	<sprite name="BackgroundSessionTooltip">
 		<image
 			backcolor="darkbrown"
@@ -88,30 +60,6 @@
 		/>
 	</sprite>
 
-	<sprite name="BackgroundIndentFillDark">
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<!-- Top border -->
-		<image	backcolor="60 60 40"
-			size="0 0 100%-1 1"
-		/>
-		<!-- Right border -->
-		<image 	backcolor="120 120 80"
-			size="100%-1 0 100% 100%"
-		/>
-		<!-- Bottom border -->
-		<image 	backcolor="120 120 80"
-			size="0 100%-1 100% 100%"
-		/>
-		<!-- Left border -->
-		<image 	backcolor="60 60 40"
-			size="0 0 1 100%-1"
-		/>
-		<!-- middle -->
-		<image 	backcolor="0 0 0 85"
-			size="1 1 100%-1 100%-1"
-		/>
-	</sprite>
-
 
 	<!--
 	==========================================
@@ -220,52 +168,6 @@
 		/>
 	</sprite>
 
-	<sprite name="LargeStonePanelThinBorder">
-		<image	texture="global/tile/stone_background.png"
-			real_texture_placement="0 0 312 312"
-			texture_size="0 0 256 256"
-			size="4 4 100%-4 100%-4"
-		/>
-
-		<!-- sides -->
-		<image	texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="4 0 100%-4 4"
-		/>
-		<image	texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="100%-4 4 100% 100%-4"
-		/>
-		<image	texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="4 100%-4 100%-4 100%"
-		/>
-		<image	texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="0 4 4 100%-4"
-		/>
-
-		<!-- corners -->
-		<image
-			texture="global/border/line_corner_top_right.png"
-			texture_size="0 0 4 4"
-			size="100%-4 0 100% 4"
-		/>
-		<image	texture="global/border/line_corner_bottom_right.png"
-			texture_size="0 0 4 4"
-			size="100%-4 100%-4 100% 100%"
-		/>
-		<image	texture="global/border/line_corner_bottom_left.png"
-			texture_size="0 0 4 4"
-			size="0 100%-4 4 100%"
-		/>
-		<image	texture="global/border/line_corner_top_left.png"
-			texture_size="0 0 4 4"
-			size="0 0 4 4"
-		/>
-	</sprite>
-
-
 	<sprite name="StonePanelThinBorder">
 		<image	texture="global/tile/stone_background.png"
 			texture_size="0 0 512 512"
@@ -310,208 +212,6 @@
 		/>
 	</sprite>
 
-	<sprite name="StoneWindow">
-		<!-- background -->
-		<image	texture="global/tile/stone_background_light.png"
-			texture_size="0 0 512 512"
-			size="4 4 100%-4 100%-4"
-		/>
-
-                <!-- shading -->
-		<image
-			texture="global/shading/gradient_wide.png"
-			size="0 0 100% 100%"
-		/>
-
-                <!-- thin sides -->
-		<image	texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="20 16 100%-20 20"
-		/>
-		<image	texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="100%-20 20 100%-16 100%-20"
-		/>
-		<image	texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="20 100%-20 100%-20 100%-16"
-		/>
-		<image	texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="16 20 20 100%-20"
-		/>
-
-		<!-- thin corners -->
-		<image
-			texture="global/border/line_corner_top_right.png"
-			texture_size="0 0 4 4"
-			size="100%-20 16 100%-16 20"
-		/>
-		<image	texture="global/border/line_corner_bottom_right.png"
-			texture_size="0 0 4 4"
-			size="100%-20 100%-20 100%-16 100%-16"
-		/>
-		<image	texture="global/border/line_corner_bottom_left.png"
-			texture_size="0 0 4 4"
-			size="16 100%-20 20 100%-16"
-		/>
-		<image	texture="global/border/line_corner_top_left.png"
-			texture_size="0 0 4 4"
-			size="16 16 20 20"
-		/>
-
-		<!-- sides -->
-		<image	texture="global/border/border-top.png"
-			texture_size="0 0 128 16"
-			size="16 0 100%-16 16"
-		/>
-		<image	texture="global/border/border-right.png"
-			texture_size="0 0 16 128"
-			size="100%-16 16 100% 100%-16"
-		/>
-		<image	texture="global/border/border-bottom.png"
-			texture_size="0 0 128 16"
-			size="16 100%-16 100%-16 100%"
-		/>
-		<image	texture="global/border/border-left.png"
-			texture_size="0 0 16 128"
-			size="0 16 16 100%-16"
-		/>
-
-		<!-- corners -->
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 0 100% 16"
-		/>
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 100%-16 100% 100%"
-		/>
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 100%-16 16 100%"
-		/>
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 0 16 16"
-		/>
-
-		<!-- title frame -->
-		<image	texture="global/titlebar/titlebar_left.png"
-			real_texture_placement="0 0 64 32"
-			size="50%-128 36 50%-64 4"
-		/>
-                <image 	texture="global/titlebar/titlebar_middle.png"
-			real_texture_placement="0 0 64 32"
-			size="50%-64 36 50%+64 4"
-		/>
-                <image 	texture="global/titlebar/titlebar_right.png"
-			real_texture_placement="0 0 64 32"
-			size="50%+64 36 50%+128 4"
-		/>
-	</sprite>
-
-	<sprite name="StoneDialog">
-		<!-- background -->
-		<image	texture="global/tile/stone_background_light.png"
-			texture_size="0 0 512 512"
-			size="4 4 100%-4 100%-4"
-		/>
-
-                <!-- shading -->
-		<image
-			texture="global/shading/gradient_wide.png"
-			size="0 0 100% 100%"
-		/>
-
-                <!-- thin sides -->
-		<image	texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="20 16 100%-20 20"
-		/>
-		<image	texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="100%-20 20 100%-16 100%-20"
-		/>
-		<image	texture="global/border/line_horiz.png"
-			texture_size="0 0 64 4"
-			size="20 100%-20 100%-20 100%-16"
-		/>
-		<image	texture="global/border/line_vert.png"
-			texture_size="0 0 4 64"
-			size="16 20 20 100%-20"
-		/>
-
-		<!-- thin corners -->
-		<image
-			texture="global/border/line_corner_top_right.png"
-			texture_size="0 0 4 4"
-			size="100%-20 16 100%-16 20"
-		/>
-		<image	texture="global/border/line_corner_bottom_right.png"
-			texture_size="0 0 4 4"
-			size="100%-20 100%-20 100%-16 100%-16"
-		/>
-		<image	texture="global/border/line_corner_bottom_left.png"
-			texture_size="0 0 4 4"
-			size="16 100%-20 20 100%-16"
-		/>
-		<image	texture="global/border/line_corner_top_left.png"
-			texture_size="0 0 4 4"
-			size="16 16 20 20"
-		/>
-
-		<!-- sides -->
-		<image	texture="global/border/border-top.png"
-			texture_size="0 0 128 16"
-			size="16 0 100%-16 16"
-		/>
-		<image	texture="global/border/border-right.png"
-			texture_size="0 0 16 128"
-			size="100%-16 16 100% 100%-16"
-		/>
-		<image	texture="global/border/border-bottom.png"
-			texture_size="0 0 128 16"
-			size="16 100%-16 100%-16 100%"
-		/>
-		<image	texture="global/border/border-left.png"
-			texture_size="0 0 16 128"
-			size="0 16 16 100%-16"
-		/>
-
-		<!-- corners -->
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 0 100% 16"
-		/>
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="100%-16 100%-16 100% 100%"
-		/>
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 100%-16 16 100%"
-		/>
-		<image	texture="global/border/border-corner.png"
-			texture_size="0 0 16 16"
-			size="0 0 16 16"
-		/>
-
-		<!-- title frame -->
-		<image	texture="global/titlebar/titlebar_left.png"
-			real_texture_placement="0 0 64 32"
-			size="50%-128 0%-16 50%-64 16"
-		/>
-                <image 	texture="global/titlebar/titlebar_middle.png"
-			real_texture_placement="0 0 64 32"
-			size="50%-64 0%-16 50%+64 16"
-		/>
-                <image 	texture="global/titlebar/titlebar_right.png"
-			real_texture_placement="0 0 64 32"
-			size="50%+64 0%-16 50%+128 16"
-		/>
-	</sprite>
-
 	<!--
 	==========================================
 	MENU CONTROL ELEMENT SPRITES
@@ -579,30 +279,6 @@
 		/>
         </sprite>
 
-	<sprite name="StoneCheckBoxOpen">
-		<image	texture="global/button/checkbox_open_gray.dds"
-			size="0 0 16 16"
-		/>
-        </sprite>
-
-	<sprite name="StoneCheckBoxTick">
-		<image	texture="global/button/checkbox_tick_gray.dds"
-			size="0 0 16 16"
-		/>
-        </sprite>
-
-	<sprite name="StoneCheckBoxCross">
-		<image	texture="global/button/checkbox_cross_gray.dds"
-			size="0 0 16 16"
-		/>
-        </sprite>
-
-	<sprite name="StoneCheckBoxCrossOver">
-		<image	texture="global/button/checkbox_cross_over_gray.dds"
-			size="0 0 16 16"
-		/>
-        </sprite>
-
 	<sprite name="StoneArrowUp">
 		<image	texture="global/button/arrowbox_up.dds"
 			size="0 0 100% 100%"
@@ -627,13 +303,6 @@
 		/>
         </sprite>
 
-	<sprite name="StoneScrollSpriteBar">
-		<image	texture="global/border/scrollbar.dds"
-			real_texture_placement="0 0 16 128"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
 	<!--
 	==========================================
 	CIV ICON
diff --git a/binaries/data/mods/public/gui/common/common_styles.xml b/binaries/data/mods/public/gui/common/common_styles.xml
index 1eec672604..cbc46bf11c 100644
--- a/binaries/data/mods/public/gui/common/common_styles.xml
+++ b/binaries/data/mods/public/gui/common/common_styles.xml
@@ -99,13 +99,6 @@
 		text_valign="center"
 	/>
 
-	<style name="ChatText"
-		font="sans-9"
-		textcolor="white"
-		text_align="left"
-		text_valign="top"
-	/>
-
 	<!--
 	==========================================
 	MENU WINDOW STYLES
@@ -144,13 +137,6 @@
 		text_valign="top"
 	/>
 
-	<style 	name="LargeStonePanelThinBorder"
-		sprite="LargeStonePanelThinBorder"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
 	<style 	name="StonePanelThinBorder"
 		sprite="StonePanelThinBorder"
 		buffer_zone="10"
@@ -158,27 +144,6 @@
 		text_valign="top"
 	/>
 
-	<style 	name="StonePanel"
-		sprite="StonePanel"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<style 	name="StoneWindow"
-		sprite="StoneWindow"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
-	<style 	name="StoneDialog"
-		sprite="StoneDialog"
-		buffer_zone="10"
-		text_align="left"
-		text_valign="top"
-	/>
-
 	<!--
 	==========================================
 	MENU CONTROL ELEMENT STYLES
@@ -209,83 +174,6 @@
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 
-	<style 	name="StoneCrossBox"
-		font="sans-14"
-		sprite="StoneCheckBoxOpen"
-		sprite2="StoneCheckBoxCross"
-		square_side="16"
-		textcolor="black"
-		sound_pressed="audio/interface/ui/ui_button_click.ogg"
-	/>
-
-	<style  name="StoneInput"
-		sprite="BackgroundIndentFillDark"
-		sprite_selectarea="BackgroundRed"
-		textcolor="white"
-		textcolor_selected="gold"
-	/>
-
-	<style  name="StonePasswordInput"
-		sprite="BackgroundIndentFillDark"
-		sprite_selectarea="BackgroundRed"
-		textcolor="white"
-		textcolor_selected="gold"
-		mask="true"
-		mask_char="*"
-	/>
-
-	<style 	name="StoneDropDown"
-		dropdown_buffer="1"
-		font="sans-bold-stroke-14"
-		textcolor="white"
-		text_align="left"
-		text_valign="center"
-
-		sprite="StoneButton"
-		sprite_over="StoneButtonOver"
-		sprite_pressed="StoneButtonGlow"
-
-		button_width="15"
-		sprite2="StoneArrowDn"
-		sprite2_pressed="StoneArrowDnOver"
-
-		buffer_zone="10"
-		dropdown_size="310"
-		sprite_list="BackgroundListBox"
-		sprite_selectarea="BackgroundSelectArea"
-		textcolor_selected="white"
-
-		scrollbar="true"
-		scrollbar_style="wheatScrollBar"
-
-		sound_opened="audio/interface/ui/ui_button_click.ogg"
-		sound_closed="audio/interface/ui/ui_button_click.ogg"
-		sound_selected="audio/interface/ui/ui_button_click.ogg"
-	/>
-
-	<style 	name="StoneList"
-		buffer_zone="5"
-		font="sans-bold-stroke-14"
-		scrollbar="true"
-		scrollbar_style="wheatScrollBar"
-		sprite="BackgroundIndentFillDark"
-		sprite_selectarea="BackgroundSelectArea"
-		sprite_over="BackgroundIndentFillDark"
-		textcolor="white"
-		textcolor_selected="white"
-		text_align="left"
-		text_valign="center"
-		sound_selected="audio/interface/ui/ui_button_click.ogg"
-	/>
-
-	<style 	name="StoneExit"
-		size="100%+9 0%-25 100%+25 0%-9"
-		sprite="StoneCheckBoxCross"
-		sprite_over="StoneCheckBoxCrossOver"
-		tooltip="Close this window and return to the previous screen."
-		tooltip_style="pgToolTip"
-	/>
-
 	<style name="MapPlayerList"
 		buffer_zone="8"
 		font="sans-14"
diff --git a/binaries/data/mods/public/gui/common/setup.xml b/binaries/data/mods/public/gui/common/setup.xml
index 049660f1d5..20115ed726 100644
--- a/binaries/data/mods/public/gui/common/setup.xml
+++ b/binaries/data/mods/public/gui/common/setup.xml
@@ -3,27 +3,6 @@
 <!DOCTYPE setup SYSTEM "..\gui.dtd">
 
 <setup>
-	<!--
-	==========================================
-	- SETUP - SCROLLBARS
-	==========================================
-	-->
-
-	<scrollbar	name="wheatScrollBar"
-			width="12"
-			minimum_bar_size="4"
-			show_edge_buttons="true"
-			sprite_button_top="wheatArrowUp"
-			sprite_button_top_over="wheatArrowUpOver"
-			sprite_button_top_pressed="wheatArrowUpOver"
-			sprite_button_bottom="wheatArrowDn"
-			sprite_button_bottom_over="wheatArrowDnOver"
-			sprite_button_bottom_pressed="wheatArrowDnOver"
-			sprite_back_vertical="wheatScrollSpriteBar"
-			sprite_bar_vertical="wheatCheckBoxOpen"
-			sprite_bar_vertical_over="bkWhiteBorderBlack"
-			sprite_bar_vertical_pressed="bkWhiteBorderBlack"
-	/>
 
 	<!--
 	==========================================
@@ -31,21 +10,6 @@
 	==========================================
 	-->
 
-		<icon	name="iconProduct"
-			sprite="iconProduct"
-			size="16 16"
-		/>
-
-		<icon 	name="iconBullet"
-			sprite="iconBullet"
-			size="8 8"
-		/>
-
-		<icon 	name="iconInfinity"
-			sprite="iconInfinity"
-			size="16 16"
-		/>
-
 		<icon	name="iconInfo"
 			sprite="iconInfoWhite"
 			size="16 16"
@@ -63,23 +27,6 @@
 				hide_object="true"
 		/>
 
-		<tooltip	name="pgSessionSetupToolTip"
-				use_object="pgSessionSetupToolTip"
-				delay="0"
-				hide_object="true"
-		/>
-
-		<tooltip 	name="pgFloatingToolTip"
-				anchor="top"
-				buffer_zone="4"
-				delay="500"
-				font="sans-14"
-				maxwidth="300"
-				offset="16 32"
-				sprite="bkWhiteBorderBlack"
-				textcolor="0 0 0"
-		/>
-
 		<tooltip 	name="snToolTip"
 				anchor="top"
 				buffer_zone="4"
diff --git a/binaries/data/mods/public/gui/common/sprite1.xml b/binaries/data/mods/public/gui/common/sprite1.xml
index cc64d996ec..ca82953022 100644
--- a/binaries/data/mods/public/gui/common/sprite1.xml
+++ b/binaries/data/mods/public/gui/common/sprite1.xml
@@ -22,166 +22,16 @@
 		/>
 	</sprite>
 
-	<sprite name="bkGrayBorderBlack">
-		<image 	backcolor="gray"
-			size="0 0 100% 100%"
-			border="true"
-			bordercolor="black"
-		/>
-	</sprite>
-
-	<sprite name="bkDarkGrayBorderBlack">
-		<image 	backcolor="darkgray"
-			size="0 0 100% 100%"
-			border="true"
-			bordercolor="black"
-		/>
-	</sprite>
-
-	<sprite name="bkBlueBorderBlack">
-		<image 	backcolor="blue"
-			size="0 0 100% 100%"
-			border="true"
-			bordercolor="black"
-		/>
-	</sprite>
-
-	<sprite name="bkBorderBlack">
-		<image backcolor="black"
-			size="-1 -1 100%+1 0"
-		/>
-		<image 	backcolor="black"
-			size="-1 100% 100%+1 100%+1"
-		/>
-		<image 	backcolor="black"
-			size="-1 0 0 100%"
-		/>
-		<image 	backcolor="black"
-			size="100% 0 100%+1 100%"
-		/>
-	</sprite>
-
 	<sprite name="bkFillBlack">
 		<image backcolor="black"/>
 	</sprite>
 
-	<sprite name="bkFillWhite">
-		<image backcolor="white"/>
-	</sprite>
-
-	<sprite name="bkFillGray">
-		<image backcolor="gray"/>
-	</sprite>
-
-	<sprite name="bkFillDarkBlue">
-		<image backcolor="63 127 210 255"/>
-	</sprite>
-
-	<!--
-	==========================================
-	GENERIC - PROGRESS BARS
-	==========================================
-	-->
-
-	<sprite name="bkGreenBar">
-		<image 	backcolor="green"
-				size="0 0 100% 100%"
-		/>
-		<image	backcolor="100 100 100"
-				size="0 1 1 100%-1"
-		/>
-		<image 	backcolor="100 100 100"
-				size="0 0 100%-1 1"
-		/>
-		<image 	backcolor="64 64 64"
-				size="100%-1 0 100% 100%"
-		/>
-		<image 	backcolor="64 64 64"
-				size="0 100%-1 100%-1 100%"
-		/>
-		<image 	backcolor="128 128 128"
-				size="100%-2 1 100%-1 100%-1"
-		/>
-		<image	backcolor="128 128 128"
-				size="1 100%-2 100%-1 100%-1"
-		/>
-	</sprite>
-
-	<sprite name="bkBlueBar">
-		<image 	backcolor="blue"
-				size="0 0 100% 100%"
-		/>
-		<image	backcolor="100 100 100"
-				size="0 1 1 100%-1"
-		/>
-		<image 	backcolor="100 100 100"
-				size="0 0 100%-1 1"
-		/>
-		<image 	backcolor="64 64 64"
-				size="100%-1 0 100% 100%"
-		/>
-		<image 	backcolor="64 64 64"
-				size="0 100%-1 100%-1 100%"
-		/>
-		<image 	backcolor="128 128 128"
-				size="100%-2 1 100%-1 100%-1"
-		/>
-		<image	backcolor="128 128 128"
-				size="1 100%-2 100%-1 100%-1"
-		/>
-	</sprite>
-
-	<!--
-	==========================================
-	GENERIC - TILEABLE TEXTURES
-	==========================================
-	-->
-
-	<sprite name="textureGranite">
-		<image	texture="global/tile/granite.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="bkGraniteBorderBlack">
-		<image texture="global/tile/granite.dds"/>
-		<image
-			backcolor="transparent"
-			border="true"
-			bordercolor="black"
-		/>
-	</sprite>
-
-	<sprite name="textureSand">
-		<image	texture="global/tile/sandstone.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
 	<!--
 	==========================================
 	GENERIC ICONS
 	==========================================
 	-->
 
-	<sprite name="iconProduct">
-		<image 	texture="global/icon/product_black.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="iconBullet">
-		<image 	texture="global/icon/bullet.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="iconInfinity">
-		<image 	texture="global/icon/infinity.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
 	<sprite name="iconInfoGold">
 		<effect	add_color="237 227 167" />
 		<image 	texture="global/icon/info.png"
@@ -210,347 +60,6 @@
 		/>
 	</sprite>
 
-
-	<!--
-	==========================================
-	SKIN - WHEAT
-	==========================================
-	-->
-
-	<sprite name="thinWheatWindowSand">
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0%-10 0%-10 0 0"
-		/>
-		<image 	texture="global/border/top_marble.dds"
-			texture_size="0 0 128 32"
-			size="0 0%-10 100% 22"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100% 0%-10 100%+10 0"
-		/>
-		<image	texture="global/border/right_marble.dds"
-			texture_size="0 0 32 128"
-			size="100%-22 0 100%+10 100%"
-		/>
-		<image	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100% 100% 100%+10 100%+10"
-		/>
-		<image	texture="global/border/bottom_marble.dds"
-			texture_size="0 0 128 32"
-			size="0 100%-22 100% 100%+10"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0%-10 100% 0 100%+10"
-		/>
-		<image 	texture="global/border/left_marble.dds"
-			texture_size="0 0 32 128"
-			size="0%-10 0 0%+22 100%"
-		/>
-		<!-- middle -->
-		<image	texture="global/tile/sandstone.dds"
-			texture_size="0 0 128 128"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatWindowSand">
-		<!-- middle -->
-		<image	texture="global/tile/sandstone.dds"
-			texture_size="0 0 128 128"
-			size="0%-10 0%-10 100%+10 100%+10"
-		/>
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0%-25 0%-25 0%-10 0%-10"
-		/>
-		<image 	texture="global/border/top_marble.dds"
-			texture_size="0 0 128 32"
-			size="0%-10 0%-25 100%+10 0%+7"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100%+10 0%-25 100%+25 0%-10"
-		/>
-		<image	texture="global/border/right_marble.dds"
-			texture_size="0 0 32 128"
-			size="100%-7 0%-10 100%+25 100%+10"
-		/>
-		<image	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100%+10 100%+10 100%+25 100%+25"
-		/>
-		<image	texture="global/border/bottom_marble.dds"
-			texture_size="0 0 128 32"
-			size="0%-10 100%-7 100%+10 100%+25"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0%-25 100%+10 0%-10 100%+25"
-		/>
-		<image 	texture="global/border/left_marble.dds"
-			texture_size="0 0 32 128"
-			size="0%-25 0%-10 0%+7 100%+10"
-		/>
-	</sprite>
-
-	<sprite name="wheatWindowGranite">
-		<!-- middle -->
-		<image	texture="global/tile/granite.dds"
-			texture_size="0 0 128 128"
-			size="0%-10 0%-10 100%+10 100%+10"
-		/>
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0%-25 0%-25 0%-10 0%-10"
-		/>
-		<image 	texture="global/border/top_marble.dds"
-			texture_size="0 0 128 32"
-			size="0%-10 0%-25 100%+10 0%+7"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100%+10 0%-25 100%+25 0%-10"
-		/>
-		<image	texture="global/border/right_marble.dds"
-			texture_size="0 0 32 128"
-			size="100%-6 0%-10 100%+26 100%+10"
-		/>
-		<image	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100%+10 100%+10 100%+25 100%+25"
-		/>
-		<image	texture="global/border/bottom_marble.dds"
-			texture_size="0 0 128 32"
-			size="0%-10 100%-7 100%+10 100%+25"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0%-25 100%+10 0%-10 100%+25"
-		/>
-		<image 	texture="global/border/left_marble.dds"
-			texture_size="0 0 32 128"
-			size="0%-25 0%-10 0%+7 100%+10"
-		/>
-	</sprite>
-
-	<sprite name="wheatWindowTitle">
-		<image	texture="global/titlebar/left_gold_fern.dds"
-			real_texture_placement="0 0 64 32"
-			size="0%+0 0% 64 0%+32"
-		/>
-		<image 	texture="global/titlebar/middle_gold_fern.dds"
-			real_texture_placement="0 0 64 32"
-			size="64 0% 100%-64 0%+32"
-		/>
-		<image 	texture="global/titlebar/right_gold_fern.dds"
-			real_texture_placement="0 0 64 32"
-			size="100%-64 0% 100%+0 0%+32"
-		/>
-	</sprite>
-
-	<sprite name="wheatCheckBoxOpen">
-		<image	texture="global/button/checkbox_open_gray.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatCheckBoxTick">
-		<image	texture="global/button/checkbox_tick_gray.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatCheckBoxCross">
-		<image	texture="global/button/checkbox_cross_gray.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatCheckBoxCrossOver">
-		<image	texture="global/button/checkbox_cross_over_gray.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowLeft">
-		<image	texture="global/button/arrowbox_lt.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowLeftOver">
-		<image	texture="global/button/arrowbox_lt_over.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowRight">
-		<image	texture="global/button/arrowbox_rt.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowRightOver">
-		<image	texture="global/button/arrowbox_rt_over.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowUp">
-		<image	texture="global/button/arrowbox_up.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowUpOver">
-		<image	texture="global/button/arrowbox_up_over.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowDn">
-		<image	texture="global/button/arrowbox_dn.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatArrowDnOver">
-		<image	texture="global/button/arrowbox_dn_over.dds"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatScrollSpriteBar">
-		<image	texture="global/border/scrollbar.dds"
-			real_texture_placement="0 0 16 128"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatButton">
-		<image	texture="global/button/button_wood.png"
-			real_texture_placement="0 0 160 31"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatButtonOver">
-		<image 	texture="global/button/button_wood.png"
-			real_texture_placement="0 32 160 64"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatButtonDisabled">
-		<effect grayscale="" />
-		<image 	texture="global/button/button_wood.png"
-			real_texture_placement="0 0 160 31"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatButtonGlow">
-		<effect	add_color="60 42 42 0" />
-		<image 	texture="global/button/button_wood.png"
-			real_texture_placement="0 0 160 31"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="wheatIndentBorder">
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<!-- Top border -->
-		<image	backcolor="109 122 146"
-			size="0 0 100%-1 1"
-		/>
-		<!-- Right border -->
-		<image 	backcolor="220 223 228"
-			size="100%-1 0 100% 100%"
-		/>
-		<!-- Bottom border -->
-		<image 	backcolor="220 223 228"
-			size="0 100%-1 100% 100%"
-		/>
-		<!-- Left border -->
-		<image 	backcolor="109 122 146"
-			size="0 0 1 100%-1"
-		/>
-		<!-- middle -->
-	</sprite>
-
-	<sprite name="wheatIndentFillDark">
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<!-- Top border -->
-		<image	backcolor="109 122 146"
-			size="0 0 100%-1 1"
-		/>
-		<!-- Right border -->
-		<image 	backcolor="220 223 228"
-			size="100%-1 0 100% 100%"
-		/>
-		<!-- Bottom border -->
-		<image 	backcolor="220 223 228"
-			size="0 100%-1 100% 100%"
-		/>
-		<!-- Left border -->
-		<image 	backcolor="109 122 146"
-			size="0 0 1 100%-1"
-		/>
-		<!-- middle -->
-		<image 	backcolor="0 0 0 85"
-			size="1 1 100%-1 100%-1"
-		/>
-	</sprite>
-
-	<sprite name="wheatIndentFillLight">
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<!-- Top border -->
-		<image	backcolor="109 122 146"
-			size="0 0 100%-1 1"
-		/>
-		<!-- Right border -->
-		<image 	backcolor="220 223 228"
-			size="100%-1 0 100% 100%"
-		/>
-		<!-- Bottom border -->
-		<image 	backcolor="220 223 228"
-			size="0 100%-1 100% 100%"
-		/>
-		<!-- Left border -->
-		<image 	backcolor="109 122 146"
-			size="0 0 1 100%-1"
-		/>
-		<!-- middle -->
-		<image 	backcolor="100 100 100 85"
-			size="1 1 100%-1 100%-1"
-		/>
-	</sprite>
-
-	<sprite name="wheatIndentFillVeryLight">
-		<image	backcolor="109 122 146"
-			size="0 0 100%-1 1"
-		/>
-		<image 	backcolor="220 223 228"
-			size="100%-1 0 100% 100%"
-		/>
-		<image 	backcolor="220 223 228"
-			size="0 100%-1 100% 100%"
-		/>
-		<image 	backcolor="109 122 146"
-			size="0 0 1 100%-1"
-		/>
-		<image 	backcolor="255 255 255 160"
-			size="1 1 100%-1 100%-1"
-		/>
-	</sprite>
-
 	<!--
 	==========================================
 	SCREENSHOT WATERMARK
diff --git a/binaries/data/mods/public/gui/session/sprites.xml b/binaries/data/mods/public/gui/session/sprites.xml
index 8583dedd8f..fcead24c21 100644
--- a/binaries/data/mods/public/gui/session/sprites.xml
+++ b/binaries/data/mods/public/gui/session/sprites.xml
@@ -288,185 +288,6 @@
 		/>
 	</sprite>
 
-<!-- Older Panel Sprites -->
-	<sprite name="goldPanel">
-		<!-- (currently this is all a hack - need proper textures) -->
-		<image  texture="global/titlebar/middle_gold_fern.dds"
-			texture_size="0 0 64 32"
-			size="0 -6 100% 0"
-		/>
-		<image  texture="global/titlebar/middle_gold_fern.dds"
-			texture_size="0 0 64 32"
-			size="0 100%+5 100% 100%"
-		/>
-		<image  texture="global/border/corner_bronze.dds"
-			texture_size="0 0 16 100%"
-			size="-4 -4 0 100%+4"
-		/>
-		<image  texture="global/border/corner_bronze.dds"
-			texture_size="0 0 16 100%"
-			size="100% 0%-4 100%+4 100%+4"
-		/>
-		<image  texture="global/tile/sandstone.dds"
-			texture_size="0 0 128 128"
-		/>
-	</sprite>
-
-	<sprite name="goldPanelFrilly">
-		<!-- (currently this is all a hack - need proper textures) -->
-		<image  texture="global/titlebar/middle_gold_fern.dds"
-			texture_size="0 0 64 32"
-			size="0 -6 100% 0"
-		/>
-		<image  texture="global/titlebar/middle_gold_fern.dds"
-			texture_size="0 0 64 32"
-			size="0 100%+5 100% 100%"
-		/>
-		<image  texture="global/border/corner_bronze.dds"
-			texture_size="0 0 16 100%"
-			size="-4 -4 0 100%+4"
-		/>
-		<image  texture="global/border/corner_bronze.dds"
-			texture_size="0 0 16 100%"
-			size="100% 0%-4 100%+4 100%+4"
-		/>
-		<image  texture="global/titlebar/left_gold_fern.dds"
-			texture_size="0 0 64 32"
-			size="-48 50%-16 0 50%+16"
-		/>
-		<image  texture="global/titlebar/right_gold_fern.dds"
-			texture_size="-16 0 48 32"
-			size="100% 50%-16 100%+48 50%+16"
-		/>
-		<image  texture="global/tile/sandstone.dds"
-			texture_size="0 0 128 128"
-		/>
-	</sprite>
-
-	<sprite name="frilly">
-		<!-- (currently this is all a hack - need proper textures) -->
-		<image  texture="global/titlebar/left_gold_fern.dds"
-			texture_size="0 0 64 32"
-			size="-48 50%-16 0 50%+16"
-		/>
-		<image  texture="global/titlebar/right_gold_fern.dds"
-			texture_size="-16 0 48 32"
-			size="100% 50%-16 100%+48 50%+16"
-		/>
-	</sprite>
-
-	<sprite name="veryThinWheatWindowSand">
-		<!-- Starting with top left corner continuing in a clockwise manner -->
-		<image 	texture="global/border/top_marble.dds"
-			texture_size="0 0 128 16"
-			size="-5 0%-5 100%+5 27"
-		/>
-		<image	texture="global/border/right_marble.dds"
-			texture_size="0 0 16 128"
-			size="100%-27 0 100%+5 100%"
-		/>
-        <image	texture="global/border/bottom_marble.dds"
-			texture_size="0 0 128 16"
-			size="-5 100%-27 100%+5 100%+5"
-		/>
-		<image 	texture="global/border/left_marble.dds"
-			texture_size="0 0 16 128"
-			size="0%-5 0 0%+27 100%"
-		/>
-		<!-- middle -->
-		<image	texture="global/tile/sandstone.dds"
-			texture_size="0 0 128 128"
-			size="0 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="mainPanel">
-		<!-- (currently this is all a hack - need proper textures) -->
-		<image  texture="global/tile/sandstone.dds"
-			texture_size="0 0 128 128"
-		/>
-
-		<image  texture="global/titlebar/middle_gold_fern.dds"
-			real_texture_placement="0 4 64 6"
-			texture_size="0 0 64 32"
-			size="0 0 100% 3"
-		/>
-		<image  texture="global/titlebar/middle_gold_fern.dds"
-			real_texture_placement="0 4 64 6"
-			texture_size="0 0 64 32"
-			size="0 100%-3 100% 100%"
-		/>
-		<image  texture="global/border/corner_bronze.dds"
-			real_texture_placement="1 1 15 15"
-			texture_size="0 0 16 100%"
-			size="0 0 3 100%"
-		/>
-		<image  texture="global/border/corner_bronze.dds"
-			real_texture_placement="1 1 15 15"
-			texture_size="0 0 16 100%"
-			size="100%-3 0 100% 100%"
-		/>
-	</sprite>
-
-	<sprite name="insetWheatWindow">
-		<!-- middle -->
-		<image	texture="global/tile/sandstone.dds"
-			texture_size="0 0 128 128"
-			size="15 15 100%-15 100%-15"
-		/>
-
-		<!-- Sides -->
-		<image 	texture="global/border/top_marble.dds"
-			texture_size="0 0 128 32"
-			size="15 0 100%-15 15"
-		/>
-		<image	texture="global/border/right_marble.dds"
-			texture_size="0 0 32 128"
-			size="100% 15 100%-15 100%-15"
-		/>
-        <image	texture="global/border/bottom_marble.dds"
-			texture_size="0 0 128 32"
-			size="15 100% 100%-15 100%-15"
-		/>
-		<image 	texture="global/border/left_marble.dds"
-			texture_size="0 0 32 128"
-			size="0 15 15 100%-15"
-		/>
-
-		<!-- corners -->
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0 0 16 16"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100%-16 0 100% 16"
-		/>
-		<image	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="100%-16 100%-16 100% 100%"
-		/>
-		<image 	texture="global/border/corner_bronze.dds"
-			real_texture_placement="0 0 15 15"
-			size="0 100%-16 16 100%"
-		/>
-	</sprite>
-
-	<sprite name="titleBar">
-		<image	texture="global/titlebar/left_gold_fern.dds"
-			real_texture_placement="0 0 64 30"
-			size="0%+0 0% 64 0%+30"
-		/>
-                <image 	texture="global/titlebar/middle_gold_fern.dds"
-			real_texture_placement="0 0 64 30"
-			size="64 0% 100%-64 0%+30"
-		/>
-                <image 	texture="global/titlebar/right_gold_fern.dds"
-			real_texture_placement="0 0 64 30"
-			size="100%-64 0% 100%+0 0%+30"
-		/>
-	</sprite>
-
 	<!-- ================================  ================================ -->
 	<!-- Shading -->
 	<!-- ================================  ================================ -->
diff --git a/binaries/data/mods/public/gui/session/trade_window.xml b/binaries/data/mods/public/gui/session/trade_window.xml
index 80b226cbd3..ec9ed1011c 100644
--- a/binaries/data/mods/public/gui/session/trade_window.xml
+++ b/binaries/data/mods/public/gui/session/trade_window.xml
@@ -24,10 +24,10 @@
 						<object name="tradeResourceText[n]" type="text" style="ModernLabelText" ghost="true"/>
 					</object>
 					<object name="tradeArrowUp[n]" size="36 0 52 50%" type="button" style="iconButton">
-						<object type="image" ghost="true" sprite="wheatArrowUp"/>
+						<object type="image" ghost="true" sprite="StoneArrowUp"/>
 					</object>
 					<object name="tradeArrowDn[n]" size="36 50% 52 100%" type="button" style="iconButton">
-						<object type="image" ghost="true" sprite="wheatArrowDn"/>
+						<object type="image" ghost="true" sprite="StoneArrowDn"/>
 					</object>
 				</object>
 			</repeat>